Check in updated po files because I changed a bunch of strings

and it really does make a difference on how long it takes the
nightly stats script to run

76 files changed, 45646 insertions, 41654 deletions

diff --git a/po/af.po b/po/af.po
index 45b576f9e2..ce17e5d5c7 100644
--- a/po/af.po
+++ b/po/af.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2009-02-23 19:54+0200\n"
 "Last-Translator: F Wolff <friedel@translate.org.za>\n"
 "Language-Team: translate-discuss-af@lists.sourceforge.net\n"
@@ -2594,9 +2594,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Sluit ander kitsboodskappers se staaflêers in in die staaflêerleser."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2651,8 +2652,9 @@ msgstr "Emulasie vir vanlynboodskappe"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Stoor boodskappe gestuur aan 'n vanlynvriend as 'n vriendwag."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Die res van die boodskappe sal as 'n vriendwag gestoor word. Dié wag kan "
@@ -2902,14 +2904,16 @@ msgstr ""
 "Kon nie ActiveTCL-installasie bespeur nie. Indien u TCL-inproppe wil "
 "gebruik, installeerActiveTCL vanaf http://www.activestate.com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Die Apple Bonjour For Windows-nutspak kon nie gevind word nie; kyk kwelvrae "
 "by: http://d.pidgin.im/wiki/BonjourWindows vir meer inligting."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Kon nie vir inkomende kitsboodskap-verbindings luister nie\n"
 
 msgid ""
@@ -2964,14 +2968,21 @@ msgstr "%s het die gesprek afgesluit."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Kon nie die boodskap stuur nie, die gesprek kon nie begin word nie."
 
-msgid "Cannot open socket"
-msgstr "Kan nie sok open nie"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Kan nie sok skep nie:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Kon nie sok aan poort verbind nie"
 
-msgid "Could not listen on socket"
-msgstr "Kon nie op sok luister nie"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Kan nie sok skep nie:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Kon nie met plaaslike mDNSResponder kommunikeer nie."
@@ -3020,13 +3031,16 @@ msgstr "Stoor vriendelys..."
 msgid "Load buddylist from file..."
 msgstr "Laai vriendelys van lêer..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Vul die registrasievelde in."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Wagwoorde stem nie ooreen nie."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Kan nie nuwe rekening registreer nie. 'n Fout het voorgekom.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3038,14 +3052,15 @@ msgstr "Registrasie suksesvol voltooi!"
 msgid "Password"
 msgstr "Wagwoord"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr "Wagwoord (weer)"
 
-msgid "Enter current token"
-msgstr "Tik huidige teken"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Huidige teken"
+#, fuzzy
+msgid "Captcha"
+msgstr "Stoor prent"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registreer nuwe Gadu-Gadu-rekening"
@@ -3098,6 +3113,15 @@ msgstr "Wagwoord is suksesvol verander!"
 msgid "Current password"
 msgstr "Huidige wagwoord"
 
+msgid "Password (retype)"
+msgstr "Wagwoord (weer)"
+
+msgid "Enter current token"
+msgstr "Tik huidige teken"
+
+msgid "Current token"
+msgstr "Huidige teken"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Tik gerus u huidige wagwoord en u nuwe wagwoord vir UIN: "
 
@@ -3145,8 +3169,8 @@ msgstr "Geen passende gebruikers gevind nie"
 msgid "There are no users matching your search criteria."
 msgstr "Daar is geen gebruikers wat by u soekkriteria pas nie."
 
-msgid "Unable to read socket"
-msgstr "Kan nie sok lees nie"
+msgid "Unable to read from socket"
+msgstr "Kan nie van sok lees nie"
 
 msgid "Buddy list downloaded"
 msgstr "Vriendelys afgelaai"
@@ -3160,8 +3184,14 @@ msgstr "Vriendelys opgelaai"
 msgid "Your buddy list was stored on the server."
 msgstr "U vriendelys is na die bediener opgelaai."
 
-msgid "Connection failed."
-msgstr "Verbinding het misluk."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Koppel"
+
+msgid "Connection failed"
+msgstr "Verbinding het misluk"
 
 msgid "Add to chat"
 msgstr "Voeg by geselsie"
@@ -3169,18 +3199,23 @@ msgstr "Voeg by geselsie"
 msgid "Chat _name:"
 msgstr "Geselsie_naam:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Kan nie aan bediener koppel nie."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Koppel tans"
+
 msgid "Chat error"
 msgstr "Geselsiefout"
 
 msgid "This chat name is already in use"
 msgstr "Hierdie geselsienaam word reeds gebruik"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Nie aan die bediener koppel nie."
 
 msgid "Find buddies..."
@@ -3240,7 +3275,8 @@ msgstr "Geen onderwerp gestel nie"
 msgid "File Transfer Failed"
 msgstr "Lêeroordrag het misluk"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Kon nie 'n luisterpoort open nie."
 
 msgid "Error displaying MOTD"
@@ -3256,8 +3292,18 @@ msgstr "Daar is geen dagboodskap met hierdie verbinding geassosieer nie."
 msgid "MOTD for %s"
 msgstr "Dagboodskap vir %s"
 
-msgid "Server has disconnected"
-msgstr "Bediener is ontkoppel"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Verbinding met bediener verloor:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Bekyk dagboodskap"
@@ -3272,22 +3318,20 @@ msgstr "_Wagwoord:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC-byname kan nie spasies bevat nie"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Koppel tans"
-
 msgid "SSL support unavailable"
 msgstr "SSL-steun nie beskikbaar nie"
 
-msgid "Couldn't create socket"
-msgstr "Kon nie netwerksok skep nie"
+msgid "Unable to connect"
+msgstr "Kon nie koppel nie"
 
-msgid "Couldn't connect to host"
-msgstr "Kon nie aan gasheer koppel nie"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Kan nie koppel aan %s nie"
 
-msgid "Read error"
-msgstr "Leesfout"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Bediener het die verbinding toegemaak."
 
 msgid "Users"
 msgstr "Gebruikers"
@@ -3718,11 +3762,13 @@ msgstr "Ad hoc-bevel het misluk"
 msgid "execute"
 msgstr "uitvoer"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "Bediener vereis TLS/SSL vir aanmelding.  Geen TLS/SSL-steun gevind nie."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "U vereis enkripsie, maar geen TLS/SSL-steun is gevind nie."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3739,7 +3785,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Skoonteksstawing"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Stawing het misluk"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Ongeldige respons van die bediener."
 
 msgid "Server does not use any supported authentication method"
@@ -3751,7 +3802,8 @@ msgstr "U vereis enkripsie, maar dis nie op hierdie bediener beskikbaar nie."
 msgid "Invalid challenge from server"
 msgstr "Ongeldige uitdaging vanaf bediener"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL-fout"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3771,10 +3823,8 @@ msgstr ""
 "Kon nie 'n verbinding met die bediener bewerkstellig nie:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Kon nie 'n verbinding met die bediener bewerkstellig nie:\n"
 "%s"
@@ -3783,12 +3833,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "Kan nie verbinding inisialiseer nie"
 
-msgid "Unable to create socket"
-msgstr "Kan nie sok skep nie"
-
-msgid "Write error"
-msgstr "Skryffout"
-
 msgid "Full Name"
 msgstr "Volle name"
 
@@ -3859,159 +3903,6 @@ msgstr "Bedryfstelsel"
 msgid "Local Time"
 msgstr "Plaaslike lêer:"
 
-msgid "Last Activity"
-msgstr "Vorige aktiwiteit"
-
-msgid "Service Discovery Info"
-msgstr "Diensbespeuring-inligting"
-
-msgid "Service Discovery Items"
-msgstr "Diensbespeuring-items"
-
-msgid "Extended Stanza Addressing"
-msgstr "Uitgebreide stanza-adressering"
-
-msgid "Multi-User Chat"
-msgstr "Veelgebruiker-geselsies"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Inligting oor verlengde teenwoordigheid van veelgebruiker-geselsies"
-
-msgid "In-Band Bytestreams"
-msgstr "Inband-greepstrome"
-
-msgid "Ad-Hoc Commands"
-msgstr "Ad hoc-bevele"
-
-msgid "PubSub Service"
-msgstr "PubSub-diens"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5-greepstrome"
-
-msgid "Out of Band Data"
-msgstr "Te min banddata"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "Inband-registrasie"
-
-msgid "User Location"
-msgstr "Gebruikerligging"
-
-msgid "User Avatar"
-msgstr "Gebruikeravatar"
-
-msgid "Chat State Notifications"
-msgstr "Geselsiestatuskennisgewing"
-
-msgid "Software Version"
-msgstr "Sagtewareweergawe"
-
-msgid "Stream Initiation"
-msgstr "Stroominisiasie"
-
-msgid "File Transfer"
-msgstr "Lêeroordrag"
-
-msgid "User Mood"
-msgstr "Gebruikerstemming"
-
-msgid "User Activity"
-msgstr "Gebruikeraktiwiteit"
-
-msgid "Entity Capabilities"
-msgstr "Entiteitvermoëns"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Geënkripteerde sessieonderhandelings"
-
-msgid "User Tune"
-msgstr "Gebruikerdeuntjie"
-
-msgid "Roster Item Exchange"
-msgstr "Roosteritem-ruiling"
-
-msgid "Reachability Address"
-msgstr "Bereikbaarheid-adres"
-
-msgid "User Profile"
-msgstr "Gebruikerprofiel"
-
-msgid "Jingle"
-msgstr "Kenwysie"
-
-msgid "Jingle Audio"
-msgstr "Kenwysie-klank"
-
-msgid "User Nickname"
-msgstr "Gebruiker se bynaam"
-
-msgid "Jingle ICE UDP"
-msgstr "Kenwysie ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Kenwysie ICE TPC"
-
-msgid "Jingle Raw UDP"
-msgstr "Kenwysie rou UDP"
-
-msgid "Jingle Video"
-msgstr "Kenwysievideo"
-
-msgid "Jingle DTMF"
-msgstr "Kenwysie DTMF"
-
-msgid "Message Receipts"
-msgstr "Boodskap-ontvangste"
-
-msgid "Public Key Publishing"
-msgstr "Publiekesleutel-publisering"
-
-msgid "User Chatting"
-msgstr "Gebruikergeselsery"
-
-msgid "User Browsing"
-msgstr "Gebruikerblaaiery"
-
-msgid "User Gaming"
-msgstr "Gebruikerspelery"
-
-msgid "User Viewing"
-msgstr "Gebruikerbekyking"
-
-msgid "Ping"
-msgstr "Pieng"
-
-msgid "Stanza Encryption"
-msgstr "Stanzaenkriptering"
-
-msgid "Entity Time"
-msgstr "Entiteittyd"
-
-msgid "Delayed Delivery"
-msgstr "Vertraagde lewering"
-
-msgid "Collaborative Data Objects"
-msgstr "Samewerkende dataobjekte"
-
-msgid "File Repository and Sharing"
-msgstr "Lêerbewaarplek en deling"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "STUN-diensbespeuring vir kenwysie"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Vereenvoudigde onderhandeling vir geënkripteerde sessies"
-
-msgid "Hop Check"
-msgstr "Hop-kontrole"
-
-msgid "Capabilities"
-msgstr "Vermoëns"
-
 msgid "Priority"
 msgstr "Prioriteit"
 
@@ -4023,7 +3914,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Aangemeld"
 
 msgid "Middle Name"
@@ -4204,16 +4095,13 @@ msgstr "Geen passende gebruikers gevind nie"
 msgid "Roles:"
 msgstr "Rol"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Pieng-uittelling"
 
-msgid "Read Error"
-msgstr "Leesfout"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4391,9 +4279,6 @@ msgstr "U wagwoord is verander."
 msgid "Error changing password"
 msgstr "Kon nie wagwoord verander nie"
 
-msgid "Password (again)"
-msgstr "Wagwoord (weer)"
-
 msgid "Change XMPP Password"
 msgstr "Verander XMPP-wagwoord"
 
@@ -4782,6 +4667,14 @@ msgstr "XML-ontleedfout"
 msgid "Unknown Error in presence"
 msgstr "Onbekende fout in teenwoordigheid"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Kon nie by geselsie %s aansluit nie"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Fout in geselsie %s"
+
 msgid "Create New Room"
 msgstr "Skep nuwe kamer"
 
@@ -4797,16 +4690,20 @@ msgstr "_Stel kamer op"
 msgid "_Accept Defaults"
 msgstr "_Aanvaar verstek"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Kon nie by geselsie %s aansluit nie"
+#, fuzzy
+msgid "No reason"
+msgstr "Geen rede gegee nie"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Fout in geselsie %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "U is geskop deur %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Geskop deur %s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Kon nie die lêer open nie."
 
 #, fuzzy
@@ -5296,9 +5193,6 @@ msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "SSL-steun is nodig vir MSN. Installeer gerus 'n gesteunde SSL-programmateek."
 
-msgid "Failed to connect to server."
-msgstr "Verbind aan bediener het misluk."
-
 msgid "Error retrieving profile"
 msgstr "Kon nie profiel haal nie"
 
@@ -5551,9 +5445,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Boodskap is nie gestuur nie omdat 'n onbekende fout voorgekom het."
 
-msgid "Unable to connect"
-msgstr "Kon nie koppel nie"
-
 msgid "Writing error"
 msgstr "Skryffout"
 
@@ -5568,20 +5459,24 @@ msgstr ""
 "Verbindingfout vanaf %s bediener:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Ons protokol word nie deur die bediener ondersteun nie."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Kon nie HTTP ontleed nie."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "U het van 'n ander plek aangemeld."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Die MSN-bedieners is tydelik nie beskikbaar nie. Wag gerus en probeer weer."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Die MSN-bedieners sal tydelik afskakel."
 
 #, c-format
@@ -5593,9 +5488,6 @@ msgid ""
 msgstr ""
 "U MSN-vriendelys is tydelik nie beskikbaar nie. Wag gerus en probeer weer."
 
-msgid "Unknown error."
-msgstr "Onbekende fout."
-
 msgid "Handshaking"
 msgstr "Bladskud"
 
@@ -5699,6 +5591,9 @@ msgstr "MSN-protokolinprop"
 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)"
@@ -5809,12 +5704,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Voeg kontakte van bediener by"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Koppel"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protokolfout, kode %d: %s"
@@ -5838,16 +5727,6 @@ msgstr "MySpaceIM-fout"
 msgid "Invalid input condition"
 msgstr "Ongeldige toevoertoestand"
 
-msgid "Read buffer full (2)"
-msgstr "Leesbuffer vol (2)"
-
-msgid "Unparseable message"
-msgstr "Onontleedbare boodskap"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Kon nie aan gasheer koppel nie: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Byvoeg van vriend het misluk"
 
@@ -5933,6 +5812,12 @@ msgstr "Totale vriende"
 msgid "Client Version"
 msgstr "Kliëntweergawe"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Gebruikernaam beskikbaar"
 
@@ -6189,9 +6074,9 @@ msgstr "Die gebruiker is óf vanlyn óf het u geblokkeer"
 msgid "Unknown error: 0x%X"
 msgstr "Onbekende fout: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Aanmelding het misluk (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Kan nie aanmeld nie"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6295,9 +6180,6 @@ msgstr "GroupWise-konferensie %d"
 msgid "Authenticating..."
 msgstr "Staaf tans..."
 
-msgid "Unable to connect to server."
-msgstr "Kan nie aan bediener koppel nie."
-
 msgid "Waiting for response..."
 msgstr "Wag vir respons..."
 
@@ -6321,9 +6203,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Wil u by die gesprek aansluit?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "U is afgemeld omdat u by 'n ander werkstasie aangemeld het."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6331,16 +6210,14 @@ msgstr ""
 "%s blyk vanlyn te wees, en nie die boodskap ontvang het wat u nou net "
 "gestuur het nie."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Kan nie aan bediener koppel nie. Tik gerus die adres van die bediener "
 "waaraan u wil koppel."
 
-msgid "Error. SSL support is not installed."
-msgstr "Fout. SSL-steun nie geïnstalleer nie."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 "Hierdie konferensie is gesluit. Geen verdere boodskappe kan gestuur word nie."
@@ -6380,10 +6257,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6392,18 +6266,8 @@ msgstr "Kon nie by geselsie aansluit nie"
 msgid "Invalid chat room name"
 msgstr "Ongeldige kletskamernaam"
 
-msgid "Server closed the connection."
-msgstr "Bediener het die verbinding toegemaak."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Verbinding met bediener verloor:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Het ongeldige data ontvang tydens verbinding met bediener."
 
 #. *< type
@@ -6451,7 +6315,8 @@ msgstr "Verbinding met die afgeleë gebruiker verloor:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Het ongeldige data ontvang tydens verbinding met afgeleë gebruiker."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Kon nie 'n verbinding met die afgeleë gebruiker bewerkstellig nie."
 
 msgid "Direct IM established"
@@ -6651,21 +6516,15 @@ msgstr "Waarskuwingvlak"
 msgid "Buddy Comment"
 msgstr "Vriendkommentaar"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Kon nie aan stawingbediener koppel nie:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Kon nie aan BOS-bediener koppel nie:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Kan nie aan bediener koppel nie."
 
 msgid "Username sent"
 msgstr "Gebruikernaam gestuur"
@@ -6677,11 +6536,11 @@ msgstr "Verbinding bewerkstellig, koekie gestuur"
 msgid "Finalizing connection"
 msgstr "Finaliseer verbinding"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Kan nie aanmeld nie: Kon nie op %s aanmeld nie omdat die skermnaam ongeldig "
 "is.  Skermname moet geldige e-posadresse wees, of met 'n letter begin en net "
@@ -6696,26 +6555,22 @@ msgstr ""
 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."
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Gebruiker bestaan nie"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "U rekening is tans opgeskort."
 
 #. service temporarily unavailable
@@ -6735,7 +6590,8 @@ 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."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Die SecurID-sleutel wat getik is, is ongeldig."
 
 msgid "Enter SecurID"
@@ -6910,6 +6766,9 @@ msgstr "Aanlyn sedert"
 msgid "Member Since"
 msgstr "Lid sedert"
 
+msgid "Capabilities"
+msgstr "Vermoëns"
+
 msgid "Profile"
 msgstr "Profiel"
 
@@ -7090,9 +6949,9 @@ msgstr[1] ""
 msgid "Away message too long."
 msgstr "Weg-boodskap te lank."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7116,9 +6975,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Wesies"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Kon nie die vriend %s byvoeg nie omdat u te veel vriende in u vriendelys "
@@ -7127,8 +6986,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(geen naam)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Kon nie die vriend %s byvoeg nie, om 'n onbekende rede."
 
 #, c-format
@@ -7923,7 +7782,7 @@ msgid "Update interval (seconds)"
 msgstr "Opdateringsinterval(le)"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Kan nie bedienerinligting kry nie"
 
 #, c-format
@@ -7950,10 +7809,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Ongeldige teken-antwoordkode, 0x%02X"
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Kan nie bedienerinligting kry nie"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "Vra %s se aandag aan..."
 
@@ -7991,21 +7846,9 @@ msgid ""
 "%s"
 msgstr "Ongeldige teken-antwoordkode, 0x%02X"
 
-msgid "Unable to connect."
-msgstr "Kan nie koppel nie."
-
 msgid "Socket error"
 msgstr "Sokfout"
 
-msgid "Unable to read from socket"
-msgstr "Kan nie van sok lees nie"
-
-msgid "Write Error"
-msgstr "Skryffout"
-
-msgid "Connection lost"
-msgstr "Verbinding verloor"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "Stel gebruikerinligting..."
@@ -8014,8 +7857,9 @@ msgstr "Stel gebruikerinligting..."
 msgid "Requesting token"
 msgstr "Versoek geweier"
 
-msgid "Couldn't resolve host"
-msgstr "Kon nie gasheer oplos nie"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Kan nie aan bediener koppel nie."
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8068,7 +7912,7 @@ msgid "QQ Qun Command"
 msgstr "Bevel"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Kan nie bedienerinligting kry nie"
 
 #, fuzzy
@@ -8090,9 +7934,6 @@ msgstr "Lêer stuur"
 msgid "%d canceled the transfer of %s"
 msgstr "%d het die oordrag van %s gekanselleer"
 
-msgid "Connection closed (writing)"
-msgstr "Verbinding gesluit (skrif)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Groeptitel:</b> %s<br>"
@@ -8148,17 +7989,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime-administrateur se aankondiging"
 
-msgid "Connection reset"
-msgstr "Verbinding teruggestel"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Kon nie vanaf sok lees nie: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Kon nie aan gasheer koppel nie"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Aankondiging van %s"
@@ -8181,6 +8011,9 @@ msgstr "Luidsprekers"
 msgid "Video Camera"
 msgstr "Videokamera"
 
+msgid "File Transfer"
+msgstr "Lêeroordrag"
+
 msgid "Supports"
 msgstr "Ondersteun"
 
@@ -9000,6 +8833,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Netwerk statistiek"
 
+msgid "Ping"
+msgstr "Pieng"
+
 msgid "Ping failed"
 msgstr "Pieng het misluk"
 
@@ -9064,7 +8900,8 @@ msgstr "Niegesteunde publiekesleutel-tipe"
 msgid "Disconnected by server"
 msgstr "Ontkoppel van bediener"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Kon nie volledig aan SILC-bediener koppel nie"
 
 msgid "Key Exchange failed"
@@ -9076,26 +8913,26 @@ msgstr ""
 "Hervat van onthegte sessie het misluk. Druk 'Koppel weer' om 'n nuwe "
 "verbinding te skep."
 
-msgid "Connection failed"
-msgstr "Verbinding het misluk"
-
 msgid "Performing key exchange"
 msgstr "Verrig tans sleutelruiling"
 
-msgid "Unable to create connection"
-msgstr "Kon nie verbinding skep nie"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Kon nie SILC-sleutelpaar laai nie"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Koppel tans aan SILC-bediener"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Kon nie SILC-sleutelpaar laai nie"
+
 msgid "Out of memory"
 msgstr "Onvoldoende geheue"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Kon nie SILC-protokol inisialiseer nie"
 
 msgid "Error loading SILC key pair"
@@ -9393,7 +9230,8 @@ msgstr "Onder digitaal en verifieer alle boodskappe"
 msgid "Creating SILC key pair..."
 msgstr "Skep tans SILC-sleutelpaar..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Kan nie SILC-sleutelpaar skep nie\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9488,6 +9326,9 @@ msgstr "Witbord"
 msgid "No server statistics available"
 msgstr "Geen bedienerstatistiek beskikbaar nie"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Kon nie volledig aan SILC-bediener koppel nie"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Mislukking: Weergawe pas nie, gradeer u kliënt op"
@@ -9529,30 +9370,27 @@ msgstr "Mislukking: Ongeldige koekie"
 msgid "Failure: Authentication failed"
 msgstr "Mislukking: Stawing het misluk"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Kon nie SILC-kliëntverbinding inisialiseer nie"
 
 msgid "John Noname"
 msgstr "Naamloos Niemand"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Kon nie SILC-sleutelpaar laai nie: %s"
 
-msgid "Could not write"
-msgstr "Kon nie skryf nie"
-
-msgid "Could not connect"
-msgstr "Kon nie koppel nie"
+msgid "Unable to create connection"
+msgstr "Kon nie verbinding skep nie"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Onbekende bedienerrespons."
 
-msgid "Could not create listen socket"
-msgstr "Kon nie luistersok skep nie"
-
-msgid "Could not resolve hostname"
-msgstr "Kon nie gasheernaam oplos nie"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Kan nie sok skep nie"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-gebruikername mag nie spasies of @-simbole bevat nie"
@@ -9593,6 +9431,78 @@ msgstr "Magtig gebruiker"
 msgid "Auth Domain"
 msgstr "Magtig domein"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr ""
+"join &lt;kamer&gt;:  Sluit by 'n geselsiekamers op die Yahoo-netwerk aan"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Lys kamers op die Yahoo-netwerk"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Versoek gebruiker om 'n krabbelsessie te begin"
+
+msgid "Yahoo ID..."
+msgstr "Yahoo-ID..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Inprop vir die Yahoo-protokol"
+
+msgid "Pager server"
+msgstr "Roeper-bediener"
+
+msgid "Pager port"
+msgstr "Roeper-poort"
+
+msgid "File transfer server"
+msgstr "Lêeroordragbediener"
+
+msgid "File transfer port"
+msgstr "Lêeroordragpoort"
+
+msgid "Chat room locale"
+msgstr "Geselsiekamer-lokaliteit"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignoreer konferensie- en geselsiekamer-uitnodigings"
+
+msgid "Chat room list URL"
+msgstr "Geselsiekamer-lys-URL"
+
+msgid "Yahoo Chat server"
+msgstr "Yahoo-geselsiebediener"
+
+msgid "Yahoo Chat port"
+msgstr "Yahoo-geselsiepoort"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo-ID..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Inprop vir die Yahoo-protokol"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9623,30 +9533,20 @@ msgstr "Vriend byvoeg geweier"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  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."
@@ -9689,38 +9589,33 @@ msgstr ""
 "Onbekende fout, nommer %d. As u by die Yahoo!-webwerf aanmeld, kan dit dalk "
 "die probleem oplos."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Kon nie vriend %s by groep %s op die bedienerlys op rekening %s voeg nie."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Kon nie vriend by bedienerlys voeg nie"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hoorbaar %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Onverwagte HTTP-respons van die bediener ontvang."
 
-msgid "Connection problem"
-msgstr "Verbindingprobleem"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Verbinding met %s verloor:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Kon nie 'n verbinding met %s bewerkstellig nie:\n"
+"Kon nie 'n verbinding met die bediener bewerkstellig nie:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9783,74 +9678,15 @@ msgstr "Sluit gebruiker by geselsie aan..."
 msgid "Open Inbox"
 msgstr "Open inkassie"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-"join &lt;kamer&gt;:  Sluit by 'n geselsiekamers op die Yahoo-netwerk aan"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Lys kamers op die Yahoo-netwerk"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Versoek gebruiker om 'n krabbelsessie te begin"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo-ID..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Inprop vir die Yahoo-protokol"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-msgid "Pager server"
-msgstr "Roeper-bediener"
-
-msgid "Japan Pager server"
-msgstr "Japannese roeper-bediener"
-
-msgid "Pager port"
-msgstr "Roeper-poort"
-
-msgid "File transfer server"
-msgstr "Lêeroordragbediener"
-
-msgid "Japan file transfer server"
-msgstr "Japannese lêeroordragbediener"
-
-msgid "File transfer port"
-msgstr "Lêeroordragpoort"
-
-msgid "Chat room locale"
-msgstr "Geselsiekamer-lokaliteit"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignoreer konferensie- en geselsiekamer-uitnodigings"
-
-msgid "Chat room list URL"
-msgstr "Geselsiekamer-lys-URL"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo-geselsiebediener"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo-geselsiepoort"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Krabbelversoek gestuur."
 
+msgid "Unable to connect."
+msgstr "Kan nie koppel nie."
+
 msgid "Unable to establish file descriptor."
 msgstr "Kon nie lêerbeskrywer bewerkstellig nie."
 
@@ -9858,6 +9694,9 @@ msgstr "Kon nie lêerbeskrywer bewerkstellig nie."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s probeer om groep van %d lêers aan u te stuur.\n"
 
+msgid "Write Error"
+msgstr "Skryffout"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan-profiel"
 
@@ -9975,23 +9814,19 @@ msgstr "Stemme"
 msgid "Webcams"
 msgstr "Webkameras"
 
+msgid "Connection problem"
+msgstr "Verbindingprobleem"
+
 msgid "Unable to fetch room list."
 msgstr "Kon nie die kamerlys haal nie."
 
 msgid "User Rooms"
 msgstr "Gebruikerkamers"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Verbindingprobleem met die YCHT-bediener."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Verbinding met bediener verloor\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10121,33 +9956,22 @@ msgstr "Ryk"
 msgid "Exposure"
 msgstr "Blootstelling"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Kan nie sok skep nie:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Kon nie respons van HTTP-instaanbediener ontleed nie: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP-instaanverbinding-fout %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Toegang geweier: HTTP-instaanbediener verbied poort %d om te tonnel."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Kon nie %s oplos nie"
 
-msgid "Could not resolve host name"
-msgstr "Kon nie gasheernaam oplos nie"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Vra %s se aandag aan..."
@@ -10349,13 +10173,6 @@ msgstr "Kon nie %s skryf nie: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "Kan nie koppel aan %s nie: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"Bediener vereis TLS/SSL vir aanmelding.  Geen TLS/SSL-steun gevind nie."
-
 #, c-format
 msgid " - %s"
 msgstr " - %s"
@@ -10605,9 +10422,14 @@ msgstr "Voeg vriend_wag by..."
 msgid "View _Log"
 msgstr "Bekyk _staaflêer"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Versteek terwyl vanlyn"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Wys terwyl aanlyn"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
@@ -11109,6 +10931,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Verander gebruikerinligting vir %s"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Tik die gasheernaam vir hierdie sertifikaat in."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL-bedieners"
@@ -11155,7 +10981,8 @@ msgstr "Ignoreer"
 msgid "Get Away Message"
 msgstr "Kry Weg-boodskap"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Laaste gesê"
 
 msgid "Unable to save icon file to disk."
@@ -12049,7 +11876,8 @@ msgstr "Kleur om hiperskakels mee te teken."
 msgid "Hyperlink visited color"
 msgstr "Besoekte hiperskakelkleur"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+#, fuzzy
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 "Kleur om hiperskakels mee te teken ná dit besoek is (of geaktiveer is)."
 
@@ -12088,13 +11916,22 @@ msgid "Action Message Name Color for Whispered Message"
 msgstr "Kleur van aksieboodskapnaam"
 
 #, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Kleur vir die naam van 'n aksieboodskap."
+
+#, fuzzy
 msgid "Whisper Message Name Color"
 msgstr "Kleur van gestuurde boodskapnaam"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Kleur vir die naam van 'n aksieboodskap."
+
 msgid "Typing notification color"
 msgstr "Kleur van tikkennisgewing"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "Die kleur vir die tikkennisgewing"
 
 msgid "Typing notification font"
@@ -12491,6 +12328,10 @@ msgid ""
 msgstr ""
 "Die 'Handmatige' blaaier-bevel is gekies, maar geen bevel is gestel nie."
 
+#, fuzzy
+msgid "No message"
+msgstr "Onbekende boodskap"
+
 msgid "Open All Messages"
 msgstr "Open alle boodskappe"
 
@@ -12508,10 +12349,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">U het pos!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Onbekende boodskap"
-
 msgid "The following plugins will be unloaded."
 msgstr "Die volgende inproppe gaan ontlaai word."
 
@@ -12727,8 +12564,9 @@ msgstr "_Wys ikoon in stelsellaai"
 msgid "On unread messages"
 msgstr "Met ongelese boodskappe"
 
-msgid "Conversation Window Hiding"
-msgstr "Versteking van gesprekvenster"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Kitsboodskap-gesprekvensters"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Versteek nuwe kitsboodskappe:"
@@ -12736,6 +12574,9 @@ msgstr "_Versteek nuwe kitsboodskappe:"
 msgid "When away"
 msgstr "Terwyl weg"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Minim_eer nuwe gesprekvensters"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Oortjies"
@@ -12794,9 +12635,6 @@ msgstr "Gebruik gladde rol"
 msgid "F_lash window when IMs are received"
 msgstr "_Flits boodskap wanneer 'n kitsboodskap ontvang word"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Minim_eer nuwe gesprekvensters"
-
 msgid "Minimum input area height in lines:"
 msgstr "Minimum intikareahoogte in reëls:"
 
@@ -12831,7 +12669,8 @@ msgstr "Kan nie blaaieropstellingsprogram begin nie."
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Voorbeeld: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Outospeur IP-adres"
 
 msgid "Public _IP:"
@@ -13199,21 +13038,6 @@ msgstr "S_toor en gebruik"
 msgid "Status for %s"
 msgstr "Status vir %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "Eie gesiggie"
-
-msgid "More Data needed"
-msgstr "Meer data benodig"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Verskaf gerus 'n kortpad om met die gesiggie te assosieer."
-
 #, fuzzy, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
@@ -13221,12 +13045,12 @@ msgstr ""
 "'n Eie gesiggie vir die gekose kortpad bestaan reeds. Gee asseblief 'n ander "
 "kortpad."
 
+msgid "Custom Smiley"
+msgstr "Eie gesiggie"
+
 msgid "Duplicate Shortcut"
 msgstr "Duplikaatkortpad"
 
-msgid "Please select an image for the smiley."
-msgstr "Kies asseblief 'n prent vir die gesiggie."
-
 msgid "Edit Smiley"
 msgstr "Wysig gesiggie"
 
@@ -13340,9 +13164,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Kan nie laaier stuur nie"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "U het 'n werkskermlaaier gesleep. U wou waarskynlik dit stuur waarna die "
 "laaier wys, in plaas van die laaier sélf."
@@ -13936,9 +13761,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Musiekboodskap-inprop vir saamwerk-komponering."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Die musiekboodskap-inprop stel 'n getal gebruikers in staat om gelyktydig "
 "aan 'n musiekstuk te werk deur gedeelde bladmusiek intyds te redigeer."
@@ -14193,9 +14019,10 @@ msgid "Conversation Window Send Button."
 msgstr "Knoppie om gesprekvenster te stuur."
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Voeg 'n Stuur-knoppie by die intikarea van die gesprekvenster. Bedoel vir "
 "wanneer daar geen fisiese sleutelbord is nie."
@@ -14526,8 +14353,9 @@ msgstr "Windows Pidgin-opsies"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opsies spesifiek aan Pidgin vir Windows."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Verskaf opsies spesifiek vir Pidgin op Windows, soos vriendelysdokking."
 
@@ -14568,6 +14396,311 @@ msgstr "Stuur en ontvang rou XMPP-stanzas."
 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 "Cannot open socket"
+#~ msgstr "Kan nie sok open nie"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Kon nie op sok luister nie"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Kan nie sok lees nie"
+
+#~ msgid "Connection failed."
+#~ msgstr "Verbinding het misluk."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Bediener is ontkoppel"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Kon nie netwerksok skep nie"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Kon nie aan gasheer koppel nie"
+
+#~ msgid "Read error"
+#~ msgstr "Leesfout"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kon nie 'n verbinding met die bediener bewerkstellig nie:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Skryffout"
+
+#~ msgid "Last Activity"
+#~ msgstr "Vorige aktiwiteit"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Diensbespeuring-inligting"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Diensbespeuring-items"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Uitgebreide stanza-adressering"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Veelgebruiker-geselsies"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Inligting oor verlengde teenwoordigheid van veelgebruiker-geselsies"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "Inband-greepstrome"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ad hoc-bevele"
+
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub-diens"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5-greepstrome"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Te min banddata"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "Inband-registrasie"
+
+#~ msgid "User Location"
+#~ msgstr "Gebruikerligging"
+
+#~ msgid "User Avatar"
+#~ msgstr "Gebruikeravatar"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Geselsiestatuskennisgewing"
+
+#~ msgid "Software Version"
+#~ msgstr "Sagtewareweergawe"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Stroominisiasie"
+
+#~ msgid "User Mood"
+#~ msgstr "Gebruikerstemming"
+
+#~ msgid "User Activity"
+#~ msgstr "Gebruikeraktiwiteit"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Entiteitvermoëns"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Geënkripteerde sessieonderhandelings"
+
+#~ msgid "User Tune"
+#~ msgstr "Gebruikerdeuntjie"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Roosteritem-ruiling"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Bereikbaarheid-adres"
+
+#~ msgid "User Profile"
+#~ msgstr "Gebruikerprofiel"
+
+#~ msgid "Jingle"
+#~ msgstr "Kenwysie"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Kenwysie-klank"
+
+#~ msgid "User Nickname"
+#~ msgstr "Gebruiker se bynaam"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Kenwysie ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Kenwysie ICE TPC"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Kenwysie rou UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Kenwysievideo"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Kenwysie DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Boodskap-ontvangste"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Publiekesleutel-publisering"
+
+#~ msgid "User Chatting"
+#~ msgstr "Gebruikergeselsery"
+
+#~ msgid "User Browsing"
+#~ msgstr "Gebruikerblaaiery"
+
+#~ msgid "User Gaming"
+#~ msgstr "Gebruikerspelery"
+
+#~ msgid "User Viewing"
+#~ msgstr "Gebruikerbekyking"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Stanzaenkriptering"
+
+#~ msgid "Entity Time"
+#~ msgstr "Entiteittyd"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Vertraagde lewering"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Samewerkende dataobjekte"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Lêerbewaarplek en deling"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "STUN-diensbespeuring vir kenwysie"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Vereenvoudigde onderhandeling vir geënkripteerde sessies"
+
+#~ msgid "Hop Check"
+#~ msgstr "Hop-kontrole"
+
+#~ msgid "Read Error"
+#~ msgstr "Leesfout"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Verbind aan bediener het misluk."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Leesbuffer vol (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Onontleedbare boodskap"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Kon nie aan gasheer koppel nie: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Aanmelding het misluk (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "U is afgemeld omdat u by 'n ander werkstasie aangemeld het."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Fout. SSL-steun nie geïnstalleer nie."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Verkeerde wagwoord."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kon nie aan BOS-bediener koppel nie:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "U kan dalk binnekort ontkoppel word.  Kontroleer %s vir bywerkings."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Kon nie koppel nie"
+
+#~ msgid "Invalid username."
+#~ msgstr "Ongeldige gebruikernaam."
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Kan nie bedienerinligting kry nie"
+
+#~ msgid "Connection lost"
+#~ msgstr "Verbinding verloor"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Kon nie gasheer oplos nie"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Verbinding gesluit (skrif)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Verbinding teruggestel"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Kon nie vanaf sok lees nie: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Kon nie aan gasheer koppel nie"
+
+#~ msgid "Could not write"
+#~ msgstr "Kon nie skryf nie"
+
+#~ msgid "Could not connect"
+#~ msgstr "Kon nie koppel nie"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Kon nie luistersok skep nie"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Kon nie gasheernaam oplos nie"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Verkeerde wagwoord"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kon nie 'n verbinding met %s bewerkstellig nie:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Japannese roeper-bediener"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japannese lêeroordragbediener"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Verbinding met bediener verloor\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Kon nie gasheernaam oplos nie"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Bediener vereis TLS/SSL vir aanmelding.  Geen TLS/SSL-steun gevind nie."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Versteking van gesprekvenster"
+
+#~ msgid "More Data needed"
+#~ msgstr "Meer data benodig"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Verskaf gerus 'n kortpad om met die gesiggie te assosieer."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Kies asseblief 'n prent vir die gesiggie."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Aktiveer watter ID?"
 
@@ -15049,9 +15182,6 @@ msgstr "Hierdie inprop is nuttig om XMPP-bedieners of -kliënte te ontfout."
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "Kon nie aanmeld nie. Kontroleer ontfoutstaaflêer."
 
-#~ msgid "Unable to login"
-#~ msgstr "Kan nie aanmeld nie"
-
 #, fuzzy
 #~ msgid "Failed room reply"
 #~ msgstr "Aanmelding het misluk, geen antwoord nie"
diff --git a/po/am.po b/po/am.po
index d9c9c50f6e..5a8eda8755 100644
--- a/po/am.po
+++ b/po/am.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 0.60 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2003-04-08 09:23:11+EDT\n"
 "Last-Translator: Ge'ez Frontier Foundation <locales@geez.org>\n"
 "Language-Team: Amharic <locales@geez.org>\n"
@@ -2595,7 +2595,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2645,7 +2645,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2888,12 +2888,13 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
+msgstr "ተገናኝቷል"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2956,14 +2957,17 @@ msgstr ""
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "ተገናኝቷል"
 
-msgid "Cannot open socket"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "ተገናኝቷል"
 
-msgid "Could not bind socket to port"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "ተገናኝቷል"
 
-msgid "Could not listen on socket"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "ተገናኝቷል"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
@@ -3015,13 +3019,13 @@ msgstr "ምልክትን በሌላ ስም አስቀምጥ..."
 msgid "Load buddylist from file..."
 msgstr "ምልክትን በሌላ ስም አስቀምጥ..."
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
-msgid "Passwords do not match."
+msgid "Passwords do not match"
 msgstr ""
 
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr ""
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3035,14 +3039,15 @@ msgid "Password"
 msgstr "ሚስጢራዊ ቃል፦"
 
 #, fuzzy
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr "ሚስጢራዊ ቃል፦"
 
-msgid "Enter current token"
+msgid "Enter captcha text"
 msgstr ""
 
-msgid "Current token"
-msgstr ""
+#, fuzzy
+msgid "Captcha"
+msgstr "ምስሉን አስቀምጥ... (_S)"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr ""
@@ -3099,6 +3104,16 @@ msgstr "ሚስጢራዊ ቃል፦"
 msgid "Current password"
 msgstr "አዲስ ሚስጢራዊ ቃል"
 
+#, fuzzy
+msgid "Password (retype)"
+msgstr "ሚስጢራዊ ቃል፦"
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
@@ -3150,8 +3165,9 @@ msgstr ""
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-msgid "Unable to read socket"
-msgstr ""
+#, fuzzy
+msgid "Unable to read from socket"
+msgstr "ተገናኝቷል"
 
 msgid "Buddy list downloaded"
 msgstr ""
@@ -3165,8 +3181,15 @@ msgstr ""
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+#, fuzzy
+msgid "Connected"
+msgstr "አገናኝ"
+
 #, fuzzy
-msgid "Connection failed."
+msgid "Connection failed"
 msgstr "መድረክን አስወግድ"
 
 #, fuzzy
@@ -3177,11 +3200,15 @@ msgstr "ውሪ"
 msgid "Chat _name:"
 msgstr "የአባት ስም፦"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "ተገናኝቷል"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr ""
+
 #, fuzzy
 msgid "Chat error"
 msgstr "የIRC ስህተት"
@@ -3190,7 +3217,7 @@ msgid "This chat name is already in use"
 msgstr ""
 
 #, fuzzy
-msgid "Not connected to the server."
+msgid "Not connected to the server"
 msgstr "ተገናኝቷል"
 
 #, fuzzy
@@ -3256,7 +3283,7 @@ msgid "File Transfer Failed"
 msgstr "ፋይልን ላክ"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "መድረክን አስወግድ"
 
 msgid "Error displaying MOTD"
@@ -3272,8 +3299,15 @@ msgstr ""
 msgid "MOTD for %s"
 msgstr ""
 
-#, fuzzy
-msgid "Server has disconnected"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
 msgstr "ተገናኝቷል"
 
 msgid "View MOTD"
@@ -3290,23 +3324,20 @@ msgstr "ሚስጢራዊ ቃል (_P)"
 msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr ""
-
 msgid "SSL support unavailable"
 msgstr ""
 
-msgid "Couldn't create socket"
+msgid "Unable to connect"
 msgstr ""
 
-msgid "Couldn't connect to host"
-msgstr ""
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "ተገናኝቷል"
 
-#, fuzzy
-msgid "Read error"
-msgstr "የIRC ስህተት"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "ተገናኝቷል"
 
 #, fuzzy
 msgid "Users"
@@ -3705,10 +3736,10 @@ msgstr "ትእዛዝ"
 msgid "execute"
 msgstr "አጥፉ"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3723,8 +3754,13 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
-msgid "Invalid response from server."
-msgstr ""
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "መድረክን አስወግድ"
+
+#, fuzzy
+msgid "Invalid response from server"
+msgstr "ተገናኝቷል"
 
 msgid "Server does not use any supported authentication method"
 msgstr ""
@@ -3735,8 +3771,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr ""
 
-#, fuzzy
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "የIRC ስህተት"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3752,22 +3788,14 @@ msgstr ""
 msgid "Unable to establish a connection with the server"
 msgstr "ተገናኝቷል"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "ተገናኝቷል"
 
 #, fuzzy
 msgid "Unable to establish SSL connection"
 msgstr "ተገናኝቷል"
 
-msgid "Unable to create socket"
-msgstr ""
-
-msgid "Write error"
-msgstr ""
-
 msgid "Full Name"
 msgstr "ሙሉ ስም"
 
@@ -3837,183 +3865,6 @@ msgstr ""
 msgid "Local Time"
 msgstr "አካባቢ"
 
-msgid "Last Activity"
-msgstr ""
-
-msgid "Service Discovery Info"
-msgstr ""
-
-msgid "Service Discovery Items"
-msgstr ""
-
-msgid "Extended Stanza Addressing"
-msgstr ""
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "የጌም ማውሪያ"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "ትእዛዝ"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr ""
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "የIRC ስህተት"
-
-#, fuzzy
-msgid "User Location"
-msgstr "አካባቢ"
-
-msgid "User Avatar"
-msgstr ""
-
-msgid "Chat State Notifications"
-msgstr ""
-
-msgid "Software Version"
-msgstr ""
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "የቢሮ መረጃ፦"
-
-#, fuzzy
-msgid "File Transfer"
-msgstr "ፋይልን ላክ"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "ተጠቃሚ መርጫዎች"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "ተጠቃሚ (_U)"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr ""
-"\n"
-"<b>ሁኔታ፦</b>"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "ተጠቃሚ፦ (_U)"
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "ኢሜያል አድራሻ"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "የJabber ስህተት %s"
-
-msgid "Jingle"
-msgstr ""
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "ቅጽል ስም"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr ""
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "መልእክት፦ (_M)"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "የቢሮ መረጃ፦"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "ተጠቃሚ መርጫዎች"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "ተጠቃሚ መርጫዎች"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "ተጠቃሚ (_U)"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "ተጠቃሚ (_U)"
-
-msgid "Ping"
-msgstr ""
-
-msgid "Stanza Encryption"
-msgstr ""
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-#, fuzzy
-msgid "Capabilities"
-msgstr ""
-"\n"
-"<b>ሁኔታ፦</b>"
-
 #, fuzzy
 msgid "Priority"
 msgstr "ፖርት"
@@ -4027,7 +3878,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr ""
 "\n"
 "<b>ቅጽል ስም፦</b>"
@@ -4227,17 +4078,12 @@ msgid "Roles:"
 msgstr ""
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "መድረክን አስወግድ"
 
-#, fuzzy
-msgid "Read Error"
-msgstr "የIRC ስህተት"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4427,10 +4273,6 @@ msgid "Error changing password"
 msgstr " የመጀመሪያው ሚስጢራዊ ቃል"
 
 #, fuzzy
-msgid "Password (again)"
-msgstr "ሚስጢራዊ ቃል፦"
-
-#, fuzzy
 msgid "Change XMPP Password"
 msgstr "ሚስጢራዊ ቃልን ለውጥ"
 
@@ -4825,6 +4667,14 @@ msgstr ""
 msgid "Unknown Error in presence"
 msgstr ""
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr ""
+
+#, c-format
+msgid "Error in chat %s"
+msgstr ""
+
 #, fuzzy
 msgid "Create New Room"
 msgstr "የውሪ ቤቶች"
@@ -4841,15 +4691,21 @@ msgstr ""
 msgid "_Accept Defaults"
 msgstr "አጥፉ"
 
+#, fuzzy
+msgid "No reason"
+msgstr "ያልታወቀ ስህተት"
+
 #, c-format
-msgid "Error joining chat %s"
+msgid "You have been kicked: (%s)"
 msgstr ""
 
-#, c-format
-msgid "Error in chat %s"
+#, fuzzy, c-format
+msgid "Kicked (%s)"
 msgstr ""
+"%s\n"
+"%s፦ %s"
 
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr ""
 
 #, fuzzy
@@ -5352,10 +5208,6 @@ msgstr "የጌም ማውሪያ"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-#, fuzzy
-msgid "Failed to connect to server."
-msgstr "ተገናኝቷል"
-
 msgid "Error retrieving profile"
 msgstr ""
 
@@ -5622,9 +5474,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 
-msgid "Unable to connect"
-msgstr ""
-
 #, fuzzy
 msgid "Writing error"
 msgstr "የIRC ስህተት"
@@ -5639,19 +5488,20 @@ msgid ""
 "%s"
 msgstr "ያልታወቀ የስህተት ኮድ"
 
-msgid "Our protocol is not supported by the server."
+msgid "Our protocol is not supported by the server"
 msgstr ""
 
-msgid "Error parsing HTTP."
-msgstr ""
+#, fuzzy
+msgid "Error parsing HTTP"
+msgstr " የመጀመሪያው ሚስጢራዊ ቃል"
 
-msgid "You have signed on from another location."
+msgid "You have signed on from another location"
 msgstr ""
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr ""
 
 #, fuzzy, c-format
@@ -5662,10 +5512,6 @@ msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
-#, fuzzy
-msgid "Unknown error."
-msgstr "ያልታወቀ ስህተት"
-
 msgid "Handshaking"
 msgstr ""
 
@@ -5762,6 +5608,10 @@ msgstr ""
 msgid "%s is not a valid group."
 msgstr ""
 
+#, fuzzy
+msgid "Unknown error."
+msgstr "ያልታወቀ ስህተት"
+
 #, fuzzy, c-format
 msgid "%s on %s (%s)"
 msgstr ""
@@ -5878,13 +5728,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "ተገናኝቷል"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-#, fuzzy
-msgid "Connected"
-msgstr "አገናኝ"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr ""
@@ -5907,17 +5750,6 @@ msgstr ""
 msgid "Invalid input condition"
 msgstr "ሰርቨር፦"
 
-msgid "Read buffer full (2)"
-msgstr ""
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "አዲስ መልእክት"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr ""
-
 msgid "Failed to add buddy"
 msgstr ""
 
@@ -6005,6 +5837,12 @@ msgstr ""
 msgid "Client Version"
 msgstr "የCTCP ዝርያ"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr ""
 
@@ -6268,9 +6106,9 @@ msgstr ""
 msgid "Unknown error: 0x%X"
 msgstr "ያልታወቀ ስህተት"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "ተገናኝቷል"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6373,9 +6211,6 @@ msgstr "የጌም ማውሪያ"
 msgid "Authenticating..."
 msgstr ""
 
-msgid "Unable to connect to server."
-msgstr ""
-
 msgid "Waiting for response..."
 msgstr ""
 
@@ -6396,20 +6231,14 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr ""
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-
-msgid "Error. SSL support is not installed."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 
 msgid "This conference has been closed. No more messages can be sent."
@@ -6449,10 +6278,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr " የመጀመሪያው ሚስጢራዊ ቃል"
 
-msgid "Incorrect password."
-msgstr ""
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, fuzzy
@@ -6464,17 +6290,7 @@ msgid "Invalid chat room name"
 msgstr "የውስጥ ብልሽት"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "ተገናኝቷል"
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "ተገናኝቷል"
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "ተገናኝቷል"
 
 #. *< type
@@ -6524,8 +6340,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "ተገናኝቷል"
 
 #, fuzzy
 msgid "Direct IM established"
@@ -6726,15 +6543,11 @@ msgid "Buddy Comment"
 msgstr "የቢሮ መረጃ፦"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "ተገናኝቷል"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
 msgstr "ተገናኝቷል"
 
 #, fuzzy
@@ -6750,9 +6563,9 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 
 #, c-format
@@ -6762,27 +6575,21 @@ 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
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "እስክሪን ስም"
+msgid "Username does not exist"
+msgstr "ተጠቃሚ፦ (_U)"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+msgid "Your account is currently suspended"
 msgstr ""
 
 #. service temporarily unavailable
@@ -6799,7 +6606,7 @@ msgid ""
 "try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
-msgid "The SecurID key entered is invalid."
+msgid "The SecurID key entered is invalid"
 msgstr ""
 
 msgid "Enter SecurID"
@@ -6957,6 +6764,12 @@ msgid "Member Since"
 msgstr ""
 
 #, fuzzy
+msgid "Capabilities"
+msgstr ""
+"\n"
+"<b>ሁኔታ፦</b>"
+
+#, fuzzy
 msgid "Profile"
 msgstr "የJabber ስህተት %s"
 
@@ -7120,7 +6933,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7143,16 +6956,16 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
 msgid "(no name)"
 msgstr "(ስም የለም)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
+msgstr "ተገናኝቷል"
 
 #, c-format
 msgid ""
@@ -7996,7 +7809,7 @@ msgid "Update interval (seconds)"
 msgstr "የIRC ስህተት"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "ተገናኝቷል"
 
 #, c-format
@@ -8021,10 +7834,6 @@ msgstr ""
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
-#, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "ተገናኝቷል"
-
 msgid "Requesting captcha"
 msgstr ""
 
@@ -8059,26 +7868,11 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr ""
-
 #, fuzzy
 msgid "Socket error"
 msgstr "ያልታወቀ ስህተት"
 
 #, fuzzy
-msgid "Unable to read from socket"
-msgstr "ተገናኝቷል"
-
-#, fuzzy
-msgid "Write Error"
-msgstr "የIRC ስህተት"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "ተገናኝቷል"
-
-#, fuzzy
 msgid "Getting server"
 msgstr "ተገናኝቷል"
 
@@ -8086,8 +7880,8 @@ msgid "Requesting token"
 msgstr ""
 
 #, fuzzy
-msgid "Couldn't resolve host"
-msgstr "መድረክን አስወግድ"
+msgid "Unable to resolve hostname"
+msgstr "ተገናኝቷል"
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8140,7 +7934,7 @@ msgid "QQ Qun Command"
 msgstr "ትእዛዝ"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "ተገናኝቷል"
 
 #, fuzzy
@@ -8163,10 +7957,6 @@ msgstr "ፋይልን ላክ"
 msgid "%d canceled the transfer of %s"
 msgstr ""
 
-#, fuzzy
-msgid "Connection closed (writing)"
-msgstr "መድረክን አስወግድ"
-
 #, fuzzy, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>ሁኔታ፦</b> %s"
@@ -8226,19 +8016,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#, fuzzy
-msgid "Connection reset"
-msgstr "ተገናኝቷል"
-
-#, fuzzy, c-format
-msgid "Error reading from socket: %s"
-msgstr " የመጀመሪያው ሚስጢራዊ ቃል"
-
-#. this is a regular connect, error out
-#, fuzzy
-msgid "Unable to connect to host"
-msgstr "ተገናኝቷል"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -8266,6 +8043,10 @@ msgid "Video Camera"
 msgstr "ውሪ"
 
 #, fuzzy
+msgid "File Transfer"
+msgstr "ፋይልን ላክ"
+
+#, fuzzy
 msgid "Supports"
 msgstr "ፖርት"
 
@@ -9083,6 +8864,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr ""
 
+msgid "Ping"
+msgstr ""
+
 msgid "Ping failed"
 msgstr ""
 
@@ -9142,8 +8926,9 @@ msgstr ""
 msgid "Disconnected by server"
 msgstr "ተገናኝቷል"
 
-msgid "Error during connecting to SILC Server"
-msgstr ""
+#, fuzzy
+msgid "Error connecting to SILC Server"
+msgstr "ተገናኝቷል"
 
 msgid "Key Exchange failed"
 msgstr ""
@@ -9152,30 +8937,28 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-#, fuzzy
-msgid "Connection failed"
-msgstr "መድረክን አስወግድ"
-
 msgid "Performing key exchange"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to create connection"
+msgid "Unable to load SILC key pair"
 msgstr "ተገናኝቷል"
 
-msgid "Could not load SILC key pair"
-msgstr ""
-
 #. Progress
 #, fuzzy
 msgid "Connecting to SILC Server"
 msgstr "ተገናኝቷል"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "ተገናኝቷል"
+
 msgid "Out of memory"
 msgstr ""
 
-msgid "Cannot initialize SILC protocol"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
+msgstr "ተገናኝቷል"
 
 msgid "Error loading SILC key pair"
 msgstr ""
@@ -9462,8 +9245,9 @@ msgstr ""
 msgid "Creating SILC key pair..."
 msgstr ""
 
-msgid "Cannot create SILC key pair\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to create SILC key pair"
+msgstr "ተገናኝቷል"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9556,6 +9340,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr "ሰርቨርን የለም"
 
+msgid "Error during connecting to SILC Server"
+msgstr ""
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -9596,34 +9383,29 @@ msgstr ""
 msgid "Failure: Authentication failed"
 msgstr ""
 
-msgid "Cannot initialize SILC Client connection"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
+msgstr "ተገናኝቷል"
 
 #, fuzzy
 msgid "John Noname"
 msgstr "የአባት ስም፦"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr ""
-
-#, fuzzy
-msgid "Could not write"
-msgstr "መድረክን አስወግድ"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
+msgstr "ተገናኝቷል"
 
 #, fuzzy
-msgid "Could not connect"
-msgstr "መድረክን አስወግድ"
+msgid "Unable to create connection"
+msgstr "ተገናኝቷል"
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "ያልታወቀ ስህተት"
 
-msgid "Could not create listen socket"
-msgstr ""
-
-msgid "Could not resolve hostname"
-msgstr ""
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "ተገናኝቷል"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
@@ -9668,6 +9450,81 @@ msgstr ""
 msgid "Auth Domain"
 msgstr "አውቶማቲክ"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr ""
+
+msgid "list: List rooms on the Yahoo network"
+msgstr ""
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "ምረጡ..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "የJabber ስህተት %s"
+
+#, fuzzy
+msgid "Pager server"
+msgstr "ሰርቨርን የለም"
+
+msgid "Pager port"
+msgstr ""
+
+#, fuzzy
+msgid "File transfer server"
+msgstr "ፋይልን ላክ"
+
+msgid "File transfer port"
+msgstr ""
+
+#, fuzzy
+msgid "Chat room locale"
+msgstr "የውሪ ቤቶች"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
+
+#, fuzzy
+msgid "Chat room list URL"
+msgstr "የውሪ ቤቶች"
+
+msgid "Yahoo Chat server"
+msgstr ""
+
+msgid "Yahoo Chat port"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "ምረጡ..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr ""
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9696,26 +9553,16 @@ msgstr ""
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 
 #. username or password missing
@@ -9751,35 +9598,28 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-msgid "Could not add buddy to server list"
-msgstr ""
+#, fuzzy
+msgid "Unable to add buddy to server list"
+msgstr "ተገናኝቷል"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr ""
 
-#, fuzzy
-msgid "Connection problem"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr "ተገናኝቷል"
 
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
 msgstr "ተገናኝቷል"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-
 #, fuzzy
 msgid "Not at Home"
 msgstr "የአባት ስም፦"
@@ -9851,78 +9691,15 @@ msgstr "ውሪ አገጣጥም..."
 msgid "Open Inbox"
 msgstr ""
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-
-msgid "list: List rooms on the Yahoo network"
-msgstr ""
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "ምረጡ..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr ""
-
-msgid "Yahoo Japan"
-msgstr ""
-
-#, fuzzy
-msgid "Pager server"
-msgstr "ሰርቨርን የለም"
-
-msgid "Japan Pager server"
-msgstr ""
-
-msgid "Pager port"
-msgstr ""
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "ፋይልን ላክ"
-
-msgid "Japan file transfer server"
-msgstr ""
-
-msgid "File transfer port"
-msgstr ""
-
-#, fuzzy
-msgid "Chat room locale"
-msgstr "የውሪ ቤቶች"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-#, fuzzy
-msgid "Chat room list URL"
-msgstr "የውሪ ቤቶች"
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-msgid "Yahoo Chat port"
-msgstr ""
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr ""
+
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -9930,6 +9707,10 @@ msgstr ""
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "ተገናኝቷል"
 
+#, fuzzy
+msgid "Write Error"
+msgstr "የIRC ስህተት"
+
 msgid "Yahoo! Japan Profile"
 msgstr ""
 
@@ -10040,6 +9821,10 @@ msgstr ""
 msgid "Webcams"
 msgstr ""
 
+#, fuzzy
+msgid "Connection problem"
+msgstr "ተገናኝቷል"
+
 msgid "Unable to fetch room list."
 msgstr ""
 
@@ -10048,13 +9833,7 @@ msgid "User Rooms"
 msgstr "ተጠቃሚ መርጫዎች"
 
 #, fuzzy
-msgid "Connection problem with the YCHT server."
-msgstr "ተገናኝቷል"
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
+msgid "Connection problem with the YCHT server"
 msgstr "ተገናኝቷል"
 
 msgid ""
@@ -10177,30 +9956,21 @@ msgid "Exposure"
 msgstr ""
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "ተገናኝቷል"
 
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "ተገናኝቷል"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr " የመጀመሪያው ሚስጢራዊ ቃል"
 
-msgid "Could not resolve host name"
-msgstr ""
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10407,12 +10177,6 @@ msgid "Unable to connect to %s: %s"
 msgstr "ተገናኝቷል"
 
 #, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-
-#, c-format
 msgid " - %s"
 msgstr ""
 
@@ -10668,7 +10432,11 @@ msgid "View _Log"
 msgstr ""
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "ኦንላይን"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "ኦንላይን"
 
 msgid "_Alias..."
@@ -11221,6 +10989,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr ""
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11271,7 +11042,7 @@ msgid "Get Away Message"
 msgstr "አዲስ መልእክት"
 
 #, fuzzy
-msgid "Last said"
+msgid "Last Said"
 msgstr "የአባት ስም፦"
 
 #, fuzzy
@@ -12210,7 +11981,7 @@ msgstr ""
 msgid "Hyperlink visited color"
 msgstr ""
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 
 msgid "Hyperlink prelight color"
@@ -12248,15 +12019,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "አያያዝ ቦታ ቅጂ"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "አያያዝ ቦታ ቅጂ"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12617,6 +12395,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "No message"
+msgstr "(1 መልዕክት)"
+
+#, fuzzy
 msgid "Open All Messages"
 msgstr "አዲስ መልእክት"
 
@@ -12633,10 +12415,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr ""
 
-#, fuzzy
-msgid "No message"
-msgstr "(1 መልዕክት)"
-
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -12860,7 +12638,7 @@ msgid "On unread messages"
 msgstr "[መልዕክት የለም]"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "ተገናኝቷል"
 
 #, fuzzy
@@ -12870,6 +12648,10 @@ msgstr "<አዲስ ተጠቃሚ>"
 msgid "When away"
 msgstr ""
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "<አዲስ ተጠቃሚ>"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "መክፈቻዎች"
@@ -12930,10 +12712,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr ""
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "<አዲስ ተጠቃሚ>"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12970,8 +12748,8 @@ msgstr "የቢሮ መረጃ፦"
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-#, fuzzy
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "አድራሻ፦"
 
 msgid "Public _IP:"
@@ -13363,34 +13141,19 @@ msgstr "አስቀምጥ እና ተጠቀም"
 msgid "Status for %s"
 msgstr "ሁኔታ፦ %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "ምስል አስገባ"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
 #, fuzzy
+msgid "Custom Smiley"
+msgstr "ምስል አስገባ"
+
+#, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "የቢሮ መረጃ፦"
 
-msgid "Please select an image for the smiley."
-msgstr ""
-
 #, fuzzy
 msgid "Edit Smiley"
 msgstr "ምስል አስገባ"
@@ -13506,8 +13269,8 @@ msgid "Cannot send launcher"
 msgstr ""
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -14111,7 +13874,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -14365,7 +14128,7 @@ msgstr "ተገናኝቷል"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14688,7 +14451,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr ""
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14733,6 +14496,160 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Connection failed."
+#~ msgstr "መድረክን አስወግድ"
+
+#, fuzzy
+#~ msgid "Server has disconnected"
+#~ msgstr "ተገናኝቷል"
+
+#, fuzzy
+#~ msgid "Read error"
+#~ msgstr "የIRC ስህተት"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "የጌም ማውሪያ"
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "ትእዛዝ"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "የIRC ስህተት"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "አካባቢ"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "የቢሮ መረጃ፦"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "ተጠቃሚ መርጫዎች"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "ተጠቃሚ (_U)"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>ሁኔታ፦</b>"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "ተጠቃሚ፦ (_U)"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "ኢሜያል አድራሻ"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "የJabber ስህተት %s"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "ቅጽል ስም"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "መልእክት፦ (_M)"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "የቢሮ መረጃ፦"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "ተጠቃሚ መርጫዎች"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "ተጠቃሚ መርጫዎች"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "ተጠቃሚ (_U)"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "ተጠቃሚ (_U)"
+
+#, fuzzy
+#~ msgid "Read Error"
+#~ msgstr "የIRC ስህተት"
+
+#, fuzzy
+#~ msgid "Failed to connect to server."
+#~ msgstr "ተገናኝቷል"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "አዲስ መልእክት"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "ተገናኝቷል"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "እስክሪን ስም"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "ተገናኝቷል"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "ተገናኝቷል"
+
+#, fuzzy
+#~ msgid "Couldn't resolve host"
+#~ msgstr "መድረክን አስወግድ"
+
+#, fuzzy
+#~ msgid "Connection closed (writing)"
+#~ msgstr "መድረክን አስወግድ"
+
+#, fuzzy
+#~ msgid "Connection reset"
+#~ msgstr "ተገናኝቷል"
+
+#, fuzzy
+#~ msgid "Error reading from socket: %s"
+#~ msgstr " የመጀመሪያው ሚስጢራዊ ቃል"
+
+#, fuzzy
+#~ msgid "Unable to connect to host"
+#~ msgstr "ተገናኝቷል"
+
+#, fuzzy
+#~ msgid "Could not write"
+#~ msgstr "መድረክን አስወግድ"
+
+#, fuzzy
+#~ msgid "Could not connect"
+#~ msgstr "መድረክን አስወግድ"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "አዲስ ሚስጢራዊ ቃል"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "ተገናኝቷል"
+
+#, fuzzy
 #~ msgid "Interface colors"
 #~ msgstr "የውስጥ ብልሽት"
 
diff --git a/po/ar.po b/po/ar.po
index 55b6bbd4df..818173221e 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2008-11-01 17:41+0200\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -2546,9 +2546,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "يُضمِّن سجلات عملاء التراسل الأخرى في عارض السجلات."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2602,8 +2603,9 @@ msgstr "محاكاة الرسائل بلا اتصال"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "احفظ الرسائل المرسلة إلى مستخدم غير متصل كإشعار."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "المتبقي من الرسائل سيحفظ كإشعار. يمكنك تحرير/حذف الإشعار من مربع حوار `إشعار "
@@ -2851,14 +2853,16 @@ msgstr ""
 "تعذّر اكتشاف تثبيت ActiveTCL. إذا كنت ترغب في استخدام ملحقات TCL، ثبِّت "
 "ActiveTCL من   http://www.activestate.com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "لم يُعثر على عدة أدوات أبل بونجور لويندوز، راجع الأسئلة الشائعة في: http://d."
 "pidgin.im/BonjourWindows لمزيد من المعلومات."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "تعذّر الاستماع إلى اتصالات التراسل الفوري الواردة\n"
 
 msgid ""
@@ -2911,14 +2915,21 @@ msgstr "%s أغلق المحادثة."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "تعذّر إرسال الرسالة، لا يمكن أن تبدأ المحادثة."
 
-msgid "Cannot open socket"
-msgstr "لا يمكن فتح المقبس"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"تعذّر إنشاء مقبس:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "لا يمكن ربط المقبس بالمنفذ"
 
-msgid "Could not listen on socket"
-msgstr "لا يمكن الاستماع إلى المقبس"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"تعذّر إنشاء مقبس:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "عطل أثناء التواصل مع mDNSResponder."
@@ -2965,13 +2976,16 @@ msgstr "احفظ قائمة الأصدقاء..."
 msgid "Load buddylist from file..."
 msgstr "حمّل قائمة الأصدقاء من ملف..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "املأ حقول التسجيل."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "كلمة السر غير متطابقة."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "تعذّر تسجيل حساب جديد. حدث خطأ.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2983,14 +2997,15 @@ msgstr "اكتمل التسجيل بنجاح!"
 msgid "Password"
 msgstr "كلمة السّر"
 
-msgid "Password (retype)"
-msgstr "أعد كتابة كلمة السر"
+msgid "Password (again)"
+msgstr "كلمة السر (مجددًا)"
 
-msgid "Enter current token"
-msgstr "أدخل الرمز الحالي"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "الرمز الحالي"
+#, fuzzy
+msgid "Captcha"
+msgstr "صورة كابتشا"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "سجّل حساب Gadu-Gadu جديد"
@@ -3043,6 +3058,15 @@ msgstr "غيّرت كلمة السر بنجاح"
 msgid "Current password"
 msgstr "كلمة السر الحالية"
 
+msgid "Password (retype)"
+msgstr "أعد كتابة كلمة السر"
+
+msgid "Enter current token"
+msgstr "أدخل الرمز الحالي"
+
+msgid "Current token"
+msgstr "الرمز الحالي"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "من فضلك، أدخل كلمة السر الحالية وكلمة السر الجديدة لـ UIN: "
 
@@ -3090,8 +3114,8 @@ msgstr "لا يوجد مستخدمون مطابقون"
 msgid "There are no users matching your search criteria."
 msgstr "لا يوجد مستخدمون يطابقون معيار البحث."
 
-msgid "Unable to read socket"
-msgstr "تعذّرت قراءة المقبس"
+msgid "Unable to read from socket"
+msgstr "تعذّرت القراءة من المقبس"
 
 msgid "Buddy list downloaded"
 msgstr "جُلِبَت قائمة الأصدقاء"
@@ -3105,8 +3129,14 @@ msgstr "حُفِظت قائمة الأصدقاء"
 msgid "Your buddy list was stored on the server."
 msgstr "تم حفظ قائمة أصدقائك على الخادوم."
 
-msgid "Connection failed."
-msgstr "فشل الاتصال."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "متَّصل"
+
+msgid "Connection failed"
+msgstr "فشل الاتصال"
 
 msgid "Add to chat"
 msgstr "أضف إلى الدردشة"
@@ -3114,18 +3144,23 @@ msgstr "أضف إلى الدردشة"
 msgid "Chat _name:"
 msgstr "ا_سم الدردشة:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "تعذّر الاتصال بالخادوم."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "يتّصل"
+
 msgid "Chat error"
 msgstr "عُطل في الدردشة"
 
 msgid "This chat name is already in use"
 msgstr "اسم الدردشة هذا مستخدم بالفعلً"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "غير متصل بالخادوم."
 
 msgid "Find buddies..."
@@ -3185,7 +3220,8 @@ msgstr "لم يُحدد أي موضوع"
 msgid "File Transfer Failed"
 msgstr "فشل إرسال الملف"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "لا يمكن فتح منفذ استماع."
 
 msgid "Error displaying MOTD"
@@ -3201,8 +3237,18 @@ msgstr "لا توجد \"رسالة يوم\" مرتبطة بهذا الاتصال
 msgid "MOTD for %s"
 msgstr "\"رسالة اليوم\" لأجل %s "
 
-msgid "Server has disconnected"
-msgstr "قطع الخادومُ الاتصال"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"فُقد الاتصال بالخادوم:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "اعرض \"رسالة اليوم\""
@@ -3217,22 +3263,20 @@ msgstr "كلمة ال_سر:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "لا يمكن للاسم المستعار في IRC أن يحوي مسافة خاوية"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "يتّصل"
-
 msgid "SSL support unavailable"
 msgstr "لا يتوفر دعم SSL"
 
-msgid "Couldn't create socket"
-msgstr "تعذَّر إنشاء مقبس"
+msgid "Unable to connect"
+msgstr "تعذّر الاتصال"
 
-msgid "Couldn't connect to host"
-msgstr "لا يمكن الاتصال بالخادوم"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "تعذّر الاتصال ب%s"
 
-msgid "Read error"
-msgstr "خطأ في القراءة"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "أَغلقَ الخادومُ الاتصال"
 
 msgid "Users"
 msgstr "المستخدمون"
@@ -3690,10 +3734,12 @@ msgstr "فشل الأمر اللحظي"
 msgid "execute"
 msgstr "نفِّذ"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "يتطلب الخادوم TLS/SSL للولوج. لا يوجد دعم TLS/SSL."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "تطلب تعمية، لكن لا يوجد دعم TLS/SSL."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3710,7 +3756,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "استيثاق بالنص الصريح"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "فشل الاستيثاق"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "استجابة غير صحيحة من الخادوم."
 
 msgid "Server does not use any supported authentication method"
@@ -3722,7 +3773,8 @@ msgstr "أنت تتطلب استخدام التعمية لكنها غير متا
 msgid "Invalid challenge from server"
 msgstr "تحدٍ غير صحيح من الخادوم"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "عطل في SASL"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3742,10 +3794,8 @@ msgstr ""
 "تعذَّر الاتصال بالخادوم:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "تعذَّر الاتصال بالخادوم:\n"
 "%s"
@@ -3754,12 +3804,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "تعذّر استبداء الاتصال"
 
-msgid "Unable to create socket"
-msgstr "تعذّر إنشاء مقبس"
-
-msgid "Write error"
-msgstr "عطل في الكتابة"
-
 msgid "Full Name"
 msgstr "الاسم الكامل"
 
@@ -3829,159 +3873,6 @@ msgstr "نظام التشغيل"
 msgid "Local Time"
 msgstr "الملف المحلي:"
 
-msgid "Last Activity"
-msgstr "آخر نشاط"
-
-msgid "Service Discovery Info"
-msgstr "معلومات اكتشاف الخدمة"
-
-msgid "Service Discovery Items"
-msgstr "عناصر اكتشاف الخدمة"
-
-msgid "Extended Stanza Addressing"
-msgstr "عنونة الأبيات الممتدّة"
-
-msgid "Multi-User Chat"
-msgstr "دردشة متعددة المستخدمين"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "معلومات التواجد الممتدة للدردشة متعددة المستخدمين"
-
-msgid "In-Band Bytestreams"
-msgstr "تيار بايتات داخل الحزمة"
-
-msgid "Ad-Hoc Commands"
-msgstr "أوامر لحظية"
-
-msgid "PubSub Service"
-msgstr "خدمة PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "تيار بايتات SOCKS5"
-
-msgid "Out of Band Data"
-msgstr "بيانات خارج الحزمة"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "التسجيل داخل الحزمة"
-
-msgid "User Location"
-msgstr "موضع المستخدم"
-
-msgid "User Avatar"
-msgstr "أيقونة المستخدم"
-
-msgid "Chat State Notifications"
-msgstr "تنويه حالة الدردشة"
-
-msgid "Software Version"
-msgstr "إصدارة البرمجية"
-
-msgid "Stream Initiation"
-msgstr "بدأ التيار"
-
-msgid "File Transfer"
-msgstr "نقل الملفّات "
-
-msgid "User Mood"
-msgstr "مزاج المستخدم"
-
-msgid "User Activity"
-msgstr "نشاط المستخدم"
-
-msgid "Entity Capabilities"
-msgstr "إمكانات الكيان"
-
-msgid "Encrypted Session Negotiations"
-msgstr "مفاوضات الجلسات المعمّاة"
-
-msgid "User Tune"
-msgstr "نغمة المستخدم"
-
-msgid "Roster Item Exchange"
-msgstr "تبادل دوراني للعناصر"
-
-msgid "Reachability Address"
-msgstr "عنوان الوصولية"
-
-msgid "User Profile"
-msgstr "لاحة المستخدم"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle Audio"
-
-msgid "User Nickname"
-msgstr "كنية المستخدم"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle Raw UDP"
-
-msgid "Jingle Video"
-msgstr "فيديو Jingle"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "إيصالات الرسائل"
-
-msgid "Public Key Publishing"
-msgstr "نشر المفتاح العلني"
-
-msgid "User Chatting"
-msgstr "المستخدم يدردش"
-
-msgid "User Browsing"
-msgstr "المستخدم يتصفّح"
-
-msgid "User Gaming"
-msgstr "المستخدم يلعب"
-
-msgid "User Viewing"
-msgstr "المستخدم يطالع"
-
-msgid "Ping"
-msgstr "بِنْج"
-
-msgid "Stanza Encryption"
-msgstr "تعمية الأبيات"
-
-msgid "Entity Time"
-msgstr "وقت الكيان"
-
-msgid "Delayed Delivery"
-msgstr "تسليم متأخر"
-
-msgid "Collaborative Data Objects"
-msgstr "عناصر البيانات التشاركيّة"
-
-msgid "File Repository and Sharing"
-msgstr "مستودع الملفات والمشاركة"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "اكتشاف خدمة STUN لـ Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "التفاوض المبسط لجلسة معمّاة"
-
-msgid "Hop Check"
-msgstr "تدقيق القفزات"
-
-msgid "Capabilities"
-msgstr "الإمكانات"
-
 msgid "Priority"
 msgstr "الأولويّة"
 
@@ -3993,7 +3884,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "والِج بالفعل"
 
 msgid "Middle Name"
@@ -4174,16 +4065,13 @@ msgstr "لا يوجد مستخدمون مطابقون"
 msgid "Roles:"
 msgstr "الدّور"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "مهلة بِنْج"
 
-msgid "Read Error"
-msgstr "عطل في القراءة"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4359,9 +4247,6 @@ msgstr "تم تغيير كلمة السرّ."
 msgid "Error changing password"
 msgstr "عطل أثناء تغيير كلمة السر"
 
-msgid "Password (again)"
-msgstr "كلمة السر (مجددًا)"
-
 msgid "Change XMPP Password"
 msgstr "غيّر كلمة سر XMPP"
 
@@ -4764,6 +4649,14 @@ msgstr "خطأ في تحليل XML"
 msgid "Unknown Error in presence"
 msgstr "خطأ مجهول في التواجد"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "عطل أثناء الانضمام للدردشة %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "عطل في دردشة %s"
+
 msgid "Create New Room"
 msgstr "أنشئ غرفة جديدة"
 
@@ -4778,16 +4671,20 @@ msgstr "ا_عدّ الغرفة"
 msgid "_Accept Defaults"
 msgstr "ا_قبل المبدئية"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "عطل أثناء الانضمام للدردشة %s"
+#, fuzzy
+msgid "No reason"
+msgstr "لا سبب معطى"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "عطل في دردشة %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "لقد طردك %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "طردك %s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "حدث عطل أثناء فتح الملف."
 
 #, fuzzy
@@ -5276,9 +5173,6 @@ msgstr "ابدأ _دردشة"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN تتطلب دعم SSL. رجاءً ثبت مكتبة SSL مدعومة."
 
-msgid "Failed to connect to server."
-msgstr "فشل الاتصال بالخادوم."
-
 msgid "Error retrieving profile"
 msgstr "عطل في جلب اللاحة"
 
@@ -5551,9 +5445,6 @@ msgstr "الرسالة ربما تكون لم ترسل لحدوث عطل ترم�
 msgid "Message was not sent because an unknown error occurred."
 msgstr "الرسالة ربما تكون لم ترسل لحدوث عطل مجهول."
 
-msgid "Unable to connect"
-msgstr "تعذّر الاتصال"
-
 msgid "Writing error"
 msgstr "عطل في الكتابة"
 
@@ -5568,19 +5459,23 @@ msgstr ""
 "خطأ اتصال من خادوم %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "لا يدعم الخادوم هذا البروتوكول."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "خطأ في تحليل HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "قمت بالدخول من موقع آخر."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "خواديم MSN غير متاحة مؤقتًا. من فضلك انتظر و حاول مرة ثانية."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "خادوم MSN سيطفأ مؤقتا."
 
 #, c-format
@@ -5591,9 +5486,6 @@ msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "قائمة أصدقائك في MSN غير متاحة مؤقتًا. من فضلك انتظر و حاول مرة ثانية."
 
-msgid "Unknown error."
-msgstr "خطأ مجهول."
-
 msgid "Handshaking"
 msgstr "المصافحة"
 
@@ -5690,6 +5582,9 @@ msgstr "ملحقة بروتوكول MSN"
 msgid "%s is not a valid group."
 msgstr "%s ليست مجموعة صالحة."
 
+msgid "Unknown error."
+msgstr "خطأ مجهول."
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s على %s (%s)"
@@ -5815,12 +5710,6 @@ msgstr[5] ""
 msgid "Add contacts from server"
 msgstr "أضف معارف من الخادوم"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "متَّصل"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "عطل بروتوكول، رمز %d: %s"
@@ -5844,16 +5733,6 @@ msgstr "عطل في MySpaceIM"
 msgid "Invalid input condition"
 msgstr "حالة دخل غير صحيحة"
 
-msgid "Read buffer full (2)"
-msgstr "براح القراءة ممتليء (2)"
-
-msgid "Unparseable message"
-msgstr "رسالة يتعذّر تحليلها"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "تعذّر الاتصال بالخادوم: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "فشلت إضافة صديق"
 
@@ -5935,6 +5814,12 @@ msgstr "مجموع الأصدقاء"
 msgid "Client Version"
 msgstr "إصدارة العميل"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "‏MySpaceIM - الاسم غير مُتاح"
 
@@ -6189,9 +6074,9 @@ msgstr "المستخدم إما أن يكون غير متصل أو أنك قد �
 msgid "Unknown error: 0x%X"
 msgstr "خطأ مجهول: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "فشل الولوج (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "تعذّر إرسال ping للمستخدم %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6292,9 +6177,6 @@ msgstr "اجتماع GroupWise %d"
 msgid "Authenticating..."
 msgstr "يجري الاستيثاق..."
 
-msgid "Unable to connect to server."
-msgstr "تعذّر الاتصال بالخادوم."
-
 msgid "Waiting for response..."
 msgstr "في انتظار رد..."
 
@@ -6318,22 +6200,17 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "هل تود الانضمام للمحادثة؟"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "أولجت خارجا لأنك ولجت من حاسوب آخر."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "يبدو أن %s غير متصل و لم يتسلم الرسالة التي أرسلتها توا.."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr "تعذّر الاتصال بالخادوم. من فضلك أدخل عنوان الخادوم الذي تود الاتصال به."
 
-msgid "Error. SSL support is not installed."
-msgstr "عطل. دعم SSL غير مثبت."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "لقد فُضَّ هذا الاجتماع. لا يمكن إرسال المزيد من الرسائل."
 
@@ -6372,10 +6249,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "خطأ أثناء استجلاء %s"
 
-msgid "Incorrect password."
-msgstr "كلمة سر خطأ."
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6384,18 +6258,8 @@ msgstr "تعذّر الانضمام لقناة الدردشة"
 msgid "Invalid chat room name"
 msgstr "اسم غرفة دردشة غير صالح"
 
-msgid "Server closed the connection."
-msgstr "أَغلقَ الخادومُ الاتصال"
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"فُقد الاتصال بالخادوم:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "استقبلت بيانات غير صالحة عند الاتصال بالخادوم."
 
 #. *< type
@@ -6443,7 +6307,8 @@ msgstr "فقد الاتصال مع المستخدم البعيد:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "استقبلت بيانات غير صالحة عند الاتصال بمستخدم بعيد."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "لا يمكن عمل اتصال بالمستخدم البعيد"
 
 msgid "Direct IM established"
@@ -6642,21 +6507,15 @@ msgstr "مستوى التحذير"
 msgid "Buddy Comment"
 msgstr "تعليق الصديق"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "تعذّر الاتصال بخادوم الاستيثاق:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"تعذّر الاتصال بخادوم BOS:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "تعذّر الاتصال بالخادوم."
 
 msgid "Username sent"
 msgstr "حُدِّد اسم المُستخدم"
@@ -6668,11 +6527,11 @@ msgstr "أُنشئ الاتصال، أرسلت الكوكي"
 msgid "Finalizing connection"
 msgstr "يُنهي الاتصال"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "تعذّر الولوج: لم يمكن الولوج باسم %s لأنه اسم غير صحيح. يجب أن يكون الاسم "
 "عنوان بريد صحيح، أو أن يبدأ بحرف و يحوي فقط أحرفا و أرقاما و مسافات، أو "
@@ -6685,26 +6544,22 @@ 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 "اسم مستخدم غير صالح"
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "المستخدم غير موجود"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "حسابك مُعَلّق حاليا."
 
 #. service temporarily unavailable
@@ -6724,7 +6579,8 @@ msgstr ""
 "قمت بالاتصال و قطعته مرات عديدة في وقت قصير جدا. انتظر عشر دقائق وحاول "
 "مجددا. إذا استمريت في المحاولة الآن فسينبغي لك الانتظار مدة أطول."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "مفتاح SecurID المدخل غير صالح."
 
 msgid "Enter SecurID"
@@ -6913,6 +6769,9 @@ msgstr "متصل منذ"
 msgid "Member Since"
 msgstr "عضو منذ"
 
+msgid "Capabilities"
+msgstr "الإمكانات"
+
 msgid "Profile"
 msgstr "لاحة"
 
@@ -7090,9 +6949,9 @@ msgstr[5] "لقد تجاوز طول رسالة الغياب الحد الأقص�
 msgid "Away message too long."
 msgstr "رسالة \"غياب\" أطول من المسموح."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7118,9 +6977,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "أيتام"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "تعذّرت إضافة الصديق %s لأن لديك أصدقاء أكثر من المسموح به في قائمة أصدقائك. "
@@ -7129,8 +6988,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(بلا اسم)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "تعذّرت إضافة الصديق %s لسبب مجهول."
 
 #, c-format
@@ -7921,7 +7780,7 @@ msgid "Update interval (seconds)"
 msgstr "فترات التحديث"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "تعذّر تظهير رد الخادوم المُستَلَم"
 
 #, c-format
@@ -7948,10 +7807,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "رمز رد غير معروف أثناء الولوج (0x%02X)"
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "تعذّر تظهير رد الخادوم المُستَلَم"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "يسجّل كابتشا ..."
 
@@ -7989,21 +7844,9 @@ msgstr ""
 "رمز رد غير معروف أثناء الولوج (0x%02X):\n"
 "%s"
 
-msgid "Unable to connect."
-msgstr "تعذّر الاتصال."
-
 msgid "Socket error"
 msgstr "عطل في المقبس"
 
-msgid "Unable to read from socket"
-msgstr "تعذّرت القراءة من المقبس"
-
-msgid "Write Error"
-msgstr "عطل في الكتابة"
-
-msgid "Connection lost"
-msgstr "قُطع الاتصال"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "اجلب الخادوم ..."
@@ -8012,8 +7855,9 @@ msgstr "اجلب الخادوم ..."
 msgid "Requesting token"
 msgstr "مُنِع الطلب"
 
-msgid "Couldn't resolve host"
-msgstr "لا يمكن استجلاء المضيف"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "تعذّر الاتصال بالخادوم."
 
 msgid "Invalid server or port"
 msgstr "خادوم أو منفذ غير صحيح"
@@ -8066,7 +7910,7 @@ msgid "QQ Qun Command"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "تعذر تظهير رد الولوج"
 
 msgid "Unknown LOGIN CMD"
@@ -8086,9 +7930,6 @@ msgstr "أُرسِل الملف"
 msgid "%d canceled the transfer of %s"
 msgstr "ألغى %d نقل %s"
 
-msgid "Connection closed (writing)"
-msgstr "أُغلِق الاتصال (تدري الكتابة)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>عنوان المجموعة:</b> %s<br>"
@@ -8142,17 +7983,6 @@ msgstr "وضع مدير Sametime الإعلان التالي على الخادو
 msgid "Sametime Administrator Announcement"
 msgstr "إعلان من مدير Sametime"
 
-msgid "Connection reset"
-msgstr "صُفِّر الاتصال"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "عطل في القراءة من المقبس: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "تعذّر الاتصال بالخادوم"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "إعلان من %s"
@@ -8175,6 +8005,9 @@ msgstr "سماعات"
 msgid "Video Camera"
 msgstr "كاميرا فيديو"
 
+msgid "File Transfer"
+msgstr "نقل الملفّات "
+
 msgid "Supports"
 msgstr "الدعم"
 
@@ -8980,6 +8813,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "إحصائيات الشبكة"
 
+msgid "Ping"
+msgstr "بِنْج"
+
 msgid "Ping failed"
 msgstr "فشل بِنْج"
 
@@ -9039,7 +8875,8 @@ msgstr "نوع مفتاح علني غير مدعوم"
 msgid "Disconnected by server"
 msgstr "قطع الخادوم الاتصال"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "خطأ أثناء الاتصال بخادوم SILC"
 
 msgid "Key Exchange failed"
@@ -9049,26 +8886,26 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "فشلت متابعة الجلسة المفصولة. اضغط \"أعِد الاتصال\" لتُنشئ اتصالا جديدا."
 
-msgid "Connection failed"
-msgstr "فشل الاتصال"
-
 msgid "Performing key exchange"
 msgstr "يجري تبادل المفاتيح"
 
-msgid "Unable to create connection"
-msgstr "تعذّر إنشاء اتصال"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "تعذّر تحميل زوج مفاتيح SILC"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "يجري الاتصال بخادوم SILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "تعذّر تحميل زوج مفاتيح SILC"
+
 msgid "Out of memory"
 msgstr "نفدت الذّاكرة"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "لا يمكن استبداء بروتوكول SILC"
 
 msgid "Error loading SILC key pair"
@@ -9405,7 +9242,8 @@ msgstr "وقع و تحقق من كل الرسائل"
 msgid "Creating SILC key pair..."
 msgstr "يجري توليد زوج مفاتيح SILC..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "تعذّر توليد زوج مفاتيح SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9497,6 +9335,9 @@ msgstr "السبورة"
 msgid "No server statistics available"
 msgstr "لا تتوفر إحصائيات للخادوم"
 
+msgid "Error during connecting to SILC Server"
+msgstr "خطأ أثناء الاتصال بخادوم SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "فشل: إصدارة قديمة. رقّ العميل."
@@ -9537,30 +9378,27 @@ msgstr "فشل: كوكي غير صالحة"
 msgid "Failure: Authentication failed"
 msgstr "فشل: فشل الاستيثاق"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "تعذّر استبداء اتصال عميل SILC"
 
 msgid "John Noname"
 msgstr "اللهو الخفي"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "تعذّر تحميل زوج مفاتيح SILC: %s"
 
-msgid "Could not write"
-msgstr "تعذّرت الكتابة"
-
-msgid "Could not connect"
-msgstr "تعذّر الاتصال"
+msgid "Unable to create connection"
+msgstr "تعذّر إنشاء اتصال"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "استجابة خادوم مجهولة."
 
-msgid "Could not create listen socket"
-msgstr "لايمكن إنشاء مقبس استماع"
-
-msgid "Could not resolve hostname"
-msgstr "لا يمكن استجلاء اسم المضيف"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "تعذّر إنشاء مقبس"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "لا يمكن أن تحوي أسماء مستخدمي SIP فراغات أو رمز @"
@@ -9602,6 +9440,83 @@ msgstr "استوثق من المستخدم"
 msgid "Auth Domain"
 msgstr "استوثق من النطاق"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr ""
+"join &lt;room&gt;: \n"
+"انضم إلي غرفة دردشة في شبكة ياهو"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr ""
+"list: \n"
+"اسرد الغرف في شبكة ياهو"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+"doodle: \n"
+"اطلب من المستخدم أن يبدأ جلسة Doodle"
+
+msgid "Yahoo ID..."
+msgstr "هويّة ياهو..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "ملحقة بروتوكول ياهو"
+
+msgid "Pager server"
+msgstr "خادوم الاستدعاء"
+
+msgid "Pager port"
+msgstr "منفذ الاستدعاء"
+
+msgid "File transfer server"
+msgstr "خادوم نقل الملفات"
+
+msgid "File transfer port"
+msgstr "منفذ نقل الملفات"
+
+msgid "Chat room locale"
+msgstr "محليّة غرفة الدردشة"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "تجاهل دعوات الاجتماعات و غرف الدردشة"
+
+msgid "Chat room list URL"
+msgstr "مسار قائمة غرفة المحادثة."
+
+msgid "Yahoo Chat server"
+msgstr "خادوم دردشة ياهو"
+
+msgid "Yahoo Chat port"
+msgstr "منفذ دردشة ياهو"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "هويّة ياهو..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "ملحقة بروتوكول ياهو"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9630,28 +9545,18 @@ msgstr "رفضت إضافة صديق"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr "خطأ مجهول رقم %d. الولوج في موقع ياهوو! على الوب قد يصحح هذه المشكلة."
 
 #. username or password missing
@@ -9689,37 +9594,32 @@ msgstr "حسابك مقفل، من فضلك لُج في موقع ياهوو! ع�
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "خطأ مجهول رقم %d. الولوج في موقع ياهوو! على الوب قد يصحح هذه المشكلة."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "تعذرت إضافة الصديق %s إلى المجموعة %s على قائمة الخادوم للحساب %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "تعذرت إضافة الصديق إلى قائمة الخادوم."
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ %s/%s/%s.swf مسموع] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "تلقيت استجابة غير متوقّعة من خادوم HTTP."
 
-msgid "Connection problem"
-msgstr "مشكلة في الاتصال"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "انقطع الاتصال مع %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"تعذّر إقامة اتصال مع %s:\n"
+"تعذَّر الاتصال بالخادوم:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9782,79 +9682,15 @@ msgstr "ضمّ مستخدما إلى الدردشة..."
 msgid "Open Inbox"
 msgstr "افتح صندوق الوارد"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-"join &lt;room&gt;: \n"
-"انضم إلي غرفة دردشة في شبكة ياهو"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr ""
-"list: \n"
-"اسرد الغرف في شبكة ياهو"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-"doodle: \n"
-"اطلب من المستخدم أن يبدأ جلسة Doodle"
-
-msgid "Yahoo ID..."
-msgstr "هويّة ياهو..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "ملحقة بروتوكول ياهو"
-
-msgid "Yahoo Japan"
-msgstr "ياهو اليابان"
-
-msgid "Pager server"
-msgstr "خادوم الاستدعاء"
-
-msgid "Japan Pager server"
-msgstr "خادوم استدعاء اليابان"
-
-msgid "Pager port"
-msgstr "منفذ الاستدعاء"
-
-msgid "File transfer server"
-msgstr "خادوم نقل الملفات"
-
-msgid "Japan file transfer server"
-msgstr "خادوم نقل ملفّات ياباني"
-
-msgid "File transfer port"
-msgstr "منفذ نقل الملفات"
-
-msgid "Chat room locale"
-msgstr "محليّة غرفة الدردشة"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "تجاهل دعوات الاجتماعات و غرف الدردشة"
-
-msgid "Chat room list URL"
-msgstr "مسار قائمة غرفة المحادثة."
-
-msgid "Yahoo Chat server"
-msgstr "خادوم دردشة ياهو"
-
-msgid "Yahoo Chat port"
-msgstr "منفذ دردشة ياهو"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "أُرسِل طلب Doodle."
 
+msgid "Unable to connect."
+msgstr "تعذّر الاتصال."
+
 msgid "Unable to establish file descriptor."
 msgstr "تعذّر إنشاء موصّف ملف."
 
@@ -9862,6 +9698,9 @@ msgstr "تعذّر إنشاء موصّف ملف."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "‏%s يحاول أن يرسل لك مجموعة من %d ملفات.\n"
 
+msgid "Write Error"
+msgstr "عطل في الكتابة"
+
 msgid "Yahoo! Japan Profile"
 msgstr "لاحة ياهو! اليابان"
 
@@ -9975,23 +9814,19 @@ msgstr "الأصوات"
 msgid "Webcams"
 msgstr "كاميرا وِب"
 
+msgid "Connection problem"
+msgstr "مشكلة في الاتصال"
+
 msgid "Unable to fetch room list."
 msgstr "تعذّر احضار قائمة الغرف."
 
 msgid "User Rooms"
 msgstr "غرف المستخدمين"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "مشكلة اتصال مع خادوم YCHT."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"انقطع الاتصال بالخادوم\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10124,33 +9959,22 @@ msgstr "عالم"
 msgid "Exposure"
 msgstr "التعرّض"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"تعذّر إنشاء مقبس:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "تعذّر تحليل استجابة من خادوم وسيط HTTP: %s \n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "خطأ في اتصال وسيط HTTP %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "الوصول ممنوع: لا يسمح خادوم وسيط HTTP بأنفقة المنفذ %d."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "خطأ أثناء استجلاء %s"
 
-msgid "Could not resolve host name"
-msgstr "لايمكن استجلاء اسم المضيف"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "يجري طلب انتباه %s..."
@@ -10376,12 +10200,6 @@ msgstr "عطل في الكتابة إلى %s: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "تعذّر الاتصال بـ %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "يتطلب الخادوم TLS/SSL للولوج. لا يوجد دعم TLS/SSL."
-
 #, c-format
 msgid " - %s"
 msgstr " - %s"
@@ -10630,9 +10448,14 @@ msgstr "أضف إ_شعار صديق..."
 msgid "View _Log"
 msgstr "اعرض ال_سجل"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "اخفِ عندما لا تكون متصلا"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "أظهر عندما لا تكون متصلا"
+
 msgid "_Alias..."
 msgstr "_كنية..."
 
@@ -11138,6 +10961,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "غيّر معلومات المستخدم لأجل %s"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "أدخل اسم المضيف صاحب هذه الشهادة."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "خادوم SSL"
@@ -11183,7 +11010,8 @@ msgstr "تجاهل"
 msgid "Get Away Message"
 msgstr "اجلب رسالة \"الغياب\""
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "آخر ماقيل"
 
 msgid "Unable to save icon file to disk."
@@ -12084,7 +11912,7 @@ msgid "Hyperlink visited color"
 msgstr "لون الرابط الفائق المزار"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "لون لرسم الروابط الفائقة عندما تكون الفأرة فوقها."
 
 msgid "Hyperlink prelight color"
@@ -12122,15 +11950,24 @@ msgid "Action Message Name Color for Whispered Message"
 msgstr "لون اسم رسالة الإجراء"
 
 #, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "لون رسم اسم رسالة إجراء."
+
+#, fuzzy
 msgid "Whisper Message Name Color"
 msgstr "أرسل لون اسم الرسالة"
 
 #, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "لون رسم اسم رسالة إجراء."
+
+#, fuzzy
 msgid "Typing notification color"
 msgstr "إزالة التنبيه"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "تنبيهات بريديّة جديدة"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12528,6 +12365,10 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "أمر المتصفح \"اليدوي\" تم اختياره، ولكن لم يُحدد أي أمر."
 
+#, fuzzy
+msgid "No message"
+msgstr "رسالة مجهولة"
+
 msgid "Open All Messages"
 msgstr "افتح جميع الرسائل"
 
@@ -12545,10 +12386,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">لديك رسالة!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "رسالة مجهولة"
-
 msgid "The following plugins will be unloaded."
 msgstr "الملحقات التالية ستفرغ."
 
@@ -12762,8 +12599,9 @@ msgstr "ا_عرض أيقونة لوحة النظام:"
 msgid "On unread messages"
 msgstr "عند الرسائل غير المقروءة"
 
-msgid "Conversation Window Hiding"
-msgstr "إخفاء نافذة المحادثة"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "نوافذ المحادثة الفورية"
 
 msgid "_Hide new IM conversations:"
 msgstr "ا_خفِ محادثات التراسل الفوري الجديدة"
@@ -12771,6 +12609,9 @@ msgstr "ا_خفِ محادثات التراسل الفوري الجديدة"
 msgid "When away"
 msgstr "عند الغياب"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "_صغّر نوافذ المحادثات الجديدة"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "الألسنة"
@@ -12829,9 +12670,6 @@ msgstr "استخدم التدحرج السلس"
 msgid "F_lash window when IMs are received"
 msgstr "أ_ومض النافذة عند استقبال الرسائل الفورية"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "_صغّر نوافذ المحادثات الجديدة"
-
 msgid "Minimum input area height in lines:"
 msgstr "أقل ارتفاع لمنطقة الإدخال بالسطور:"
 
@@ -12864,7 +12702,8 @@ msgstr "تعذّر بدأ برنامج إعداد المتصفح."
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">مثال: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_تحرّى عنوان IP تلقائيا"
 
 msgid "Public _IP:"
@@ -13232,34 +13071,18 @@ msgstr "احف_ظ و استخدم"
 msgid "Status for %s"
 msgstr "حالة %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "أدرِج بسمة"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
 #, fuzzy
-msgid "Duplicate Shortcut"
-msgstr "تصوِيب مكرر"
+msgid "Custom Smiley"
+msgstr "أدرِج بسمة"
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "من فضلك اختر مزاجك من القائمة."
+msgid "Duplicate Shortcut"
+msgstr "تصوِيب مكرر"
 
 msgid "Edit Smiley"
 msgstr "حرّرجال بسمة"
@@ -13372,9 +13195,10 @@ msgstr "يمكنك إدراج هذه الصورة داخل الرسالة، أو
 msgid "Cannot send launcher"
 msgstr "تعذّر إرسال المشغل"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "قمت بسحب مشغل سطح مكتب. على الأغلب قصدت أن ترسل الشيء الذي يشير اليه هذا "
 "المشغل و ليس المشغل ذاته."
@@ -13962,9 +13786,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "ملحقة تراسل موسيقي للتأليف الجماعي."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "تتيح ملحقة التراسل الموسيقي لمجموعة من المستخدمين العمل معا على مقطوعة "
 "موسيقية بتحرير نوتة مشتركة في الوقت الحقيقي."
@@ -14222,7 +14047,7 @@ msgstr "زر إرسال نافذة المحادثة."
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14548,8 +14373,9 @@ msgstr "خيارات بِدْجِن لويندوز"
 msgid "Options specific to Pidgin for Windows."
 msgstr "خيارات خاصة لبِدْجِن من أجل ويندوز"
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "يتيح خيارات خاصة بويندوز، مثل إرساء قائمة الأصدقاء."
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14589,6 +14415,305 @@ msgstr "أرسِل و استقبل أبيات XMPP خام."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "تفيد هذه الملحقة في تنقيح خواديم و عملاء XMPXMPPP."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "لا يمكن فتح المقبس"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "لا يمكن الاستماع إلى المقبس"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "تعذّرت قراءة المقبس"
+
+#~ msgid "Connection failed."
+#~ msgstr "فشل الاتصال."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "قطع الخادومُ الاتصال"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "تعذَّر إنشاء مقبس"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "لا يمكن الاتصال بالخادوم"
+
+#~ msgid "Read error"
+#~ msgstr "خطأ في القراءة"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "تعذَّر الاتصال بالخادوم:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "عطل في الكتابة"
+
+#~ msgid "Last Activity"
+#~ msgstr "آخر نشاط"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "معلومات اكتشاف الخدمة"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "عناصر اكتشاف الخدمة"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "عنونة الأبيات الممتدّة"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "دردشة متعددة المستخدمين"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "معلومات التواجد الممتدة للدردشة متعددة المستخدمين"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "تيار بايتات داخل الحزمة"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "أوامر لحظية"
+
+#~ msgid "PubSub Service"
+#~ msgstr "خدمة PubSub"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "تيار بايتات SOCKS5"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "بيانات خارج الحزمة"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "التسجيل داخل الحزمة"
+
+#~ msgid "User Location"
+#~ msgstr "موضع المستخدم"
+
+#~ msgid "User Avatar"
+#~ msgstr "أيقونة المستخدم"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "تنويه حالة الدردشة"
+
+#~ msgid "Software Version"
+#~ msgstr "إصدارة البرمجية"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "بدأ التيار"
+
+#~ msgid "User Mood"
+#~ msgstr "مزاج المستخدم"
+
+#~ msgid "User Activity"
+#~ msgstr "نشاط المستخدم"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "إمكانات الكيان"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "مفاوضات الجلسات المعمّاة"
+
+#~ msgid "User Tune"
+#~ msgstr "نغمة المستخدم"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "تبادل دوراني للعناصر"
+
+#~ msgid "Reachability Address"
+#~ msgstr "عنوان الوصولية"
+
+#~ msgid "User Profile"
+#~ msgstr "لاحة المستخدم"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Jingle Audio"
+
+#~ msgid "User Nickname"
+#~ msgstr "كنية المستخدم"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle Raw UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "فيديو Jingle"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "إيصالات الرسائل"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "نشر المفتاح العلني"
+
+#~ msgid "User Chatting"
+#~ msgstr "المستخدم يدردش"
+
+#~ msgid "User Browsing"
+#~ msgstr "المستخدم يتصفّح"
+
+#~ msgid "User Gaming"
+#~ msgstr "المستخدم يلعب"
+
+#~ msgid "User Viewing"
+#~ msgstr "المستخدم يطالع"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "تعمية الأبيات"
+
+#~ msgid "Entity Time"
+#~ msgstr "وقت الكيان"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "تسليم متأخر"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "عناصر البيانات التشاركيّة"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "مستودع الملفات والمشاركة"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "اكتشاف خدمة STUN لـ Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "التفاوض المبسط لجلسة معمّاة"
+
+#~ msgid "Hop Check"
+#~ msgstr "تدقيق القفزات"
+
+#~ msgid "Read Error"
+#~ msgstr "عطل في القراءة"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "فشل الاتصال بالخادوم."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "براح القراءة ممتليء (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "رسالة يتعذّر تحليلها"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "تعذّر الاتصال بالخادوم: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "فشل الولوج (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "أولجت خارجا لأنك ولجت من حاسوب آخر."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "عطل. دعم SSL غير مثبت."
+
+#~ msgid "Incorrect password."
+#~ msgstr "كلمة سر خطأ."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "تعذّر الاتصال بخادوم BOS:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "قد ينقطع اتصالك قريبا. طالع %s للتحديثات."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "تعذّر الاتصال"
+
+#~ msgid "Invalid username."
+#~ msgstr "اسم مستخدم غير صالح"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "تعذّر تظهير رد الخادوم المُستَلَم"
+
+#~ msgid "Connection lost"
+#~ msgstr "قُطع الاتصال"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "لا يمكن استجلاء المضيف"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "أُغلِق الاتصال (تدري الكتابة)"
+
+#~ msgid "Connection reset"
+#~ msgstr "صُفِّر الاتصال"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "عطل في القراءة من المقبس: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "تعذّر الاتصال بالخادوم"
+
+#~ msgid "Could not write"
+#~ msgstr "تعذّرت الكتابة"
+
+#~ msgid "Could not connect"
+#~ msgstr "تعذّر الاتصال"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "لايمكن إنشاء مقبس استماع"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "لا يمكن استجلاء اسم المضيف"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "كلمة السر غير صحيحة"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "تعذّر إقامة اتصال مع %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "ياهو اليابان"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "خادوم استدعاء اليابان"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "خادوم نقل ملفّات ياباني"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "انقطع الاتصال بالخادوم\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "لايمكن استجلاء اسم المضيف"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "يتطلب الخادوم TLS/SSL للولوج. لا يوجد دعم TLS/SSL."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "إخفاء نافذة المحادثة"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "من فضلك اختر مزاجك من القائمة."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "أي هوية أُنشّط؟"
 
diff --git a/po/az.po b/po/az.po
index 582f2e8866..3650bbf545 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2004-06-28 14:03+0300\n"
 "Last-Translator: Metin Amiroff <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -2606,7 +2606,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2656,7 +2656,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2904,12 +2904,13 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
+msgstr "Bağlanıla bilmədi"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2968,15 +2969,17 @@ msgstr ""
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Soket açıla bilmədi"
 
-#, fuzzy
-msgid "Cannot open socket"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
 msgstr "Soket açıla bilmədi"
 
-msgid "Could not bind socket to port"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "Bağlanıla bilmədi"
 
-msgid "Could not listen on socket"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Soket açıla bilmədi"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
@@ -3030,13 +3033,13 @@ msgstr "Fərqli Qeyd Et..."
 msgid "Load buddylist from file..."
 msgstr "_Alias..."
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
-msgid "Passwords do not match."
+msgid "Passwords do not match"
 msgstr ""
 
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr ""
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3048,14 +3051,13 @@ msgstr ""
 msgid "Password"
 msgstr "Şifrə"
 
-#, fuzzy
-msgid "Password (retype)"
-msgstr "Şifrə"
+msgid "Password (again)"
+msgstr ""
 
-msgid "Enter current token"
+msgid "Enter captcha text"
 msgstr ""
 
-msgid "Current token"
+msgid "Captcha"
 msgstr ""
 
 msgid "Register New Gadu-Gadu Account"
@@ -3113,6 +3115,16 @@ msgstr ""
 msgid "Current password"
 msgstr "Səhv şifrə."
 
+#, fuzzy
+msgid "Password (retype)"
+msgstr "Şifrə"
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
@@ -3166,8 +3178,9 @@ msgstr "Yeni istifadəçilər qəbul edilmir"
 msgid "There are no users matching your search criteria."
 msgstr "Xahiş edirik şəxs haqqında məlumatı aşağıda bildirin."
 
-msgid "Unable to read socket"
-msgstr ""
+#, fuzzy
+msgid "Unable to read from socket"
+msgstr "Soket açıla bilmədi"
 
 #, fuzzy
 msgid "Buddy list downloaded"
@@ -3183,8 +3196,14 @@ msgstr "Əlaqə hərəkətsizdir:"
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
 #, fuzzy
-msgid "Connection failed."
+msgid "Connected"
+msgstr "Bağlantı bacarılmadı"
+
+msgid "Connection failed"
 msgstr "Bağlantı bacarılmadı"
 
 #, fuzzy
@@ -3195,11 +3214,15 @@ msgstr "Söhbət Əlavə Et"
 msgid "Chat _name:"
 msgstr "Soyad:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Oxuna bilmədi"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr ""
+
 #, fuzzy
 msgid "Chat error"
 msgstr "Oxuma xətası"
@@ -3209,7 +3232,7 @@ msgid "This chat name is already in use"
 msgstr "O fayl onsuz da mövcuddur"
 
 #, fuzzy
-msgid "Not connected to the server."
+msgid "Not connected to the server"
 msgstr "Transfer üçün bağlana bilmədi."
 
 #, fuzzy
@@ -3276,7 +3299,7 @@ msgid "File Transfer Failed"
 msgstr "Fayl transfer qovşağı"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Soket açıla bilmədi"
 
 msgid "Error displaying MOTD"
@@ -3292,8 +3315,16 @@ msgstr ""
 msgid "MOTD for %s"
 msgstr "%s üçün MOTD"
 
-msgid "Server has disconnected"
-msgstr ""
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "Transfer üçün bağlana bilmədi."
 
 msgid "View MOTD"
 msgstr "MOTD-u Göstər"
@@ -3307,22 +3338,20 @@ msgstr "Ş_ifrə:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr ""
-
 msgid "SSL support unavailable"
 msgstr ""
 
-msgid "Couldn't create socket"
-msgstr ""
+msgid "Unable to connect"
+msgstr "Bağlanıla bilmədi"
 
-msgid "Couldn't connect to host"
-msgstr ""
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Bağlanıla bilmədi"
 
-msgid "Read error"
-msgstr "Oxuma xətası"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "_Yenidən bağlan"
 
 msgid "Users"
 msgstr "İstifadəçilər"
@@ -3717,10 +3746,10 @@ msgstr ""
 msgid "execute"
 msgstr "Sil"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3735,8 +3764,13 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
-msgid "Invalid response from server."
-msgstr ""
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Bağlantı bacarılmadı"
+
+#, fuzzy
+msgid "Invalid response from server"
+msgstr "Transfer üçün bağlana bilmədi."
 
 msgid "Server does not use any supported authentication method"
 msgstr ""
@@ -3747,8 +3781,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr ""
 
-#, fuzzy
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Oxuma xətası"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3765,22 +3799,14 @@ msgstr ""
 msgid "Unable to establish a connection with the server"
 msgstr "Transfer üçün bağlana bilmədi."
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Transfer üçün bağlana bilmədi."
 
 #, fuzzy
 msgid "Unable to establish SSL connection"
 msgstr "Bağlanıla bilmədi"
 
-msgid "Unable to create socket"
-msgstr ""
-
-msgid "Write error"
-msgstr ""
-
 msgid "Full Name"
 msgstr ""
 
@@ -3849,177 +3875,6 @@ msgstr ""
 msgid "Local Time"
 msgstr "Yerli İstifadəçilər"
 
-msgid "Last Activity"
-msgstr ""
-
-msgid "Service Discovery Info"
-msgstr ""
-
-msgid "Service Discovery Items"
-msgstr ""
-
-msgid "Extended Stanza Addressing"
-msgstr ""
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "Söhbət Aliası"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "Əmr"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-msgid "In-Band Registration"
-msgstr ""
-
-#, fuzzy
-msgid "User Location"
-msgstr "Mövqe"
-
-msgid "User Avatar"
-msgstr ""
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "Əlaqə Vəziyyəti Bildirişi"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "Danışığı Qeyd Et"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "Tətildə"
-
-#, fuzzy
-msgid "File Transfer"
-msgstr "Fayl Transferləri"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "İstifadəçi Otaqları"
-
-msgid "User Activity"
-msgstr ""
-
-msgid "Entity Capabilities"
-msgstr ""
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "_İstifadəçi Adı:"
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "Epoçt Ünvanı"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "Profili Seç"
-
-msgid "Jingle"
-msgstr ""
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "_İstifadəçi Adı:"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr ""
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "İsmarış Mətni"
-
-msgid "Public Key Publishing"
-msgstr ""
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "İstifadəçi Seçimləri"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "İstifadəçi Otaqları"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "İstifadəçi Seçimləri"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "İstifadəçi yazır..."
-
-msgid "Ping"
-msgstr ""
-
-msgid "Stanza Encryption"
-msgstr ""
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr ""
-
 #, fuzzy
 msgid "Priority"
 msgstr "Port"
@@ -4032,7 +3887,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "%s xətdə girdi."
 
 msgid "Middle Name"
@@ -4219,16 +4074,12 @@ msgid "Roles:"
 msgstr "Rolu"
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "Bağlantı bacarılmadı"
 
-msgid "Read Error"
-msgstr ""
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 #, fuzzy
@@ -4411,9 +4262,6 @@ msgstr ""
 msgid "Error changing password"
 msgstr ""
 
-msgid "Password (again)"
-msgstr ""
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "Səhv şifrə."
@@ -4795,6 +4643,14 @@ msgstr ""
 msgid "Unknown Error in presence"
 msgstr ""
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr ""
+
+#, c-format
+msgid "Error in chat %s"
+msgstr ""
+
 msgid "Create New Room"
 msgstr ""
 
@@ -4810,15 +4666,19 @@ msgstr ""
 msgid "_Accept Defaults"
 msgstr "Sil"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr ""
+#, fuzzy
+msgid "No reason"
+msgstr "Otaq adı bildirilməyib."
 
 #, c-format
-msgid "Error in chat %s"
+msgid "You have been kicked: (%s)"
 msgstr ""
 
-msgid "An error occured on the in-band bytestream transfer\n"
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s sizə %s yollamaq istəyir (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr ""
 
 #, fuzzy
@@ -5318,10 +5178,6 @@ msgstr ""
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-#, fuzzy
-msgid "Failed to connect to server."
-msgstr "Transfer üçün bağlana bilmədi."
-
 msgid "Error retrieving profile"
 msgstr ""
 
@@ -5578,9 +5434,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 
-msgid "Unable to connect"
-msgstr "Bağlanıla bilmədi"
-
 msgid "Writing error"
 msgstr ""
 
@@ -5594,20 +5447,20 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Our protocol is not supported by the server."
+msgid "Our protocol is not supported by the server"
 msgstr ""
 
 #, fuzzy
-msgid "Error parsing HTTP."
+msgid "Error parsing HTTP"
 msgstr "MOTD göstərilə bilmir"
 
-msgid "You have signed on from another location."
+msgid "You have signed on from another location"
 msgstr ""
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr ""
 
 #, fuzzy, c-format
@@ -5618,10 +5471,6 @@ msgid ""
 "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 ""
 
@@ -5721,6 +5570,10 @@ msgstr "AIM/ICQ Protokol Əlavəsi"
 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)"
@@ -5837,13 +5690,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Transfer üçün bağlana bilmədi."
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-#, fuzzy
-msgid "Connected"
-msgstr "Bağlantı bacarılmadı"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr ""
@@ -5866,17 +5712,6 @@ msgstr ""
 msgid "Invalid input condition"
 msgstr "Səhv istifadəçi adı."
 
-msgid "Read buffer full (2)"
-msgstr ""
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "Soket açıla bilmədi"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Transfer üçün bağlana bilmədi."
-
 #, fuzzy
 msgid "Failed to add buddy"
 msgstr "Söhbətdəki əlaqəyə qoşula bilmədi"
@@ -5963,6 +5798,12 @@ msgstr ""
 msgid "Client Version"
 msgstr ""
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr ""
 
@@ -6224,9 +6065,9 @@ msgstr ""
 msgid "Unknown error: 0x%X"
 msgstr ""
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Soket açıla bilmədi"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6326,9 +6167,6 @@ msgstr ""
 msgid "Authenticating..."
 msgstr ""
 
-msgid "Unable to connect to server."
-msgstr ""
-
 msgid "Waiting for response..."
 msgstr ""
 
@@ -6349,20 +6187,14 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr ""
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-
-msgid "Error. SSL support is not installed."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 
 msgid "This conference has been closed. No more messages can be sent."
@@ -6400,10 +6232,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, fuzzy
@@ -6414,17 +6243,8 @@ msgstr "Transfer üçün bağlana bilmədi."
 msgid "Invalid chat room name"
 msgstr "Səhv istifadəçi adı."
 
-msgid "Server closed the connection."
-msgstr ""
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "Transfer üçün bağlana bilmədi."
-
 #, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "Transfer üçün bağlana bilmədi."
 
 #. *< type
@@ -6475,8 +6295,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Transfer üçün bağlana bilmədi."
 
 msgid "Direct IM established"
 msgstr ""
@@ -6669,16 +6490,12 @@ msgid "Buddy Comment"
 msgstr ""
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "Transfer üçün bağlana bilmədi."
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr "Transfer üçün bağlana bilmədi."
+msgid "Unable to connect to BOS server: %s"
+msgstr "Bağlanıla bilmədi"
 
 #, fuzzy
 msgid "Username sent"
@@ -6693,9 +6510,9 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 
 #, c-format
@@ -6705,28 +6522,22 @@ 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
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "Səhv istifadəçi adı."
+msgid "Username does not exist"
+msgstr "Bu fayl mövcud deyil."
 
 #. Suspended account
-msgid "Your account is currently suspended."
+msgid "Your account is currently suspended"
 msgstr ""
 
 #. service temporarily unavailable
@@ -6743,7 +6554,7 @@ msgid ""
 "try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
-msgid "The SecurID key entered is invalid."
+msgid "The SecurID key entered is invalid"
 msgstr ""
 
 msgid "Enter SecurID"
@@ -6899,6 +6710,9 @@ msgstr ""
 msgid "Member Since"
 msgstr ""
 
+msgid "Capabilities"
+msgstr ""
+
 msgid "Profile"
 msgstr "Profil"
 
@@ -7055,7 +6869,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7078,7 +6892,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
@@ -7086,7 +6900,7 @@ msgid "(no name)"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Əlaqə verici siyahısına əlavə edilə bilmədi"
 
 #, c-format
@@ -7925,7 +7739,7 @@ msgid "Update interval (seconds)"
 msgstr "Oxuma xətası"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Verici siyahısında deyil"
 
 #, c-format
@@ -7951,10 +7765,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Verici siyahısında deyil"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "Qalan"
 
@@ -7989,26 +7799,11 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr ""
-
 #, fuzzy
 msgid "Socket error"
 msgstr "Xəta"
 
 #, fuzzy
-msgid "Unable to read from socket"
-msgstr "Soket açıla bilmədi"
-
-#, fuzzy
-msgid "Write Error"
-msgstr "Xəta"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "Bağlantı bacarılmadı"
-
-#, fuzzy
 msgid "Getting server"
 msgstr "Peycer qovşağı"
 
@@ -8017,8 +7812,8 @@ msgid "Requesting token"
 msgstr "Qalan"
 
 #, fuzzy
-msgid "Couldn't resolve host"
-msgstr "Soket açıla bilmədi"
+msgid "Unable to resolve hostname"
+msgstr "Oxuna bilmədi"
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8069,7 +7864,7 @@ msgid "QQ Qun Command"
 msgstr "Əmr"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Verici siyahısında deyil"
 
 #, fuzzy
@@ -8092,10 +7887,6 @@ msgstr "Bacarılmadı"
 msgid "%d canceled the transfer of %s"
 msgstr ""
 
-#, fuzzy
-msgid "Connection closed (writing)"
-msgstr "Bağlantı bacarılmadı"
-
 #, fuzzy, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>İstifadəçi:</b> %s<br>"
@@ -8154,19 +7945,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#, fuzzy
-msgid "Connection reset"
-msgstr "Bağlantı problemi"
-
-#, fuzzy, c-format
-msgid "Error reading from socket: %s"
-msgstr "MOTD göstərilə bilmir"
-
-#. this is a regular connect, error out
-#, fuzzy
-msgid "Unable to connect to host"
-msgstr "Bağlanıla bilmədi"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -8191,6 +7969,10 @@ msgstr ""
 msgid "Video Camera"
 msgstr "Kamera"
 
+#, fuzzy
+msgid "File Transfer"
+msgstr "Fayl Transferləri"
+
 msgid "Supports"
 msgstr ""
 
@@ -8977,6 +8759,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr ""
 
+msgid "Ping"
+msgstr ""
+
 #, fuzzy
 msgid "Ping failed"
 msgstr "Bağlantı bacarılmadı"
@@ -9037,8 +8822,9 @@ msgstr ""
 msgid "Disconnected by server"
 msgstr ""
 
-msgid "Error during connecting to SILC Server"
-msgstr ""
+#, fuzzy
+msgid "Error connecting to SILC Server"
+msgstr "Bağlantı problemi"
 
 msgid "Key Exchange failed"
 msgstr ""
@@ -9047,28 +8833,27 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-msgid "Connection failed"
-msgstr "Bağlantı bacarılmadı"
-
 msgid "Performing key exchange"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to create connection"
-msgstr "Bağlanıla bilmədi"
-
-msgid "Could not load SILC key pair"
-msgstr ""
+msgid "Unable to load SILC key pair"
+msgstr "Soket açıla bilmədi"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr ""
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Soket açıla bilmədi"
+
 msgid "Out of memory"
 msgstr ""
 
-msgid "Cannot initialize SILC protocol"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
+msgstr "Bağlanıla bilmədi"
 
 msgid "Error loading SILC key pair"
 msgstr ""
@@ -9347,8 +9132,9 @@ msgstr ""
 msgid "Creating SILC key pair..."
 msgstr ""
 
-msgid "Cannot create SILC key pair\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to create SILC key pair"
+msgstr "Bağlanıla bilmədi"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9436,6 +9222,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr ""
 
+msgid "Error during connecting to SILC Server"
+msgstr ""
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -9476,34 +9265,29 @@ msgstr ""
 msgid "Failure: Authentication failed"
 msgstr ""
 
-msgid "Cannot initialize SILC Client connection"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
+msgstr "Bağlanıla bilmədi"
 
 #, fuzzy
 msgid "John Noname"
 msgstr "Soyad:"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr ""
-
-#, fuzzy
-msgid "Could not write"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Soket açıla bilmədi"
 
 #, fuzzy
-msgid "Could not connect"
-msgstr "Transfer üçün bağlana bilmədi."
+msgid "Unable to create connection"
+msgstr "Bağlanıla bilmədi"
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "Naməlum xəta"
 
-msgid "Could not create listen socket"
-msgstr ""
-
-msgid "Could not resolve hostname"
-msgstr ""
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Soket açıla bilmədi"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
@@ -9552,6 +9336,83 @@ msgstr "Təstiqlənmə qovşağı"
 msgid "Auth Domain"
 msgstr "Avtomatik"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr ""
+
+msgid "list: List rooms on the Yahoo network"
+msgstr ""
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID-si"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo Protokol Əlavəsi"
+
+#, fuzzy
+msgid "Pager server"
+msgstr "Peycer qovşağı"
+
+msgid "Pager port"
+msgstr "Peycer portu"
+
+#, fuzzy
+msgid "File transfer server"
+msgstr "Fayl transfer qovşağı"
+
+msgid "File transfer port"
+msgstr "Fayl transfer portu"
+
+#, fuzzy
+msgid "Chat room locale"
+msgstr "Söhbət Otağı Siyahısı Ünvanı"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
+
+#, fuzzy
+msgid "Chat room list URL"
+msgstr "Söhbət Otağı Siyahısı Ünvanı"
+
+msgid "Yahoo Chat server"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo Chat port"
+msgstr "Yahoo Yaponiya"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID-si"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo Protokol Əlavəsi"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9580,26 +9441,16 @@ msgstr "Əlaqə əlavə edilişi rədd edildi"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 
 #. username or password missing
@@ -9634,33 +9485,27 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Əlaqə verici siyahısına əlavə edilə bilmədi"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr ""
 
-msgid "Connection problem"
-msgstr "Bağlantı problemi"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "Söhbət edilən əlaqə"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Transfer üçün bağlana bilmədi."
 
 #, fuzzy
 msgid "Not at Home"
@@ -9729,81 +9574,15 @@ msgstr "Söhbətdəki əlaqəyə qoşul..."
 msgid "Open Inbox"
 msgstr ""
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-
-msgid "list: List rooms on the Yahoo network"
-msgstr ""
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID-si"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo Protokol Əlavəsi"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Yaponiya"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "Peycer qovşağı"
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "Yaponiya Peycer Portu"
-
-msgid "Pager port"
-msgstr "Peycer portu"
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "Fayl transfer qovşağı"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "Yaponiya fayl transfer qovşağı"
-
-msgid "File transfer port"
-msgstr "Fayl transfer portu"
-
-#, fuzzy
-msgid "Chat room locale"
-msgstr "Söhbət Otağı Siyahısı Ünvanı"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-#, fuzzy
-msgid "Chat room list URL"
-msgstr "Söhbət Otağı Siyahısı Ünvanı"
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "Yahoo Yaponiya"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr ""
+
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -9812,6 +9591,10 @@ msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s sizə %s yollamaq istəyir (%s)"
 
 #, fuzzy
+msgid "Write Error"
+msgstr "Xəta"
+
+#, fuzzy
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo Yaponiya"
 
@@ -9921,6 +9704,9 @@ msgstr "Səslər"
 msgid "Webcams"
 msgstr "Veb kameraları"
 
+msgid "Connection problem"
+msgstr "Bağlantı problemi"
+
 msgid "Unable to fetch room list."
 msgstr "Otaq siyahısı alına bilmədi."
 
@@ -9928,15 +9714,9 @@ msgid "User Rooms"
 msgstr "İstifadəçi Otaqları"
 
 #, fuzzy
-msgid "Connection problem with the YCHT server."
+msgid "Connection problem with the YCHT server"
 msgstr "Bağlantı problemi"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "Transfer üçün bağlana bilmədi."
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10060,30 +9840,21 @@ msgid "Exposure"
 msgstr "İxrac"
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Soket açıla bilmədi"
 
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Vəkil bağlantısı xətası %d"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr "MOTD göstərilə bilmir"
 
-msgid "Could not resolve host name"
-msgstr ""
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10294,12 +10065,6 @@ msgid "Unable to connect to %s: %s"
 msgstr "Bağlanıla bilmədi"
 
 #, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-
-#, c-format
 msgid " - %s"
 msgstr ""
 
@@ -10549,7 +10314,11 @@ msgid "View _Log"
 msgstr "_Qeydi Göstər"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "Daha az seçim göstər"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "Daha az seçim göstər"
 
 msgid "_Alias..."
@@ -11097,6 +10866,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr ""
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11146,7 +10918,7 @@ msgid "Get Away Message"
 msgstr "Uzaqda İsmarışı Al"
 
 #, fuzzy
-msgid "Last said"
+msgid "Last Said"
 msgstr "Soyad:"
 
 #, fuzzy
@@ -12080,7 +11852,7 @@ msgstr ""
 msgid "Hyperlink visited color"
 msgstr ""
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 
 msgid "Hyperlink prelight color"
@@ -12118,15 +11890,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "Bildirişin Sonlandırılması"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "Yeni məktub bildirişləri"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12492,6 +12271,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "No message"
+msgstr "(1 ismarış)"
+
+#, fuzzy
 msgid "Open All Messages"
 msgstr "Uzaqda İsmarışı Al"
 
@@ -12516,10 +12299,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, fuzzy
-msgid "No message"
-msgstr "(1 ismarış)"
-
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -12755,7 +12534,7 @@ msgid "On unread messages"
 msgstr "Rəsm daxil et"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "Söhbət edilən əlaqə"
 
 #, fuzzy
@@ -12766,6 +12545,10 @@ msgstr "/_Danışıq"
 msgid "When away"
 msgstr "%s uzaqlaşdı"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "Pəncərə başına danışıq ədədi"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -12827,10 +12610,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr ""
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "Pəncərə başına danışıq ədədi"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12866,7 +12645,8 @@ msgstr ""
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-msgid "_Autodetect IP address"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr ""
 
 msgid "Public _IP:"
@@ -13249,35 +13029,19 @@ msgstr "_Qeyd Et & İşlət"
 msgid "Status for %s"
 msgstr "Vəziyyət"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "Emosiya daxil et"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
+#, fuzzy
+msgid "Custom Smiley"
+msgstr "Emosiya daxil et"
+
 msgid "Duplicate Shortcut"
 msgstr ""
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Xahiş edirik seçili qrup üçün yeni ad bildirin."
-
-#, fuzzy
 msgid "Edit Smiley"
 msgstr "Emosiya daxil et"
 
@@ -13394,8 +13158,8 @@ msgid "Cannot send launcher"
 msgstr "0 bayt böyüklüyündə fayl göndərilə bilməz."
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -14007,7 +13771,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -14270,7 +14034,7 @@ msgstr "Söhbət edilən əlaqə"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14603,7 +14367,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr ""
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14646,6 +14410,171 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Cannot open socket"
+#~ msgstr "Soket açıla bilmədi"
+
+#, fuzzy
+#~ msgid "Connection failed."
+#~ msgstr "Bağlantı bacarılmadı"
+
+#~ msgid "Read error"
+#~ msgstr "Oxuma xətası"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "Söhbət Aliası"
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Əmr"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "Mövqe"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "Əlaqə Vəziyyəti Bildirişi"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "Danışığı Qeyd Et"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "Tətildə"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "İstifadəçi Otaqları"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "_İstifadəçi Adı:"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "Epoçt Ünvanı"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "Profili Seç"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "_İstifadəçi Adı:"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "İsmarış Mətni"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "İstifadəçi Seçimləri"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "İstifadəçi Otaqları"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "İstifadəçi Seçimləri"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "İstifadəçi yazır..."
+
+#, fuzzy
+#~ msgid "Failed to connect to server."
+#~ msgstr "Transfer üçün bağlana bilmədi."
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "Soket açıla bilmədi"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Transfer üçün bağlana bilmədi."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Səhv şifrə."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "Transfer üçün bağlana bilmədi."
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "Səhv istifadəçi adı."
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Verici siyahısında deyil"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "Bağlantı bacarılmadı"
+
+#, fuzzy
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Soket açıla bilmədi"
+
+#, fuzzy
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Bağlantı bacarılmadı"
+
+#, fuzzy
+#~ msgid "Connection reset"
+#~ msgstr "Bağlantı problemi"
+
+#, fuzzy
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "MOTD göstərilə bilmir"
+
+#, fuzzy
+#~ msgid "Unable to connect to host"
+#~ msgstr "Bağlanıla bilmədi"
+
+#, fuzzy
+#~ msgid "Could not write"
+#~ msgstr "Soket açıla bilmədi"
+
+#, fuzzy
+#~ msgid "Could not connect"
+#~ msgstr "Transfer üçün bağlana bilmədi."
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Səhv şifrə."
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Yaponiya"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "Yaponiya Peycer Portu"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "Yaponiya fayl transfer qovşağı"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "Transfer üçün bağlana bilmədi."
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Xahiş edirik seçili qrup üçün yeni ad bildirin."
+
+#, fuzzy
 #~ msgid "Activate which ID?"
 #~ msgstr "Hansı ID fəallaşdırılsın?"
 
diff --git a/po/be@latin.po b/po/be@latin.po
index 79f14e2398..093dde27bd 100644
--- a/po/be@latin.po
+++ b/po/be@latin.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin 2.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2008-03-29 21:08+0200\n"
 "Last-Translator: YOUR NAME <E-MAIL@ADDRESS>\n"
 "Language-Team: Belarusian Latin <be-latin.open-tran.eu>\n"
@@ -2583,9 +2583,10 @@ msgstr ""
 "Ułučaje logi ad inšych klijentaŭ chutkich paviedamleńniaŭ u ahlad logaŭ."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2641,8 +2642,9 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 "Zachoŭvaj paviedamleńni, dasyłanyja adłučanamu karystalniku, jak začepki."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Astatnija paviedamleńni buduć zachavanyja jak začepki. Ty možaš redahavać/"
@@ -2896,14 +2898,15 @@ msgstr ""
 
 #, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Toolkit Apple Bonjour dla Windowsa nia znojdzieny, hladzi FAQ na: http://"
 "developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
 "LocalMessaging pa padrabiaznyja źviestki."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Niemahčyma słuchać uvachodnyja spałučeńni\n"
 
 msgid ""
@@ -2956,14 +2959,21 @@ msgstr "%s začyniaje razmovu."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Niemahčyma dasłać paviedamleńnie, niemahčyma pačać razmovu."
 
-msgid "Cannot open socket"
-msgstr "Niemahčyma adčynić sokiet"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Niemahčyma stvaryć sokiet:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Niemahčyma pryviazać sokiet da portu"
 
-msgid "Could not listen on socket"
-msgstr "Niemahčyma słuchać sokiet"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Niemahčyma stvaryć sokiet:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Pamyłka kamunikacyi ź lakalnaj pasłuhaj mDNSResponder."
@@ -3012,13 +3022,16 @@ msgstr "Zachavaj śpis siabroŭ..."
 msgid "Load buddylist from file..."
 msgstr "Zahruzi śpis siabroŭ z fajłu..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Zapoŭni pali rehistracyi."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Paroli roznyja."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Niemahčyma zarehistravać novy kont. Adbyłasia pamyłka.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3030,14 +3043,15 @@ msgstr "Rehistracyja paśpiachova skončanaja!"
 msgid "Password"
 msgstr "Parol"
 
-msgid "Password (retype)"
-msgstr "Parol (paŭtary)"
+msgid "Password (again)"
+msgstr "Parol (znoŭ)"
 
-msgid "Enter current token"
-msgstr "Uviadzi dziejny znak"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Dziejny znak"
+#, fuzzy
+msgid "Captcha"
+msgstr "Zapišy vyjavu"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Zarehistruj novy kont Gadu-Gadu"
@@ -3090,6 +3104,15 @@ msgstr "Parol paśpiachova źmienieny!"
 msgid "Current password"
 msgstr "Dziejny parol"
 
+msgid "Password (retype)"
+msgstr "Parol (paŭtary)"
+
+msgid "Enter current token"
+msgstr "Uviadzi dziejny znak"
+
+msgid "Current token"
+msgstr "Dziejny znak"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Uviadzi dziejny parol i tvoj novy parol dla UIN'a: "
 
@@ -3137,7 +3160,7 @@ msgstr "Nia znojdziena takich karystalnikaŭ"
 msgid "There are no users matching your search criteria."
 msgstr "Niama karystalnikaŭ, jakija adpaviadajuć tvaim kryteram pošuku."
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "Niemahčyma pračytać z sokieta"
 
 msgid "Buddy list downloaded"
@@ -3152,8 +3175,14 @@ msgstr "Śpis siabroŭ zahružany na server"
 msgid "Your buddy list was stored on the server."
 msgstr "Tvoj śpis siabroŭ zachavany na servery."
 
-msgid "Connection failed."
-msgstr "Pamyłka spałučeńnia."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Spałučany"
+
+msgid "Connection failed"
+msgstr "Pamyłka spałučeńnia"
 
 msgid "Add to chat"
 msgstr "Dadaj da hutarki"
@@ -3161,18 +3190,23 @@ msgstr "Dadaj da hutarki"
 msgid "Chat _name:"
 msgstr "Nazva _hutarki:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Niemahčyma spałučycca z serveram."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Spałučeńnie"
+
 msgid "Chat error"
 msgstr "Pamyłka hutarki"
 
 msgid "This chat name is already in use"
 msgstr "Hetaja nazva hutarki ŭžo zaniataja"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Niama spałučeńnia z serveram."
 
 msgid "Find buddies..."
@@ -3232,7 +3266,8 @@ msgstr "Tema nie akreślenaja"
 msgid "File Transfer Failed"
 msgstr "Pamyłka pieradačy fajłu"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Niemahčyma adčynić port dziela słuchańnia."
 
 msgid "Error displaying MOTD"
@@ -3248,8 +3283,18 @@ msgstr "Z hetym spałučeńniem nie źviazany MOTD."
 msgid "MOTD for %s"
 msgstr "MOTD dla %s"
 
-msgid "Server has disconnected"
-msgstr "Server adłučyŭsia"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Spałučeńnie z serversm stračanaje:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Pakažy MOTD"
@@ -3264,22 +3309,20 @@ msgstr "_Parol:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "Mianuški IRC nia mohuć utrymvać prabiełaŭ"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Spałučeńnie"
-
 msgid "SSL support unavailable"
 msgstr "Niama padtrymki SSL"
 
-msgid "Couldn't create socket"
-msgstr "Niemahčyma stvaryć sokiet"
+msgid "Unable to connect"
+msgstr "Niemahčyma spałučycca"
 
-msgid "Couldn't connect to host"
-msgstr "Niemahčyma spałučycca z hostam"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Niemahčyma spałučycca z %s"
 
-msgid "Read error"
-msgstr "Pamyłka čytańnia"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Server začyniŭ spałučeńnie."
 
 msgid "Users"
 msgstr "Karystalniki"
@@ -3709,10 +3752,12 @@ msgstr "Niaŭdałaje vykanańnie zahadu Ad-Hoc"
 msgid "execute"
 msgstr "vykanaj"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Server vymahaje TLS/SSL, kab uvajści. Niama padtrymki TLS/SSL."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Ty vymahaješ šyfravańnia, ale padtrymki TLS/SSL niama."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3729,7 +3774,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Aŭtaryzacyja prostym tekstam"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Pamyłka aŭtaryzacyi"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Niapravilny adkaz ad servera."
 
 msgid "Server does not use any supported authentication method"
@@ -3741,7 +3791,8 @@ msgstr "Ty vymahaješ šyfravańnia, ale server nia ŭmieje hetaha."
 msgid "Invalid challenge from server"
 msgstr "Niapravilny vyklik ad servera"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Pamyłka SASL"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3761,10 +3812,8 @@ msgstr ""
 "Niemahčyma spałučycca z serveram:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Niemahčyma spałučycca z serveram:\n"
 "%s"
@@ -3773,12 +3822,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "Niemahčyma inicyjavać spałučeńnie"
 
-msgid "Unable to create socket"
-msgstr "Niemahčyma stvaryć sokiet"
-
-msgid "Write error"
-msgstr "Pamyłka zapisu"
-
 msgid "Full Name"
 msgstr "Poŭnaje imia"
 
@@ -3849,159 +3892,6 @@ msgstr "Aperacyjnaja systema"
 msgid "Local Time"
 msgstr "Lakalny fajł:"
 
-msgid "Last Activity"
-msgstr "Apošniaja dziejnaść"
-
-msgid "Service Discovery Info"
-msgstr "Źviestki ad znojdzienych pasłuhach"
-
-msgid "Service Discovery Items"
-msgstr "Znojdzienyja pasłuhi"
-
-msgid "Extended Stanza Addressing"
-msgstr "Pašyranaja adrasacyja frazaŭ"
-
-msgid "Multi-User Chat"
-msgstr "Ludnaja hutarka"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Pašyranyja źviestki ab udziele ŭ ludnaj hutarcy"
-
-msgid "In-Band Bytestreams"
-msgstr "Bajtavyja płyni In-Band"
-
-msgid "Ad-Hoc Commands"
-msgstr "Zahady Ad-Hoc"
-
-msgid "PubSub Service"
-msgstr "Pasłuha PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "Bajtavyja płyni SOCKS5"
-
-msgid "Out of Band Data"
-msgstr "Źviestki Out of Band"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "Rehistracyja In-Band"
-
-msgid "User Location"
-msgstr "Pałažeńnie karystalnika"
-
-msgid "User Avatar"
-msgstr "Avatar karystalnika"
-
-msgid "Chat State Notifications"
-msgstr "Infarmavańni ab statusie hutarki"
-
-msgid "Software Version"
-msgstr "Versija prahramy"
-
-msgid "Stream Initiation"
-msgstr "Inicyjacyja płyni"
-
-msgid "File Transfer"
-msgstr "Pieradača fajłu"
-
-msgid "User Mood"
-msgstr "Nastroj karystalnika"
-
-msgid "User Activity"
-msgstr "Dziejnaść karystalnika"
-
-msgid "Entity Capabilities"
-msgstr "Mahčymaści siabra"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Uzhadnieńnie šyfravanaj sesii"
-
-msgid "User Tune"
-msgstr "Pieśnia karystalnika"
-
-msgid "Roster Item Exchange"
-msgstr "Abmieńvańnie elementaŭ śpisu siabroŭ"
-
-msgid "Reachability Address"
-msgstr "Adras dasiahalnaści"
-
-msgid "User Profile"
-msgstr "Profil karystalnika"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle Audio"
-
-msgid "User Nickname"
-msgstr "Mianuška karystalnika"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle Suvory UDP"
-
-msgid "Jingle Video"
-msgstr "Jingle Video"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Atrymańnie paviedamleńniaŭ"
-
-msgid "Public Key Publishing"
-msgstr "Supolny dostup da publičnaha kluča"
-
-msgid "User Chatting"
-msgstr "Karystalnik hutaryć"
-
-msgid "User Browsing"
-msgstr "Karystalnik u Siecivie"
-
-msgid "User Gaming"
-msgstr "Karystalnik hulajecca"
-
-msgid "User Viewing"
-msgstr "Karystalnik hladzić"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Šyfravańnie frazy"
-
-msgid "Entity Time"
-msgstr "Čas isnavańnia"
-
-msgid "Delayed Delivery"
-msgstr "Adterminavanaja dastaŭka"
-
-msgid "Collaborative Data Objects"
-msgstr "Supolnyja infarmacyjnyja abjekty"
-
-msgid "File Repository and Sharing"
-msgstr "Schovišča fajłaŭ i supolny dostup"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "Pošuk pasłuh STUN dla Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Uzhadnieńnie sproščana šyfravanaj sesii"
-
-msgid "Hop Check"
-msgstr "Pravierka Hop"
-
-msgid "Capabilities"
-msgstr "Mahčymaści"
-
 msgid "Priority"
 msgstr "Pryjarytet"
 
@@ -4013,7 +3903,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Uvajšoŭ/Uvajšła"
 
 msgid "Middle Name"
@@ -4195,16 +4085,13 @@ msgstr "Nia znojdziena takich karystalnikaŭ"
 msgid "Roles:"
 msgstr "Rola"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Termin čakańnia pingu"
 
-msgid "Read Error"
-msgstr "Pamyłka čytańnia"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4380,9 +4267,6 @@ msgstr "Tvoj parol źmianiŭsia."
 msgid "Error changing password"
 msgstr "Pamyłka źmieny parolu"
 
-msgid "Password (again)"
-msgstr "Parol (znoŭ)"
-
 msgid "Change XMPP Password"
 msgstr "Źmiani parol XMPP"
 
@@ -4768,6 +4652,14 @@ msgstr "Pamyłka razboru XML"
 msgid "Unknown Error in presence"
 msgstr "Jość nieviadomaja pamyłka"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Pamyłka dałučeńnia da hutarki %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Pamyłka ŭ hutarcy %s"
+
 msgid "Create New Room"
 msgstr "Stvary novy pakoj"
 
@@ -4784,16 +4676,20 @@ msgstr "_Skanfihuruj pakoj"
 msgid "_Accept Defaults"
 msgstr "_Pryjmi zmoŭčanyja nałady"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Pamyłka dałučeńnia da hutarki %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Pryčyna nie akreślenaja."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Pamyłka ŭ hutarcy %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Ciabie kiknuli z %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s kiknuŭ/kiknuła (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Pry adčynieńni fajłu adbyłasia pamyłka."
 
 #, fuzzy
@@ -5295,9 +5191,6 @@ msgstr ""
 "MSN vymahaje padtrymki SSL. Kali łaska, zainstaluj padtrmvanuju biblijateku "
 "SSL."
 
-msgid "Failed to connect to server."
-msgstr "Pamyłka spałučeńnia z serveram."
-
 msgid "Error retrieving profile"
 msgstr "Pamyłka atrymańnia profilu"
 
@@ -5563,9 +5456,6 @@ msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 "Paviedamleńnie moža być nie dasłanym, bo adbyłasia nieviadomaja pamyłka:"
 
-msgid "Unable to connect"
-msgstr "Niemahčyma spałučycca"
-
 msgid "Writing error"
 msgstr "Pamyłka zapisu"
 
@@ -5580,19 +5470,23 @@ msgstr ""
 "Pamyłka spałučeńnia ad serveru %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Naš pratakoł nie padtrymvajecca serveram."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Pamyłka razboru HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Ty ŭvajšoŭ ź inšaha miesca."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "Servery MSN časova niedastupnyja. Kali łaska, pačakaj i paŭtary znoŭ."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Servery MSN časova vyklučajucca."
 
 #, c-format
@@ -5604,9 +5498,6 @@ msgid ""
 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"
 
@@ -5711,6 +5602,9 @@ msgstr "Plugin pratakołu MSN"
 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)"
@@ -5827,12 +5721,6 @@ msgstr[2] ""
 msgid "Add contacts from server"
 msgstr "Dadaj kantakty z servera"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Spałučany"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Pamyłka pratakołu, kod %d: %s"
@@ -5857,16 +5745,6 @@ msgstr "Pamyłka MySpaceIM"
 msgid "Invalid input condition"
 msgstr "Niapravilnaja ŭmova ŭvodu"
 
-msgid "Read buffer full (2)"
-msgstr "Bufer čytańnia zapoŭnieny (2)"
-
-msgid "Unparseable message"
-msgstr "Paviedamleńnie, jakoje niemahčyma razabrać"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Niemahčyma spałučycca z hostam: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Pamyłka dadańnia siabra"
 
@@ -5951,6 +5829,12 @@ msgstr "Usich siabroŭ"
 msgid "Client Version"
 msgstr "Versija klijenta"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Volnaja nazva karystalnika"
 
@@ -6208,9 +6092,9 @@ msgstr "Karystalnik adłučany, albo ty zablakavany"
 msgid "Unknown error: 0x%X"
 msgstr "Nieviadomaja pamyłka: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Pamyłka ŭvachodu (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Niemahčyma ŭvajści"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6316,9 +6200,6 @@ msgstr "Kanferencyja GroupWise %d"
 msgid "Authenticating..."
 msgstr "Aŭtaryzacyja..."
 
-msgid "Unable to connect to server."
-msgstr "Niemahčyma spałučycca z serveram."
-
 msgid "Waiting for response..."
 msgstr "Čakańnie adkazu..."
 
@@ -6342,9 +6223,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Chočaš dałučycca da razmovy?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Ty vyjšaŭ, bo ŭvajšoŭ ź inšaha kamputara."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6352,16 +6230,14 @@ msgstr ""
 "%s adłučany/adłučanaja i nie atrymaŭ/atrymała paviedamleńnie, jakoje ty "
 "tolkišto dasłaŭ."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Niemahčyma spałučycca z serveram. Akreśl adras servera, ź jakim chočaš "
 "spałučycca."
 
-msgid "Error. SSL support is not installed."
-msgstr "Pamyłka. Padtrymka SSL nie zainstalavanaja."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Hetaja kanferencyja začynienaja. Bolš nielha dasyłać paviedamleńni."
 
@@ -6400,10 +6276,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6412,18 +6285,8 @@ msgstr "Niemahčyma dałučycca da hutarki ŭ pakoi"
 msgid "Invalid chat room name"
 msgstr "Niapravilnaja nazva pakoju dla hutarki"
 
-msgid "Server closed the connection."
-msgstr "Server začyniŭ spałučeńnie."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Spałučeńnie z serversm stračanaje:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Pry spałučeńni z serveram atrymanyja niapravilnyja źviestki."
 
 #. *< type
@@ -6472,7 +6335,8 @@ msgid "Received invalid data on connection with remote user."
 msgstr ""
 "Pry spałučeńni z addalenym karystalnikam atrymanyja niapravilnyja źviestki."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Niemahčyma spałučycca z addalenym karystalnikam."
 
 msgid "Direct IM established"
@@ -6673,21 +6537,15 @@ msgstr "Uzrovień aściarohi"
 msgid "Buddy Comment"
 msgstr "Kamentar siabra"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Niemahčyma spałučycca z serveram aŭtaryzacyi:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Niemahčyma spałučycca z serveram BOS:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Niemahčyma spałučycca z serveram."
 
 msgid "Username sent"
 msgstr "Nazva karystalnika vysłanaja"
@@ -6699,11 +6557,11 @@ msgstr "Spałučeńnie ŭstalavanaje, ciestka dasłanaje"
 msgid "Finalizing connection"
 msgstr "Zakančeńnie spałučeńnia"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Niemahčyma ŭvajści: niemahčyma ŭvajści jak %s, bo nazva karystalnika "
 "niapravilnaja. Nazvy karystalnikaŭ musiać być pravilnymi adrasami email albo "
@@ -6717,26 +6575,22 @@ 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."
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Karystalnik nie isnuje"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Tvoj kont dziejna ŭsypleny."
 
 #. service temporarily unavailable
@@ -6756,7 +6610,8 @@ 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š."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Akreśleny kluč SecurID niapravilny."
 
 msgid "Enter SecurID"
@@ -6932,6 +6787,9 @@ msgstr "Spałučany ad"
 msgid "Member Since"
 msgstr "Udzielničaje ad"
 
+msgid "Capabilities"
+msgstr "Mahčymaści"
+
 msgid "Profile"
 msgstr "Profil"
 
@@ -7122,9 +6980,9 @@ msgstr[2] ""
 msgid "Away message too long."
 msgstr "Paviedamleńnie ab adychodzie nadta vialikaje."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7151,9 +7009,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Siroty"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Niemahčyma dadać siabra %s, bo ŭ tvaim śpisie siabroŭ nadta šmat siabroŭ. "
@@ -7162,8 +7020,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(biaz nazvy)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Niemahčyma dadać siabra %s ź nieviadomaje pryčyny."
 
 #, c-format
@@ -8006,7 +7864,7 @@ msgid "Update interval (seconds)"
 msgstr "Pamyłka padtrymki aktyŭnaha stanu"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Niemahčyma atrymać źviestki ab servery"
 
 #, c-format
@@ -8033,10 +7891,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Niemahčyma atrymać źviestki ab servery"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "Vymahańnie ŭvahi %s..."
 
@@ -8074,21 +7928,9 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "Niemahčyma spałučycca."
-
 msgid "Socket error"
 msgstr "Pamyłka sokieta"
 
-msgid "Unable to read from socket"
-msgstr "Niemahčyma pračytać z sokieta"
-
-msgid "Write Error"
-msgstr "Pamyłka zapisu"
-
-msgid "Connection lost"
-msgstr "Spałučeńnie zhublenaje"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "Akreśl źviestki karystalnika..."
@@ -8097,8 +7939,9 @@ msgstr "Akreśl źviestki karystalnika..."
 msgid "Requesting token"
 msgstr "Zapyt admoŭleny"
 
-msgid "Couldn't resolve host"
-msgstr "Niemahčyma vyjaśnić host"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Niemahčyma spałučycca z serveram."
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8149,7 +7992,7 @@ msgid "QQ Qun Command"
 msgstr "Zahad"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Niemahčyma atrymać źviestki ab servery"
 
 #, fuzzy
@@ -8171,9 +8014,6 @@ msgstr "Dasyłańnie fajłu"
 msgid "%d canceled the transfer of %s"
 msgstr "%d anulavaj pieradaču fajłu %s"
 
-msgid "Connection closed (writing)"
-msgstr "Spałučeńnie začynienaje (zapis)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Nazva hrupy:<b> %s<br>"
@@ -8227,17 +8067,6 @@ msgstr "Administratar Sametime pakinuŭ nastupnuju abviestku na servery %s"
 msgid "Sametime Administrator Announcement"
 msgstr "Abviestka ad administratara Sametime"
 
-msgid "Connection reset"
-msgstr "Pieraŭruchamleńie spałučeńnia"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Pamyłka čytańnia z sokietu: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Niemahčyma spałučycca z hostam"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Abviestka ad %s"
@@ -8260,6 +8089,9 @@ msgstr "Kalonki"
 msgid "Video Camera"
 msgstr "Videakamera"
 
+msgid "File Transfer"
+msgstr "Pieradača fajłu"
+
 msgid "Supports"
 msgstr "Padtrymvaje"
 
@@ -9077,6 +8909,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Statystyka sietki"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Pamyłka pingu"
 
@@ -9140,7 +8975,8 @@ msgstr "Niepadtrymany typ publičnaha kluča"
 msgid "Disconnected by server"
 msgstr "Adłučany serveram"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Pamyłka ŭ časie spałučeńnia z serveram SILC"
 
 msgid "Key Exchange failed"
@@ -9152,26 +8988,26 @@ msgstr ""
 "Pamyłka praciahu adłučanaj sesii. Naciśni \"Pierałučysia\", kab stvaryć "
 "novaje spałučeńnie."
 
-msgid "Connection failed"
-msgstr "Pamyłka spałučeńnia"
-
 msgid "Performing key exchange"
 msgstr "Abmieńvańnie klučami"
 
-msgid "Unable to create connection"
-msgstr "Niemahčyma stvaryć spałučeńnie"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Niemahčyma zahruzić paru klučoŭ SILC"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Spałučeńnia z serveram SILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Niemahčyma zahruzić paru klučoŭ SILC"
+
 msgid "Out of memory"
 msgstr "Nie staje pamiaci"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Niemahčyma inicyjalizavać pratakoł SILC"
 
 msgid "Error loading SILC key pair"
@@ -9471,7 +9307,8 @@ msgstr "Ličbava padpisvaj i praviaraj usie paviedamleńni"
 msgid "Creating SILC key pair..."
 msgstr "Stvareńnie pary klučoŭ SILC..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Niemahčyma stvaryć paru klučoŭ SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9565,6 +9402,9 @@ msgstr "Doška"
 msgid "No server statistics available"
 msgstr "Niama statystyki servera"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Pamyłka ŭ časie spałučeńnia z serveram SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Pamyłka: Nieadpaviednaść versij, aktualizuj svajho klijenta"
@@ -9606,30 +9446,27 @@ msgstr "Pamyłka: Niapravilnaje ciestka"
 msgid "Failure: Authentication failed"
 msgstr "Pamyłka: Pamyłka aŭtaryzacyi"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Niamahčyma inicyjalizavać spałučeńnie klijenta SILC"
 
 msgid "John Noname"
 msgstr "John Biezymienny"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Niemahčyma zahruzić paru klučoŭ SILC: %s"
 
-msgid "Could not write"
-msgstr "Niemahyma zapisać"
-
-msgid "Could not connect"
-msgstr "Niemahčyma spałučycca"
+msgid "Unable to create connection"
+msgstr "Niemahčyma stvaryć spałučeńnie"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Nieviadomy adkaz ad servera."
 
-msgid "Could not create listen socket"
-msgstr "Niemahčyma stvaryć sokiet dziela słuchańnia"
-
-msgid "Could not resolve hostname"
-msgstr "Niemahčyma vyjaśnić nazvu hostu"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Niemahčyma stvaryć sokiet"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
@@ -9672,6 +9509,78 @@ msgstr "Aŭtaryzuj karystalnika"
 msgid "Auth Domain"
 msgstr "Aŭtaryzuj damen"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;pakoj&gt;:  Uvajdzi ŭ pakoj hutarki ŭ sietcy Yahoo"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Pakažy śpis pakojaŭ u sietcy Yahoo"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Prapanuj karystalniku pačać sesiju Durnoty"
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Plugin pratakołu Yahoo"
+
+msgid "Pager server"
+msgstr "Server pagera"
+
+msgid "Pager port"
+msgstr "Port pagera"
+
+msgid "File transfer server"
+msgstr "Server pieradačy fajłaŭ"
+
+msgid "File transfer port"
+msgstr "Port pieradačy fajłaŭ"
+
+msgid "Chat room locale"
+msgstr "Lakalnaść pakoju hutarki"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ihnaruj zaprašeńni na kanferencyi i ŭ pakoi hutarak"
+
+msgid "Chat room list URL"
+msgstr "Spasyłka na śpis pakojaŭ hutarak"
+
+msgid "Yahoo Chat server"
+msgstr "Server hutarak Yahoo"
+
+msgid "Yahoo Chat port"
+msgstr "Port hutarak Yahoo"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Plugin pratakołu Yahoo"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9701,30 +9610,20 @@ msgstr "Dadańnie siabra nie dazvolenaje"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 "Numar %d nieviadomaj pamyłki. Naviedvańnie sajtu Yahoo! moža vypravić hetuju "
 "prablemu."
@@ -9766,37 +9665,32 @@ msgstr ""
 "Numar %d nieviadomaj pamyłki. Naviedvańnie sajtu Yahoo! moža vypravić hetuju "
 "prablemu."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "Niemahčyma dadać siabra %s u hrupu %s ŭ śpis z servera dla kontu %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Niemahčyma dadać siabra ŭ śpis z servera"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hukavy %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Atrymany niečakany adkaz HTTP ad servera."
 
-msgid "Connection problem"
-msgstr "Pamyłka spałučeńnia"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Spałučeńnie z %s zhublenaje:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Niemahčyma spałučycca z %s:\n"
+"Niemahčyma spałučycca z serveram:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9859,74 +9753,15 @@ msgstr "Dałučysia da karystalnika ŭ hutarcy..."
 msgid "Open Inbox"
 msgstr "Adčyni Ŭvachodnyja"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;pakoj&gt;:  Uvajdzi ŭ pakoj hutarki ŭ sietcy Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Pakažy śpis pakojaŭ u sietcy Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Prapanuj karystalniku pačać sesiju Durnoty"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Plugin pratakołu Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japonija"
-
-msgid "Pager server"
-msgstr "Server pagera"
-
-msgid "Japan Pager server"
-msgstr "Japonski server pagera"
-
-msgid "Pager port"
-msgstr "Port pagera"
-
-msgid "File transfer server"
-msgstr "Server pieradačy fajłaŭ"
-
-msgid "Japan file transfer server"
-msgstr "Japonski server pieradačy fajłaŭ"
-
-msgid "File transfer port"
-msgstr "Port pieradačy fajłaŭ"
-
-msgid "Chat room locale"
-msgstr "Lakalnaść pakoju hutarki"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ihnaruj zaprašeńni na kanferencyi i ŭ pakoi hutarak"
-
-msgid "Chat room list URL"
-msgstr "Spasyłka na śpis pakojaŭ hutarak"
-
-msgid "Yahoo Chat server"
-msgstr "Server hutarak Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "Port hutarak Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Dašli zapyt Durnoty."
 
+msgid "Unable to connect."
+msgstr "Niemahčyma spałučycca."
+
 msgid "Unable to establish file descriptor."
 msgstr "Niemahčyma atrymać fajłavy deskryptar."
 
@@ -9934,6 +9769,9 @@ msgstr "Niemahčyma atrymać fajłavy deskryptar."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s choča vysłać tabie %d fajłaŭ.\n"
 
+msgid "Write Error"
+msgstr "Pamyłka zapisu"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Profil japonskaha Yahoo!"
 
@@ -10053,23 +9891,19 @@ msgstr "Hałasy"
 msgid "Webcams"
 msgstr "Webkamery"
 
+msgid "Connection problem"
+msgstr "Pamyłka spałučeńnia"
+
 msgid "Unable to fetch room list."
 msgstr "Niemahčyma atrymać śpis pakojaŭ."
 
 msgid "User Rooms"
 msgstr "Pakoi karystalnikaŭ"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Prablema spałučeńnia z serveram YCHT."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Spałučeńnie z serveram zhublenaje\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10200,33 +10034,22 @@ msgstr "Vaładarstva"
 msgid "Exposure"
 msgstr "Vykryćcio"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Niemahčyma stvaryć sokiet:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Niemahčyma razabrać adkaz ad HTTP proxy: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Pamyłka spałučeńnia %d z HTTP proxy"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Dostup niedazvoleny: HTTP proxy-server zabaraniaje tunelavać port %d."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Pamyłka vyjaśnieńnia %s."
 
-msgid "Could not resolve host name"
-msgstr "Niemahčyma vyjaśnić nazvu hostu"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Vymahańnie ŭvahi %s..."
@@ -10437,12 +10260,6 @@ msgstr "Pamyłka zapisu ŭ %s: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "Niemahčyma spałučycca z %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "Server vymahaje TLS/SSL, kab uvajści. Niama padtrymki TLS/SSL."
-
 #, c-format
 msgid " - %s"
 msgstr " - %s"
@@ -10694,9 +10511,14 @@ msgstr "Dadaj siabroŭskuju _začepku..."
 msgid "View _Log"
 msgstr "Pakažy _logi"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Chavaj, kali adłučany"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Pakazvaj, kali adłučany"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
@@ -11204,6 +11026,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Źmiani źviestki karystalnika dla %s"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Uviadzi nazvu kamputara, dla jakoha vydadzieny hety sertyfikat."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Servery SSL"
@@ -11251,7 +11077,8 @@ msgstr "Ihnaruj"
 msgid "Get Away Message"
 msgstr "Atrymaj paviedamleńnie adychodu"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Apošnija replika"
 
 msgid "Unable to save icon file to disk."
@@ -12158,7 +11985,7 @@ msgid "Hyperlink visited color"
 msgstr "Koler hiperspasyłak"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Koler padśviatleńnia hiperspasyłak, kali kursor naviedzieny na ich."
 
 msgid "Hyperlink prelight color"
@@ -12197,13 +12024,22 @@ msgid "Action Message Name Color for Whispered Message"
 msgstr "Koler dla nazvy dziejnasnaha paviedamleńnia"
 
 #, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Koler dla nazvy dziejnasnaha paviedamleńnia."
+
+#, fuzzy
 msgid "Whisper Message Name Color"
 msgstr "Dasłany koler dla nazvy paviedamleńnia"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Koler dla nazvy dziejnasnaha paviedamleńnia."
+
 msgid "Typing notification color"
 msgstr "Koler infarmavańnia pra nabor tekstu"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "Koler šryftu dziela infarmavańnia pra nabor tekstu"
 
 msgid "Typing notification font"
@@ -12604,6 +12440,10 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Abrany 'Admysłovy' hartač, ale zahad nie akreśleny."
 
+#, fuzzy
+msgid "No message"
+msgstr "Nieviadomaje paviedamleńnie"
+
 msgid "Open All Messages"
 msgstr "Adčyni ŭsie paviedamleńni"
 
@@ -12621,10 +12461,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Majem novuju poštu!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Nieviadomaje paviedamleńnie"
-
 msgid "The following plugins will be unloaded."
 msgstr "Nastupnyja pluginy buduć adhružanyja."
 
@@ -12840,8 +12676,9 @@ msgstr "_Pakazvaj ikonu systemnaha treju:"
 msgid "On unread messages"
 msgstr "Kali jość niepračytanyja paviedamleńni"
 
-msgid "Conversation Window Hiding"
-msgstr "Chavańnie vakna razmovy"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Vokny razmovaŭ"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Chavaj novyja pryvatnyja razmovy:"
@@ -12849,6 +12686,9 @@ msgstr "_Chavaj novyja pryvatnyja razmovy:"
 msgid "When away"
 msgstr "Kali adyjšoŭ"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "_Minimalizuj novyja vokny razmovaŭ"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Kartki"
@@ -12907,9 +12747,6 @@ msgstr "Užyj miakkuju prakrutku"
 msgid "F_lash window when IMs are received"
 msgstr "Mir_haj vaknom, kali atrymanyja novyja paviedamleńni"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "_Minimalizuj novyja vokny razmovaŭ"
-
 msgid "Minimum input area height in lines:"
 msgstr "Minimalnaja vyšynia absiahu ŭvodu, radkoŭ:"
 
@@ -12944,7 +12781,8 @@ msgstr "Niemahčyma ŭklučyć prahramu dziela kanfihuravańnia hartača."
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Prykład: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Aŭtamatyčna vyznačaj IP adras"
 
 msgid "Public _IP:"
@@ -13317,34 +13155,18 @@ msgstr "_Zapišy i ŭžyj"
 msgid "Status for %s"
 msgstr "Status dla %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "Ustaŭ smajł"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
 #, fuzzy
-msgid "Duplicate Shortcut"
-msgstr "Padvojnaje vypraŭleńnie."
+msgid "Custom Smiley"
+msgstr "Ustaŭ smajł"
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Abiary sabie nastroj sa śpisu."
+msgid "Duplicate Shortcut"
+msgstr "Padvojnaje vypraŭleńnie."
 
 #, fuzzy
 msgid "Edit Smiley"
@@ -13463,9 +13285,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Niemahčyma dasłać uruchamlalnik"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Ty pieraciahnuŭ uruchamlalnik prahramy sa stała. Chutčej za ŭsio, ty chočaš "
 "dasłać toje, na što jon pakazvaje, a nia sam uruchamlalnik."
@@ -14065,9 +13888,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Plugin muzyčnych paviedamleńniaŭ dziela supolnaha pisańnia muzyki."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Plugin muzyčnych paviedamleńniaŭ dazvalaje niekalkim karystalnikam "
 "adnačasova pracavać nad adnym muzyčnym frahmentam, redahujučy ahulnyja noty "
@@ -14327,9 +14151,10 @@ msgid "Conversation Window Send Button."
 msgstr "Knopka vysyłańnia dla voknaŭ razmovaŭ."
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Dadaje knopku vysyłańnia da abšaru naboru tekstu akna razmovy. Zručna, kali "
 "niama sapraŭdnaj klavijatury."
@@ -14661,8 +14486,9 @@ msgstr "Opcyi Pidgina dla Windowsa"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opcyi Pidgina, admysłovyja dla Windowsa."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Daje opcyi Pidgina, admysłovyja dla Windowsa, naprykład, ubudoŭvańnie śpisu "
 "siabroŭ."
@@ -14704,6 +14530,305 @@ msgstr "Dasyłaj i atrymvaj suvoryja strofy XMPP."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Hety plugin užyvajecca dziela debugavańnia serveraŭ i klijentaŭ XMPP."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Niemahčyma adčynić sokiet"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Niemahčyma słuchać sokiet"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Niemahčyma pračytać z sokieta"
+
+#~ msgid "Connection failed."
+#~ msgstr "Pamyłka spałučeńnia."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Server adłučyŭsia"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Niemahčyma stvaryć sokiet"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Niemahčyma spałučycca z hostam"
+
+#~ msgid "Read error"
+#~ msgstr "Pamyłka čytańnia"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Niemahčyma spałučycca z serveram:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Pamyłka zapisu"
+
+#~ msgid "Last Activity"
+#~ msgstr "Apošniaja dziejnaść"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Źviestki ad znojdzienych pasłuhach"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Znojdzienyja pasłuhi"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Pašyranaja adrasacyja frazaŭ"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Ludnaja hutarka"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Pašyranyja źviestki ab udziele ŭ ludnaj hutarcy"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "Bajtavyja płyni In-Band"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Zahady Ad-Hoc"
+
+#~ msgid "PubSub Service"
+#~ msgstr "Pasłuha PubSub"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "Bajtavyja płyni SOCKS5"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Źviestki Out of Band"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "Rehistracyja In-Band"
+
+#~ msgid "User Location"
+#~ msgstr "Pałažeńnie karystalnika"
+
+#~ msgid "User Avatar"
+#~ msgstr "Avatar karystalnika"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Infarmavańni ab statusie hutarki"
+
+#~ msgid "Software Version"
+#~ msgstr "Versija prahramy"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Inicyjacyja płyni"
+
+#~ msgid "User Mood"
+#~ msgstr "Nastroj karystalnika"
+
+#~ msgid "User Activity"
+#~ msgstr "Dziejnaść karystalnika"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Mahčymaści siabra"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Uzhadnieńnie šyfravanaj sesii"
+
+#~ msgid "User Tune"
+#~ msgstr "Pieśnia karystalnika"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Abmieńvańnie elementaŭ śpisu siabroŭ"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Adras dasiahalnaści"
+
+#~ msgid "User Profile"
+#~ msgstr "Profil karystalnika"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Jingle Audio"
+
+#~ msgid "User Nickname"
+#~ msgstr "Mianuška karystalnika"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle Suvory UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Jingle Video"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Atrymańnie paviedamleńniaŭ"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Supolny dostup da publičnaha kluča"
+
+#~ msgid "User Chatting"
+#~ msgstr "Karystalnik hutaryć"
+
+#~ msgid "User Browsing"
+#~ msgstr "Karystalnik u Siecivie"
+
+#~ msgid "User Gaming"
+#~ msgstr "Karystalnik hulajecca"
+
+#~ msgid "User Viewing"
+#~ msgstr "Karystalnik hladzić"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Šyfravańnie frazy"
+
+#~ msgid "Entity Time"
+#~ msgstr "Čas isnavańnia"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Adterminavanaja dastaŭka"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Supolnyja infarmacyjnyja abjekty"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Schovišča fajłaŭ i supolny dostup"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "Pošuk pasłuh STUN dla Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Uzhadnieńnie sproščana šyfravanaj sesii"
+
+#~ msgid "Hop Check"
+#~ msgstr "Pravierka Hop"
+
+#~ msgid "Read Error"
+#~ msgstr "Pamyłka čytańnia"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Pamyłka spałučeńnia z serveram."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Bufer čytańnia zapoŭnieny (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Paviedamleńnie, jakoje niemahčyma razabrać"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Niemahčyma spałučycca z hostam: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Pamyłka ŭvachodu (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Ty vyjšaŭ, bo ŭvajšoŭ ź inšaha kamputara."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Pamyłka. Padtrymka SSL nie zainstalavanaja."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Niapravilny parol."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Niemahčyma spałučycca z serveram BOS:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Ty možaš być chutka adłučany. Pravier aktualnaść na %s."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Niemahčyma spałučycca"
+
+#~ msgid "Invalid username."
+#~ msgstr "Niapravilnaja nazva."
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Niemahčyma atrymać źviestki ab servery"
+
+#~ msgid "Connection lost"
+#~ msgstr "Spałučeńnie zhublenaje"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Niemahčyma vyjaśnić host"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Spałučeńnie začynienaje (zapis)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Pieraŭruchamleńie spałučeńnia"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Pamyłka čytańnia z sokietu: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Niemahčyma spałučycca z hostam"
+
+#~ msgid "Could not write"
+#~ msgstr "Niemahyma zapisać"
+
+#~ msgid "Could not connect"
+#~ msgstr "Niemahčyma spałučycca"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Niemahčyma stvaryć sokiet dziela słuchańnia"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Niemahčyma vyjaśnić nazvu hostu"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Niapravilny parol"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Niemahčyma spałučycca z %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japonija"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Japonski server pagera"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japonski server pieradačy fajłaŭ"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Spałučeńnie z serveram zhublenaje\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Niemahčyma vyjaśnić nazvu hostu"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "Server vymahaje TLS/SSL, kab uvajści. Niama padtrymki TLS/SSL."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Chavańnie vakna razmovy"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Abiary sabie nastroj sa śpisu."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Jaki ID aktyvizavać?"
 
@@ -15224,9 +15349,6 @@ msgstr "Hety plugin užyvajecca dziela debugavańnia serveraŭ i klijentaŭ XMPP
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "Niemahčyma ŭvajści. Pravier debugavy log."
 
-#~ msgid "Unable to login"
-#~ msgstr "Niemahčyma ŭvajści"
-
 #~ msgid "TCP Address"
 #~ msgstr "TCP adras"
 
diff --git a/po/bg.po b/po/bg.po
index 15b8d90e1d..b955bfe312 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin-1.30\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2007-02-12 00:46+0200\n"
 "Last-Translator: Vladimir \"Kaladan\" Petkov <kaladan@gmail.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -2643,7 +2643,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2694,7 +2694,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2944,12 +2944,12 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
 #, fuzzy
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr "Не може да бъде установена нова връзка."
 
 msgid ""
@@ -3006,16 +3006,16 @@ msgstr "%s затвори прозореца за разговор."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Съобщението не може да бъде изпратено: Твърде е голямо."
 
-#, fuzzy
-msgid "Cannot open socket"
-msgstr "Не мога да вляза в %s:"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Грешка при създаване на сокет"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Грешка при създаване на сокет"
 
-#, fuzzy
-msgid "Could not listen on socket"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
 msgstr "Грешка при създаване на сокет"
 
 #, fuzzy
@@ -3066,14 +3066,16 @@ msgstr "Запазване на списъка с приятели..."
 msgid "Load buddylist from file..."
 msgstr "Зареждане на списък с приятели от файл..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Попълнете полетата за регистрация."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Паролите не съвпадат."
 
 #, fuzzy
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Не може да бъде установена нова връзка."
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3086,16 +3088,15 @@ msgstr "Регистрацията успешна"
 msgid "Password"
 msgstr "Парола"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr "Парола (отново)"
 
-#, fuzzy
-msgid "Enter current token"
-msgstr "%s в момента не е свързан."
+msgid "Enter captcha text"
+msgstr ""
 
 #, fuzzy
-msgid "Current token"
-msgstr "В момента е в"
+msgid "Captcha"
+msgstr "Запазване на изображение"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Регистриране на нов акаунт за Gadu-Gadu"
@@ -3149,6 +3150,17 @@ msgstr "Паролата е променена успешно!"
 msgid "Current password"
 msgstr "Текуща парола"
 
+msgid "Password (retype)"
+msgstr "Парола (отново)"
+
+#, fuzzy
+msgid "Enter current token"
+msgstr "%s в момента не е свързан."
+
+#, fuzzy
+msgid "Current token"
+msgstr "В момента е в"
+
 #, fuzzy
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Въведете настоящата и новата си парола."
@@ -3198,8 +3210,9 @@ msgstr "Няма съвпадащи потребители"
 msgid "There are no users matching your search criteria."
 msgstr "Няма потребители, които да отговарят на вашите изисквания."
 
-msgid "Unable to read socket"
-msgstr ""
+#, fuzzy
+msgid "Unable to read from socket"
+msgstr "Грешка при четене през мрежата"
 
 msgid "Buddy list downloaded"
 msgstr "Списъкът с приятели е изтеглен"
@@ -3213,8 +3226,14 @@ msgstr "Списъкът с приятели е качен"
 msgid "Your buddy list was stored on the server."
 msgstr "Списъкът ви с приятели вече се съхранява на сървъра."
 
-msgid "Connection failed."
-msgstr "Неуспешен опит за връзка."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Свързване"
+
+msgid "Connection failed"
+msgstr "Неуспешен опит за връзка"
 
 msgid "Add to chat"
 msgstr "Добавяне за разговор"
@@ -3222,18 +3241,23 @@ msgstr "Добавяне за разговор"
 msgid "Chat _name:"
 msgstr "Име:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Неуспешно свързване със сървъра."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Свързване"
+
 msgid "Chat error"
 msgstr "Грешка при разговора"
 
 msgid "This chat name is already in use"
 msgstr "Това име вече се използва от някой друг"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Не сте свързван със сървъра."
 
 msgid "Find buddies..."
@@ -3294,7 +3318,7 @@ msgid "File Transfer Failed"
 msgstr "Преноса на файла е неуспешен"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Pidgin не може да отвори порт за слушане."
 
 msgid "Error displaying MOTD"
@@ -3310,8 +3334,16 @@ msgstr "Няма съобщение за деня, свързано с тази
 msgid "MOTD for %s"
 msgstr "Съобщение за деня за %s"
 
-msgid "Server has disconnected"
-msgstr "Сървъра се изключи"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "Не сте свързван със сървъра."
 
 msgid "View MOTD"
 msgstr "Показване съобщението за деня"
@@ -3326,22 +3358,20 @@ msgstr "_Парола:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "Потребителските имена в IRC не може да съдържат интервали"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Свързване"
-
 msgid "SSL support unavailable"
 msgstr "Няма поддръжка на SSL"
 
-msgid "Couldn't create socket"
-msgstr "Грешка при създаване на сокет"
+msgid "Unable to connect"
+msgstr "Неуспешно свързване"
 
-msgid "Couldn't connect to host"
-msgstr "Неуспешна връзка със сървъра"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Невъзможност за връзка със сървъра"
 
-msgid "Read error"
-msgstr "Грешка при четенето"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Грешка при установяването на връзката"
 
 msgid "Users"
 msgstr "Потребители"
@@ -3733,11 +3763,12 @@ msgstr "Командата е изключена"
 msgid "execute"
 msgstr "Неочакван"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Сървърът изисква TLS или SSL за влизане. Нямаме поддръжка на TLS/SSL."
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Сървърът изисква TLS или SSL за влизане. Нямаме поддръжка на TLS/SSL."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3754,7 +3785,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Парола в чист текст"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Неуспешна идентификация"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Неправилен отговор от сървъра."
 
 msgid "Server does not use any supported authentication method"
@@ -3766,8 +3802,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr ""
 
-#, fuzzy
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Грешка при четенето"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3785,22 +3821,14 @@ msgstr "Тази версия не е поддържана"
 msgid "Unable to establish a connection with the server"
 msgstr "Неуспено свързване със сървъра."
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Неуспено свързване със сървъра."
 
 #, fuzzy
 msgid "Unable to establish SSL connection"
 msgstr "Не може да бъде установена нова връзка."
 
-msgid "Unable to create socket"
-msgstr "Грешка при създаване на сокет"
-
-msgid "Write error"
-msgstr "Грешка при запис"
-
 msgid "Full Name"
 msgstr "Пълно име"
 
@@ -3871,187 +3899,6 @@ msgstr ""
 msgid "Local Time"
 msgstr "Локален файл:"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "Задаване данните на директорията"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "Разширен адрес"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "Заглавие за разговор"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "В директорията няма данни за този потребител."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "Команда"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "Грешка при регистрацията"
-
-#, fuzzy
-msgid "User Location"
-msgstr "Местонахождение"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "Търсене за потребители"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "Известяване за състоянието на потребител"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "Тази версия не е поддържана"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "Ориентация"
-
-msgid "File Transfer"
-msgstr "Пренос на файлове"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "Режими на потребителя"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "Ограничение на потребителите"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "Възможности"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "Потребителско име"
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "Е-поща"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "Профил в MSN"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "_Включване"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "Потребителско име"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "Живо видео"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "Съобщението е получено"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "Файл с публичния ключ"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "Настройки за потребител"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "Режими на потребителя"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "Потребителско име"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "Ограничение на потребителите"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Криптиране на Trillian"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Възможности"
-
 msgid "Priority"
 msgstr "Приоритет"
 
@@ -4063,7 +3910,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Вече сте свързан в"
 
 msgid "Middle Name"
@@ -4250,16 +4097,12 @@ msgid "Roles:"
 msgstr "Описание на длъжността"
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "Обикновен текст"
 
-msgid "Read Error"
-msgstr "Грешка при четене"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 #, fuzzy
@@ -4449,9 +4292,6 @@ msgstr "Вашата парола беше сменена."
 msgid "Error changing password"
 msgstr "Грешка при смяна на паролата"
 
-msgid "Password (again)"
-msgstr "Парола (отново)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "Смяна на парола"
@@ -4838,6 +4678,14 @@ msgstr "Грешка при обработката на XML"
 msgid "Unknown Error in presence"
 msgstr ""
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Грешка при присъединяването към чат %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Грешка в чат %s"
+
 msgid "Create New Room"
 msgstr "Създаване на нова стая"
 
@@ -4854,16 +4702,20 @@ msgstr "_Настройване на стая"
 msgid "_Accept Defaults"
 msgstr "Прием_ане на стандартните настройки"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Грешка при присъединяването към чат %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Няма посочена причина."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Грешка в чат %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "%s ви изрита: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Изритан от %s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Получи се грешка при отварянето на файла."
 
 #, fuzzy
@@ -5369,9 +5221,6 @@ msgstr ""
 "Поддръжка на SSL е необходима за MNS. Инсталирайте SSL-библиотека. За повече "
 "информация вижте на адрес: http://Pidgin.sf.net/faq-ssl.php("
 
-msgid "Failed to connect to server."
-msgstr "Неуспешно свързване със сървъра."
-
 #, fuzzy
 msgid "Error retrieving profile"
 msgstr "Грешка при четене от сървъра"
@@ -5635,9 +5484,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 
-msgid "Unable to connect"
-msgstr "Неуспешно свързване"
-
 msgid "Writing error"
 msgstr "Грешка при запис"
 
@@ -5650,13 +5496,16 @@ msgid ""
 "%s"
 msgstr "Непозната грешка номер %d."
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Нашия протокол не се поддържа от сървъра."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Грешка при прегледа на HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Връзката ви беше прекъсната, тъй като сте се включили от друго място."
 
 #, fuzzy
@@ -5664,7 +5513,7 @@ msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "Услугата е временно недостъпна."
 
 #, fuzzy
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr "Връзката ви беше прекъсната. Понякога MSN-сървърите"
 
 #, fuzzy, c-format
@@ -5675,9 +5524,6 @@ msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "Unknown error."
-msgstr "Непозната грешка:"
-
 msgid "Handshaking"
 msgstr "Ръкостискане"
 
@@ -5776,6 +5622,9 @@ msgstr "Приставка за протокола AIM/ICQ"
 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)"
@@ -5890,12 +5739,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Неправилен отговор от сървъра."
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Свързване"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr ""
@@ -5919,18 +5762,6 @@ msgid "Invalid input condition"
 msgstr "Приключване на връзката"
 
 #, fuzzy
-msgid "Read buffer full (2)"
-msgstr "Опашката е запълнена"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "Съобщението не може да бъде прегледано"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Неуспешна връзка със сървъра"
-
-#, fuzzy
 msgid "Failed to add buddy"
 msgstr "Неуспешен опит за присъединяване към приятелски чат"
 
@@ -6023,6 +5854,12 @@ msgstr ""
 msgid "Client Version"
 msgstr "Затваряне на разговор"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 #, fuzzy
 msgid "MySpaceIM - Username Available"
 msgstr "Услугата не е налична"
@@ -6290,9 +6127,9 @@ msgstr "Потребителят е или в режим \"изключен\" и
 msgid "Unknown error: 0x%X"
 msgstr "Непозната грешка: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Неуспешна идентификация (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Неуспех при забраната на потребителя %s"
 
 #, fuzzy, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6393,9 +6230,6 @@ msgstr ""
 msgid "Authenticating..."
 msgstr "Идентификация..."
 
-msgid "Unable to connect to server."
-msgstr "Неуспешно свързване със сървъра."
-
 msgid "Waiting for response..."
 msgstr "Изчакване за отговор..."
 
@@ -6417,9 +6251,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Искате ли да запишете новия на негово място?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Връзката беше прекъсната, тъй като се включихте от друга машина."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6427,14 +6258,11 @@ msgstr ""
 
 #, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Моля, напишете името на потребителя, на когото искате да забраните достъпа."
 
-msgid "Error. SSL support is not installed."
-msgstr ""
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 
@@ -6474,10 +6302,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "Грешка при установяването на връзката"
 
-msgid "Incorrect password."
-msgstr "Невярна парола."
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, fuzzy
@@ -6489,17 +6314,7 @@ msgid "Invalid chat room name"
 msgstr "Невалидно име на стая"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "Грешка при установяването на връзката"
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "Не сте свързван със сървъра."
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "Неуспено свързване със сървъра."
 
 #. *< type
@@ -6551,8 +6366,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Неуспено свързване със сървъра."
 
 #, fuzzy
 msgid "Direct IM established"
@@ -6746,15 +6562,11 @@ msgid "Buddy Comment"
 msgstr "Коментар за приятел"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "Не може да бъде установена връзка за трансфер."
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
 msgstr "Неуспешно свързване със сървъра."
 
 #, fuzzy
@@ -6770,9 +6582,9 @@ msgstr "Приключване на връзката"
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 
 #, fuzzy, c-format
@@ -6783,28 +6595,23 @@ msgstr "Връзката със сървъра беше прекъсната."
 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
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "Невалидно потребителско име"
+msgid "Username does not exist"
+msgstr "Няма такъв потребител"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Абонаментът временно спрян."
 
 #. service temporarily unavailable
@@ -6827,8 +6634,9 @@ msgstr ""
 "отново. Ако продължите с опитите си да влезете сега, ще трябва да чакате още "
 "по-дълго."
 
-msgid "The SecurID key entered is invalid."
-msgstr ""
+#, fuzzy
+msgid "The SecurID key entered is invalid"
+msgstr "Новото форматиране е неправилно."
 
 msgid "Enter SecurID"
 msgstr ""
@@ -6991,6 +6799,9 @@ msgstr "Включен от"
 msgid "Member Since"
 msgstr "Член от"
 
+msgid "Capabilities"
+msgstr "Възможности"
+
 #, fuzzy
 msgid "Profile"
 msgstr "Профил в MSN"
@@ -7178,7 +6989,7 @@ msgstr "Съобщението за състояние е твърде дълг�
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7203,9 +7014,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Сираци"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "%s не може да бъде добавен в списъка, защото имате твърде много познати в "
@@ -7215,7 +7026,7 @@ msgid "(no name)"
 msgstr "(без име)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Бяхте изключен по неизвестни причини."
 
 #, fuzzy, c-format
@@ -8080,7 +7891,7 @@ msgid "Update interval (seconds)"
 msgstr "Грешка при четенето"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Грешка при получаване данните на сървъра"
 
 #, c-format
@@ -8107,10 +7918,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Грешка при получаване данните на сървъра"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "Отговорът е отказан"
 
@@ -8146,26 +7953,11 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "Неуспешно свързване."
-
 #, fuzzy
 msgid "Socket error"
 msgstr "Непозната грешка"
 
 #, fuzzy
-msgid "Unable to read from socket"
-msgstr "Грешка при четене през мрежата"
-
-#, fuzzy
-msgid "Write Error"
-msgstr "Грешка при запис"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "Връзката е прекъсната"
-
-#, fuzzy
 msgid "Getting server"
 msgstr "Задаване данни на потребител..."
 
@@ -8174,8 +7966,8 @@ msgid "Requesting token"
 msgstr "Отговорът е отказан"
 
 #, fuzzy
-msgid "Couldn't resolve host"
-msgstr "Неуспешна връзка със сървъра"
+msgid "Unable to resolve hostname"
+msgstr "Неуспешно свързване със сървъра."
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8226,7 +8018,7 @@ msgid "QQ Qun Command"
 msgstr "Команда"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Грешка при получаване данните на сървъра"
 
 #, fuzzy
@@ -8249,10 +8041,6 @@ msgstr "Неуспешно изпращане на файл"
 msgid "%d canceled the transfer of %s"
 msgstr "%s прекъсна прехвърлянето на файл %s"
 
-#, fuzzy
-msgid "Connection closed (writing)"
-msgstr "Връзката е прекъсната"
-
 #, fuzzy, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Потребител:<b> %s<b>"
@@ -8312,19 +8100,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#, fuzzy
-msgid "Connection reset"
-msgstr "Връзката е прекъсната"
-
-#, fuzzy, c-format
-msgid "Error reading from socket: %s"
-msgstr "Грешка при четенето от socket."
-
-#. this is a regular connect, error out
-#, fuzzy
-msgid "Unable to connect to host"
-msgstr "Невъзможност за връзка със сървъра"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -8348,6 +8123,9 @@ msgstr "Говорители"
 msgid "Video Camera"
 msgstr "Видео камера"
 
+msgid "File Transfer"
+msgstr "Пренос на файлове"
+
 #, fuzzy
 msgid "Supports"
 msgstr "поддръжка"
@@ -9141,6 +8919,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Статистика на мрежата"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Неуспешен ping"
 
@@ -9202,7 +8983,7 @@ msgid "Disconnected by server"
 msgstr "Изключен от сървъра"
 
 #, fuzzy
-msgid "Error during connecting to SILC Server"
+msgid "Error connecting to SILC Server"
 msgstr "Грешка при установяването на връзката"
 
 msgid "Key Exchange failed"
@@ -9212,18 +8993,11 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-msgid "Connection failed"
-msgstr "Неуспешен опит за връзка"
-
 msgid "Performing key exchange"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to create connection"
-msgstr "Не може да бъде установена нова връзка."
-
-#, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "Потребителското име не може да бъде променено"
 
 #. Progress
@@ -9231,11 +9005,15 @@ msgstr "Потребителското име не може да бъде про
 msgid "Connecting to SILC Server"
 msgstr "Свързване към сървър"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Потребителското име не може да бъде променено"
+
 msgid "Out of memory"
 msgstr "Няма достатъчно памет"
 
 #, fuzzy
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "Приключване на връзката"
 
 #, fuzzy
@@ -9529,7 +9307,7 @@ msgid "Creating SILC key pair..."
 msgstr ""
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "Потребителското име не може да бъде променено"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9622,6 +9400,10 @@ msgstr ""
 msgid "No server statistics available"
 msgstr "Няма възможни действия"
 
+#, fuzzy
+msgid "Error during connecting to SILC Server"
+msgstr "Грешка при установяването на връзката"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -9663,7 +9445,7 @@ msgid "Failure: Authentication failed"
 msgstr "Неуспешна идентификация"
 
 #, fuzzy
-msgid "Cannot initialize SILC Client connection"
+msgid "Unable to initialize SILC Client connection"
 msgstr "Приключване на връзката"
 
 #, fuzzy
@@ -9671,30 +9453,22 @@ msgid "John Noname"
 msgstr "Без име"
 
 #, fuzzy, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "Потребителското име не може да бъде променено"
 
 #, fuzzy
-msgid "Could not write"
-msgstr "Невъзможност за изпращане"
-
-#, fuzzy
-msgid "Could not connect"
-msgstr "Неуспех при свързването"
+msgid "Unable to create connection"
+msgstr "Не може да бъде установена нова връзка."
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "Причината е неизвестна."
 
 #, fuzzy
-msgid "Could not create listen socket"
+msgid "Unable to create listen socket"
 msgstr "Грешка при създаване на сокет"
 
 #, fuzzy
-msgid "Could not resolve hostname"
-msgstr "Неуспешна връзка със сървъра"
-
-#, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Потребителските имена в IRC не може да съдържат интервали"
 
@@ -9739,6 +9513,82 @@ msgstr "Потребител на Gadu-Gadu"
 msgid "Auth Domain"
 msgstr "Автоматично"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr ""
+
+msgid "list: List rooms on the Yahoo network"
+msgstr ""
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Име в Yahoo!"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Модул за протокола Yahoo"
+
+#, fuzzy
+msgid "Pager server"
+msgstr "Сървър "
+
+msgid "Pager port"
+msgstr "Порт за пейджър"
+
+#, fuzzy
+msgid "File transfer server"
+msgstr "Порт за преност на файлове"
+
+msgid "File transfer port"
+msgstr "Порт за преност на файлове"
+
+msgid "Chat room locale"
+msgstr ""
+
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
+
+#, fuzzy
+msgid "Chat room list URL"
+msgstr "Грешка при получаване списъка със стаите"
+
+msgid "Yahoo Chat server"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo Chat port"
+msgstr "Yahoo Japan"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Име в Yahoo!"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Модул за протокола Yahoo"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9769,28 +9619,18 @@ msgstr "Отказ за добавяне на потребител"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr "Абонаментът ви е заключен, моля влезте в страницата на Yahoo!"
 
 #. username or password missing
@@ -9829,13 +9669,14 @@ msgstr "Абонаментът ви е заключен, моля влезте �
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Потребителят %s не може да бъде добавен в група %s от списъка на сървърите "
 "на абонамент %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Потребителят не може да бъде добавен в списъка"
 
 #, c-format
@@ -9843,23 +9684,16 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
 #, fuzzy
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "Неправилен отговор от сървъра."
 
-msgid "Connection problem"
-msgstr "Проблем с връзката"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "Не сте свързван със сървъра."
 
 #, fuzzy, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr "Не сте свързван със сървъра."
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Неуспено свързване със сървъра."
 
 msgid "Not at Home"
 msgstr "Не е вкъщи"
@@ -9930,80 +9764,15 @@ msgstr "Присъедини се към потребителя в чата..."
 msgid "Open Inbox"
 msgstr "Отваряне на пощенската кутия в Hotmail"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-
-msgid "list: List rooms on the Yahoo network"
-msgstr ""
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Име в Yahoo!"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Модул за протокола Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "Сървър "
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "Порт за пейджър"
-
-msgid "Pager port"
-msgstr "Порт за пейджър"
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "Порт за преност на файлове"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "Порт за трансфер на файлове"
-
-msgid "File transfer port"
-msgstr "Порт за преност на файлове"
-
-msgid "Chat room locale"
-msgstr ""
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-#, fuzzy
-msgid "Chat room list URL"
-msgstr "Грешка при получаване списъка със стаите"
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "Yahoo Japan"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "Неуспешно свързване."
+
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -10011,6 +9780,10 @@ msgstr ""
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "Съобщението не може да бъде изпратено."
 
+#, fuzzy
+msgid "Write Error"
+msgstr "Грешка при запис"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Профил в Yahoo! Japan"
 
@@ -10125,6 +9898,9 @@ msgstr "Гласoве"
 msgid "Webcams"
 msgstr "Уеб камери"
 
+msgid "Connection problem"
+msgstr "Проблем с връзката"
+
 #, fuzzy
 msgid "Unable to fetch room list."
 msgstr "Неуспешно свързване."
@@ -10133,15 +9909,9 @@ msgid "User Rooms"
 msgstr "Стаи на потребителя"
 
 #, fuzzy
-msgid "Connection problem with the YCHT server."
+msgid "Connection problem with the YCHT server"
 msgstr "Проблем с връзката"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "Не сте свързван със сървъра."
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10263,31 +10033,21 @@ msgid "Exposure"
 msgstr ""
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "Грешка при създаване на сокет"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Съобщението не може да бъде изпратено: %s"
 
 #, fuzzy, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Грешка при свързването с прокси-сървъра %d"
 
 #, fuzzy, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Достъпът отказан: сървърът-посредник отказва свързване през порт %d."
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr "Грешка при четенето на %s"
 
-#, fuzzy
-msgid "Could not resolve host name"
-msgstr "Неуспешна връзка със сървъра"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10495,12 +10255,6 @@ msgstr "Грешка при писане в %s: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "Невъзможност за връзка с %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "Сървърът изисква TLS или SSL за влизане. Нямаме поддръжка на TLS/SSL."
-
 #, c-format
 msgid " - %s"
 msgstr ""
@@ -10748,7 +10502,11 @@ msgid "View _Log"
 msgstr "Преглед на _дневник"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "Не е разрешено при състояние „Изключен“"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "Не е разрешено при състояние „Изключен“"
 
 msgid "_Alias..."
@@ -11289,6 +11047,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Промяна на данните за потребител %s"
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11336,7 +11097,8 @@ msgstr "Игнориране"
 msgid "Get Away Message"
 msgstr "Съобщение за състоянието „Няма ме“"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Последно съобщение"
 
 msgid "Unable to save icon file to disk."
@@ -12284,7 +12046,7 @@ msgid "Hyperlink visited color"
 msgstr "Цвят на хипер-връзките"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Цвят за оцветяване на хипер-връзките."
 
 #, fuzzy
@@ -12324,15 +12086,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "Премахване на известяванията"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "Известяване за нова е-поща"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12714,6 +12483,10 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
+#, fuzzy
+msgid "No message"
+msgstr "Непознато съобщение"
+
 msgid "Open All Messages"
 msgstr "Отваряне на всички съобщения"
 
@@ -12731,10 +12504,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Имате поща!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Непознато съобщение"
-
 msgid "The following plugins will be unloaded."
 msgstr "Следните приставки ще бъдат деактивирани."
 
@@ -12958,7 +12727,7 @@ msgid "On unread messages"
 msgstr "Непрочетени съобщения"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "IM прозорци за разговор"
 
 #, fuzzy
@@ -12968,6 +12737,10 @@ msgstr "Нови разговори:"
 msgid "When away"
 msgstr "При състояние \"Няма ме\""
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "IM прозорци за разговор"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -13030,10 +12803,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr "_Прозореца да примигва при получаване на ново съобщение"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "IM прозорци за разговор"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -13070,7 +12839,8 @@ msgstr "Грешка при получаване данните на потре�
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Автоматично откриване на IP адрес"
 
 msgid "Public _IP:"
@@ -13460,34 +13230,18 @@ msgstr "Запаз_ване и използване"
 msgid "Status for %s"
 msgstr "Състояние за %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "Вмъкване на усмивка"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
 #, fuzzy
-msgid "Duplicate Shortcut"
-msgstr "Файл с публичния ключ"
+msgid "Custom Smiley"
+msgstr "Вмъкване на усмивка"
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Въведете новата парола"
+msgid "Duplicate Shortcut"
+msgstr "Файл с публичния ключ"
 
 #, fuzzy
 msgid "Edit Smiley"
@@ -13605,8 +13359,8 @@ msgid "Cannot send launcher"
 msgstr "Неуспех при изпращането на стартер"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -14216,7 +13970,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -14490,7 +14244,7 @@ msgstr "IM прозорци за разговор"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14830,7 +14584,7 @@ msgstr "Специфични настройки на Windows Pidgin."
 
 #, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "Специфични настройки на Windows Pidgin."
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14873,6 +14627,282 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Cannot open socket"
+#~ msgstr "Не мога да вляза в %s:"
+
+#, fuzzy
+#~ msgid "Could not listen on socket"
+#~ msgstr "Грешка при създаване на сокет"
+
+#~ msgid "Connection failed."
+#~ msgstr "Неуспешен опит за връзка."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Сървъра се изключи"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Грешка при създаване на сокет"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Неуспешна връзка със сървъра"
+
+#~ msgid "Read error"
+#~ msgstr "Грешка при четенето"
+
+#~ msgid "Write error"
+#~ msgstr "Грешка при запис"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "Задаване данните на директорията"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Разширен адрес"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "Заглавие за разговор"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "В директорията няма данни за този потребител."
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Команда"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "Грешка при регистрацията"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "Местонахождение"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "Търсене за потребители"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "Известяване за състоянието на потребител"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "Тази версия не е поддържана"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "Ориентация"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "Режими на потребителя"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "Ограничение на потребителите"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "Възможности"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "Потребителско име"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "Е-поща"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "Профил в MSN"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "_Включване"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "Потребителско име"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "Живо видео"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "Съобщението е получено"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "Файл с публичния ключ"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "Настройки за потребител"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "Режими на потребителя"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "Потребителско име"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "Ограничение на потребителите"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Криптиране на Trillian"
+
+#~ msgid "Read Error"
+#~ msgstr "Грешка при четене"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Неуспешно свързване със сървъра."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Опашката е запълнена"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "Съобщението не може да бъде прегледано"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Неуспешна връзка със сървъра"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Неуспешна идентификация (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Неуспешно свързване със сървъра."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Връзката беше прекъсната, тъй като се включихте от друга машина."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Невярна парола."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "Неуспешно свързване със сървъра."
+
+#, fuzzy
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Връзката със сървъра беше прекъсната."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Неуспех при свързването"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "Невалидно потребителско име"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Грешка при получаване данните на сървъра"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "Връзката е прекъсната"
+
+#, fuzzy
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Неуспешна връзка със сървъра"
+
+#, fuzzy
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Връзката е прекъсната"
+
+#, fuzzy
+#~ msgid "Connection reset"
+#~ msgstr "Връзката е прекъсната"
+
+#, fuzzy
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Грешка при четенето от socket."
+
+#, fuzzy
+#~ msgid "Unable to connect to host"
+#~ msgstr "Невъзможност за връзка със сървъра"
+
+#, fuzzy
+#~ msgid "Could not write"
+#~ msgstr "Невъзможност за изпращане"
+
+#, fuzzy
+#~ msgid "Could not connect"
+#~ msgstr "Неуспех при свързването"
+
+#, fuzzy
+#~ msgid "Could not create listen socket"
+#~ msgstr "Грешка при създаване на сокет"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Неуспешна връзка със сървъра"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Невярна парола."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr "Не сте свързван със сървъра."
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "Порт за пейджър"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "Порт за трансфер на файлове"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "Не сте свързван със сървъра."
+
+#, fuzzy
+#~ msgid "Could not resolve host name"
+#~ msgstr "Неуспешна връзка със сървъра"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Сървърът изисква TLS или SSL за влизане. Нямаме поддръжка на TLS/SSL."
+
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "IM прозорци за разговор"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Въведете новата парола"
+
+#, fuzzy
 #~ msgid "Activate which ID?"
 #~ msgstr "Активиране на коя идентификация?"
 
@@ -15446,10 +15476,6 @@ msgstr ""
 #~ msgstr "В момента е в"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Неуспешно свързване със сървъра."
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_Съобщение"
 
diff --git a/po/bn.po b/po/bn.po
index 3b027b5492..d66641b48c 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2008-11-13 17:07+0600\n"
 "Last-Translator: Israt Jahan <israt@ankur.org.bd>\n"
 "Language-Team: Bengali <core@bengalinux.org>\n"
@@ -2696,9 +2696,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "লগ প্রদর্শকে অন্যান্য আইএম ক্লায়েন্টদের লগসমূহ অন্তর্ভুক্ত করে।"
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2758,8 +2759,9 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr "অফলাইন ব্যবহারকারীকে পাঠানো বার্তা পাউন্স হিসেবে সংরক্ষণ করুন।"
 
 # tithi
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "অবশিষ্ট বার্তাগুলো পাউন্স হিসেবে সংরক্ষিত হবে। আপনি 'বন্ধু পাউন্স' সংলাপ হতে পাউন্স "
@@ -3019,14 +3021,16 @@ msgstr ""
 "http://www.activestate.com থেকে সক্রিয় TCL সংস্থাপন করুন\n"
 
 # tithi
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "উইন্ডোজ টুলকিটের জন্য অ্যাপল বোনজুর খুঁজে পাওয়া যায়নি, আরও তথ্যের জন্য http://d."
 "pidgin.im/BonjourWindows এর FAQ দেখুন।"
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "আগত আইএম সংযোগসূমহের জন্য শুনতে অক্ষম\n"
 
 msgid ""
@@ -3079,14 +3083,21 @@ msgstr "%s কথোপকথন বন্ধ করে দিয়েছে।
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "বার্তা পাঠাতে অক্ষম, কথোপকথন শুরু হতে পারে নি।"
 
-msgid "Cannot open socket"
-msgstr "সকেট খোলা যাচ্ছে না"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"সকেট তৈরী করতে ব্যর্থ:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "পোর্টের সাথে সকেটকে সংযুক্ত করা যায়নি"
 
-msgid "Could not listen on socket"
-msgstr "সকেট এ শোনা যাচ্ছে না"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"সকেট তৈরী করতে ব্যর্থ:\n"
+"%s"
 
 # tithi
 msgid "Error communicating with local mDNSResponder."
@@ -3134,13 +3145,16 @@ msgstr "বন্ধু-তালিকা সংরক্ষণ করুন...
 msgid "Load buddylist from file..."
 msgstr "ফাইল থেকে বন্ধু-তালিকা লোড করুন..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "নিবন্ধন ক্ষেত্রে পূরণ করুন।"
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "গুপ্তসংকেত মিলে না।"
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "নতুন একাউন্ট নিবন্ধন করতে ব্যর্থ। ত্রুটি দেখা দিয়েছে।\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3152,14 +3166,16 @@ msgstr "নিবন্ধন সফলভাবে শেষ হয়েছে
 msgid "Password"
 msgstr "গুপ্তসংকেত"
 
-msgid "Password (retype)"
-msgstr "গুপ্তসংকেত (পুনরায় টাইপ করুন)"
+msgid "Password (again)"
+msgstr "গুপ্তসংকেত (আবার)"
 
-msgid "Enter current token"
-msgstr "বর্তমান টোকেন প্রবেশ করান"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "বর্তমান টোকেন"
+# fix me tithi
+#, fuzzy
+msgid "Captcha"
+msgstr "Captcha চিত্র"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "নতুন গাদু-গাদু একাউন্ট নিবন্ধন করুন"
@@ -3212,6 +3228,15 @@ msgstr "গুপ্তসংকেত সফলভাবে পরিবর্�
 msgid "Current password"
 msgstr "বর্তমান গুপ্তসংকেত"
 
+msgid "Password (retype)"
+msgstr "গুপ্তসংকেত (পুনরায় টাইপ করুন)"
+
+msgid "Enter current token"
+msgstr "বর্তমান টোকেন প্রবেশ করান"
+
+msgid "Current token"
+msgstr "বর্তমান টোকেন"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 "অনুগ্রহ করে, UIN-এর জন্য আপনার বর্তমান গুপ্তসংকেত এবং আপনার নতুন গুপ্তসংকেত প্রবেশ "
@@ -3261,8 +3286,8 @@ msgstr "কোনো সমন্বয়কারী ব্যবহারকা�
 msgid "There are no users matching your search criteria."
 msgstr "আপনার অনুসন্ধানের শর্তাবলী সাথে মেলে এমন কোনো ব্যবহারকারী নেই।"
 
-msgid "Unable to read socket"
-msgstr "সকেট পড়তে ব্যর্থ"
+msgid "Unable to read from socket"
+msgstr "সকেট থেকে পাঠ করতে ব্যর্থ"
 
 msgid "Buddy list downloaded"
 msgstr "বন্ধু তালিকা ডাউনলোড করা হয়েছে"
@@ -3276,8 +3301,14 @@ msgstr "বন্ধু তালিকা আপলোড করা হয়�
 msgid "Your buddy list was stored on the server."
 msgstr "আপনার বন্ধু তালিকাটি সার্ভারে সংরক্ষণ করা হয়েছিল।"
 
-msgid "Connection failed."
-msgstr "সংযোগ ব্যর্থ।"
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "সংযুক্ত"
+
+msgid "Connection failed"
+msgstr "সংযোগ ব্যর্থ হয়েছে"
 
 msgid "Add to chat"
 msgstr "আড্ডার যোগ দিন"
@@ -3285,18 +3316,23 @@ msgstr "আড্ডার যোগ দিন"
 msgid "Chat _name:"
 msgstr "আড্ডার নাম (_n):"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "সার্ভারের সাথে সংযোগ স্থাপনে অসমর্থ।"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "সংযোগ করছে"
+
 msgid "Chat error"
 msgstr "আড্ডা ত্রুটি"
 
 msgid "This chat name is already in use"
 msgstr "এই আড্ডা নামটি ইতোমধ্যে ব্যবহৃত হচ্ছে"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "সার্ভারের সাথে সংযুক্ত নয়।"
 
 msgid "Find buddies..."
@@ -3356,7 +3392,8 @@ msgstr "কোনো বিষয় নির্ধারণ করা হয�
 msgid "File Transfer Failed"
 msgstr "ফাইল বিনিময় ব্যর্থ"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "শোনার কোনো পোর্ট খুলতে পারছে না।"
 
 msgid "Error displaying MOTD"
@@ -3372,8 +3409,18 @@ msgstr "এই সংযোগের সাথে সম্পর্কিত �
 msgid "MOTD for %s"
 msgstr "%s এর জন্য MOTD"
 
-msgid "Server has disconnected"
-msgstr "সার্ভার বিচ্ছিন্ন হয়েছে"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"সার্ভারের সাথে সংযুক্ত হারিয়েছে:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "MOTD প্রদর্শন করুন"
@@ -3389,22 +3436,20 @@ msgstr "গুপ্তসংকেত (_P):"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC এর ডাকনামসমূহ ফাঁকা স্থান ধারণ নাও করতে পারে"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "সংযোগ করছে"
-
 msgid "SSL support unavailable"
 msgstr "এসএসএল সমর্থন অপ্রাপ্য"
 
-msgid "Couldn't create socket"
-msgstr "সকেট তৈরী করা যাচ্ছে না"
+msgid "Unable to connect"
+msgstr "সংযোগ করতে সমর্থ নয়"
 
-msgid "Couldn't connect to host"
-msgstr "হোস্টের সাথে সংযুক্ত করা যাচ্ছে না"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "%s এ সংযোগ দিতে ব্যর্থ হয়েছে"
 
-msgid "Read error"
-msgstr "পড়ায় ত্রুটি"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "সার্ভার সংযোগটি বন্ধ করে দিয়েছে।"
 
 msgid "Users"
 msgstr "ব্যবহারকারীরা"
@@ -3863,12 +3908,14 @@ msgid "execute"
 msgstr "কার্যকর করুন"
 
 # tithi
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "সার্ভারের লগইন করার জন্য TSL/SSL আবশ্যক,  কোনো TLS/SSL সমর্থন খুঁজে পাওয়া যায়নি।"
 
 # tithi
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "আপনার এনক্রিপশন প্রয়োজন, কিন্তু কোনো TLS/SSL সমর্থন খুঁজে পাওয়া যায়নি।"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3885,7 +3932,13 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "সরল-পাঠ প্রমাণীকরণ"
 
-msgid "Invalid response from server."
+# tithi
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "প্রমাণীকরণ ব্যর্থ"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "সার্ভার থেকে অবৈধ সাড়া।"
 
 msgid "Server does not use any supported authentication method"
@@ -3898,7 +3951,8 @@ msgstr "আপনার সঙ্কেতায়ন প্রয়োজন, �
 msgid "Invalid challenge from server"
 msgstr "সার্ভার থেকে অবৈধ চ্যালেঞ্জ"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL ত্রুটি"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3919,10 +3973,8 @@ msgstr ""
 "সার্ভারের সাথে সংযোগ স্থাপন করতে পারে না:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "সার্ভারের সাথে সংযোগ স্থাপন করতে পারে না:\n"
 "%s"
@@ -3931,12 +3983,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "সংযোগ প্রস্তুত করতে ব্যর্থ"
 
-msgid "Unable to create socket"
-msgstr "সকেট তৈরী করতে অক্ষম"
-
-msgid "Write error"
-msgstr "লিখন ত্রুটি"
-
 msgid "Full Name"
 msgstr "পুরো নাম"
 
@@ -4008,185 +4054,6 @@ msgstr "অপারেটিং সিস্টেম"
 msgid "Local Time"
 msgstr "স্থানীয় ফাইল:"
 
-# tithi
-msgid "Last Activity"
-msgstr "শেষ সক্রিয়তা"
-
-msgid "Service Discovery Info"
-msgstr "সেবা আবিষ্কারের তথ্য"
-
-# tithi
-msgid "Service Discovery Items"
-msgstr "সেবা আবিষ্কারের বিষয়োপকরনসমূহ"
-
-msgid "Extended Stanza Addressing"
-msgstr "বর্ধিত স্ট্যানজা উদ্দেশ করছে"
-
-msgid "Multi-User Chat"
-msgstr "একাধিক-ব্যবহারকারী সম্বলিত আড্ডা"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "একাধিক-ব্যবহারকারীর বর্ধিত উপস্থিতি তথ্য"
-
-# tithi
-msgid "In-Band Bytestreams"
-msgstr "In-Band বাইট-প্রবাহ"
-
-msgid "Ad-Hoc Commands"
-msgstr "Ad-Hoc নির্দেশসমূহ"
-
-# tithi
-msgid "PubSub Service"
-msgstr "PubSub সেবা"
-
-# tithi
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 বাইট-প্রবাহ"
-
-# tithi
-msgid "Out of Band Data"
-msgstr "ব্যান্ড তথ্যের বাইরে"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "ইন ব্যান্ড নিবন্ধন"
-
-msgid "User Location"
-msgstr "ব্যবহারকারীর অবস্থান"
-
-# fix me tithi
-msgid "User Avatar"
-msgstr "ব্যবহারকারী অ্যাভাটার"
-
-msgid "Chat State Notifications"
-msgstr "আড্ডার অবস্থার প্রজ্ঞাপন"
-
-msgid "Software Version"
-msgstr "সফটওয়্যায় সংস্করণ"
-
-# fix me tithi
-msgid "Stream Initiation"
-msgstr "প্রবাহ শুরু করুন"
-
-msgid "File Transfer"
-msgstr "ফাইল স্থানান্তর করুন"
-
-msgid "User Mood"
-msgstr "ব্যবহাকারীরর পরিমন্ডল"
-
-msgid "User Activity"
-msgstr "ব্যবহারকারীর কাজকর্ম"
-
-# tithi
-msgid "Entity Capabilities"
-msgstr "সত্তার সক্ষমতা"
-
-# tithi
-msgid "Encrypted Session Negotiations"
-msgstr "সঙ্কেতায়িত অধিবেশনের আলোচনা"
-
-msgid "User Tune"
-msgstr "ব্যবহারকারীর সুর"
-
-# tithi
-msgid "Roster Item Exchange"
-msgstr "রোস্টার বিষয়োপকরণ পরিবর্তন করুন"
-
-msgid "Reachability Address"
-msgstr "পৌঁছানোর মতো ঠিকানা"
-
-msgid "User Profile"
-msgstr "ব্যবহারকারীর প্রোফাইল"
-
-msgid "Jingle"
-msgstr "ছন্দ"
-
-# tithi
-msgid "Jingle Audio"
-msgstr "ছন্দময় অডিও"
-
-msgid "User Nickname"
-msgstr "ব্যবহারকারীর ডাকনাম"
-
-# tithi
-msgid "Jingle ICE UDP"
-msgstr "ছন্দময় ICE UDP"
-
-# tithi
-msgid "Jingle ICE TCP"
-msgstr "ছন্দময়  ICE TCP"
-
-# tithi
-msgid "Jingle Raw UDP"
-msgstr "ছন্দময় Raw UDP"
-
-# tithi
-msgid "Jingle Video"
-msgstr "ছন্দময় ভিডিও"
-
-# tithi
-msgid "Jingle DTMF"
-msgstr "ছন্দময় DTMF"
-
-msgid "Message Receipts"
-msgstr "বার্তা গ্রহণ করা হয়েছে"
-
-msgid "Public Key Publishing"
-msgstr "সর্বসাধারণের কী প্রকাশ করা হচ্ছে"
-
-msgid "User Chatting"
-msgstr "ব্যবহারকারী আড্ডা দিচ্ছে"
-
-msgid "User Browsing"
-msgstr "ব্যবহাকারী ব্রাউজ করছে"
-
-msgid "User Gaming"
-msgstr "ব্যবহারকারীরা খেলছে"
-
-msgid "User Viewing"
-msgstr "ব্যবহারকারীরা দেখছে"
-
-msgid "Ping"
-msgstr "পিঙ্গ করুন"
-
-# tithi
-msgid "Stanza Encryption"
-msgstr "স্ট্যানজা সঙ্কেতায়ন"
-
-# tithi
-msgid "Entity Time"
-msgstr "সত্ত্বার সময়"
-
-# tithi
-msgid "Delayed Delivery"
-msgstr "বিলম্বিত সরবরাহ"
-
-# tithi
-msgid "Collaborative Data Objects"
-msgstr "সহযোগি উপাত্ত অবজেক্ট"
-
-# tithi
-msgid "File Repository and Sharing"
-msgstr "ফাইল ভান্ডার এবং শেয়ার করছে"
-
-# tithi
-msgid "STUN Service Discovery for Jingle"
-msgstr "ছন্দময়তার জন্য STUN সেবা আবিষ্কার"
-
-# tithi
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "সহজবোধ্য সঙ্কেতায়িত অধিবেশনের আলোচনা"
-
-# tithi
-msgid "Hop Check"
-msgstr "হপ পরীক্ষা করুন"
-
-# tithi
-msgid "Capabilities"
-msgstr "সক্ষমতা"
-
 msgid "Priority"
 msgstr "অগ্রাধিকার"
 
@@ -4198,7 +4065,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "লগইন করেছে"
 
 msgid "Middle Name"
@@ -4388,16 +4255,13 @@ msgstr "কোনো সমন্বয়কারী ব্যবহারকা�
 msgid "Roles:"
 msgstr "ভূমিকা"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "পিঙ্গ সময়-উত্তীর্ণ হয়েছে"
 
-msgid "Read Error"
-msgstr "পাঠ ত্রুটি"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4589,9 +4453,6 @@ msgstr "আপনার গুপ্তসংকেত পরিবর্তি�
 msgid "Error changing password"
 msgstr "গুপ্তসংকেত পরিবর্তনে ত্রুটি"
 
-msgid "Password (again)"
-msgstr "গুপ্তসংকেত (আবার)"
-
 msgid "Change XMPP Password"
 msgstr "XMPP গুপ্তসংকেত পরিবর্তন করুন"
 
@@ -5027,6 +4888,14 @@ msgstr "XML পার্স ত্রুটি"
 msgid "Unknown Error in presence"
 msgstr "বর্তমানে অজানা ত্রুটি"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "%s আড্ডায় অংশগ্রহনের ত্রুটি"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "%s আড্ডায় ত্রুটি"
+
 msgid "Create New Room"
 msgstr "নতুন কক্ষ তৈরী করুন"
 
@@ -5044,16 +4913,20 @@ msgstr "কক্ষ বিন্যাস করুন (_C)"
 msgid "_Accept Defaults"
 msgstr "পূর্বনির্ধারিত গ্রহণ (_A)"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "%s আড্ডায় অংশগ্রহনের ত্রুটি"
+#, fuzzy
+msgid "No reason"
+msgstr "কোনো কারন দর্শানো হয়নি"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "%s আড্ডায় ত্রুটি"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "%1s দ্বারা আপনাকে বের করে দেয়া হয়েছে: (%2s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%1s (%2s) দ্বারা বহিষ্কৃত"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "ফাইলটি খোলার সময়ে একটি ত্রুটি ঘটেছে।"
 
 #, fuzzy
@@ -5593,9 +5466,6 @@ msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "MSN এর জন্য SSL সমর্থন প্রয়োজন। অনুগ্রহ করে একটি সমর্থিত SSL লাইব্রেরী সংস্থাপন করুন।"
 
-msgid "Failed to connect to server."
-msgstr "সার্ভারে সংযোগ দিতে ব্যর্থ হয়েছে।"
-
 # tithi
 msgid "Error retrieving profile"
 msgstr "বৃত্তান্ত উদ্ধারে ত্রুটি"
@@ -5860,9 +5730,6 @@ msgstr "অজানা সঙ্কেতায়ন ত্রুটি সংঘ
 msgid "Message was not sent because an unknown error occurred."
 msgstr "অজানা ত্রুটি সংঘটিত হওয়ার কারণে বার্তা পাঠানো যায়নি।"
 
-msgid "Unable to connect"
-msgstr "সংযোগ করতে সমর্থ নয়"
-
 # tithi
 msgid "Writing error"
 msgstr "লিখন ত্রুটি"
@@ -5879,13 +5746,16 @@ msgstr ""
 "%1s সার্ভার হতে সংযোগের ত্রুটি:\n"
 "%2s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "আমাদের প্রটোকল সার্ভার সমর্থন করে না।"
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "HTTP পার্স করতে ত্রুটি।"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "আপনি অন্য স্থান থেকে সাইন অন করেছেন।"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5894,7 +5764,8 @@ msgstr ""
 "চেষ্টা করুন"
 
 # tithi
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN সার্ভার সাময়িকভাবে নিস্ক্রিয় হচ্ছে।"
 
 #, c-format
@@ -5907,9 +5778,6 @@ msgstr ""
 "সাময়িকভাবে আপনার এমএসএন বন্ধু-তালিকা পাওয়া যাচ্ছে না। অনুগ্রহ করে অপেক্ষা করুন এবং "
 "পুনরায় চেষ্টা করুন।"
 
-msgid "Unknown error."
-msgstr "অজানা ত্রুটি।"
-
 # tithi
 msgid "Handshaking"
 msgstr "হ্যান্ডসেকিং"
@@ -6015,6 +5883,9 @@ msgstr "MSN প্রোটোকল প্লাগইন"
 msgid "%s is not a valid group."
 msgstr "%s কোনো বৈধ গ্রুপ নয়।"
 
+msgid "Unknown error."
+msgstr "অজানা ত্রুটি।"
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%2s (%3s) এ %1s"
@@ -6135,12 +6006,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "সার্ভার থেকে যোগাযোগগুলো যোগ করুন"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "সংযুক্ত"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "প্রোটকল ত্রুটি, কোড %1d: %2s"
@@ -6166,17 +6031,6 @@ msgstr "MySpaceIM ত্রুটি"
 msgid "Invalid input condition"
 msgstr "অবৈধ ইনপুট শর্ত"
 
-# tithi
-msgid "Read buffer full (2)"
-msgstr "পাঠ বাফার পূর্ণ (২)"
-
-msgid "Unparseable message"
-msgstr "পার্স অযোগ্য বার্তা"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "হোস্টের সাথে সংযুক্ত করা যায়নি: %1s (%2d)"
-
 msgid "Failed to add buddy"
 msgstr "বন্ধু যোগ করতে ব্যর্থ"
 
@@ -6273,6 +6127,12 @@ msgstr "সব বন্ধু"
 msgid "Client Version"
 msgstr "ক্লায়েন্ট সংস্করণ"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM -ব্যবহারকারীর নাম সহজলভ্য"
 
@@ -6562,9 +6422,9 @@ msgstr "এই ব্যবহারকারী হয় অফলাইনে �
 msgid "Unknown error: 0x%X"
 msgstr "অজানা ত্রুটি: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "লগইন ব্যর্থ হয়েছে (%s)।"
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "%s ব্যবহারকারীকে পিঙ্গ করতে অক্ষম"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6672,9 +6532,6 @@ msgstr "GroupWise অধিবেশন %d"
 msgid "Authenticating..."
 msgstr "প্রমাণীকরণ..."
 
-msgid "Unable to connect to server."
-msgstr "সার্ভারের সাথে সংযোগ স্থাপনে অসমর্থ।"
-
 msgid "Waiting for response..."
 msgstr "উত্তরের জন্য অপেক্ষা করছে..."
 
@@ -6700,27 +6557,20 @@ msgid "Would you like to join the conversation?"
 msgstr "আপনি কি কথোপকথনে অংশগ্রহন করতে ইচ্ছুক?"
 
 # tithi
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "আপনাকে প্রস্থান করছেন কারণ আপনি অন্য একটি ওয়ার্ক-ষ্টেশনে সংযুক্ত হয়েছেন।"
-
-# tithi
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s অফলাইনে উপস্থিত এবং আপনার প্রেরিত বার্তাটি গ্রহণ করেনি।"
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "সার্ভারে সংযোগ দিতে অসমর্থ। অনুগ্রহ করে আপনি যে সার্ভারে সংযোগ দিতে চান সেই "
 "ঠিকানা প্রবেশ করান।"
 
 # tithi
-msgid "Error. SSL support is not installed."
-msgstr "ত্রুটি। SSL সমর্থন সংস্থাপিত নয়।"
-
-# tithi
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "এই অধিবেশনটি বন্ধ করা হয়েছে। আর কোনো বার্তা পাঠানো যাবে না।"
 
@@ -6762,10 +6612,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "%s স্থিরকরণে ত্রুটি"
 
-msgid "Incorrect password."
-msgstr "ভুল গুপ্তসংকেত।"
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6774,18 +6621,8 @@ msgstr "আড্ডার রুমে যুক্ত হতে পারে�
 msgid "Invalid chat room name"
 msgstr "অবৈধ আড্ডার রুমের নাম"
 
-msgid "Server closed the connection."
-msgstr "সার্ভার সংযোগটি বন্ধ করে দিয়েছে।"
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"সার্ভারের সাথে সংযুক্ত হারিয়েছে:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "সার্ভারের সাথে সংযুক্ত অবস্থায় অবৈধ উপাত্ত গ্রহণ করেছে।"
 
 #. *< type
@@ -6837,7 +6674,8 @@ msgstr "দূরবর্তী ব্যবহারকারীর সঙ্�
 msgid "Received invalid data on connection with remote user."
 msgstr "দূরবর্তী ব্যবহারকারীর সাথে সংযুক্ত অবস্থায় অবৈধ উপাত্ত গ্রহণ করেছে।"
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "দূরবর্তী ব্য়বহারকারীর সাথে সংযোগ স্থাপন করতে পারেনি।"
 
 msgid "Direct IM established"
@@ -7075,21 +6913,15 @@ msgid "Buddy Comment"
 msgstr "বন্ধুর মন্তব্য"
 
 # fix me tithi
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "প্রমাণীকরণ সাথে সংযুক্ত করা যায়নি:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"BOS সার্ভারের সাথে সংযুক্ত করা যায়নি:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "সার্ভারের সাথে সংযোগ স্থাপনে অসমর্থ।"
 
 msgid "Username sent"
 msgstr "ব্যবহারকারীর-নাম পাঠানো হয়েছে"
@@ -7104,11 +6936,11 @@ msgid "Finalizing connection"
 msgstr "সংযোগ চূড়ান্ত করা হচ্ছে"
 
 # tithi
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "লগইন করতে অক্ষম: ব্যবহারকারীর-নাম অবৈধ থাকার কারণে %s হিসেবে যুক্ত হতে পারেন না। "
 "ব্যবহারকারীর অবশ্যই একটি বৈধ ই-মেইল ঠিকানা থাকতে হবে, বা একটি বর্ণ দ্বারা শুরু হবে "
@@ -7121,28 +6953,24 @@ msgstr "আপনি সাময়িকভাবে বিচ্ছিন্ন
 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 "অবৈধ ব্যবহারকারীর নাম।"
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "ব্যবহারকারী বিদ্যমান নয়"
 
 # tithi
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "আপনার একাউন্টটি বর্তমানে স্থগিত।"
 
 # tithi
@@ -7167,7 +6995,8 @@ msgstr ""
 "করতে হবে।"
 
 # tithi
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "অবৈধ নিরাপদ-আইডি কী প্রবেশ করা হয়েছে।"
 
 # tithi
@@ -7355,6 +7184,10 @@ msgstr "যখন থেকে অনলাইনে"
 msgid "Member Since"
 msgstr "যখন থেকে সদস্য"
 
+# tithi
+msgid "Capabilities"
+msgstr "সক্ষমতা"
+
 msgid "Profile"
 msgstr "প্রোফাইল"
 
@@ -7556,9 +7389,9 @@ msgid "Away message too long."
 msgstr "দূরের বার্তাটি খুব দীর্ঘ।"
 
 # tithi
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7585,9 +7418,9 @@ msgid "Orphans"
 msgstr "অনাথ"
 
 # tithi
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "আপনার বন্ধু তালিকাতে খুব বেশি বন্ধু থাকার কারণে %s বন্ধু যোগ করতে পারে না। অনুগ্রহ "
@@ -7597,8 +7430,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(কোনো নাম নেই)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "একটি অজানা কারণে %s বন্ধুকে যুক্ত করা যায়নি।"
 
 #, c-format
@@ -8463,7 +8296,8 @@ msgid "Update interval (seconds)"
 msgstr "বিরতি হালনাগাদ করুন (সেকেন্ড)"
 
 # fix me tithi
-msgid "Cannot decrypt server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "সার্ভার জবাব অসঙ্কেতায়ন করে না"
 
 # tithi
@@ -8491,10 +8325,6 @@ msgstr "সক্রিয়করণ আবশ্যক"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "(0x%02X) এ লগইন করার সময় অজানা উত্তর কোড"
 
-# fix me tithi
-msgid "Could not decrypt server reply"
-msgstr "সার্ভার জবাব অসঙ্কেতায়ন করতে পারেনি"
-
 # tithi
 msgid "Requesting captcha"
 msgstr "captcha অনুরোধ করছে"
@@ -8535,29 +8365,18 @@ msgstr ""
 "(0x%02X) এ লগইন করার সময় অজানা উত্তর কোড:\n"
 "%s"
 
-msgid "Unable to connect."
-msgstr "সংযুক্ত করতে ব্যর্থ।"
-
 msgid "Socket error"
 msgstr "সকেট ত্রুটি"
 
-msgid "Unable to read from socket"
-msgstr "সকেট থেকে পাঠ করতে ব্যর্থ"
-
-msgid "Write Error"
-msgstr "লিখন ত্রুটি"
-
-msgid "Connection lost"
-msgstr "সংযোগ হারিয়ে গেছে"
-
 msgid "Getting server"
 msgstr "সার্ভার পাচ্ছে"
 
 msgid "Requesting token"
 msgstr "টোকেন অনুরোধ করছে"
 
-msgid "Couldn't resolve host"
-msgstr "হোস্ট সমাধান করা সম্ভব হয়নি"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "সার্ভারের সাথে সংযোগ স্থাপনে অসমর্থ।"
 
 msgid "Invalid server or port"
 msgstr "অবৈধ সার্ভার বা পোর্ট"
@@ -8614,7 +8433,8 @@ msgid "QQ Qun Command"
 msgstr "QQ Qun নির্দেশ"
 
 # tithi
-msgid "Could not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "লগইন উত্তর অসঙ্কেতায়ন করতে পারে না"
 
 # fix me tithi
@@ -8635,9 +8455,6 @@ msgstr "ফাইল প্রেরণ করা হয়েছে"
 msgid "%d canceled the transfer of %s"
 msgstr "%1d %2s-এর স্থানান্তর বাতিল করেছেন"
 
-msgid "Connection closed (writing)"
-msgstr "সংযোগ বন্ধ করা হয়েছে (লিখছে)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>দলের শিরোনাম:</b> %s<br>"
@@ -8703,17 +8520,6 @@ msgstr "একটি এককালীন প্রশাসক %s সার্
 msgid "Sametime Administrator Announcement"
 msgstr "এককালীন প্রশাসকের ঘোষণা"
 
-msgid "Connection reset"
-msgstr "সংযোগ পুনরায় বিন্যাস করুন"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "সকেট থেকে পড়ায় ত্রুটি: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "হোস্টের সাথে সংযোগে ব্যর্থ"
-
 # tithi
 #, c-format
 msgid "Announcement from %s"
@@ -8741,6 +8547,9 @@ msgstr "স্পিকারসমূহ"
 msgid "Video Camera"
 msgstr "ভিডিও ক্যামেরা"
 
+msgid "File Transfer"
+msgstr "ফাইল স্থানান্তর করুন"
+
 msgid "Supports"
 msgstr "সমর্থনসমূহ"
 
@@ -9677,6 +9486,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "নেটওয়ার্ক পরিসংখ্যান"
 
+msgid "Ping"
+msgstr "পিঙ্গ করুন"
+
 msgid "Ping failed"
 msgstr "পিঙ্গ ব্যর্থ"
 
@@ -9751,7 +9563,8 @@ msgid "Disconnected by server"
 msgstr "সার্ভার দ্বারা বিচ্ছিন্ন"
 
 # tithi
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "SILC সার্ভারে সংযোগের সময় ত্রুটি"
 
 # tithi
@@ -9765,18 +9578,13 @@ msgstr ""
 "বিচ্ছিন্ন অধিবেশনটি পুনরায় শুরু করতে ব্যর্থ হয়েছে। অনুগ্রহ করে নতুন সংযোগ তৈরী করতে "
 "'পুনরায় সংযোগ' চাপুন।"
 
-msgid "Connection failed"
-msgstr "সংযোগ ব্যর্থ হয়েছে"
-
 # tithi
 msgid "Performing key exchange"
 msgstr "কী বিনিময় সম্পাদন করছে"
 
-msgid "Unable to create connection"
-msgstr "সংযোগ তৈরী করতে ব্যর্থ হয়েছে"
-
 # tithi
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "SILC কী যুগল লোড করতে পারেনি"
 
 # tithi
@@ -9784,11 +9592,17 @@ msgstr "SILC কী যুগল লোড করতে পারেনি"
 msgid "Connecting to SILC Server"
 msgstr "SILC সার্ভারে সংযোগ করছে"
 
+# tithi
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "SILC কী যুগল লোড করতে পারেনি"
+
 msgid "Out of memory"
 msgstr "মেমোরীর বাইরে"
 
 # tithi
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "SILC প্রটোকল চালু করতে পারে না"
 
 # tithi
@@ -10137,7 +9951,8 @@ msgstr "সকল বার্তা ডিজিটাল স্বাক্ষ
 msgid "Creating SILC key pair..."
 msgstr "SILC কী যুগল তৈরি করছে..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "SILC কী যুগল তৈরী করতে পারে না\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -10238,6 +10053,10 @@ msgid "No server statistics available"
 msgstr "কোনো সার্ভার পরিসংখ্যান সহজলভ্য নয়"
 
 # tithi
+msgid "Error during connecting to SILC Server"
+msgstr "SILC সার্ভারে সংযোগের সময় ত্রুটি"
+
+# tithi
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "ব্যর্থতা: সংস্করণ অমিল, আপনার ক্লায়েন্ট উন্নততর করুন"
@@ -10287,7 +10106,8 @@ msgid "Failure: Authentication failed"
 msgstr "ব্যর্থতা: প্রমাণীকরণ ব্যর্থ হয়েছে"
 
 # tithi
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "SILC ক্লায়েন্ট সংযোগ প্রাথমিকভাবে প্রস্তুত করতে পারে না"
 
 # fix me tithi
@@ -10295,25 +10115,20 @@ msgid "John Noname"
 msgstr "জন নোনেম"
 
 # tithi
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "SILC কী যুগল লোড করতে পারেনি: %s"
 
-msgid "Could not write"
-msgstr "লিখতে পারেনি"
-
-msgid "Could not connect"
-msgstr "সংযোগ দিতে পারেনি"
+msgid "Unable to create connection"
+msgstr "সংযোগ তৈরী করতে ব্যর্থ হয়েছে"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "অজানা সার্ভার উত্তর।"
 
-# tithi
-msgid "Could not create listen socket"
-msgstr "শ্রবণ সকেট তৈরি করতে পারেনি"
-
-msgid "Could not resolve hostname"
-msgstr "হোস্ট-নাম স্থির করা হয়নি"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "সকেট তৈরী করতে অক্ষম"
 
 # tihi
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -10358,6 +10173,78 @@ msgstr "স্বীকৃত ব্যবহারকারী"
 msgid "Auth Domain"
 msgstr "স্বীকৃত ডোমেইন"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "যোগ দিন &1lt;রুম&2gt;:  ইয়াহু নেটওয়ার্কের একটি আড্ডার রুমে যোগ দিন"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "তালিকা: ইয়াহু নেটওয়ার্কে রুমের তালিকা করুন"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "হিজিবিজি: ব্যবহারকারীকে একটি হিজিবিজি অধিবেশন শুরু করতে অনুরোধ করুন"
+
+msgid "Yahoo ID..."
+msgstr "ইয়াহু আইডি..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "ইয়াহু প্রটোকল প্লাগইন"
+
+msgid "Pager server"
+msgstr "পেজার সার্ভার"
+
+msgid "Pager port"
+msgstr "পেজার পোর্ট"
+
+msgid "File transfer server"
+msgstr "ফাইল স্থানান্তর সার্ভার"
+
+msgid "File transfer port"
+msgstr "ফাইল স্থানান্তর পোর্ট"
+
+msgid "Chat room locale"
+msgstr "আড্ডা রুমের অবস্থা"
+
+# tithi
+msgid "Ignore conference and chatroom invitations"
+msgstr "আলোচনা সভা এবং আড্ডার-রুমের আমন্ত্রন অগ্রাহ্য করুন"
+
+msgid "Chat room list URL"
+msgstr "আড্ডার রুম তালিকার ইউআরএল"
+
+msgid "Yahoo Chat server"
+msgstr "ইয়াহু আড্ডা সার্ভার"
+
+msgid "Yahoo Chat port"
+msgstr "ইয়াহু আড্ডার পোর্ট"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "ইয়াহু আইডি..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "ইয়াহু প্রটোকল প্লাগইন"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -10391,30 +10278,20 @@ msgstr "বন্ধু যোগ প্রত্যাখ্যান করে
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr "অজানা ত্রুটি নাম্বার %d। ইয়াহু! ওয়েব সাইটে লগইন করলে হয়ত এটি ঠিক হতে পারে।"
 
 #. username or password missing
@@ -10457,12 +10334,13 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "অজানা ত্রুটি নাম্বার %d। ইয়াহু! ওয়েব সাইটে লগইন করলে হয়ত এটি ঠিক হতে পারে।"
 
 # tithi
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "%3s একাউন্টের সার্ভার তালিকায় %2s গ্রুপে %1s বন্ধুকে যোগ করতে পারেনি।"
 
 # tithi
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "সার্ভার তালিকায় বন্ধু যোগ করতে পারেনি।"
 
 # tithi
@@ -10470,27 +10348,21 @@ msgstr "সার্ভার তালিকায় বন্ধু যোগ �
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ শ্রবণযোগ্য %1s/%2s/%3s.swf ] %4s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "সার্ভার থেকে অপ্রত্যাশিত এইচটিটিপি সাড়া পেয়েছে।"
 
-msgid "Connection problem"
-msgstr "সংযোগ সমস্যা"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "%1s এর সাথে সংযোগ হারিয়েছে:\n"
 "%2s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"%1s এর সাথে সংযোগ স্থাপন করতে পারেনি:\n"
-"%2s"
+"সার্ভারের সাথে সংযোগ স্থাপন করতে পারে না:\n"
+"%s"
 
 msgid "Not at Home"
 msgstr "বাসায় নেই"
@@ -10557,74 +10429,15 @@ msgstr "ব্যবহারকারীকে আড্ডায় যোগ
 msgid "Open Inbox"
 msgstr "ইনবক্স খুলুন"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "যোগ দিন &1lt;রুম&2gt;:  ইয়াহু নেটওয়ার্কের একটি আড্ডার রুমে যোগ দিন"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "তালিকা: ইয়াহু নেটওয়ার্কে রুমের তালিকা করুন"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "হিজিবিজি: ব্যবহারকারীকে একটি হিজিবিজি অধিবেশন শুরু করতে অনুরোধ করুন"
-
-msgid "Yahoo ID..."
-msgstr "ইয়াহু আইডি..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "ইয়াহু প্রটোকল প্লাগইন"
-
-msgid "Yahoo Japan"
-msgstr "ইয়াহু জাপান"
-
-msgid "Pager server"
-msgstr "পেজার সার্ভার"
-
-msgid "Japan Pager server"
-msgstr "জাপানী পেজার সার্ভার"
-
-msgid "Pager port"
-msgstr "পেজার পোর্ট"
-
-msgid "File transfer server"
-msgstr "ফাইল স্থানান্তর সার্ভার"
-
-msgid "Japan file transfer server"
-msgstr "জাপান ফাইল স্থানান্তর সার্ভার"
-
-msgid "File transfer port"
-msgstr "ফাইল স্থানান্তর পোর্ট"
-
-msgid "Chat room locale"
-msgstr "আড্ডা রুমের অবস্থা"
-
-# tithi
-msgid "Ignore conference and chatroom invitations"
-msgstr "আলোচনা সভা এবং আড্ডার-রুমের আমন্ত্রন অগ্রাহ্য করুন"
-
-msgid "Chat room list URL"
-msgstr "আড্ডার রুম তালিকার ইউআরএল"
-
-msgid "Yahoo Chat server"
-msgstr "ইয়াহু আড্ডা সার্ভার"
-
-msgid "Yahoo Chat port"
-msgstr "ইয়াহু আড্ডার পোর্ট"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "হিজিবিজি অনুরোধ পাঠানো হয়েছে"
 
+msgid "Unable to connect."
+msgstr "সংযুক্ত করতে ব্যর্থ।"
+
 msgid "Unable to establish file descriptor."
 msgstr "ফাইল বর্ণনাকারী স্থাপন করতে অক্ষম।"
 
@@ -10632,6 +10445,9 @@ msgstr "ফাইল বর্ণনাকারী স্থাপন করত
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s আপনাকে %d ফাইলের একটি গ্রুপ পাঠানোর চেষ্টা করছে।\n"
 
+msgid "Write Error"
+msgstr "লিখন ত্রুটি"
+
 msgid "Yahoo! Japan Profile"
 msgstr "ইয়াহু! জাপান প্রোফাইল"
 
@@ -10754,6 +10570,9 @@ msgstr "কন্ঠস্বরসমূহ"
 msgid "Webcams"
 msgstr "ওয়েবক্যামসমূহ"
 
+msgid "Connection problem"
+msgstr "সংযোগ সমস্যা"
+
 msgid "Unable to fetch room list."
 msgstr "রুমের তালিকা খুঁজতে অক্ষম।"
 
@@ -10761,17 +10580,10 @@ msgid "User Rooms"
 msgstr "ব্যবহারকারীর রুম"
 
 # tithi
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "YCHT সার্ভারের সাথে সংযোগে সমস্যা।"
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"সার্ভারের সাথে সংযোগ হারিয়েছে\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10917,16 +10729,8 @@ msgstr "এলাকা"
 msgid "Exposure"
 msgstr "অনাবৃতকরণ"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"সকেট তৈরী করতে ব্যর্থ:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "HTTP প্রক্সি থেকে সাড়া গ্রহণ করতে অক্ষম: %s\n"
 
 #, c-format
@@ -10934,17 +10738,14 @@ msgid "HTTP proxy connection error %d"
 msgstr "এইচটিটিপি প্রক্সি সংযোগের %d ত্রুটি"
 
 # tithi
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "অনুমতি বাতিল: HTTP প্রক্সি সার্ভার %d পোর্ট টানেলকরণে বাধা দেয়।"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "%s স্থিরকরণে ত্রুটি"
 
-msgid "Could not resolve host name"
-msgstr "হোস্টের নাম স্থির করা হয়নি"
-
 # tithi
 #, c-format
 msgid "Requesting %s's attention..."
@@ -11155,14 +10956,6 @@ msgid "Unable to connect to %s: %s"
 msgstr "%1s এর সাথে সংযোগে ব্যর্থ: %2s"
 
 # tithi
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"সার্ভারের লগইন করার জন্য TSL/SSL আবশ্যক,  কোনো TLS/SSL সমর্থন খুঁজে পাওয়া যায়নি।"
-
-# tithi
 #, c-format
 msgid " - %s"
 msgstr " - %s"
@@ -11425,9 +11218,14 @@ msgstr "বন্ধু পাউন্স যোগ করুন... (_P)"
 msgid "View _Log"
 msgstr "লগ প্রদর্শন করুন (_L)"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "অফলাইনে থাকলে লুকিয়ে রাখুন"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "অফলাইনে থাকলে প্রদর্শন করুন"
+
 msgid "_Alias..."
 msgstr "উপনাম... (_A)"
 
@@ -11937,6 +11735,11 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "%s এর জন্য ব্যবহাকারীর তথ্য পরিবর্তন করুন"
 
+# tithi
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "এই প্রত্যয়ণপত্রের হোস্ট নাম টাইপ করুন।"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL সার্ভারসমূহ"
@@ -11982,7 +11785,8 @@ msgstr "অগ্রাহ্য করুন"
 msgid "Get Away Message"
 msgstr "অনুপস্থিতি বার্তা গ্রহণ করুন"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "সর্বশেষ বলা হয়েছে"
 
 msgid "Unable to save icon file to disk."
@@ -12899,7 +12703,8 @@ msgstr "হাইপারলিঙ্ক আঁকার রং।"
 msgid "Hyperlink visited color"
 msgstr "হাইপারলিঙ্কের পরিদর্শিত রং"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+#, fuzzy
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "হাইপারলিঙ্ক পরিদর্শন (বা সক্রিয়) করার পর এটা আকাঁর রং।"
 
 msgid "Hyperlink prelight color"
@@ -12942,15 +12747,26 @@ msgstr "একটি কর্ম বার্তার নাম আকার �
 msgid "Action Message Name Color for Whispered Message"
 msgstr "গোপনীয় বার্তার জন্য কার্য বার্তার নামের রং"
 
+# tithi
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "একটি কর্ম বার্তার নাম আকার রং।"
+
 # fix- me tithi
 msgid "Whisper Message Name Color"
 msgstr "গোপনীয় বার্তার নামের রং"
 
+# tithi
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "একটি কর্ম বার্তার নাম আকার রং।"
+
 msgid "Typing notification color"
 msgstr "প্রজ্ঞাপন রং টাইপ করছে"
 
 # tithi
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "টাইপকরণ প্রজ্ঞাপন ফন্টের জন্য ব্যবহারের রং"
 
 msgid "Typing notification font"
@@ -13363,6 +13179,10 @@ msgstr ""
 "'হস্তচালিতভাবে' ব্রাউজার নির্দেশ পছন্দ করা হয়েছে, কিন্তু কোনো নির্দেশ নির্ধারণ করা "
 "হয়নি।"
 
+#, fuzzy
+msgid "No message"
+msgstr "অজানা বার্তা"
+
 msgid "Open All Messages"
 msgstr "সকল বার্তা খুলুন"
 
@@ -13380,10 +13200,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">আপনার মেইল আছে!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "অজানা বার্তা"
-
 # tithi
 msgid "The following plugins will be unloaded."
 msgstr "নিম্নোক্ত প্লাগইনগুলো লোড মুক্ত করা হবে।"
@@ -13606,8 +13422,9 @@ msgstr "সিস্টেম ট্রে এর আইকন প্রদর�
 msgid "On unread messages"
 msgstr "অপঠিত বার্তাসমূহে"
 
-msgid "Conversation Window Hiding"
-msgstr "কথোপকথন উইন্ডো লুকিয়ে ফেলছে"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "তাৎক্ষণিক বার্তার কথোপকথন উইন্ডোজ"
 
 msgid "_Hide new IM conversations:"
 msgstr "নতুন কথোপকথন IM লুকিয়ে রাখুন (_H):"
@@ -13615,6 +13432,9 @@ msgstr "নতুন কথোপকথন IM লুকিয়ে রাখু
 msgid "When away"
 msgstr "যখন অনুপস্থিত"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "নতুন কথোপকথন উইন্ডো নূন্যতম করুন (_z)"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "ট্যাবসমূহ"
@@ -13675,9 +13495,6 @@ msgstr "মসৃন-স্ক্রলিং ব্যবহার করুন
 msgid "F_lash window when IMs are received"
 msgstr "আইএম গ্রহণ করলে উইন্ডো ফ্ল্যাশ দিন (_l)"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "নতুন কথোপকথন উইন্ডো নূন্যতম করুন (_z)"
-
 # tithi
 msgid "Minimum input area height in lines:"
 msgstr "লাইনের ন্যুনতম ইনপুট এলাকার উচ্চতা:"
@@ -13717,7 +13534,8 @@ msgstr "ব্রাউজারের বিন্যাসন প্রোগ�
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">উদাহরণ: স্ট্যানসার্ভার.অর্গ</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "স্বয়ং-শনাক্ত আইপি ঠিকানা (_A)"
 
 msgid "Public _IP:"
@@ -14097,23 +13915,6 @@ msgstr "সংরক্ষণ এবং ব্যবহার করুন (_v)"
 msgid "Status for %s"
 msgstr "%s-এর জন্য অবস্থা"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "পছন্দসই স্মাইলী"
-
-# tithi
-msgid "More Data needed"
-msgstr "আরও তথ্য প্রয়োজন"
-
-# tithi
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "অনুগ্রহ করে স্মাইলীর সাথে সম্পর্কিত করতে একটি শর্টকাট প্রদান করুন।"
-
 # tithi
 #, fuzzy, c-format
 msgid ""
@@ -14122,12 +13923,12 @@ msgstr ""
 "নির্বাচিত শর্টকাটটির জন্য পছন্দসই স্মাইলী ইতোমধ্যে বিদ্যমান। অনুগ্রহ করে একটি ভিন্ন "
 "শর্টকাট উল্লেখ করুন।"
 
+msgid "Custom Smiley"
+msgstr "পছন্দসই স্মাইলী"
+
 msgid "Duplicate Shortcut"
 msgstr "অনুরুপ শর্টকাট"
 
-msgid "Please select an image for the smiley."
-msgstr "অনুগ্রহ করে স্মাইলীটির জন্য একটি চিত্র নির্বাচন করুন।"
-
 msgid "Edit Smiley"
 msgstr "স্মাইলী সম্পাদনা করুন"
 
@@ -14244,9 +14045,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "প্রকাশক পাঠাতে পারে না"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "আপনি একটি ডেস্কটপ প্রকাশক টেনে এনেছেন। এই প্রকাশকটি নিজেকে নির্দেশ করার পরিবর্তে "
 "আর যেখানে নির্দেশ করে সেখানে সম্ভবত আপনি পাঠাতে চান।"
@@ -14871,9 +14673,10 @@ msgstr "সমন্নিত রচনার জন্য সংগীত ব�
 
 # fix me tithi
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "সংগীত বার্তাকরণ প্লাগইন কিছু সংখ্যক ব্যবহারকারী বাস্তব-সময়ের একটি সাধারন স্কোর "
 "সম্পাদনার মাধ্যমে যুগপৎভাবে এক খন্ড সংগীতের উপর কাজ করে।"
@@ -15131,9 +14934,10 @@ msgid "Conversation Window Send Button."
 msgstr "কথোপকথন উইন্ডোর প্রেরণ বোতাম"
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "কথোপকথন উইন্ডোর এন্ট্রি এলাকায় একটি প্রেরণ বোতাম যোগ করুন। যখন কোনো কীবোর্ড বর্তমান "
 "নেই এমন উদ্দেশ্যে।"
@@ -15474,8 +15278,9 @@ msgid "Options specific to Pidgin for Windows."
 msgstr "উইন্ডোজের জন্য পিজিনে উল্লেখিত পছন্দসমূহ।"
 
 # fix me
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "উইন্ডোজের জন্য পিজিনে উল্লেখিত পছন্দগুলো প্রদান করে , যেমন বন্ধু তালিকা দেখানো।"
 
@@ -15520,6 +15325,343 @@ msgstr "নতুন XMPP পংক্তিগুলো পাঠান এব�
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "এই প্লাগিনটি XMPP সার্ভার বা ক্লায়েন্ট ডিবাগ করার জন্য কার্যকর।"
 
+#~ msgid "Cannot open socket"
+#~ msgstr "সকেট খোলা যাচ্ছে না"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "সকেট এ শোনা যাচ্ছে না"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "সকেট পড়তে ব্যর্থ"
+
+#~ msgid "Connection failed."
+#~ msgstr "সংযোগ ব্যর্থ।"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "সার্ভার বিচ্ছিন্ন হয়েছে"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "সকেট তৈরী করা যাচ্ছে না"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "হোস্টের সাথে সংযুক্ত করা যাচ্ছে না"
+
+#~ msgid "Read error"
+#~ msgstr "পড়ায় ত্রুটি"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "সার্ভারের সাথে সংযোগ স্থাপন করতে পারে না:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "লিখন ত্রুটি"
+
+# tithi
+#~ msgid "Last Activity"
+#~ msgstr "শেষ সক্রিয়তা"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "সেবা আবিষ্কারের তথ্য"
+
+# tithi
+#~ msgid "Service Discovery Items"
+#~ msgstr "সেবা আবিষ্কারের বিষয়োপকরনসমূহ"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "বর্ধিত স্ট্যানজা উদ্দেশ করছে"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "একাধিক-ব্যবহারকারী সম্বলিত আড্ডা"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "একাধিক-ব্যবহারকারীর বর্ধিত উপস্থিতি তথ্য"
+
+# tithi
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "In-Band বাইট-প্রবাহ"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ad-Hoc নির্দেশসমূহ"
+
+# tithi
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub সেবা"
+
+# tithi
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5 বাইট-প্রবাহ"
+
+# tithi
+#~ msgid "Out of Band Data"
+#~ msgstr "ব্যান্ড তথ্যের বাইরে"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "ইন ব্যান্ড নিবন্ধন"
+
+#~ msgid "User Location"
+#~ msgstr "ব্যবহারকারীর অবস্থান"
+
+# fix me tithi
+#~ msgid "User Avatar"
+#~ msgstr "ব্যবহারকারী অ্যাভাটার"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "আড্ডার অবস্থার প্রজ্ঞাপন"
+
+#~ msgid "Software Version"
+#~ msgstr "সফটওয়্যায় সংস্করণ"
+
+# fix me tithi
+#~ msgid "Stream Initiation"
+#~ msgstr "প্রবাহ শুরু করুন"
+
+#~ msgid "User Mood"
+#~ msgstr "ব্যবহাকারীরর পরিমন্ডল"
+
+#~ msgid "User Activity"
+#~ msgstr "ব্যবহারকারীর কাজকর্ম"
+
+# tithi
+#~ msgid "Entity Capabilities"
+#~ msgstr "সত্তার সক্ষমতা"
+
+# tithi
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "সঙ্কেতায়িত অধিবেশনের আলোচনা"
+
+#~ msgid "User Tune"
+#~ msgstr "ব্যবহারকারীর সুর"
+
+# tithi
+#~ msgid "Roster Item Exchange"
+#~ msgstr "রোস্টার বিষয়োপকরণ পরিবর্তন করুন"
+
+#~ msgid "Reachability Address"
+#~ msgstr "পৌঁছানোর মতো ঠিকানা"
+
+#~ msgid "User Profile"
+#~ msgstr "ব্যবহারকারীর প্রোফাইল"
+
+#~ msgid "Jingle"
+#~ msgstr "ছন্দ"
+
+# tithi
+#~ msgid "Jingle Audio"
+#~ msgstr "ছন্দময় অডিও"
+
+#~ msgid "User Nickname"
+#~ msgstr "ব্যবহারকারীর ডাকনাম"
+
+# tithi
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "ছন্দময় ICE UDP"
+
+# tithi
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "ছন্দময়  ICE TCP"
+
+# tithi
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "ছন্দময় Raw UDP"
+
+# tithi
+#~ msgid "Jingle Video"
+#~ msgstr "ছন্দময় ভিডিও"
+
+# tithi
+#~ msgid "Jingle DTMF"
+#~ msgstr "ছন্দময় DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "বার্তা গ্রহণ করা হয়েছে"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "সর্বসাধারণের কী প্রকাশ করা হচ্ছে"
+
+#~ msgid "User Chatting"
+#~ msgstr "ব্যবহারকারী আড্ডা দিচ্ছে"
+
+#~ msgid "User Browsing"
+#~ msgstr "ব্যবহাকারী ব্রাউজ করছে"
+
+#~ msgid "User Gaming"
+#~ msgstr "ব্যবহারকারীরা খেলছে"
+
+#~ msgid "User Viewing"
+#~ msgstr "ব্যবহারকারীরা দেখছে"
+
+# tithi
+#~ msgid "Stanza Encryption"
+#~ msgstr "স্ট্যানজা সঙ্কেতায়ন"
+
+# tithi
+#~ msgid "Entity Time"
+#~ msgstr "সত্ত্বার সময়"
+
+# tithi
+#~ msgid "Delayed Delivery"
+#~ msgstr "বিলম্বিত সরবরাহ"
+
+# tithi
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "সহযোগি উপাত্ত অবজেক্ট"
+
+# tithi
+#~ msgid "File Repository and Sharing"
+#~ msgstr "ফাইল ভান্ডার এবং শেয়ার করছে"
+
+# tithi
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "ছন্দময়তার জন্য STUN সেবা আবিষ্কার"
+
+# tithi
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "সহজবোধ্য সঙ্কেতায়িত অধিবেশনের আলোচনা"
+
+# tithi
+#~ msgid "Hop Check"
+#~ msgstr "হপ পরীক্ষা করুন"
+
+#~ msgid "Read Error"
+#~ msgstr "পাঠ ত্রুটি"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "সার্ভারে সংযোগ দিতে ব্যর্থ হয়েছে।"
+
+# tithi
+#~ msgid "Read buffer full (2)"
+#~ msgstr "পাঠ বাফার পূর্ণ (২)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "পার্স অযোগ্য বার্তা"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "হোস্টের সাথে সংযুক্ত করা যায়নি: %1s (%2d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "লগইন ব্যর্থ হয়েছে (%s)।"
+
+# tithi
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "আপনাকে প্রস্থান করছেন কারণ আপনি অন্য একটি ওয়ার্ক-ষ্টেশনে সংযুক্ত হয়েছেন।"
+
+# tithi
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "ত্রুটি। SSL সমর্থন সংস্থাপিত নয়।"
+
+#~ msgid "Incorrect password."
+#~ msgstr "ভুল গুপ্তসংকেত।"
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "BOS সার্ভারের সাথে সংযুক্ত করা যায়নি:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "আপনি সাময়িকভাবে বিচ্ছিন্ন থাকতে পারেন।  হালনাগাদের জন্য %s পরীক্ষা করুন।"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "সংযোগ দিতে পারে না"
+
+#~ msgid "Invalid username."
+#~ msgstr "অবৈধ ব্যবহারকারীর নাম।"
+
+# fix me tithi
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "সার্ভার জবাব অসঙ্কেতায়ন করতে পারেনি"
+
+#~ msgid "Connection lost"
+#~ msgstr "সংযোগ হারিয়ে গেছে"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "হোস্ট সমাধান করা সম্ভব হয়নি"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "সংযোগ বন্ধ করা হয়েছে (লিখছে)"
+
+#~ msgid "Connection reset"
+#~ msgstr "সংযোগ পুনরায় বিন্যাস করুন"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "সকেট থেকে পড়ায় ত্রুটি: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "হোস্টের সাথে সংযোগে ব্যর্থ"
+
+#~ msgid "Could not write"
+#~ msgstr "লিখতে পারেনি"
+
+#~ msgid "Could not connect"
+#~ msgstr "সংযোগ দিতে পারেনি"
+
+# tithi
+#~ msgid "Could not create listen socket"
+#~ msgstr "শ্রবণ সকেট তৈরি করতে পারেনি"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "হোস্ট-নাম স্থির করা হয়নি"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "ভুল গুপ্তসঙ্কেতে"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%1s এর সাথে সংযোগ স্থাপন করতে পারেনি:\n"
+#~ "%2s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "ইয়াহু জাপান"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "জাপানী পেজার সার্ভার"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "জাপান ফাইল স্থানান্তর সার্ভার"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "সার্ভারের সাথে সংযোগ হারিয়েছে\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "হোস্টের নাম স্থির করা হয়নি"
+
+# tithi
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "সার্ভারের লগইন করার জন্য TSL/SSL আবশ্যক,  কোনো TLS/SSL সমর্থন খুঁজে পাওয়া যায়নি।"
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "কথোপকথন উইন্ডো লুকিয়ে ফেলছে"
+
+# tithi
+#~ msgid "More Data needed"
+#~ msgstr "আরও তথ্য প্রয়োজন"
+
+# tithi
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "অনুগ্রহ করে স্মাইলীর সাথে সম্পর্কিত করতে একটি শর্টকাট প্রদান করুন।"
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "অনুগ্রহ করে স্মাইলীটির জন্য একটি চিত্র নির্বাচন করুন।"
+
 #~ msgid "Activate which ID?"
 #~ msgstr "কোন আইডি সক্রিয় করা হবে?"
 
diff --git a/po/bs.po b/po/bs.po
index cdcd50cf46..7669978276 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2005-10-27 16:55-0400\n"
 "Last-Translator: Lejla Hadialic <lejlah@gmail.com>\n"
 "Language-Team: bs <LL@li.org>\n"
@@ -2663,7 +2663,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2715,7 +2715,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2963,12 +2963,12 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
 #, fuzzy
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr "Nije moguce kreirati novu konekciju."
 
 msgid ""
@@ -3028,17 +3028,17 @@ msgstr "%s je zatvorio prozor za konverzaciju."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Nije moguce poslati poruku. Poruka je preduga."
 
-#, fuzzy
-msgid "Cannot open socket"
-msgstr "Nije u stanju otvoriti socket"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Nije moguce kreirati socket"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Spajanje na hosta neuspješno"
 
-#, fuzzy
-msgid "Could not listen on socket"
-msgstr "Kreiranje socketa neuspješno"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Nije moguce kreirati socket"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3094,15 +3094,15 @@ msgstr "Pošalji listu prijatelja"
 msgid "Load buddylist from file..."
 msgstr ""
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
 #, fuzzy
-msgid "Passwords do not match."
+msgid "Passwords do not match"
 msgstr "Nove lozinke se ne slažu."
 
 #, fuzzy
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Nije moguce kreirati novu konekciju."
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3115,17 +3115,15 @@ msgstr "Registracija uspješna"
 msgid "Password"
 msgstr "Lozinka"
 
-#, fuzzy
-msgid "Password (retype)"
-msgstr "Lozinka poslana"
+msgid "Password (again)"
+msgstr "Lozinka (ponovo)"
 
-#, fuzzy
-msgid "Enter current token"
-msgstr "%s nije trenutno logovan."
+msgid "Enter captcha text"
+msgstr ""
 
 #, fuzzy
-msgid "Current token"
-msgstr "Trenutno na"
+msgid "Captcha"
+msgstr "Spasi sliku"
 
 #, fuzzy
 msgid "Register New Gadu-Gadu Account"
@@ -3187,6 +3185,18 @@ msgid "Current password"
 msgstr "Netacna lozinka."
 
 #, fuzzy
+msgid "Password (retype)"
+msgstr "Lozinka poslana"
+
+#, fuzzy
+msgid "Enter current token"
+msgstr "%s nije trenutno logovan."
+
+#, fuzzy
+msgid "Current token"
+msgstr "Trenutno na"
+
+#, fuzzy
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Unesite vašu trenutnu lozinku i vašu novu lozinku."
 
@@ -3239,7 +3249,8 @@ msgstr "Neslagajuci hostovi"
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-msgid "Unable to read socket"
+#, fuzzy
+msgid "Unable to read from socket"
 msgstr "Nije moguce citanje soketa"
 
 #, fuzzy
@@ -3258,8 +3269,14 @@ msgstr "Prijatelj displej"
 msgid "Your buddy list was stored on the server."
 msgstr "Nema spašene liste prijatelja na Gadu-Gadu serveru."
 
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
 #, fuzzy
-msgid "Connection failed."
+msgid "Connected"
+msgstr "Spajanje"
+
+msgid "Connection failed"
 msgstr "Konekcija neuspjela"
 
 #, fuzzy
@@ -3270,11 +3287,15 @@ msgstr "Dodaj chat"
 msgid "Chat _name:"
 msgstr "Prezime:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Nije moguce pingati server"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Spajanje"
+
 #, fuzzy
 msgid "Chat error"
 msgstr "Greška prilikom citanja"
@@ -3284,7 +3305,7 @@ msgid "This chat name is already in use"
 msgstr "Ta datoteka vec postoji"
 
 #, fuzzy
-msgid "Not connected to the server."
+msgid "Not connected to the server"
 msgstr "Diskonektovani ste sa servera."
 
 #, fuzzy
@@ -3352,7 +3373,7 @@ msgid "File Transfer Failed"
 msgstr "Transfer datoteke je otkazan"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Pidgin nije mogao otvoriti port za slušanje."
 
 msgid "Error displaying MOTD"
@@ -3368,8 +3389,16 @@ msgstr "Nema MOTD asociranog sa ovom konekcijom."
 msgid "MOTD for %s"
 msgstr "MOTD za %s"
 
-msgid "Server has disconnected"
-msgstr "Server je diskonektovao"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "Greška pri komunikaciji sa serverom"
 
 msgid "View MOTD"
 msgstr "Pogledaj MOTD"
@@ -3384,22 +3413,20 @@ msgstr "Lozinka:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC nadimci ne smiju sadržavati whitespace"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Spajanje"
-
 msgid "SSL support unavailable"
 msgstr "SSL podrška nedostupna"
 
-msgid "Couldn't create socket"
-msgstr "Kreiranje socketa neuspješno"
+msgid "Unable to connect"
+msgstr "Nije moguce se spojiti"
 
-msgid "Couldn't connect to host"
-msgstr "Spajanje na hosta neuspješno"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Nije moguce konektovanje na server."
 
-msgid "Read error"
-msgstr "Greška prilikom citanja"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Greška pri kreiranju konekcije"
 
 msgid "Users"
 msgstr "Korisnici"
@@ -3839,12 +3866,13 @@ msgstr "Komanda iskljucena"
 msgid "execute"
 msgstr "Neocekivan"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "Serveru je potreban TLS/SSL za prijavu. Nije pronadena TLS/SSL podrška."
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "Serveru je potreban TLS/SSL za prijavu. Nije pronadena TLS/SSL podrška."
 
@@ -3863,7 +3891,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Tekstualna autentikacija"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Autentikacija neuspjela"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Pogrešan odgovor od servera."
 
 msgid "Server does not use any supported authentication method"
@@ -3875,8 +3908,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "Pogrešan upit od servera"
 
-#, fuzzy
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Greška prilikom citanja"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3894,22 +3927,14 @@ msgstr "Nepodržana verzija"
 msgid "Unable to establish a connection with the server"
 msgstr "Nije moguce ostvariti SSL konekciju na server."
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Nije moguce ostvariti SSL konekciju na server."
 
 #, fuzzy
 msgid "Unable to establish SSL connection"
 msgstr "Nije moguce kreirati novu konekciju."
 
-msgid "Unable to create socket"
-msgstr "Nije moguce kreirati socket"
-
-msgid "Write error"
-msgstr "Greška pri pisanju"
-
 msgid "Full Name"
 msgstr "Puno ime"
 
@@ -3981,188 +4006,6 @@ msgstr "Sakrij operativni sistem"
 msgid "Local Time"
 msgstr "Lokalna datoteka:"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "Postavi Dir informacije"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "Produžena adresa"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "Alias chat"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Korisnik nema informacija o direktoriju."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "Komanda"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "Greška pri registraciji"
-
-#, fuzzy
-msgid "User Location"
-msgstr "Lokacija"
-
-msgid "User Avatar"
-msgstr ""
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "Obavještavanje o statusu prijatelja"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "Nepodržana verzija"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "Orijentacija"
-
-#, fuzzy
-msgid "File Transfer"
-msgstr "Transfer datoteke"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "Korisnicki modusi"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "Korisnicko ogranicenje"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "Mogucnosti"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "Korisnicko ime"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "IM sa razmjenom kljuca"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "Email adresa"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "Postavi profil"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "Ping"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "Korisnicko ime"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "Video uživo"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "Primljena poruka"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "Javni kljuc babbleprint"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "Korisnicke opcije"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "Korisnicki modusi"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "Korisnicko ogranicenje"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "Korisnicko ogranicenje"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Trillian enkripcija"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Mogucnosti"
-
 #, fuzzy
 msgid "Priority"
 msgstr "Prioritet kontakta"
@@ -4175,7 +4018,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Neulogovan"
 
 msgid "Middle Name"
@@ -4365,16 +4208,12 @@ msgid "Roles:"
 msgstr "Uloga"
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "Obicni tekst"
 
-msgid "Read Error"
-msgstr "Greška pri citanju"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 #, fuzzy
@@ -4565,9 +4404,6 @@ msgstr "Vaša lozinka je promjenjena."
 msgid "Error changing password"
 msgstr "Greška prilikom mjenjanja lozinke"
 
-msgid "Password (again)"
-msgstr "Lozinka (ponovo)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "Promjeni lozinku"
@@ -4962,6 +4798,14 @@ msgstr "Greška XML prevoda"
 msgid "Unknown Error in presence"
 msgstr "Postojeca nepoznata greška"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Greška pri ulaženju na chat %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Greška na chatu %s"
+
 msgid "Create New Room"
 msgstr "Kreiraj novu sobu"
 
@@ -4980,16 +4824,20 @@ msgstr "Konfiguriši sobu"
 msgid "_Accept Defaults"
 msgstr "Prihvati standardne postavke"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Greška pri ulaženju na chat %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Nema razloga"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Greška na chatu %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Izbaceni ste od %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Izbaceni ste od %s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Pojavila se greška tokom otvaranja datoteke."
 
 #, fuzzy
@@ -5508,9 +5356,6 @@ msgstr ""
 "SSL podrška je potrebna za MSN. Instalirajte podržanu SSL biblioteku. "
 "Pogledajte http://Pidgin.sf.net/faq-ssl.php za više informacija."
 
-msgid "Failed to connect to server."
-msgstr "Neuspjelo spajanje na server."
-
 msgid "Error retrieving profile"
 msgstr "Greška pri povratu profila"
 
@@ -5793,9 +5638,6 @@ msgstr "Poruka možda nije poslana, jer se pojavila nepoznata greška:"
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Poruka možda nije poslana, jer se pojavila nepoznata greška:"
 
-msgid "Unable to connect"
-msgstr "Nije moguce se spojiti"
-
 msgid "Writing error"
 msgstr "Greška pri pisanju"
 
@@ -5810,19 +5652,23 @@ msgstr ""
 "Konekcijska greška sa %s servera (%s):\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Naš protokol nije podržan od servera."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Greška parsanja HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Prijavili ste se sa druge lokacije."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "MSN serveri su trenutno nedostupni. Sacekajte i pokušajte kasnije."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN serveri su privremeno ugašeni."
 
 #, c-format
@@ -5835,9 +5681,6 @@ 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"
 
@@ -5939,6 +5782,9 @@ msgstr "AIM/ICQ protokol plugin"
 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)"
@@ -6054,13 +5900,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Pogrešan odgovor od servera."
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-#, fuzzy
-msgid "Connected"
-msgstr "Spajanje"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr ""
@@ -6084,18 +5923,6 @@ msgid "Invalid input condition"
 msgstr "Finaliziranje konekcije"
 
 #, fuzzy
-msgid "Read buffer full (2)"
-msgstr "Popunjen red cekanja"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "Nije moguce parsati poruku"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Spajanje na hosta neuspješno"
-
-#, fuzzy
 msgid "Failed to add buddy"
 msgstr "Neuspjeh prilikom pridruživanja prijatelju na chat-u"
 
@@ -6189,6 +6016,12 @@ msgstr ""
 msgid "Client Version"
 msgstr "Zatvori konverzaciju"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 #, fuzzy
 msgid "MySpaceIM - Username Available"
 msgstr "Servis nedostupan"
@@ -6456,9 +6289,9 @@ msgstr "Korisnik je ili offline ili ste blokirani"
 msgid "Unknown error: 0x%X"
 msgstr "Nepoznata greška: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Neuspio login (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Nije moguce banovati korisnika %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6564,9 +6397,6 @@ msgstr "GroupWise konferencija %d"
 msgid "Authenticating..."
 msgstr "Autenticiranje..."
 
-msgid "Unable to connect to server."
-msgstr "Nije moguce konektovanje na server."
-
 msgid "Waiting for response..."
 msgstr "Cekanje na odgovor..."
 
@@ -6590,25 +6420,20 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Da li biste željeli da se pridružite konverzaciji?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Upravo ste izlogovani, jer ste se ulogovali na drugoj radnoj stanici."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 "%s izgleda da je offline i nije primio/la poruku, koju ste upravo poslali."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Nije moguce spajanje na server. Unesite adresu servera, na koji želite da se "
 "spojite."
 
-msgid "Error. SSL support is not installed."
-msgstr "Greška. SSL podrška nije instalirana."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Ova konferencija je zatvorena. Poruke više ne mogu biti poslane."
 
@@ -6647,10 +6472,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, fuzzy
@@ -6662,17 +6484,7 @@ msgid "Invalid chat room name"
 msgstr "Pogrešno ime sobe"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "Greška pri kreiranju konekcije"
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "Greška pri komunikaciji sa serverom"
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "Nije moguce ostvariti SSL konekciju na server."
 
 #. *< type
@@ -6725,8 +6537,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Nije moguce ostvariti SSL konekciju na server."
 
 #, fuzzy
 msgid "Direct IM established"
@@ -6922,16 +6735,12 @@ msgid "Buddy Comment"
 msgstr "Komentar prijatelja"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "Nije bilo moguce se spojiti za transfer."
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr "Neuspjelo spajanje na server."
+msgid "Unable to connect to BOS server: %s"
+msgstr "Nije moguce konektovanje na server."
 
 #, fuzzy
 msgid "Username sent"
@@ -6946,9 +6755,9 @@ msgstr "Finaliziranje konekcije"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Nemoguca prijava: Neuspio pokušaj prijavljivanja kao %s, jer je ovo ime "
 "pogrešno. Imena moraju pocinjati sa slovima i sadržavati samo slova, brojeve "
@@ -6964,30 +6773,23 @@ msgstr ""
 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
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "Pogrešan nadimak"
+msgid "Username does not exist"
+msgstr "Korisnik ne postoji"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Vaš account je trenutno suspendovan."
 
 #. service temporarily unavailable
@@ -7007,7 +6809,8 @@ 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."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Ukucani SecurID je pogrešan."
 
 msgid "Enter SecurID"
@@ -7178,6 +6981,9 @@ msgstr "Prijavljen vec"
 msgid "Member Since"
 msgstr "Clan vec od"
 
+msgid "Capabilities"
+msgstr "Mogucnosti"
+
 msgid "Profile"
 msgstr "Profil"
 
@@ -7363,7 +7169,7 @@ msgstr "Poruka o odsutnosti preduga."
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7391,9 +7197,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Sirocad"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Nije moguce dodati prijatelja %s, jer vec imate previše prijatelja u Vašoj "
@@ -7403,7 +7209,7 @@ msgid "(no name)"
 msgstr "(bez imena)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Vaša komanda nije uspjela iz nepoznatih razloga."
 
 #, fuzzy, c-format
@@ -8280,7 +8086,7 @@ msgid "Update interval (seconds)"
 msgstr "Greška pri citanju"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Nemoguce dobiti informacije o serveru"
 
 #, c-format
@@ -8307,10 +8113,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Nemoguce dobiti informacije o serveru"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "Zahtjev nejasan"
 
@@ -8346,26 +8148,11 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "Nije moguce spajanje."
-
 #, fuzzy
 msgid "Socket error"
 msgstr "Greška prilikom citanja"
 
 #, fuzzy
-msgid "Unable to read from socket"
-msgstr "Nije moguce citanje soketa"
-
-#, fuzzy
-msgid "Write Error"
-msgstr "Greška pri pisanju"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "Konekcija zatvorena"
-
-#, fuzzy
 msgid "Getting server"
 msgstr "Postavi korisnicki info..."
 
@@ -8374,8 +8161,8 @@ msgid "Requesting token"
 msgstr "Zahtjev odbijen"
 
 #, fuzzy
-msgid "Couldn't resolve host"
-msgstr "Spajanje na hosta neuspješno"
+msgid "Unable to resolve hostname"
+msgstr "Nije moguce pingati server"
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8426,7 +8213,7 @@ msgid "QQ Qun Command"
 msgstr "Komanda"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Nemoguce dobiti informacije o serveru"
 
 #, fuzzy
@@ -8449,10 +8236,6 @@ msgstr "Neuspjelo slanje datoteke"
 msgid "%d canceled the transfer of %s"
 msgstr "%s je otkazao transfer %s"
 
-#, fuzzy
-msgid "Connection closed (writing)"
-msgstr "Konekcija zatvorena"
-
 #, fuzzy, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Korisnik:</b> %s<br>"
@@ -8514,19 +8297,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#, fuzzy
-msgid "Connection reset"
-msgstr "Konekcija zatvorena"
-
-#, fuzzy, c-format
-msgid "Error reading from socket: %s"
-msgstr "Greška pri citanju socketa."
-
-#. this is a regular connect, error out
-#, fuzzy
-msgid "Unable to connect to host"
-msgstr "Nije moguce konektovanje na server."
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -8554,6 +8324,10 @@ msgid "Video Camera"
 msgstr "Video chat"
 
 #, fuzzy
+msgid "File Transfer"
+msgstr "Transfer datoteke"
+
+#, fuzzy
 msgid "Supports"
 msgstr "podrška"
 
@@ -9389,6 +9163,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Statistika mreže"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping neuspio"
 
@@ -9454,7 +9231,8 @@ msgstr "Nepodržani tipovi javnog kljuca"
 msgid "Disconnected by server"
 msgstr "Diskonektovani od servera"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Greška prilikom konektovanja na SILC server"
 
 msgid "Key Exchange failed"
@@ -9466,29 +9244,26 @@ msgstr ""
 "Nastavak odvojene sesije neuspio. Pritisnite Ponovno konektovanje da "
 "kreirate novu konekciju."
 
-msgid "Connection failed"
-msgstr "Konekcija neuspjela"
-
 msgid "Performing key exchange"
 msgstr "Obavljanje razmjene kljuca"
 
 #, fuzzy
-msgid "Unable to create connection"
-msgstr "Nije moguce kreirati novu konekciju."
-
-#, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "Nije moguce load-ati javni kljuc"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Spajanje na SILC server"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Nije moguce load-ati javni kljuc"
+
 msgid "Out of memory"
 msgstr "Nedovoljno memorije"
 
 #, fuzzy
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "Nemoguce inicijaliziranje SILC klijenta konekcije"
 
 #, fuzzy
@@ -9798,7 +9573,7 @@ msgid "Creating SILC key pair..."
 msgstr "Kreiranje SILC para kljuca..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "Kreiranje SILC para kljuca..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9892,6 +9667,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr "Statistike servera nisu dostupne"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Greška prilikom konektovanja na SILC server"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Neuspjeh: Pogrešna verzija, obnovite Vašeg klijenta"
@@ -9932,7 +9710,8 @@ msgstr "Neuspjeh: Pogrešan cookie"
 msgid "Failure: Authentication failed"
 msgstr "Neuspjeh: Autentikacija neuspjela"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Nemoguce inicijaliziranje SILC klijenta konekcije"
 
 #, fuzzy
@@ -9940,27 +9719,20 @@ msgid "John Noname"
 msgstr "(bez imena)"
 
 #, fuzzy, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "Nije moguce load-ati javni kljuc"
 
 #, fuzzy
-msgid "Could not write"
-msgstr "Nije poslano"
-
-msgid "Could not connect"
-msgstr "Nemoguce spajanje"
+msgid "Unable to create connection"
+msgstr "Nije moguce kreirati novu konekciju."
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "Nepoznat razlog."
 
 #, fuzzy
-msgid "Could not create listen socket"
-msgstr "Kreiranje socketa neuspješno"
-
-#, fuzzy
-msgid "Could not resolve hostname"
-msgstr "Nije moguce riješiti hostname."
+msgid "Unable to create listen socket"
+msgstr "Nije moguce kreirati socket"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -10010,6 +9782,83 @@ msgstr "AP korisnik"
 msgid "Auth Domain"
 msgstr "Automatski"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;room&gt;:  Pridruži se chat sobi na Yahoo mreži"
+
+#, fuzzy
+msgid "list: List rooms on the Yahoo network"
+msgstr "listaj:   Izlistaj kanale na ovoj mreži"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo protokol plugin"
+
+#, fuzzy
+msgid "Pager server"
+msgstr "Proxy server"
+
+msgid "Pager port"
+msgstr "Pager port"
+
+#, fuzzy
+msgid "File transfer server"
+msgstr "Host transfera datoteke"
+
+msgid "File transfer port"
+msgstr "Port datotecnog transfera"
+
+msgid "Chat room locale"
+msgstr ""
+
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
+
+#, fuzzy
+msgid "Chat room list URL"
+msgstr "URL liste chat sobe"
+
+msgid "Yahoo Chat server"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo Chat port"
+msgstr "Yahoo Japan"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo protokol plugin"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -10041,30 +9890,20 @@ msgstr "Dodavanje prijatelja odbijeno"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 "Nepoznata greška broj %d: Prijavljivanje na Yahoo! website može ovo "
 "popraviti."
@@ -10107,13 +9946,14 @@ msgstr ""
 "Nepoznata greška broj %d: Prijavljivanje na Yahoo! website može ovo "
 "popraviti."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Nije bilo moguce dodati prijatelja %s u grupu %s na listu servera account-a %"
 "s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Nije bilo moguce dodati prijatelja na listu servera"
 
 #, c-format
@@ -10121,23 +9961,16 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
 #, fuzzy
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "Pogrešan odgovor od servera."
 
-msgid "Connection problem"
-msgstr "Problem konekcije"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "Konverzacija sa %s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Nije moguce ostvariti SSL konekciju na server."
 
 #, fuzzy
 msgid "Not at Home"
@@ -10208,81 +10041,15 @@ msgstr "Pridruživanje korisniku na chat..."
 msgid "Open Inbox"
 msgstr ""
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;room&gt;:  Pridruži se chat sobi na Yahoo mreži"
-
-#, fuzzy
-msgid "list: List rooms on the Yahoo network"
-msgstr "listaj:   Izlistaj kanale na ovoj mreži"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo protokol plugin"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "Proxy server"
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "Japan pager host"
-
-msgid "Pager port"
-msgstr "Pager port"
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "Host transfera datoteke"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "Japan host transfera datoteke"
-
-msgid "File transfer port"
-msgstr "Port datotecnog transfera"
-
-msgid "Chat room locale"
-msgstr ""
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-#, fuzzy
-msgid "Chat room list URL"
-msgstr "URL liste chat sobe"
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "Yahoo Japan"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "Nije moguce spajanje."
+
 msgid "Unable to establish file descriptor."
 msgstr "Nije moguce uspostaviti opisivaca datoteke."
 
@@ -10290,6 +10057,10 @@ msgstr "Nije moguce uspostaviti opisivaca datoteke."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "Ponuda slanja %s prema %s"
 
+#, fuzzy
+msgid "Write Error"
+msgstr "Greška pri pisanju"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japanski profil"
 
@@ -10412,21 +10183,19 @@ msgstr "Glasovi"
 msgid "Webcams"
 msgstr "Web kamere"
 
+msgid "Connection problem"
+msgstr "Problem konekcije"
+
 msgid "Unable to fetch room list."
 msgstr "Nije moguce uzimanje liste soba."
 
 msgid "User Rooms"
 msgstr "Korisnicke sobe"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Konekcijski problem sa YCHT serverom."
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "Greška pri komunikaciji sa serverom"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10562,31 +10331,21 @@ msgid "Exposure"
 msgstr "Izlaganje"
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "Nije moguce kreirati socket"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Nije moguce poslati poruku: %s"
 
 #, fuzzy, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Proxy konekcijska greška %d"
 
 #, fuzzy, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Pristup odbijen: proxy server zabranjuje port %d prolaz."
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr "Greška prilikom spašavanja slike: %s"
 
-#, fuzzy
-msgid "Could not resolve host name"
-msgstr "Nije moguce riješiti hostname."
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10802,13 +10561,6 @@ msgstr ""
 msgid "Unable to connect to %s: %s"
 msgstr "Nije moguce konektovanje na server."
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"Serveru je potreban TLS/SSL za prijavu. Nije pronadena TLS/SSL podrška."
-
 #, c-format
 msgid " - %s"
 msgstr ""
@@ -11065,7 +10817,11 @@ msgid "View _Log"
 msgstr "Pogledaj _Log"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "Nije dozvoljeno kada je offline"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "Nije dozvoljeno kada je offline"
 
 msgid "_Alias..."
@@ -11627,6 +11383,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Promijeni korisnicke informacije za %s"
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11678,7 +11437,7 @@ msgid "Get Away Message"
 msgstr "Nova poruka o odsutnosti"
 
 #, fuzzy
-msgid "Last said"
+msgid "Last Said"
 msgstr "Prezime"
 
 msgid "Unable to save icon file to disk."
@@ -12629,7 +12388,7 @@ msgid "Hyperlink visited color"
 msgstr "Hiperlink boja"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Boja za bojenje hiperlinkova."
 
 #, fuzzy
@@ -12669,15 +12428,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "Uklanjanje notifikacija"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "Obavještenje o novom mail-u"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -13046,6 +12812,10 @@ msgid ""
 msgstr "Komanda u pretraživacu je odabrana, ali nije postavljena."
 
 #, fuzzy
+msgid "No message"
+msgstr "(1 poruka)"
+
+#, fuzzy
 msgid "Open All Messages"
 msgstr "Pošalji poruku"
 
@@ -13070,10 +12840,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, fuzzy
-msgid "No message"
-msgstr "(1 poruka)"
-
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -13318,7 +13084,7 @@ msgid "On unread messages"
 msgstr "Pošalji poruku"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "IM konverzacioni prozori"
 
 #, fuzzy
@@ -13328,6 +13094,10 @@ msgstr "Zatvori konverzaciju"
 msgid "When away"
 msgstr "Pri odsutnosti"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "IM konverzacioni prozori"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -13392,10 +13162,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr "Pojava prozora pri primanju poruke"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "IM konverzacioni prozori"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -13434,8 +13200,8 @@ msgstr "Nemoguce dobiti korisnicke informacije"
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-#, fuzzy
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Autodetekcija IP adrese"
 
 msgid "Public _IP:"
@@ -13829,34 +13595,18 @@ msgstr "Spasi & koristi"
 msgid "Status for %s"
 msgstr "Status: %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "Ubaci smiley"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
 #, fuzzy
-msgid "Duplicate Shortcut"
-msgstr "Datoteka javnog kljuca"
+msgid "Custom Smiley"
+msgstr "Ubaci smiley"
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Molim Vas unesite novo ime za izabranu grupu."
+msgid "Duplicate Shortcut"
+msgstr "Datoteka javnog kljuca"
 
 #, fuzzy
 msgid "Edit Smiley"
@@ -13978,8 +13728,8 @@ msgid "Cannot send launcher"
 msgstr "Nemoguce poslati datoteku"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -14610,7 +14360,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -14885,7 +14635,7 @@ msgstr "IM konverzacioni prozori"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -15223,9 +14973,10 @@ msgstr "Opcije prijave"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opcije specificne za Windows Pidgin"
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "Opcije specificne za Windows Pidgin"
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr ""
@@ -15267,6 +15018,286 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Cannot open socket"
+#~ msgstr "Nije u stanju otvoriti socket"
+
+#, fuzzy
+#~ msgid "Could not listen on socket"
+#~ msgstr "Kreiranje socketa neuspješno"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Nije moguce citanje soketa"
+
+#, fuzzy
+#~ msgid "Connection failed."
+#~ msgstr "Konekcija neuspjela"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Server je diskonektovao"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Kreiranje socketa neuspješno"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Spajanje na hosta neuspješno"
+
+#~ msgid "Read error"
+#~ msgstr "Greška prilikom citanja"
+
+#~ msgid "Write error"
+#~ msgstr "Greška pri pisanju"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "Postavi Dir informacije"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Produžena adresa"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "Alias chat"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Korisnik nema informacija o direktoriju."
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Komanda"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "Greška pri registraciji"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "Lokacija"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "Obavještavanje o statusu prijatelja"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "Nepodržana verzija"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "Orijentacija"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "Korisnicki modusi"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "Korisnicko ogranicenje"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "Mogucnosti"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "Korisnicko ime"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "IM sa razmjenom kljuca"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "Email adresa"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "Postavi profil"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "Ping"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "Korisnicko ime"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "Video uživo"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "Primljena poruka"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "Javni kljuc babbleprint"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "Korisnicke opcije"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "Korisnicki modusi"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "Korisnicko ogranicenje"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "Korisnicko ogranicenje"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Trillian enkripcija"
+
+#~ msgid "Read Error"
+#~ msgstr "Greška pri citanju"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Neuspjelo spajanje na server."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Popunjen red cekanja"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "Nije moguce parsati poruku"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Spajanje na hosta neuspješno"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Neuspio login (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Nije moguce konektovanje na server."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Upravo ste izlogovani, jer ste se ulogovali na drugoj radnoj stanici."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Greška. SSL podrška nije instalirana."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Netacna lozinka."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "Neuspjelo spajanje na server."
+
+#, fuzzy
+#~ 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."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Nemoguce se spojiti"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "Pogrešan nadimak"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Nemoguce dobiti informacije o serveru"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "Konekcija zatvorena"
+
+#, fuzzy
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Spajanje na hosta neuspješno"
+
+#, fuzzy
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Konekcija zatvorena"
+
+#, fuzzy
+#~ msgid "Connection reset"
+#~ msgstr "Konekcija zatvorena"
+
+#, fuzzy
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Greška pri citanju socketa."
+
+#, fuzzy
+#~ msgid "Unable to connect to host"
+#~ msgstr "Nije moguce konektovanje na server."
+
+#, fuzzy
+#~ msgid "Could not write"
+#~ msgstr "Nije poslano"
+
+#~ msgid "Could not connect"
+#~ msgstr "Nemoguce spajanje"
+
+#, fuzzy
+#~ msgid "Could not create listen socket"
+#~ msgstr "Kreiranje socketa neuspješno"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Nije moguce riješiti hostname."
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Netacna lozinka."
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "Japan pager host"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japan host transfera datoteke"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "Greška pri komunikaciji sa serverom"
+
+#, fuzzy
+#~ msgid "Could not resolve host name"
+#~ msgstr "Nije moguce riješiti hostname."
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Serveru je potreban TLS/SSL za prijavu. Nije pronadena TLS/SSL podrška."
+
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "IM konverzacioni prozori"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Molim Vas unesite novo ime za izabranu grupu."
+
+#, fuzzy
 #~ msgid "Activate which ID?"
 #~ msgstr "Aktivirati koji ID?"
 
@@ -15891,10 +15922,6 @@ msgstr ""
 #~ msgstr "Trenutno na"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Nije moguce konektovanje na server."
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "Poruka:"
 
diff --git a/po/ca.po b/po/ca.po
index 5505894684..62406f51e8 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -33,7 +33,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-06 00:17+0200\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2009-07-06 00:19+0200\n"
 "Last-Translator: Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.net>\n"
@@ -2932,15 +2932,17 @@ msgstr ""
 "No s'ha pogut detectar la instal·lació d'ActiveTCL. Si voleu emprar "
 "connectors TCL, instal·leu l'ActiveTCL de http://www.activestate.com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "No s'ha pogut trobar el joc d'eines per a Windows de l'Apple Bonjour, "
 "consulteu les preguntes més freqüents a http://developer.pidgin.im/"
 "BonjourWindows per a més informació."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "No es poden escoltar connexions entrants de MI\n"
 
 msgid ""
@@ -2995,14 +2997,21 @@ msgstr "%s ha finalitzat la conversa."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "No s'ha pogut enviar el missatge, no s'ha pogut iniciar la conversa."
 
-msgid "Cannot open socket"
-msgstr "No s'ha pogut obrir el sòcol"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"No s'ha pogut crear el sòcol:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "No s'ha pogut vincular el sòcol al port"
 
-msgid "Could not listen on socket"
-msgstr "No s'ha pogut escoltar al sòcol"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"No s'ha pogut crear el sòcol:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
@@ -3052,13 +3061,16 @@ msgstr "Desa la llista d'amics..."
 msgid "Load buddylist from file..."
 msgstr "Carrega la llista d'amics d'un fitxer..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Empleneu els camps de registre."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Les contrasenyes no coincideixen."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "No s'ha pogut registrar el nou compte. S'ha produït un error.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3070,14 +3082,15 @@ msgstr "S'ha registrat amb èxit."
 msgid "Password"
 msgstr "Contrasenya"
 
-msgid "Password (retype)"
-msgstr "Contrasenya (torneu-la a escriure)"
+msgid "Password (again)"
+msgstr "Contrasenya (repetiu-la)"
 
-msgid "Enter current token"
-msgstr "Introduïu el testimoni actual"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Testimoni actual"
+#, fuzzy
+msgid "Captcha"
+msgstr "Imatge captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registra un compte Gadu-Gadu nou"
@@ -3130,6 +3143,15 @@ msgstr "S'ha canviat la contrasenya."
 msgid "Current password"
 msgstr "Contrasenya actual"
 
+msgid "Password (retype)"
+msgstr "Contrasenya (torneu-la a escriure)"
+
+msgid "Enter current token"
+msgstr "Introduïu el testimoni actual"
+
+msgid "Current token"
+msgstr "Testimoni actual"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Introduïu la contrasenya actual, i la nova per a UIN: "
 
@@ -3177,7 +3199,7 @@ msgstr "No s'ha trobat cap usuari que coincideixi"
 msgid "There are no users matching your search criteria."
 msgstr "No hi ha usuaris que coincideixin amb el vostre criteri de cerca."
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "No s'ha pogut llegir el sòcol"
 
 msgid "Buddy list downloaded"
@@ -3192,8 +3214,14 @@ msgstr "S'ha pujat la llista d'amics"
 msgid "Your buddy list was stored on the server."
 msgstr "S'ha desat la vostra llista d'amics al servidor."
 
-msgid "Connection failed."
-msgstr "Ha fallat la connexió."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Connectat"
+
+msgid "Connection failed"
+msgstr "Ha fallat la connexió"
 
 msgid "Add to chat"
 msgstr "Afegeix al xat"
@@ -3201,17 +3229,23 @@ msgstr "Afegeix al xat"
 msgid "Chat _name:"
 msgstr "_Nom del xat:"
 
-#. should this be a settings error?
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "No s'ha pogut resoldre el nom del servidor"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "S'està connectant"
+
 msgid "Chat error"
 msgstr "Error en el xat"
 
 msgid "This chat name is already in use"
 msgstr "Aquest nom de xat ja existeix"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "No esteu connectat al servidor."
 
 msgid "Find buddies..."
@@ -3270,7 +3304,8 @@ msgstr "No hi ha cap tema establert"
 msgid "File Transfer Failed"
 msgstr "Ha fallat la transferència del fitxer"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "No s'ha pogut obrir cap port on escoltar."
 
 msgid "Error displaying MOTD"
@@ -3286,8 +3321,18 @@ msgstr "No hi ha cap frase del dia associada a aquesta connexió."
 msgid "MOTD for %s"
 msgstr "Frase del dia per a %s"
 
-msgid "Server has disconnected"
-msgstr "El servidor ha desconnectat"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"S'ha perdut la connexió amb el servidor:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Mostra la frase del dia"
@@ -3302,22 +3347,20 @@ msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 "Els sobrenoms i els noms de servidor d'IRC no poden contenir espais en blanc"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "S'està connectant"
-
 msgid "SSL support unavailable"
 msgstr "El suport per a SSL no està disponible"
 
-msgid "Couldn't create socket"
-msgstr "No s'ha pogut crear el sòcol"
+msgid "Unable to connect"
+msgstr "No s'ha pogut connectar"
 
-msgid "Couldn't connect to host"
-msgstr "No s'ha pogut connectar a l'ordinador"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "No s'ha pogut connectar a %s"
 
-msgid "Read error"
-msgstr "Error de lectura"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "El servidor ha tancat la connexió."
 
 msgid "Users"
 msgstr "Usuaris"
@@ -3745,12 +3788,14 @@ msgstr "Ha fallat l'ordre «Ad-Hoc»"
 msgid "execute"
 msgstr "executa"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "El servidor requereix TLS/SSL per entrar. No s'ha trobat suport per a TLS/"
 "SSL."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "Heu requerit que es xifri, però no s'ha trobat cap implementació de TLS/SSL."
 
@@ -3768,7 +3813,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Autenticació de text"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Ha fallat l'autenticació"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "La resposta del servidor no és vàlida."
 
 msgid "Server does not use any supported authentication method"
@@ -3780,7 +3830,8 @@ msgstr "Requeriu xifratge, però no està disponible en aquest servidor."
 msgid "Invalid challenge from server"
 msgstr "Repte del servidor invàlid"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Error en el SASL"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3795,23 +3846,13 @@ msgstr "Aquesta versió del protocol BOSH no està implementada"
 msgid "Unable to establish a connection with the server"
 msgstr "No s'ha pogut establir una connexió amb el servidor"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"No s'ha pogut establir una connexió amb el servidor:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "No s'ha pogut establir una connexió amb el servidor"
 
 msgid "Unable to establish SSL connection"
 msgstr "No s'ha pogut establir una connexió SSL"
 
-msgid "Unable to create socket"
-msgstr "No s'ha pogut crear el sòcol"
-
-msgid "Write error"
-msgstr "Error d'escriptura"
-
 msgid "Full Name"
 msgstr "Nom"
 
@@ -4071,16 +4112,14 @@ msgstr "No s'ha trobat cap usuari"
 msgid "Roles:"
 msgstr "Rols:"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Temps d'espera del ping"
 
-msgid "Read Error"
-msgstr "Error de lectura"
-
-#, c-format
+#, fuzzy
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 "No s'ha pogut trobar cap mètode alternatiu de connexió XMPP després de no "
 "haver pogut connectar directament.\n"
@@ -4258,9 +4297,6 @@ msgstr "La vostra contrasenya s'ha canviat."
 msgid "Error changing password"
 msgstr "S'ha produït un error en canviar la contrasenya"
 
-msgid "Password (again)"
-msgstr "Contrasenya (repetiu-la)"
-
 msgid "Change XMPP Password"
 msgstr "Canvia la contrasenya de l'XMPP"
 
@@ -4649,6 +4685,14 @@ msgstr "Error en l'anàlisi de l'XML"
 msgid "Unknown Error in presence"
 msgstr "Error desconegut en la presència"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "S'ha produït un error en entrar al xat %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "S'ha produït un error en el xat %s"
+
 msgid "Create New Room"
 msgstr "Crea una nova sala"
 
@@ -4665,13 +4709,17 @@ msgstr "_Configura la sala"
 msgid "_Accept Defaults"
 msgstr "_Accepta els valors predeterminats"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "S'ha produït un error en entrar al xat %s"
+#, fuzzy
+msgid "No reason"
+msgstr "No s'ha indicat cap motiu"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "S'ha produït un error en el xat %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "%s us ha fet fora: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s us ha fet fora (%s)"
 
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr ""
@@ -5165,9 +5213,6 @@ msgstr "Inicia un _xat"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "L'MSN necessita SSL, instal·leu alguna biblioteca d'SSL permesa."
 
-msgid "Failed to connect to server."
-msgstr "No s'ha pogut connectar al servidor."
-
 msgid "Error retrieving profile"
 msgstr "S'ha produït un error en recuperar el perfil"
 
@@ -5425,9 +5470,6 @@ msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 "No s'ha pogut enviar el missatge perquè s'ha produït un error desconegut."
 
-msgid "Unable to connect"
-msgstr "No s'ha pogut connectar"
-
 msgid "Writing error"
 msgstr "Error en escriure"
 
@@ -5442,13 +5484,16 @@ msgstr ""
 "S'ha produït un error de connexió del servidor %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "El servidor no implementa el nostre protocol."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "S'ha produït un error en analitzar HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Us heu connectat des d'un altre lloc."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5456,7 +5501,8 @@ msgstr ""
 "Els servidors MSN estan temporalment no disponibles. Espereu i proveu-ho més "
 "tard."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Els servidors MSN no seran accessibles temporalment."
 
 #, c-format
@@ -5469,9 +5515,6 @@ 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ó"
 
@@ -5581,6 +5624,9 @@ msgstr "Connector per al protocol MSN"
 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)"
@@ -5693,12 +5739,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Addició de contactes del servidor"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Connectat"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "S'ha produït un error en el protocol amb codi %d: %s"
@@ -5722,16 +5762,6 @@ msgstr "S'ha produït un error en el MySpaceIM"
 msgid "Invalid input condition"
 msgstr "La condició d'entrada no és vàlida"
 
-msgid "Read buffer full (2)"
-msgstr "La memòria intermèdia de lectura és plena (2)"
-
-msgid "Unparseable message"
-msgstr "No es pot analitzar el missatge"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "No s'ha pogut connectar a l'ordinador: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "No s'ha pogut afegir l'amic"
 
@@ -5821,6 +5851,15 @@ msgstr "Nombre d'amics"
 msgid "Client Version"
 msgstr "Versió del client"
 
+#, fuzzy
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"Aneu a http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"escolliu un nom d'usuari i torneu a provar d'entrar."
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - El nom d'usuari està disponible"
 
@@ -6080,9 +6119,9 @@ msgstr "L'usuari està fora de línia o bé esteu blocat"
 msgid "Unknown error: 0x%X"
 msgstr "Error desconegut: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Ha fallat l'entrada (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "No s'ha pogut fer ping a l'usuari %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6193,9 +6232,6 @@ msgstr "Conferència GroupWise %d"
 msgid "Authenticating..."
 msgstr "S'està autenticant..."
 
-msgid "Unable to connect to server."
-msgstr "No s'ha pogut connectar al servidor."
-
 msgid "Waiting for response..."
 msgstr "S'està esperant una resposta..."
 
@@ -6219,11 +6255,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Voleu afegir-vos a la conversa?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Se us ha desconnectat perquè heu entrat a través d'una altra estació de "
-"treball."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6238,9 +6269,6 @@ msgstr ""
 "No s'ha pogut connectar al servidor. Introduïu l'adreça del servidor al qual "
 "us vulgueu connectar."
 
-msgid "Error. SSL support is not installed."
-msgstr "Error. No hi ha instal·lades les biblioteques per a SSL."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "S'ha tancat aquesta conferència. No s'hi poden enviar més missatges."
 
@@ -6279,10 +6307,8 @@ msgstr ""
 msgid "Error requesting "
 msgstr "S'ha produït en sol·licitar "
 
-msgid "Incorrect password."
-msgstr "La contrasenya no és correcta."
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+#, fuzzy
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 "AOL no permet que autentiqueu aquest nom d'usuari a través d'aquest web."
 
@@ -6292,18 +6318,8 @@ msgstr "No s'ha pogut entrar a la sala de xat"
 msgid "Invalid chat room name"
 msgstr "El nom de sala de xat no és vàlid"
 
-msgid "Server closed the connection."
-msgstr "El servidor ha tancat la connexió."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"S'ha perdut la connexió amb el servidor:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "S'han rebut dades invàlides a la connexió amb el servidor."
 
 #. *< type
@@ -6351,7 +6367,8 @@ msgstr "S'ha perdut la connexió amb l'usuari remot:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "S'han rebut dades invàlides a la connexió amb l'usuari remot."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "No s'ha pogut establir una connexió amb l'usuari remot."
 
 msgid "Direct IM established"
@@ -6554,21 +6571,15 @@ msgstr "Nivell d'avís"
 msgid "Buddy Comment"
 msgstr "Comentari de l'amic"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "No s'ha pogut connectar al servidor d'autenticació:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"No s'ha pogut connectar al servidor BOS:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "No s'ha pogut connectar al servidor."
 
 msgid "Username sent"
 msgstr "S'ha enviat el nom d'usuari"
@@ -6580,11 +6591,11 @@ msgstr "Connexió establerta, s'està enviant el secret"
 msgid "Finalizing connection"
 msgstr "S'està finalitzant la connexió"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "No s'ha pogut entrar: no s'ha pogut entrar com a %s perquè el nom d'usuari "
 "no és vàlid. Els noms d'usuari han de ser adreces de correu vàlides, o "
@@ -6601,28 +6612,21 @@ msgstr ""
 msgid "Unable to get a valid AIM login hash."
 msgstr "No s'ha pogut obtenir 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'aquí a poc temps. Comproveu si hi ha "
-"actualitzacions a %s."
-
 msgid "Unable to get a valid login hash."
 msgstr "No s'ha pogut obtenir 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
 #. the username does not exist
 msgid "Username does not exist"
 msgstr "L'usuari no existeix"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "El vostre compte està actualment suspès."
 
 #. service temporarily unavailable
@@ -6643,7 +6647,8 @@ msgstr ""
 "minut i intenteu-ho de nou. Si continueu intentant-ho, haureu d'esperar "
 "encara més temps."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "La clau SecurID que heu entrat no és vàlida."
 
 msgid "Enter SecurID"
@@ -6996,9 +7001,9 @@ msgstr[1] ""
 msgid "Away message too long."
 msgstr "El missatge d'absència és massa llarg."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7022,9 +7027,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Orfes"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "No s'ha pogut afegir l'amic %s perquè hi ha massa entrades a la llista "
@@ -7033,8 +7038,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(sense nom)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Per motius desconeguts no s'ha pogut afegir l'amic %s."
 
 #, c-format
@@ -7812,7 +7817,8 @@ msgstr "Interval de permanència (en segons)"
 msgid "Update interval (seconds)"
 msgstr "Interval d'actualització (en segons)"
 
-msgid "Cannot decrypt server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "No es pot desxifrar la resposta del servidor"
 
 #, c-format
@@ -7837,9 +7843,6 @@ msgstr "Cal activació"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "No s'ha reconegut el codi de resposta en entrar (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "No s'ha pogut desxifrar la resposta del servidor"
-
 # FIXME: captcha
 msgid "Requesting captcha"
 msgstr "S'està sol·licitant un capcha"
@@ -7862,10 +7865,6 @@ msgstr "Verificació del captcha QQ"
 msgid "Enter the text from the image"
 msgstr "Introduïu el text de la imatge"
 
-#. uid is not exist
-msgid "Invalid username."
-msgstr "El nom d'usuari no és vàlid"
-
 #, c-format
 msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
@@ -7879,29 +7878,18 @@ msgstr ""
 "No s'ha reconegut el codi de resposta en entrar (0x%02X):\n"
 "%s"
 
-msgid "Unable to connect."
-msgstr "No s'ha pogut connectar."
-
 msgid "Socket error"
 msgstr "Error del sòcol"
 
-msgid "Unable to read from socket"
-msgstr "No s'ha pogut llegir el sòcol"
-
-msgid "Write Error"
-msgstr "Error d'escriptura"
-
-msgid "Connection lost"
-msgstr "S'ha perdut la connexió"
-
 msgid "Getting server"
 msgstr "S'està obtenint el servidor"
 
 msgid "Requesting token"
 msgstr "S'està sol·licitant un testimoni"
 
-msgid "Couldn't resolve host"
-msgstr "No s'ha pogut obtenir l'adreça de l'ordinador"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "No s'ha pogut resoldre el nom del servidor"
 
 msgid "Invalid server or port"
 msgstr "El servidor o el port no són vàlids"
@@ -7954,7 +7942,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "Ordre QQ Qun"
 
-msgid "Could not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "No s'ha pogut desxifrar la resposta d'entrada"
 
 msgid "Unknown LOGIN CMD"
@@ -7974,9 +7963,6 @@ msgstr "S'ha enviat el fitxer"
 msgid "%d canceled the transfer of %s"
 msgstr "%d ha cancel·lat la transferència de %s"
 
-msgid "Connection closed (writing)"
-msgstr "S'ha tancat la connexió (escrivint)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Títol del grup:</b> %s<br>"
@@ -8032,17 +8018,6 @@ msgstr "Un administrador de Sametime ha enviat aquest anunci en el servidor %s"
 msgid "Sametime Administrator Announcement"
 msgstr "Anunci de l'administrador de Sametime"
 
-msgid "Connection reset"
-msgstr "S'ha reiniciat la connexió"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "S'ha produït un error en llegir del sòcol: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "No s'ha pogut connectar a l'ordinador"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Avís de %s"
@@ -8952,7 +8927,8 @@ msgstr "El tipus de la clau pública no està suportat"
 msgid "Disconnected by server"
 msgstr "El servidor us ha desconnectat"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "S'ha produït un error en connectar al servidor SILC"
 
 msgid "Key Exchange failed"
@@ -8964,26 +8940,26 @@ msgstr ""
 "No s'ha pogut restablir la sessió anteriorment separada. Premeu «Torna a "
 "connectar» per crear una nova connexió."
 
-msgid "Connection failed"
-msgstr "Ha fallat la connexió"
-
 msgid "Performing key exchange"
 msgstr "S'estan intercanviant les claus"
 
-msgid "Unable to create connection"
-msgstr "No s'ha pogut crear la connexió"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "No s'ha pogut carregar el parell de claus SILC"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "S'està connectant al servidor SILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "No s'ha pogut carregar el parell de claus SILC"
+
 msgid "Out of memory"
 msgstr "Sense memòria"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "No s'ha pogut inicialitzar el protocol SILC"
 
 msgid "Error loading SILC key pair"
@@ -9282,7 +9258,8 @@ msgstr "Signa i verifica digitalment tots els missatges"
 msgid "Creating SILC key pair..."
 msgstr "S'està creant el parell de claus SILC..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "No s'ha pogut crear el parell de claus SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9376,6 +9353,9 @@ msgstr "Pissarra"
 msgid "No server statistics available"
 msgstr "No hi ha estadístiques del servidor disponibles"
 
+msgid "Error during connecting to SILC Server"
+msgstr "S'ha produït un error en connectar al servidor SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Error: les versions no coincideixen, actualitzeu el client"
@@ -9421,30 +9401,27 @@ msgstr "Error: la galeta no és vàlida"
 msgid "Failure: Authentication failed"
 msgstr "Error: ha fallat l'autenticació"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "No s'ha pogut inicialitzar la connexió per al client SILC"
 
 msgid "John Noname"
 msgstr "Pepet Sensenom"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "No s'ha pogut carregar la parella de claus SILC: %s"
 
-msgid "Could not write"
-msgstr "No s'ha pogut escriure"
-
-msgid "Could not connect"
-msgstr "No s'ha pogut connectar"
+msgid "Unable to create connection"
+msgstr "No s'ha pogut crear la connexió"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Resposta desconeguda del servidor."
 
-msgid "Could not create listen socket"
-msgstr "No s'ha pogut crear el sòcol per a escoltar"
-
-msgid "Could not resolve hostname"
-msgstr "No s'ha pogut resoltre el nom de l'ordinador"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "No s'ha pogut crear el sòcol"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Els noms d'usuari SIP no poden contenir espais en blanc ni @"
@@ -9485,6 +9462,79 @@ msgstr "Usuari Auth"
 msgid "Auth Domain"
 msgstr "Domini Auth"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;sala&gt;:  entra en una sala de xat de la xarxa Yahoo"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  llista les sales de la xarxa Yahoo"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: fa una petició a l'usuari per iniciar una sessió Doodle"
+
+msgid "Yahoo ID..."
+msgstr "ID de Yahoo..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Connector per al protocol Yahoo"
+
+msgid "Pager server"
+msgstr "Servidor de cercapersones"
+
+msgid "Pager port"
+msgstr "Port per al cercapersones"
+
+msgid "File transfer server"
+msgstr "Servidor de transferència de fitxers"
+
+msgid "File transfer port"
+msgstr "Port per transferència de fitxers"
+
+# FIXME: no poso localització perquè l'usuari ho podria
+#        confondre amb "ubicació" (josep)
+msgid "Chat room locale"
+msgstr "Característiques locals de la sala de xat"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Bloca invitacions a conferències i sales de xat"
+
+msgid "Chat room list URL"
+msgstr "URL de la llista de sales de xat"
+
+msgid "Yahoo Chat server"
+msgstr "Servidor de xat de Yahoo"
+
+msgid "Yahoo Chat port"
+msgstr "Port del xat de Yahoo"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "ID de Yahoo..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Connector per al protocol Yahoo"
+
 msgid "Your SMS was not delivered"
 msgstr "No s'ha enviat l'SMS"
 
@@ -9516,21 +9566,20 @@ msgstr "S'ha rebutjat afegir l'amic"
 msgid "Received invalid data"
 msgstr "S'han rebut dades invàlides"
 
-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."
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
 msgstr ""
 "El compte està blocat perquè s'ha intentat entrar massa cops.\n"
 "Això es pot solucionar entrant al web de Yahoo!"
 
 #. indicates a lock of some description
+#, fuzzy
 msgid ""
-"Account locked: Unknown reason.\n"
-"Logging into the Yahoo! website may fix this."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 "El compte està blocat, però no se'n coneix el motiu.\n"
 "Això es pot solucionar entrant al web de Yahoo!"
@@ -9572,40 +9621,33 @@ msgstr ""
 "S'ha produït un error desconegut, número %d. Això es pot solucionar entrant "
 "al web de Yahoo!"
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "No s'ha pogut afegir l'amic %s al grup %s a la llista del servidor del "
 "compte %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "No s'ha pogut afegir l'amic a la llista del servidor"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "S'ha rebut una resposta HTTP inesperada del servidor."
 
-msgid "Connection problem"
-msgstr "Hi ha un problema de connexió"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "S'ha perdut la connexió amb %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"No s'ha pogut establir la connexió amb %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "No s'ha pogut establir una connexió amb el servidor"
 
 msgid "Not at Home"
 msgstr "Fora de casa"
@@ -9667,75 +9709,15 @@ msgstr "Entra a un xat d'un usuari..."
 msgid "Open Inbox"
 msgstr "Obre la safata d'entrada"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;sala&gt;:  entra en una sala de xat de la xarxa Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  llista les sales de la xarxa Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: fa una petició a l'usuari per iniciar una sessió Doodle"
-
-msgid "Yahoo ID..."
-msgstr "ID de Yahoo..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Connector per al protocol Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japó"
-
-msgid "Pager server"
-msgstr "Servidor de cercapersones"
-
-msgid "Japan Pager server"
-msgstr "Servidor de cercapersones del Japó"
-
-msgid "Pager port"
-msgstr "Port per al cercapersones"
-
-msgid "File transfer server"
-msgstr "Servidor de transferència de fitxers"
-
-msgid "Japan file transfer server"
-msgstr "Servidor de transferència de fitxers del Japó"
-
-msgid "File transfer port"
-msgstr "Port per transferència de fitxers"
-
-# FIXME: no poso localització perquè l'usuari ho podria
-#        confondre amb "ubicació" (josep)
-msgid "Chat room locale"
-msgstr "Característiques locals de la sala de xat"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Bloca invitacions a conferències i sales de xat"
-
-msgid "Chat room list URL"
-msgstr "URL de la llista de sales de xat"
-
-msgid "Yahoo Chat server"
-msgstr "Servidor de xat de Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "Port del xat de Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Envia la sol·licitud d'un dibuix."
 
+msgid "Unable to connect."
+msgstr "No s'ha pogut connectar."
+
 msgid "Unable to establish file descriptor."
 msgstr "No s'ha pogut establir un descriptor de fitxer."
 
@@ -9743,6 +9725,9 @@ msgstr "No s'ha pogut establir un descriptor de fitxer."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s està intentant enviar-vos un grup de %d fitxers.\n"
 
+msgid "Write Error"
+msgstr "Error d'escriptura"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Perfil Yahoo! japonès"
 
@@ -9859,23 +9844,19 @@ msgstr "Veus"
 msgid "Webcams"
 msgstr "Càmeres web"
 
+msgid "Connection problem"
+msgstr "Hi ha un problema de connexió"
+
 msgid "Unable to fetch room list."
 msgstr "No s'ha pogut obtenir la llista de sales."
 
 msgid "User Rooms"
 msgstr "Sales d'usuari"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Problema de connexió amb el servidor YCHT."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"S'ha perdut la connexió al servidor\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10009,16 +9990,8 @@ msgstr "Regne"
 msgid "Exposure"
 msgstr "Exposició"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"No s'ha pogut crear el sòcol:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
 "No s'ha pogut analitzar la resposta del servidor intermediari d'HTTP: %s\n"
 
@@ -10027,8 +10000,8 @@ msgid "HTTP proxy connection error %d"
 msgstr "Error en la connexió al servidor intermediari d'HTTP %d"
 
 # FIXME: tunelitzar... tunelar? fer un túnel?
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "S'ha denegat l'accés: el servidor intermediari d'HTTP prohibeix la "
 "tunelització del port %d"
@@ -10037,9 +10010,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr "S'ha produït un error en resoldre %s"
 
-msgid "Could not resolve host name"
-msgstr "No s'ha pogut resoldre el nom de l'ordinador"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "S'està reclamant l'atenció de %s..."
@@ -10245,14 +10215,6 @@ msgid "Unable to connect to %s: %s"
 msgstr "No s'ha pogut connectar a %s: %s"
 
 #, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"No s'ha pogut connectar a %s: el servidor requereix TLS/SSL, però no s'ha "
-"trobat cap implementació de TLS/SSL."
-
-#, c-format
 msgid " - %s"
 msgstr " - %s"
 
@@ -14459,6 +14421,157 @@ msgstr "Envia i rep blocs XMPP en brut."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "No s'ha pogut obrir el sòcol"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "No s'ha pogut escoltar al sòcol"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "No s'ha pogut llegir el sòcol"
+
+#~ msgid "Connection failed."
+#~ msgstr "Ha fallat la connexió."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "El servidor ha desconnectat"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "No s'ha pogut crear el sòcol"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "No s'ha pogut connectar a l'ordinador"
+
+#~ msgid "Read error"
+#~ msgstr "Error de lectura"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No s'ha pogut establir una connexió amb el servidor:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Error d'escriptura"
+
+#~ msgid "Read Error"
+#~ msgstr "Error de lectura"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "No s'ha pogut connectar al servidor."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "La memòria intermèdia de lectura és plena (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "No es pot analitzar el missatge"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "No s'ha pogut connectar a l'ordinador: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Ha fallat l'entrada (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Se us ha desconnectat perquè heu entrat a través d'una altra estació de "
+#~ "treball."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Error. No hi ha instal·lades les biblioteques per a SSL."
+
+#~ msgid "Incorrect password."
+#~ msgstr "La contrasenya no és correcta."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No s'ha pogut connectar al servidor BOS:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "Se us pot desconnectar d'aquí a poc temps. Comproveu si hi ha "
+#~ "actualitzacions a %s."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "No s'ha pogut connectar"
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "No s'ha pogut desxifrar la resposta del servidor"
+
+#~ msgid "Invalid username."
+#~ msgstr "El nom d'usuari no és vàlid"
+
+#~ msgid "Connection lost"
+#~ msgstr "S'ha perdut la connexió"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "No s'ha pogut obtenir l'adreça de l'ordinador"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "S'ha tancat la connexió (escrivint)"
+
+#~ msgid "Connection reset"
+#~ msgstr "S'ha reiniciat la connexió"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "S'ha produït un error en llegir del sòcol: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "No s'ha pogut connectar a l'ordinador"
+
+#~ msgid "Could not write"
+#~ msgstr "No s'ha pogut escriure"
+
+#~ msgid "Could not connect"
+#~ msgstr "No s'ha pogut connectar"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "No s'ha pogut crear el sòcol per a escoltar"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "No s'ha pogut resoltre el nom de l'ordinador"
+
+#~ msgid "Incorrect Password"
+#~ msgstr "La contrasenya no és correcta"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No s'ha pogut establir la connexió amb %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japó"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Servidor de cercapersones del Japó"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Servidor de transferència de fitxers del Japó"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "S'ha perdut la connexió al servidor\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "No s'ha pogut resoldre el nom de l'ordinador"
+
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "No s'ha pogut connectar a %s: el servidor requereix TLS/SSL, però no s'ha "
+#~ "trobat cap implementació de TLS/SSL."
+
 #~ msgid "Last Activity"
 #~ msgstr "Darrera activitat"
 
@@ -15065,13 +15178,6 @@ msgstr "Aquest connector és útil per a depurar servidors i clients XMPP."
 #~ "El MySpace no permet contrasenyes més llarges de %d caràcters, la vostra "
 #~ "en té %d."
 
-#~ msgid ""
-#~ "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username and choose a username and try to login again."
-#~ msgstr ""
-#~ "Aneu a http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username escolliu un nom d'usuari i torneu a provar d'entrar."
-
 #~ msgid "Screen name sent"
 #~ msgstr "S'ha enviat el nom d'usuari"
 
diff --git a/po/ca@valencia.po b/po/ca@valencia.po
index eb9896ebbe..9efd4f3965 100644
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -33,7 +33,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2009-01-05 20:36+0100\n"
 "Last-Translator: Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.net>\n"
@@ -2618,9 +2618,10 @@ msgstr ""
 "Inclou registres d'altres clients de MI en el visualitzador de registres."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2675,8 +2676,9 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 "Alça els missatges que s'hagen enviat a un usuari fora de línia com a avís"
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "La resta de missatges s'alçaran com a un avís. Podeu editar o suprimir "
@@ -2925,15 +2927,17 @@ msgstr ""
 "No s'ha pogut detectar la instal·lació d'ActiveTCL. Si voleu emprar "
 "connectors TCL, instal·leu l'ActiveTCL de http://www.activestate.com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "No s'ha pogut trobar el joc d'eines per a Windows de l'Apple Bonjour, "
 "consulteu les preguntes més freqüents a http://developer.pidgin.im/"
 "BonjourWindows per a més informació."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "No es poden escoltar connexions entrants de MI\n"
 
 msgid ""
@@ -2989,14 +2993,21 @@ msgstr "%s ha finalitzat la conversa."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "No s'ha pogut enviar el missatge, no s'ha pogut iniciar la conversa."
 
-msgid "Cannot open socket"
-msgstr "No s'ha pogut obrir el sòcol"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"No s'ha pogut crear el sòcol:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "No s'ha pogut vincular el sòcol al port"
 
-msgid "Could not listen on socket"
-msgstr "No s'ha pogut escoltar al sòcol"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"No s'ha pogut crear el sòcol:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
@@ -3046,13 +3057,16 @@ msgstr "Alça la llista d'amics..."
 msgid "Load buddylist from file..."
 msgstr "Carrega la llista d'amics d'un fitxer..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Empleneu els camps de registre."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Les contrasenyes no coincideixen."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "No s'ha pogut registrar el nou compte. S'ha produït un error.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3064,14 +3078,15 @@ msgstr "S'ha registrat amb èxit."
 msgid "Password"
 msgstr "Contrasenya"
 
-msgid "Password (retype)"
-msgstr "Contrasenya (torneu-la a escriure)"
+msgid "Password (again)"
+msgstr "Contrasenya (repetiu-la)"
 
-msgid "Enter current token"
-msgstr "Introduïu el testimoni actual"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Testimoni actual"
+#, fuzzy
+msgid "Captcha"
+msgstr "Imatge captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registra un compte Gadu-Gadu nou"
@@ -3124,6 +3139,15 @@ msgstr "S'ha canviat la contrasenya."
 msgid "Current password"
 msgstr "Contrasenya actual"
 
+msgid "Password (retype)"
+msgstr "Contrasenya (torneu-la a escriure)"
+
+msgid "Enter current token"
+msgstr "Introduïu el testimoni actual"
+
+msgid "Current token"
+msgstr "Testimoni actual"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Introduïu la contrasenya actual, i la nova per a UIN: "
 
@@ -3171,7 +3195,7 @@ msgstr "No s'ha trobat cap usuari que coincidisca"
 msgid "There are no users matching your search criteria."
 msgstr "No hi ha usuaris que coincidisquen amb el vostre criteri de cerca."
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "No s'ha pogut llegir el sòcol"
 
 msgid "Buddy list downloaded"
@@ -3186,8 +3210,14 @@ msgstr "S'ha pujat la llista d'amics"
 msgid "Your buddy list was stored on the server."
 msgstr "S'ha alçat la vostra llista d'amics al servidor."
 
-msgid "Connection failed."
-msgstr "Ha fallat la connexió."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Connectat"
+
+msgid "Connection failed"
+msgstr "Ha fallat la connexió"
 
 msgid "Add to chat"
 msgstr "Afig al xat"
@@ -3195,18 +3225,23 @@ msgstr "Afig al xat"
 msgid "Chat _name:"
 msgstr "_Nom del xat:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "No s'ha pogut resoldre el nom de l'ordinador."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "S'està connectant"
+
 msgid "Chat error"
 msgstr "Error en el xat"
 
 msgid "This chat name is already in use"
 msgstr "Este nom de xat ja existix"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "No esteu connectat al servidor."
 
 msgid "Find buddies..."
@@ -3266,7 +3301,8 @@ msgstr "No hi ha cap tema establit"
 msgid "File Transfer Failed"
 msgstr "Ha fallat la transferència del fitxer"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "No s'ha pogut obrir cap port on escoltar."
 
 msgid "Error displaying MOTD"
@@ -3282,8 +3318,18 @@ msgstr "No hi ha cap frase del dia associada a esta connexió."
 msgid "MOTD for %s"
 msgstr "Frase del dia per a %s"
 
-msgid "Server has disconnected"
-msgstr "El servidor ha desconnectat"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"S'ha perdut la connexió amb el servidor:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Mostra la frase del dia"
@@ -3298,22 +3344,20 @@ msgstr "_Contrasenya:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "Els sobrenoms d'IRC no poden contindre espais en blanc"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "S'està connectant"
-
 msgid "SSL support unavailable"
 msgstr "El suport per a SSL no està disponible"
 
-msgid "Couldn't create socket"
-msgstr "No s'ha pogut crear el sòcol"
+msgid "Unable to connect"
+msgstr "No s'ha pogut connectar"
 
-msgid "Couldn't connect to host"
-msgstr "No s'ha pogut connectar a l'ordinador"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "No s'ha pogut connectar a %s"
 
-msgid "Read error"
-msgstr "Error de lectura"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "El servidor ha tancat la connexió."
 
 msgid "Users"
 msgstr "Usuaris"
@@ -3742,11 +3786,13 @@ msgstr "Ha fallat l'orde «Ad-Hoc»"
 msgid "execute"
 msgstr "executa"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "El servidor requerix TLS/SSL per entrar. No s'ha trobat suport per a TLS/SSL."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "Heu requerit que es xifri, però no s'ha trobat cap implementació de TLS/SSL."
 
@@ -3764,7 +3810,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Autenticació de text"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Ha fallat l'autenticació"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "La resposta del servidor no és vàlida."
 
 msgid "Server does not use any supported authentication method"
@@ -3776,7 +3827,8 @@ msgstr "Requeriu xifratge, però no està disponible en este servidor."
 msgid "Invalid challenge from server"
 msgstr "Repte del servidor invàlid"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Error en el SASL"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3796,10 +3848,8 @@ msgstr ""
 "No s'ha pogut establir una connexió amb al servidor:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "No s'ha pogut establir una connexió amb al servidor:\n"
 "%s"
@@ -3808,12 +3858,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "No s'ha pogut inicialitzar la connexió"
 
-msgid "Unable to create socket"
-msgstr "No s'ha pogut crear el sòcol"
-
-msgid "Write error"
-msgstr "Error d'escriptura"
-
 msgid "Full Name"
 msgstr "Nom"
 
@@ -3884,172 +3928,6 @@ msgstr "Sistema operatiu"
 msgid "Local Time"
 msgstr "Fitxer local:"
 
-msgid "Last Activity"
-msgstr "Darrera activitat"
-
-msgid "Service Discovery Info"
-msgstr "Informació del servici de descoberta"
-
-msgid "Service Discovery Items"
-msgstr "Elements del servici de descoberta"
-
-# http://xmpp.org/extensions/xep-0033.html
-msgid "Extended Stanza Addressing"
-msgstr "Bloc d'adreçament estés"
-
-msgid "Multi-User Chat"
-msgstr "Xat multi-usuari"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Informació de presència estesa per a xats multi-usuari"
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr "Ordes Ad-Hoc"
-
-msgid "PubSub Service"
-msgstr "Servici PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "Flux de bits SOCK5"
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr ""
-
-msgid "User Location"
-msgstr "Ubicació de l'usuari"
-
-msgid "User Avatar"
-msgstr "Avatar de l'usuari"
-
-msgid "Chat State Notifications"
-msgstr "Notificacions de l'estat del xat"
-
-msgid "Software Version"
-msgstr "Versió del programari"
-
-msgid "Stream Initiation"
-msgstr "Iniciació del flux"
-
-msgid "File Transfer"
-msgstr "Transferència de fitxers"
-
-msgid "User Mood"
-msgstr "Estat d'ànim de l'usuari"
-
-msgid "User Activity"
-msgstr "Activitat de l'usuari"
-
-msgid "Entity Capabilities"
-msgstr "Capacitats de l'entitat"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Negociacions de la sessió xifrada"
-
-# Pot ser també música, cançó... (josep)
-# Vegeu: http://xmpp.org/extensions/xep-0118.html
-msgid "User Tune"
-msgstr "Melodia de l'usuari"
-
-# Nota: "Roster" en XMPP és la llista de contactes (josep)
-msgid "Roster Item Exchange"
-msgstr "Intercanvi d'element de la llista de contactes"
-
-# Vegeu: http://xmpp.org/extensions/xep-0152.html (josep)
-# Nota: codi mort
-msgid "Reachability Address"
-msgstr "Adreça de localització"
-
-msgid "User Profile"
-msgstr "Perfil de l'usuari"
-
-# Nota: Jingle és una extensió d'XMPP i ho considerem nom propi (josep)
-# http://www.xmpp.org/extensions/xep-0166.html
-msgid "Jingle"
-msgstr "Jingle"
-
-# FIXME
-msgid "Jingle Audio"
-msgstr "Àudio amb Jingle"
-
-msgid "User Nickname"
-msgstr "Sobrenom de l'usuari"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle Raw UDP"
-
-msgid "Jingle Video"
-msgstr "Vídeo amb Jingle"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Recepció de missatges"
-
-msgid "Public Key Publishing"
-msgstr "Publicació de claus públiques"
-
-msgid "User Chatting"
-msgstr "Converses d'usuari"
-
-msgid "User Browsing"
-msgstr "Navegació d'usuaris"
-
-msgid "User Gaming"
-msgstr "Jocs d'usuari"
-
-msgid "User Viewing"
-msgstr "Visualització d'usuaris"
-
-msgid "Ping"
-msgstr "Ping"
-
-# Vegeu: http://xmpp.org/extensions/xep-0200.html
-# Nota: Això es refereix a les capabilitats de l'altre interlocutor
-# No apareix a l'aplicació final, és codi mort dins un #if 0 ... #endif (josep)
-msgid "Stanza Encryption"
-msgstr "Blocs xifrats"
-
-msgid "Entity Time"
-msgstr "Hora de l'entitat"
-
-msgid "Delayed Delivery"
-msgstr "Lliurament endarrerit"
-
-msgid "Collaborative Data Objects"
-msgstr "Objectes de dades col·laboratius"
-
-msgid "File Repository and Sharing"
-msgstr "Dipòsit de fitxers i compartició"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "Servici de descoberta STUN per al Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Negociació simple del xifratge de la sessió"
-
-# Mireu l'RFC (josep)
-msgid "Hop Check"
-msgstr "Comprovació dels salts"
-
-msgid "Capabilities"
-msgstr "Capacitats"
-
 msgid "Priority"
 msgstr "Prioritat"
 
@@ -4061,7 +3939,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Connectat"
 
 # Segons la viquipèdia
@@ -4244,16 +4122,13 @@ msgstr "No s'ha trobat cap usuari que coincidisca"
 msgid "Roles:"
 msgstr "Rol"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Temps d'espera del ping"
 
-msgid "Read Error"
-msgstr "Error de lectura"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4430,9 +4305,6 @@ msgstr "La vostra contrasenya s'ha canviat."
 msgid "Error changing password"
 msgstr "S'ha produït un error en canviar la contrasenya"
 
-msgid "Password (again)"
-msgstr "Contrasenya (repetiu-la)"
-
 msgid "Change XMPP Password"
 msgstr "Canvia la contrasenya de l'XMPP"
 
@@ -4822,6 +4694,14 @@ msgstr "Error en l'anàlisi de l'XML"
 msgid "Unknown Error in presence"
 msgstr "Error desconegut en la presència"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "S'ha produït un error en entrar al xat %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "S'ha produït un error en el xat %s"
+
 msgid "Create New Room"
 msgstr "Crea una nova sala"
 
@@ -4838,16 +4718,20 @@ msgstr "_Configura la sala"
 msgid "_Accept Defaults"
 msgstr "_Accepta els valors predeterminats"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "S'ha produït un error en entrar al xat %s"
+#, fuzzy
+msgid "No reason"
+msgstr "No s'ha indicat cap motiu"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "S'ha produït un error en el xat %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "%s us ha fet fora: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s us ha fet fora (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "S'ha produït un error en obrir el fitxer."
 
 #, fuzzy
@@ -5340,9 +5224,6 @@ msgstr "Inicia un _xat"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "L'MSN necessita SSL, instal·leu alguna biblioteca d'SSL permesa."
 
-msgid "Failed to connect to server."
-msgstr "No s'ha pogut connectar al servidor."
-
 msgid "Error retrieving profile"
 msgstr "S'ha produït un error en recuperar el perfil"
 
@@ -5600,9 +5481,6 @@ msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 "No s'ha pogut enviar el missatge perquè s'ha produït un error desconegut."
 
-msgid "Unable to connect"
-msgstr "No s'ha pogut connectar"
-
 msgid "Writing error"
 msgstr "Error en escriure"
 
@@ -5617,13 +5495,16 @@ msgstr ""
 "S'ha produït un error de connexió del servidor %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "El servidor no implementa el nostre protocol."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "S'ha produït un error en analitzar HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Us heu connectat des d'un altre lloc."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5631,7 +5512,8 @@ msgstr ""
 "Els servidors MSN estan temporalment no disponibles. Espereu i proveu-ho més "
 "tard."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Els servidors MSN no seran accessibles temporalment."
 
 #, c-format
@@ -5644,9 +5526,6 @@ 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ó"
 
@@ -5756,6 +5635,9 @@ msgstr "Connector per al protocol MSN"
 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)"
@@ -5868,12 +5750,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Addició de contactes del servidor"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Connectat"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "S'ha produït un error en el protocol amb codi %d: %s"
@@ -5897,16 +5773,6 @@ msgstr "S'ha produït un error en el MySpaceIM"
 msgid "Invalid input condition"
 msgstr "La condició d'entrada no és vàlida"
 
-msgid "Read buffer full (2)"
-msgstr "La memòria intermèdia de lectura és plena (2)"
-
-msgid "Unparseable message"
-msgstr "No es pot analitzar el missatge"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "No s'ha pogut connectar a l'ordinador: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "No s'ha pogut afegir l'amic"
 
@@ -5996,6 +5862,15 @@ msgstr "Nombre d'amics"
 msgid "Client Version"
 msgstr "Versió del client"
 
+#, fuzzy
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"Aneu a http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"escolliu un nom d'usuari i torneu a provar d'entrar."
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - El nom d'usuari està disponible"
 
@@ -6257,9 +6132,9 @@ msgstr "L'usuari està fora de línia o bé esteu blocat"
 msgid "Unknown error: 0x%X"
 msgstr "Error desconegut: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Ha fallat l'entrada (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "No s'ha pogut fer ping a l'usuari %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6370,9 +6245,6 @@ msgstr "Conferència GroupWise %d"
 msgid "Authenticating..."
 msgstr "S'està autenticant..."
 
-msgid "Unable to connect to server."
-msgstr "No s'ha pogut connectar al servidor."
-
 msgid "Waiting for response..."
 msgstr "S'està esperant una resposta..."
 
@@ -6396,11 +6268,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Voleu afegir-vos a la conversa?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Se us ha desconnectat perquè heu entrat a través d'una altra estació de "
-"treball."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6408,16 +6275,14 @@ msgstr ""
 "És possible que %s no estiga en línia, i no haja rebut el missatge que li "
 "acabeu d'enviar."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "No s'ha pogut connectar al servidor. Introduïu l'adreça del servidor al qual "
 "us vulgueu connectar."
 
-msgid "Error. SSL support is not installed."
-msgstr "Error. No hi ha instal·lades les biblioteques per a SSL."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "S'ha tancat esta conferència. No s'hi poden enviar més missatges."
 
@@ -6457,10 +6322,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6469,18 +6331,8 @@ msgstr "No s'ha pogut entrar a la sala de xat"
 msgid "Invalid chat room name"
 msgstr "El nom de sala de xat no és vàlid"
 
-msgid "Server closed the connection."
-msgstr "El servidor ha tancat la connexió."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"S'ha perdut la connexió amb el servidor:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "S'han rebut dades invàlides a la connexió amb el servidor."
 
 #. *< type
@@ -6528,7 +6380,8 @@ msgstr "S'ha perdut la connexió amb l'usuari remot:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "S'han rebut dades invàlides a la connexió amb l'usuari remot."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "No s'ha pogut establir una connexió amb l'usuari remot."
 
 msgid "Direct IM established"
@@ -6730,21 +6583,15 @@ msgstr "Nivell d'avís"
 msgid "Buddy Comment"
 msgstr "Comentari de l'amic"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "No s'ha pogut connectar al servidor d'autenticació:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"No s'ha pogut connectar al servidor BOS:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "No s'ha pogut connectar al servidor."
 
 msgid "Username sent"
 msgstr "S'ha enviat el nom d'usuari"
@@ -6756,11 +6603,11 @@ msgstr "Connexió establerta, s'està enviant el secret"
 msgid "Finalizing connection"
 msgstr "S'està finalitzant la connexió"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "No s'ha pogut entrar: no s'ha pogut entrar com a %s perquè el nom d'usuari "
 "no és vàlid. Els noms d'usuari han de ser adreces de correu vàlides, o "
@@ -6777,28 +6624,22 @@ msgstr ""
 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"
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "L'usuari no existix."
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "El vostre compte està actualment suspès."
 
 #. service temporarily unavailable
@@ -6820,7 +6661,8 @@ msgstr ""
 "deu minuts i intenteu-ho de nou. Si continueu intentant-ho, haureu d'esperar "
 "encara més temps."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "La clau SecurID que heu entrat no és vàlida."
 
 msgid "Enter SecurID"
@@ -6990,6 +6832,9 @@ msgstr "En línia des de"
 msgid "Member Since"
 msgstr "Membre des de"
 
+msgid "Capabilities"
+msgstr "Capacitats"
+
 msgid "Profile"
 msgstr "Perfil"
 
@@ -7170,9 +7015,9 @@ msgstr[1] ""
 msgid "Away message too long."
 msgstr "El missatge d'absència és massa llarg."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7196,9 +7041,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Orfes"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "No s'ha pogut afegir l'amic %s perquè hi ha massa entrades a la llista "
@@ -7207,8 +7052,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(sense nom)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Per motius desconeguts no s'ha pogut afegir l'amic %s."
 
 #, c-format
@@ -7994,7 +7839,8 @@ msgstr "Interval de permanència (en segons)"
 msgid "Update interval (seconds)"
 msgstr "Interval d'actualització (en segons)"
 
-msgid "Cannot decrypt server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "No es pot desxifrar la resposta del servidor"
 
 #, c-format
@@ -8019,9 +7865,6 @@ msgstr "Cal activació"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "No s'ha reconegut el codi de resposta en entrar (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "No s'ha pogut desxifrar la resposta del servidor"
-
 # FIXME: captcha
 msgid "Requesting captcha"
 msgstr "S'està sol·licitant un capcha"
@@ -8057,29 +7900,18 @@ msgstr ""
 "No s'ha reconegut el codi de resposta en entrar (0x%02X):\n"
 "%s"
 
-msgid "Unable to connect."
-msgstr "No s'ha pogut connectar."
-
 msgid "Socket error"
 msgstr "Error del sòcol"
 
-msgid "Unable to read from socket"
-msgstr "No s'ha pogut llegir el sòcol"
-
-msgid "Write Error"
-msgstr "Error d'escriptura"
-
-msgid "Connection lost"
-msgstr "S'ha perdut la connexió"
-
 msgid "Getting server"
 msgstr "S'està obtenint el servidor"
 
 msgid "Requesting token"
 msgstr "S'està sol·licitant un testimoni"
 
-msgid "Couldn't resolve host"
-msgstr "No s'ha pogut obtindre l'adreça de l'ordinador"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "No s'ha pogut resoldre el nom de l'ordinador."
 
 msgid "Invalid server or port"
 msgstr "El servidor o el port no són vàlids"
@@ -8132,7 +7964,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "Orde QQ Qun"
 
-msgid "Could not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "No s'ha pogut desxifrar la resposta d'entrada"
 
 msgid "Unknown LOGIN CMD"
@@ -8152,9 +7985,6 @@ msgstr "S'ha enviat el fitxer"
 msgid "%d canceled the transfer of %s"
 msgstr "%d ha cancel·lat la transferència de %s"
 
-msgid "Connection closed (writing)"
-msgstr "S'ha tancat la connexió (escrivint)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Títol del grup:</b> %s<br>"
@@ -8210,17 +8040,6 @@ msgstr "Un administrador de Sametime ha enviat este anunci en el servidor %s"
 msgid "Sametime Administrator Announcement"
 msgstr "Anunci de l'administrador de Sametime"
 
-msgid "Connection reset"
-msgstr "S'ha reiniciat la connexió"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "S'ha produït un error en llegir del sòcol: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "No s'ha pogut connectar a l'ordinador"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Avís de %s"
@@ -8243,6 +8062,9 @@ msgstr "Altaveus"
 msgid "Video Camera"
 msgstr "Càmera de vídeo"
 
+msgid "File Transfer"
+msgstr "Transferència de fitxers"
+
 msgid "Supports"
 msgstr "Permet"
 
@@ -9061,6 +8883,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Estadístiques de xarxa"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ha fallat el ping"
 
@@ -9124,7 +8949,8 @@ msgstr "El tipus de la clau pública no està suportat"
 msgid "Disconnected by server"
 msgstr "El servidor us ha desconnectat"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "S'ha produït un error en connectar al servidor SILC"
 
 msgid "Key Exchange failed"
@@ -9136,26 +8962,26 @@ msgstr ""
 "No s'ha pogut restablir la sessió anteriorment separada. Premeu «Torna a "
 "connectar» per crear una nova connexió."
 
-msgid "Connection failed"
-msgstr "Ha fallat la connexió"
-
 msgid "Performing key exchange"
 msgstr "S'estan intercanviant les claus"
 
-msgid "Unable to create connection"
-msgstr "No s'ha pogut crear la connexió"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "No s'ha pogut carregar el parell de claus SILC"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "S'està connectant al servidor SILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "No s'ha pogut carregar el parell de claus SILC"
+
 msgid "Out of memory"
 msgstr "Sense memòria"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "No s'ha pogut inicialitzar el protocol SILC"
 
 msgid "Error loading SILC key pair"
@@ -9453,7 +9279,8 @@ msgstr "Signa i verifica digitalment tots els missatges"
 msgid "Creating SILC key pair..."
 msgstr "S'està creant el parell de claus SILC..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "No s'ha pogut crear el parell de claus SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9547,6 +9374,9 @@ msgstr "Pissarra"
 msgid "No server statistics available"
 msgstr "No hi ha estadístiques del servidor disponibles"
 
+msgid "Error during connecting to SILC Server"
+msgstr "S'ha produït un error en connectar al servidor SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Error: les versions no coincideixen, actualitzeu el client"
@@ -9592,30 +9422,27 @@ msgstr "Error: la galeta no és vàlida"
 msgid "Failure: Authentication failed"
 msgstr "Error: ha fallat l'autenticació"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "No s'ha pogut inicialitzar la connexió per al client SILC"
 
 msgid "John Noname"
 msgstr "Pepet Sensenom"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "No s'ha pogut carregar la parella de claus SILC: %s"
 
-msgid "Could not write"
-msgstr "No s'ha pogut escriure"
-
-msgid "Could not connect"
-msgstr "No s'ha pogut connectar"
+msgid "Unable to create connection"
+msgstr "No s'ha pogut crear la connexió"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Resposta desconeguda del servidor."
 
-msgid "Could not create listen socket"
-msgstr "No s'ha pogut crear el sòcol per a escoltar"
-
-msgid "Could not resolve hostname"
-msgstr "No s'ha pogut resoltre el nom de l'ordinador"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "No s'ha pogut crear el sòcol"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Els noms d'usuari SIP no poden contindre espais en blanc ni @"
@@ -9657,6 +9484,79 @@ msgstr "Usuari Auth"
 msgid "Auth Domain"
 msgstr "Domini Auth"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;sala&gt;:  entra en una sala de xat de la xarxa Yahoo"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  llista les sales de la xarxa Yahoo"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: fa una petició a l'usuari per iniciar una sessió Doodle"
+
+msgid "Yahoo ID..."
+msgstr "ID de Yahoo..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Connector per al protocol Yahoo"
+
+msgid "Pager server"
+msgstr "Servidor de cercapersones"
+
+msgid "Pager port"
+msgstr "Port per al cercapersones"
+
+msgid "File transfer server"
+msgstr "Servidor de transferència de fitxers"
+
+msgid "File transfer port"
+msgstr "Port per transferència de fitxers"
+
+# FIXME: no poso localització perquè l'usuari ho podria
+#        confondre amb "ubicació" (josep)
+msgid "Chat room locale"
+msgstr "Característiques locals de la sala de xat"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Bloca invitacions a conferències i sales de xat"
+
+msgid "Chat room list URL"
+msgstr "URL de la llista de sales de xat"
+
+msgid "Yahoo Chat server"
+msgstr "Servidor de xat de Yahoo"
+
+msgid "Yahoo Chat port"
+msgstr "Port del xat de Yahoo"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "ID de Yahoo..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Connector per al protocol Yahoo"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9689,30 +9589,20 @@ msgstr "S'ha rebutjat afegir l'amic"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  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!"
@@ -9755,39 +9645,34 @@ msgstr ""
 "S'ha produït un error desconegut, número %d. Això es pot solucionar entrant "
 "al web de Yahoo!"
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "No s'ha pogut afegir l'amic %s al grup %s a la llista del servidor del "
 "compte %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "No s'ha pogut afegir l'amic a la llista del servidor"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "S'ha rebut una resposta HTTP inesperada del servidor."
 
-msgid "Connection problem"
-msgstr "Hi ha un problema de connexió"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "S'ha perdut la connexió amb %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"No s'ha pogut establir la connexió amb %s:\n"
+"No s'ha pogut establir una connexió amb al servidor:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9850,75 +9735,15 @@ msgstr "Entra a un xat d'un usuari..."
 msgid "Open Inbox"
 msgstr "Obri la safata d'entrada"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;sala&gt;:  entra en una sala de xat de la xarxa Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  llista les sales de la xarxa Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: fa una petició a l'usuari per iniciar una sessió Doodle"
-
-msgid "Yahoo ID..."
-msgstr "ID de Yahoo..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Connector per al protocol Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japó"
-
-msgid "Pager server"
-msgstr "Servidor de cercapersones"
-
-msgid "Japan Pager server"
-msgstr "Servidor de cercapersones del Japó"
-
-msgid "Pager port"
-msgstr "Port per al cercapersones"
-
-msgid "File transfer server"
-msgstr "Servidor de transferència de fitxers"
-
-msgid "Japan file transfer server"
-msgstr "Servidor de transferència de fitxers del Japó"
-
-msgid "File transfer port"
-msgstr "Port per transferència de fitxers"
-
-# FIXME: no poso localització perquè l'usuari ho podria
-#        confondre amb "ubicació" (josep)
-msgid "Chat room locale"
-msgstr "Característiques locals de la sala de xat"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Bloca invitacions a conferències i sales de xat"
-
-msgid "Chat room list URL"
-msgstr "URL de la llista de sales de xat"
-
-msgid "Yahoo Chat server"
-msgstr "Servidor de xat de Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "Port del xat de Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Envia la sol·licitud d'un dibuix."
 
+msgid "Unable to connect."
+msgstr "No s'ha pogut connectar."
+
 msgid "Unable to establish file descriptor."
 msgstr "No s'ha pogut establir un descriptor de fitxer."
 
@@ -9926,6 +9751,9 @@ msgstr "No s'ha pogut establir un descriptor de fitxer."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s està intentant enviar-vos un grup de %d fitxers.\n"
 
+msgid "Write Error"
+msgstr "Error d'escriptura"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Perfil Yahoo! japonés"
 
@@ -10041,23 +9869,19 @@ msgstr "Veus"
 msgid "Webcams"
 msgstr "Càmeres web"
 
+msgid "Connection problem"
+msgstr "Hi ha un problema de connexió"
+
 msgid "Unable to fetch room list."
 msgstr "No s'ha pogut obtindre la llista de sales."
 
 msgid "User Rooms"
 msgstr "Sales d'usuari"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Problema de connexió amb el servidor YCHT."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"S'ha perdut la connexió al servidor\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10189,16 +10013,8 @@ msgstr "Regne"
 msgid "Exposure"
 msgstr "Exposició"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"No s'ha pogut crear el sòcol:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
 "No s'ha pogut analitzar la resposta del servidor intermediari d'HTTP: %s\n"
 
@@ -10207,8 +10023,8 @@ msgid "HTTP proxy connection error %d"
 msgstr "Error en la connexió al servidor intermediari d'HTTP %d"
 
 # FIXME: tunelitzar... tunelar? fer un túnel?
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "S'ha denegat l'accés: el servidor intermediari d'HTTP prohibix la "
 "tunelització del port %d"
@@ -10217,9 +10033,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr "S'ha produït un error en resoldre %s"
 
-msgid "Could not resolve host name"
-msgstr "No s'ha pogut resoldre el nom de l'ordinador"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "S'està reclamant l'atenció de %s..."
@@ -10424,13 +10237,6 @@ msgstr "S'ha produït un error en escriure a %s: %s."
 msgid "Unable to connect to %s: %s"
 msgstr "No s'ha pogut connectar a %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"El servidor requerix TLS/SSL per entrar. No s'ha trobat suport per a TLS/SSL."
-
 #, c-format
 msgid " - %s"
 msgstr " - %s"
@@ -10683,9 +10489,14 @@ msgstr "Afig un a_vís per a l'amic..."
 msgid "View _Log"
 msgstr "_Visualitza el registre"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Amaga quan estiga fora de línia"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Mostra quan estiga fora de línia"
+
 msgid "_Alias..."
 msgstr "À_lies..."
 
@@ -11195,6 +11006,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Canvia la informació d'usuari de %s"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Entreu el nom de l'ordinador al qual pertany este certificat."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Servidors SSL"
@@ -11240,7 +11055,8 @@ msgstr "Ignora"
 msgid "Get Away Message"
 msgstr "Aconseguix el missatge d'absència"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "El darrer que es digué"
 
 msgid "Unable to save icon file to disk."
@@ -12140,7 +11956,8 @@ msgstr "El color amb què pintar els enllaços."
 msgid "Hyperlink visited color"
 msgstr "Color dels enllaços visitats"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+#, fuzzy
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 "El color amb el qual es pintaran els enllaços que ja s'hagen visitat (o "
 "activat)."
@@ -12182,13 +11999,22 @@ msgstr "Color amb el qual es pintaran els missatges d'acció."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Color del nom del missatge d'acció per a missatges xiuxiuejats"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Color amb el qual es pintaran els missatges d'acció."
+
 msgid "Whisper Message Name Color"
 msgstr "Color dels missatges xiuxiuejats enviats"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Color amb el qual es pintaran els missatges d'acció."
+
 msgid "Typing notification color"
 msgstr "Color per a les notificacions de quan s'escriu"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr ""
 "El color que s'emprarà per a les notificacions indicant que s'està escrivint"
 
@@ -12597,6 +12423,10 @@ msgid ""
 msgstr ""
 "S'ha triat l'orde per al navegador «manualment», però no se n'ha indicat cap."
 
+#, fuzzy
+msgid "No message"
+msgstr "(1 missatge)"
+
 msgid "Open All Messages"
 msgstr "Obri tots els missatges"
 
@@ -12614,10 +12444,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Teniu correu electrònic.</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "(1 missatge)"
-
 msgid "The following plugins will be unloaded."
 msgstr "Es descarregaran els connectors següents."
 
@@ -12838,9 +12664,9 @@ msgstr "_Mostra la icona d'estat:"
 msgid "On unread messages"
 msgstr "Si hi ha missatges sense llegir"
 
-# REVIEW
-msgid "Conversation Window Hiding"
-msgstr "Ocultació de les finestres"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Finestres de MI"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Amaga noves converses de MI:"
@@ -12848,6 +12674,9 @@ msgstr "_Amaga noves converses de MI:"
 msgid "When away"
 msgstr "En estar absent"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "_Minimitza les finestres de conversa noves"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Pestanyes"
@@ -12906,9 +12735,6 @@ msgstr "Empra el desplaçament suau"
 msgid "F_lash window when IMs are received"
 msgstr "_Fes que la finestra faci un flaix quan hi arriben missatges"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "_Minimitza les finestres de conversa noves"
-
 msgid "Minimum input area height in lines:"
 msgstr "Alçada mínima en línies de l'àrea d'entrada:"
 
@@ -12944,7 +12770,8 @@ msgstr "No s'ha pogut iniciar el programa de configuració del navegador."
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemple: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "Detecta l'_adreça IP automàticament"
 
 msgid "Public _IP:"
@@ -13315,21 +13142,6 @@ msgstr "Alça i _fes servir"
 msgid "Status for %s"
 msgstr "Estat per a %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "Emoticona personalitzada"
-
-msgid "More Data needed"
-msgstr "Calen més dades"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Especifiqueu una drecera associada a l'emoticona."
-
 #, fuzzy, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
@@ -13337,12 +13149,12 @@ msgstr ""
 "Hi ha una emoticona personalitzada per la drecera que heu seleccionat. "
 "Indiqueu-ne una de diferent."
 
+msgid "Custom Smiley"
+msgstr "Emoticona personalitzada"
+
 msgid "Duplicate Shortcut"
 msgstr "Drecera duplicada"
 
-msgid "Please select an image for the smiley."
-msgstr "Seleccioneu una imatge per a l'emoticona."
-
 msgid "Edit Smiley"
 msgstr "Edita l'emoticona"
 
@@ -13456,9 +13268,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "No es pot enviar el llançador"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Heu arrossegat un llançador de l'escriptori. Segurament voleu enviar allò a "
 "què este llançador apunta i no pas el llançador."
@@ -14067,9 +13880,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Connector de missatgeria de música per a composar conjuntament."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "El connector per a missatgeria de música permet que diferents usuaris puguen "
 "treballar en una mateixa peça de música, editant la mateixa partitura en "
@@ -14330,9 +14144,10 @@ msgid "Conversation Window Send Button."
 msgstr "Botó d'enviar de la finestra de conversa."
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Afig un botó d'Enviar a l'àrea d'entrada de la finestra de conversa. Està "
 "pensat per situacions en què no hi ha cap teclat."
@@ -14667,8 +14482,9 @@ msgstr "Opcions del Pidgin per al Windows"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opcions específiques de la versió del Pidgin per al Windows"
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Proporciona opcions específiques per a la versió Windows del Pidgin, com ara "
 "l'acoblament de la llista d'amics."
@@ -14711,6 +14527,320 @@ msgstr "Envia i rep blocs XMPP en brut."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "No s'ha pogut obrir el sòcol"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "No s'ha pogut escoltar al sòcol"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "No s'ha pogut llegir el sòcol"
+
+#~ msgid "Connection failed."
+#~ msgstr "Ha fallat la connexió."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "El servidor ha desconnectat"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "No s'ha pogut crear el sòcol"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "No s'ha pogut connectar a l'ordinador"
+
+#~ msgid "Read error"
+#~ msgstr "Error de lectura"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No s'ha pogut establir una connexió amb al servidor:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Error d'escriptura"
+
+#~ msgid "Last Activity"
+#~ msgstr "Darrera activitat"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Informació del servici de descoberta"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Elements del servici de descoberta"
+
+# http://xmpp.org/extensions/xep-0033.html
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Bloc d'adreçament estés"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Xat multi-usuari"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Informació de presència estesa per a xats multi-usuari"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ordes Ad-Hoc"
+
+#~ msgid "PubSub Service"
+#~ msgstr "Servici PubSub"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "Flux de bits SOCK5"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "User Location"
+#~ msgstr "Ubicació de l'usuari"
+
+#~ msgid "User Avatar"
+#~ msgstr "Avatar de l'usuari"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Notificacions de l'estat del xat"
+
+#~ msgid "Software Version"
+#~ msgstr "Versió del programari"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Iniciació del flux"
+
+#~ msgid "User Mood"
+#~ msgstr "Estat d'ànim de l'usuari"
+
+#~ msgid "User Activity"
+#~ msgstr "Activitat de l'usuari"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Capacitats de l'entitat"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Negociacions de la sessió xifrada"
+
+# Pot ser també música, cançó... (josep)
+# Vegeu: http://xmpp.org/extensions/xep-0118.html
+#~ msgid "User Tune"
+#~ msgstr "Melodia de l'usuari"
+
+# Nota: "Roster" en XMPP és la llista de contactes (josep)
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Intercanvi d'element de la llista de contactes"
+
+# Vegeu: http://xmpp.org/extensions/xep-0152.html (josep)
+# Nota: codi mort
+#~ msgid "Reachability Address"
+#~ msgstr "Adreça de localització"
+
+#~ msgid "User Profile"
+#~ msgstr "Perfil de l'usuari"
+
+# Nota: Jingle és una extensió d'XMPP i ho considerem nom propi (josep)
+# http://www.xmpp.org/extensions/xep-0166.html
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+# FIXME
+#~ msgid "Jingle Audio"
+#~ msgstr "Àudio amb Jingle"
+
+#~ msgid "User Nickname"
+#~ msgstr "Sobrenom de l'usuari"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle Raw UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Vídeo amb Jingle"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Recepció de missatges"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Publicació de claus públiques"
+
+#~ msgid "User Chatting"
+#~ msgstr "Converses d'usuari"
+
+#~ msgid "User Browsing"
+#~ msgstr "Navegació d'usuaris"
+
+#~ msgid "User Gaming"
+#~ msgstr "Jocs d'usuari"
+
+#~ msgid "User Viewing"
+#~ msgstr "Visualització d'usuaris"
+
+# Vegeu: http://xmpp.org/extensions/xep-0200.html
+# Nota: Això es refereix a les capabilitats de l'altre interlocutor
+# No apareix a l'aplicació final, és codi mort dins un #if 0 ... #endif (josep)
+#~ msgid "Stanza Encryption"
+#~ msgstr "Blocs xifrats"
+
+#~ msgid "Entity Time"
+#~ msgstr "Hora de l'entitat"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Lliurament endarrerit"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Objectes de dades col·laboratius"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Dipòsit de fitxers i compartició"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "Servici de descoberta STUN per al Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Negociació simple del xifratge de la sessió"
+
+# Mireu l'RFC (josep)
+#~ msgid "Hop Check"
+#~ msgstr "Comprovació dels salts"
+
+#~ msgid "Read Error"
+#~ msgstr "Error de lectura"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "No s'ha pogut connectar al servidor."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "La memòria intermèdia de lectura és plena (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "No es pot analitzar el missatge"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "No s'ha pogut connectar a l'ordinador: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Ha fallat l'entrada (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Se us ha desconnectat perquè heu entrat a través d'una altra estació de "
+#~ "treball."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Error. No hi ha instal·lades les biblioteques per a SSL."
+
+#~ msgid "Incorrect password."
+#~ msgstr "La contrasenya no és correcta."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No s'ha pogut connectar al servidor BOS:\n"
+#~ "%s"
+
+#~ 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 "Could Not Connect"
+#~ msgstr "No s'ha pogut connectar"
+
+#~ msgid "Invalid username."
+#~ msgstr "El nom d'usuari no és vàlid"
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "No s'ha pogut desxifrar la resposta del servidor"
+
+#~ msgid "Connection lost"
+#~ msgstr "S'ha perdut la connexió"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "No s'ha pogut obtindre l'adreça de l'ordinador"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "S'ha tancat la connexió (escrivint)"
+
+#~ msgid "Connection reset"
+#~ msgstr "S'ha reiniciat la connexió"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "S'ha produït un error en llegir del sòcol: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "No s'ha pogut connectar a l'ordinador"
+
+#~ msgid "Could not write"
+#~ msgstr "No s'ha pogut escriure"
+
+#~ msgid "Could not connect"
+#~ msgstr "No s'ha pogut connectar"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "No s'ha pogut crear el sòcol per a escoltar"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "No s'ha pogut resoltre el nom de l'ordinador"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "La contrasenya no és correcta"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No s'ha pogut establir la connexió amb %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japó"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Servidor de cercapersones del Japó"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Servidor de transferència de fitxers del Japó"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "S'ha perdut la connexió al servidor\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "No s'ha pogut resoldre el nom de l'ordinador"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "El servidor requerix TLS/SSL per entrar. No s'ha trobat suport per a TLS/"
+#~ "SSL."
+
+# REVIEW
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Ocultació de les finestres"
+
+#~ msgid "More Data needed"
+#~ msgstr "Calen més dades"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Especifiqueu una drecera associada a l'emoticona."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Seleccioneu una imatge per a l'emoticona."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Quin ID voleu activar?"
 
@@ -15150,13 +15280,6 @@ msgstr "Este connector és útil per a depurar servidors i clients XMPP."
 #~ "El MySpace no permet contrasenyes més llarges de %d caràcters, la vostra "
 #~ "en té %d."
 
-#~ msgid ""
-#~ "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username and choose a username and try to login again."
-#~ msgstr ""
-#~ "Aneu a http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username escolliu un nom d'usuari i torneu a provar d'entrar."
-
 #~ msgid "Screen name sent"
 #~ msgstr "S'ha enviat el nom d'usuari"
 
diff --git a/po/cs.po b/po/cs.po
index 39e26e3fad..b556f09346 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2009-02-22 14:43+0100\n"
 "Last-Translator: David Vachulka <david@konstrukce-cad.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -2565,9 +2565,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Zahrnuje záznamy jiných klientů IM v prohlížeči záznamů."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2621,8 +2622,9 @@ msgstr "Emulace zprávy při odpojení"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Uložit zprávy poslané odpojeným uživatelům jako sledování."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Ostatní zprávy budou uloženy jako sledování. Můžete sledování upravit/"
@@ -2872,14 +2874,16 @@ msgstr ""
 "Nemohu detekovat instalaci ActiveTCL. Pokud chcete používat zásuvné moduly "
 "TCL, nainstalujte ActiveTCL z http://www.activestate.com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Apple Bonjour pro Windows toolkit nebyl nalezen, viz FAQ: http://d.pidgin.im/"
 "BonjourWindows pro další informace."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Nemohu poslouchat příchozí spojení IM\n"
 
 msgid ""
@@ -2932,14 +2936,21 @@ msgstr "%s zavřel konverzaci."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Nemohu odeslat zprávu, konverzaci nelze spustit."
 
-msgid "Cannot open socket"
-msgstr "Nemohu otevřít socket"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Nemohu vytvořit socket:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Nemohu připojit socket k portu"
 
-msgid "Could not listen on socket"
-msgstr "Nemohu poslouchat na socketu"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Nemohu vytvořit socket:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Chyba při komunikaci s lokálním mDNSResponderem."
@@ -2988,13 +2999,16 @@ msgstr "Uložit seznam kamarádů..."
 msgid "Load buddylist from file..."
 msgstr "Načíst seznam kamarádů ze serveru..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Vyplňte pole pro registraci."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Hesla nesouhlasí."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Nemohu zaregistrovat nový účet. Došlo k chybě.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3006,14 +3020,15 @@ msgstr "Registrace úspěšně dokončena!"
 msgid "Password"
 msgstr "Heslo"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr "Heslo (znovu)"
 
-msgid "Enter current token"
-msgstr "Zadejte aktuální token"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Aktuální token"
+#, fuzzy
+msgid "Captcha"
+msgstr "Captcha obrázek"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Zaregistrovat nový účet Gadu-Gadu"
@@ -3066,6 +3081,15 @@ msgstr "Heslo bylo úspěšně změněno!"
 msgid "Current password"
 msgstr "Aktuální heslo"
 
+msgid "Password (retype)"
+msgstr "Heslo (znovu)"
+
+msgid "Enter current token"
+msgstr "Zadejte aktuální token"
+
+msgid "Current token"
+msgstr "Aktuální token"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Zadejte prosím své aktuální a nové heslo pro UIN: "
 
@@ -3113,7 +3137,7 @@ msgstr "Nenalezen žádný odpovídající uživatel"
 msgid "There are no users matching your search criteria."
 msgstr "Neexistuje žádný uživatel odpovídající vašim podmínkám hledání."
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "Nemohu číst ze socketu"
 
 msgid "Buddy list downloaded"
@@ -3128,8 +3152,14 @@ msgstr "Seznam kamarádů odeslán"
 msgid "Your buddy list was stored on the server."
 msgstr "Váš seznam kamarádů byl uložen na serveru."
 
-msgid "Connection failed."
-msgstr "Spojení selhalo."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Připojen"
+
+msgid "Connection failed"
+msgstr "Spojení selhalo"
 
 msgid "Add to chat"
 msgstr "Přidat k chatu"
@@ -3137,18 +3167,23 @@ msgstr "Přidat k chatu"
 msgid "Chat _name:"
 msgstr "_Název chatu:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Nemohu se připojit k serveru."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Připojuji se"
+
 msgid "Chat error"
 msgstr "Chyba chatu"
 
 msgid "This chat name is already in use"
 msgstr "Tento název chatu se již používá"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Nepřipojen k serveru."
 
 msgid "Find buddies..."
@@ -3208,7 +3243,8 @@ msgstr "Nenastaveno žádné téma"
 msgid "File Transfer Failed"
 msgstr "Přenos souborů selhal"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Nemohu otevřít poslouchající port."
 
 msgid "Error displaying MOTD"
@@ -3224,8 +3260,18 @@ msgstr "S tímto spojením není asociována MOTD."
 msgid "MOTD for %s"
 msgstr "MOTD pro %s"
 
-msgid "Server has disconnected"
-msgstr "Server se odpojil"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Ztraceno spojení se serverem:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Zobrazit MOTD"
@@ -3240,22 +3286,20 @@ msgstr "_Heslo:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "Přezdívky IRC nemohou obsahovat mezery"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Připojuji se"
-
 msgid "SSL support unavailable"
 msgstr "Podpora SSL není k dispozici"
 
-msgid "Couldn't create socket"
-msgstr "Nemohu vytvořit socket"
+msgid "Unable to connect"
+msgstr "Nemohu se připojit"
 
-msgid "Couldn't connect to host"
-msgstr "Nemohu se připojit k hostiteli"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Nemohu se připojit k %s"
 
-msgid "Read error"
-msgstr "Chyba čtení"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Server zavřel spojení."
 
 msgid "Users"
 msgstr "Uživatelé"
@@ -3686,10 +3730,12 @@ msgstr "Selhal příkaz Ad-Hoc"
 msgid "execute"
 msgstr "spustit"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Server pro přihlášení vyžaduje SSL. Nebyla nalezena podpora TLS/SSL."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Požadujete šifrování,ale nebyla nalezena podpora TLS/SSL."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3706,7 +3752,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Textová autentizace"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Autentizace selhala"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Neplatná odpověď od serveru."
 
 msgid "Server does not use any supported authentication method"
@@ -3718,7 +3769,8 @@ msgstr "Vyžadujete šifrování, ale to není na serveru dostupné."
 msgid "Invalid challenge from server"
 msgstr "Neplatná výzva od serveru"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Chyba SASL"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3738,10 +3790,8 @@ msgstr ""
 "Nemohu navázat spojení se serverem:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Nemohu navázat spojení se serverem:\n"
 "%s"
@@ -3750,12 +3800,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "Nemohu inicializovat spojení"
 
-msgid "Unable to create socket"
-msgstr "Nemohu vytvořit socket"
-
-msgid "Write error"
-msgstr "Chyba zápisu"
-
 msgid "Full Name"
 msgstr "Celé jméno"
 
@@ -3825,159 +3869,6 @@ msgstr "Operační systém"
 msgid "Local Time"
 msgstr "Místní soubor:"
 
-msgid "Last Activity"
-msgstr "Poslední aktivita"
-
-msgid "Service Discovery Info"
-msgstr "Informace vyhledání služby"
-
-msgid "Service Discovery Items"
-msgstr "Položky hledání služeb"
-
-msgid "Extended Stanza Addressing"
-msgstr "Rozšířené Stanza adresování"
-
-msgid "Multi-User Chat"
-msgstr "Víceuživatelský chat"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Rozšířené informace vzhledu chatu"
-
-msgid "In-Band Bytestreams"
-msgstr "In-Band Bytestreamy"
-
-msgid "Ad-Hoc Commands"
-msgstr "Ad-Hoc příkazy"
-
-msgid "PubSub Service"
-msgstr "PubSub služba"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 Bytestreamy"
-
-msgid "Out of Band Data"
-msgstr "Mino Band data"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "In-Band registrace"
-
-msgid "User Location"
-msgstr "Umístění uživatele"
-
-msgid "User Avatar"
-msgstr "Avatar uživatele"
-
-msgid "Chat State Notifications"
-msgstr "Upozornění na stav chatu"
-
-msgid "Software Version"
-msgstr "Verze softwaru"
-
-msgid "Stream Initiation"
-msgstr "Iniciace streamu"
-
-msgid "File Transfer"
-msgstr "Přenos souborů"
-
-msgid "User Mood"
-msgstr "Nálada uživatele"
-
-msgid "User Activity"
-msgstr "Aktivita uživatele"
-
-msgid "Entity Capabilities"
-msgstr "Schopnosti"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Šifrované vyjednávání"
-
-msgid "User Tune"
-msgstr "Poslech uživatele"
-
-msgid "Roster Item Exchange"
-msgstr "Výměna položky seznamu"
-
-msgid "Reachability Address"
-msgstr "Dostupnost adres"
-
-msgid "User Profile"
-msgstr "Profil"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle Audio"
-
-msgid "User Nickname"
-msgstr "Přezdívka"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle Raw UDP"
-
-msgid "Jingle Video"
-msgstr "Jingle video"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Potvrzení zprávy"
-
-msgid "Public Key Publishing"
-msgstr "Zveřejnění veřejného klíče"
-
-msgid "User Chatting"
-msgstr "Uživatel chatuje"
-
-msgid "User Browsing"
-msgstr "Uživatel brouzdá"
-
-msgid "User Gaming"
-msgstr "Uživatel hraje"
-
-msgid "User Viewing"
-msgstr "Uživatel prohlíží"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Šifrování Stanza"
-
-msgid "Entity Time"
-msgstr "Čas položky"
-
-msgid "Delayed Delivery"
-msgstr "Zpožděné doručení"
-
-msgid "Collaborative Data Objects"
-msgstr "Spolupracující datové objekty"
-
-msgid "File Repository and Sharing"
-msgstr "Úložiště souboru a sdílení"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "STUN Service Discovery pro Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Zjednodušené šifrované vyjednávání"
-
-msgid "Hop Check"
-msgstr "Kontrola hopu"
-
-msgid "Capabilities"
-msgstr "Schopnosti"
-
 msgid "Priority"
 msgstr "Priorita"
 
@@ -3989,7 +3880,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Přihlášen"
 
 msgid "Middle Name"
@@ -4170,16 +4061,13 @@ msgstr "Nenalezen žádný odpovídající uživatel"
 msgid "Roles:"
 msgstr "Role"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Ping timeout"
 
-msgid "Read Error"
-msgstr "Chyba čtení"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4355,9 +4243,6 @@ msgstr "Vaše heslo bylo změněno."
 msgid "Error changing password"
 msgstr "Chyba při změně hesla"
 
-msgid "Password (again)"
-msgstr "Heslo (znovu)"
-
 msgid "Change XMPP Password"
 msgstr "Změnit heslo XMPP"
 
@@ -4741,6 +4626,14 @@ msgstr "Chyba zpracování XML"
 msgid "Unknown Error in presence"
 msgstr "Neznámá chyba v přítomnosti"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Chyba při připojování k chatu %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Chyba v chatu %s"
+
 msgid "Create New Room"
 msgstr "Vytvořit novou místnost"
 
@@ -4757,16 +4650,20 @@ msgstr "_Nastavit místnost"
 msgid "_Accept Defaults"
 msgstr "_Přijmout implicitní"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Chyba při připojování k chatu %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Neudán žádný důvod"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Chyba v chatu %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Byli jste vykopnuti z %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Vykopnut od %s: (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Při otevírání souboru došlo k chybě."
 
 #, fuzzy
@@ -5254,9 +5151,6 @@ msgstr ""
 "Pro MSN je potřeba podpora SSL. Nainstalujte prosím podporovanou knihovnu "
 "SSL."
 
-msgid "Failed to connect to server."
-msgstr "Nemohu se připojit k serveru."
-
 msgid "Error retrieving profile"
 msgstr "Chyba při získávání profilu"
 
@@ -5512,9 +5406,6 @@ msgstr "Zpráva možná nebyla odeslána, protože došlo k neznámé chybě kó
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Zpráva možná nebyla odeslána, protože došlo k neznámé chybě."
 
-msgid "Unable to connect"
-msgstr "Nemohu se připojit"
-
 msgid "Writing error"
 msgstr "Chyba zápisu"
 
@@ -5529,20 +5420,24 @@ msgstr ""
 "Chyba spojení od serveru %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Server nepodporuje náš protokol."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Chyba při zpracovávání HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Přihlásili jste se z jiného umístění."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Servery MSN dočasně nejsou dostupné. Počkejte prosím a zkuste to znovu."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Servery MSN se dočasně vypínají."
 
 #, c-format
@@ -5555,9 +5450,6 @@ 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"
 
@@ -5654,6 +5546,9 @@ msgstr "Zásuvný modul protokolu MSN"
 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)"
@@ -5767,12 +5662,6 @@ msgstr[2] ""
 msgid "Add contacts from server"
 msgstr "Přidat kontakty ze serveru"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Připojen"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Chyba protokolu, kód %d: %s"
@@ -5796,16 +5685,6 @@ msgstr "Chyba MySpaceIM"
 msgid "Invalid input condition"
 msgstr "Neplatný stav vstupu"
 
-msgid "Read buffer full (2)"
-msgstr "Vyrovnávací paměť čtení plná (2)"
-
-msgid "Unparseable message"
-msgstr "Nezpracovatelná zpráva"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Nemohu se připojit k počítači: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Nemohu přidat kamaráda"
 
@@ -5890,6 +5769,15 @@ msgstr "Celkem Přátelé"
 msgid "Client Version"
 msgstr "Verze klienta"
 
+#, fuzzy
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"Jděte prosím na http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username, zvolte jméno uživatele, a zkuste se přihlásit znovu."
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - jméno uživatele dostupné"
 
@@ -6146,9 +6034,9 @@ msgstr "Buď je uživatel odpojen, nebo jste blokováni"
 msgid "Unknown error: 0x%X"
 msgstr "Neznámá chyba: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Přihlášení selhalo (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Nemohu se přihlásit"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6250,9 +6138,6 @@ msgstr "Konference GroupWise %d"
 msgid "Authenticating..."
 msgstr "Autentizuji..."
 
-msgid "Unable to connect to server."
-msgstr "Nemohu se připojit k serveru."
-
 msgid "Waiting for response..."
 msgstr "Čekám na odpověď..."
 
@@ -6276,25 +6161,19 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Chcete se připojit k této konverzaci?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Byli jste odhlášeni, protože jste se přihlásili u jiné pracovní stanice."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s je zřejmě odpojen a nedostal zprávu, kterou jste právě odeslali."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Nemohu se připojit k serveru. Zadejte prosím adresu serveru, ke kterému se "
 "chcete připojit."
 
-msgid "Error. SSL support is not installed."
-msgstr "Chyba. Není nainstalována podpora SSL."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Tato konference byla uzavřena. Nelze tam posílat další zprávy."
 
@@ -6333,10 +6212,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6345,18 +6221,8 @@ msgstr "Nemohu se připojit k chatu"
 msgid "Invalid chat room name"
 msgstr "Neplatný název místnosti"
 
-msgid "Server closed the connection."
-msgstr "Server zavřel spojení."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Ztraceno spojení se serverem:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Na spojení se serverem přijata neplatná data."
 
 #. *< type
@@ -6404,7 +6270,8 @@ msgstr "Ztraceno spojení se vzdáleným uživatelem:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Při spojení se vzdáleným uživatelem přijata neplatná data."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Nemohu navázat spojení se vzdáleným uživatelem."
 
 msgid "Direct IM established"
@@ -6603,21 +6470,15 @@ msgstr "Úroveň varování"
 msgid "Buddy Comment"
 msgstr "Poznámka o kamarádovi"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Nemohu se připojit k autentizačnímu serveru:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Nemohu se připojit k serveru BOS:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Nemohu se připojit k serveru."
 
 msgid "Username sent"
 msgstr "Jméno uživatele posláno"
@@ -6629,11 +6490,11 @@ msgstr "Spojení navázáno, cookie odesláno"
 msgid "Finalizing connection"
 msgstr "Dokončuji spojení"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Nemohu se přihlásit: Nemohu se přihlásit jako %s, protože jméno uživatele "
 "není platné. Jméno uživatele musí být platná emailová adresa nebo začínat "
@@ -6648,26 +6509,22 @@ msgstr ""
 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."
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Uživatel neexistuje"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Váš účet je momentálně suspendován."
 
 #. service temporarily unavailable
@@ -6688,7 +6545,8 @@ 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 "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Zadaný klíč SecurID není platný."
 
 msgid "Enter SecurID"
@@ -6877,6 +6735,9 @@ msgstr "Odpojen od"
 msgid "Member Since"
 msgstr "Člen od"
 
+msgid "Capabilities"
+msgstr "Schopnosti"
+
 msgid "Profile"
 msgstr "Profil"
 
@@ -7062,9 +6923,9 @@ msgstr[2] ""
 msgid "Away message too long."
 msgstr "Zpráva o nepřítomnosti příliš dlouhá."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7088,9 +6949,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Sirotci"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Nemohu přidat kamaráda %s, protože ve svém seznamu máte příliš mnoho "
@@ -7099,8 +6960,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(žádné jméno)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Nemohu přidat kamaráda %s z neznámého důvodu."
 
 #, c-format
@@ -7874,7 +7735,8 @@ msgstr "Interval udržování naživu (v sekundách)"
 msgid "Update interval (seconds)"
 msgstr "Interval updatu (v sekundách)"
 
-msgid "Cannot decrypt server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "Nemohu dešifrovat odpověď serveru"
 
 #, c-format
@@ -7899,9 +7761,6 @@ msgstr "Je vyžadována aktivace"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Neznámý kód odpovědi při přihlašování 0x%02X"
 
-msgid "Could not decrypt server reply"
-msgstr "Nemohu dešifrovat odpověď serveru"
-
 msgid "Requesting captcha"
 msgstr "Vyžaduji captcha"
 
@@ -7935,29 +7794,18 @@ msgstr ""
 "Neznámý kód odpovědi, při přihlášení (0x%02X):\n"
 "%s"
 
-msgid "Unable to connect."
-msgstr "Nemohu se připojit."
-
 msgid "Socket error"
 msgstr "Chyba socketu"
 
-msgid "Unable to read from socket"
-msgstr "Nemohu číst ze socketu"
-
-msgid "Write Error"
-msgstr "Chyba při zápisu"
-
-msgid "Connection lost"
-msgstr "Spojení ztraceno"
-
 msgid "Getting server"
 msgstr "Získávám server"
 
 msgid "Requesting token"
 msgstr "Požadavek symbolu"
 
-msgid "Couldn't resolve host"
-msgstr "Nemohu najít počítač"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Nemohu se připojit k serveru."
 
 msgid "Invalid server or port"
 msgstr "Neplatný server nebo port"
@@ -8010,7 +7858,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "QQ Qun příkaz"
 
-msgid "Could not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "Nemohu dešifrovat přihlašovací odpověď"
 
 msgid "Unknown LOGIN CMD"
@@ -8030,9 +7879,6 @@ msgstr "Odeslání souboru"
 msgid "%d canceled the transfer of %s"
 msgstr "%d zrušil přenos %s"
 
-msgid "Connection closed (writing)"
-msgstr "Spojení uzavřeno (zápis)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Název skupiny:</b> %s<br>"
@@ -8086,17 +7932,6 @@ msgstr "Správce Sametime vydal na serveru %s následující oznámení"
 msgid "Sametime Administrator Announcement"
 msgstr "Oznámení správce Sametime"
 
-msgid "Connection reset"
-msgstr "Spojení přerušeno"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Chyba při čtení ze socketu: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Nemohu se připojit k počítači"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Oznámení od %s"
@@ -8119,6 +7954,9 @@ msgstr "Reproduktory"
 msgid "Video Camera"
 msgstr "Videokamera"
 
+msgid "File Transfer"
+msgstr "Přenos souborů"
+
 msgid "Supports"
 msgstr "Podporuje"
 
@@ -8935,6 +8773,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Statistika o síti"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping selhal"
 
@@ -8998,7 +8839,8 @@ msgstr "Nepodporovaný typ veřejného klíče"
 msgid "Disconnected by server"
 msgstr "Odpojen serverem"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Chyba při připojování se k serveru SILC"
 
 msgid "Key Exchange failed"
@@ -9010,26 +8852,26 @@ msgstr ""
 "Obnova odpojeného sezení selhala. Vytvořte nové spojení stisknutím Znovu se "
 "připojit"
 
-msgid "Connection failed"
-msgstr "Spojení selhalo"
-
 msgid "Performing key exchange"
 msgstr "Provádím výměnu klíčů"
 
-msgid "Unable to create connection"
-msgstr "Nemohu vytvořit spojení"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Nemohu načíst pár klíčů SILC"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Připojuji se k serveru SILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Nemohu načíst pár klíčů SILC"
+
 msgid "Out of memory"
 msgstr "Nedostatek paměti"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Nemohu inicializovat protokol SILC"
 
 msgid "Error loading SILC key pair"
@@ -9323,7 +9165,8 @@ msgstr "Digitálně podepisovat a ověřovat všechny zprávy"
 msgid "Creating SILC key pair..."
 msgstr "Vytvářím pár klíčů SILC..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Nemohu vytvořit pár klíčů SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9417,6 +9260,9 @@ msgstr "Tabule"
 msgid "No server statistics available"
 msgstr "Statistika o serveru není k dispozici"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Chyba při připojování se k serveru SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Chyba: Verze nesouhlasí, aktualizujte vašeho klienta"
@@ -9457,30 +9303,27 @@ msgstr "Chyba: Neplatný cookie"
 msgid "Failure: Authentication failed"
 msgstr "Chyba: Autentizace selhala"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Nemohu inicializovat připojení klienta SILC"
 
 msgid "John Noname"
 msgstr "Jan Anonym"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Nemohu načíst pár klíčů SILC: %s"
 
-msgid "Could not write"
-msgstr "Nemohu zapisovat"
-
-msgid "Could not connect"
-msgstr "Nemohu se připojit"
+msgid "Unable to create connection"
+msgstr "Nemohu vytvořit spojení"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Neznámá odpověď serveru."
 
-msgid "Could not create listen socket"
-msgstr "Nemohu vytvořit socket pro poslouchání"
-
-msgid "Could not resolve hostname"
-msgstr "Nemohu přeložit název počítače"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Nemohu vytvořit socket"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Jména uživatelů SIP nemohou obsahovat mezery ani symboly @"
@@ -9521,6 +9364,77 @@ msgstr "Uživatel pro autentizaci"
 msgid "Auth Domain"
 msgstr "Doména autentizace"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;místnost&gt;:  Připojit se k místnosti chatu v síti Yahoo"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Vypsat místnosti v síti Yahoo"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Požádat uživatele, aby začal sezení kreslení"
+
+msgid "Yahoo ID..."
+msgstr "Yahoo ID..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Zásuvný modul protokolu Yahoo"
+
+msgid "Pager server"
+msgstr "Server pageru"
+
+msgid "Pager port"
+msgstr "Port pageru"
+
+msgid "File transfer server"
+msgstr "Server přenosu souborů"
+
+msgid "File transfer port"
+msgstr "Port přenosu souborů"
+
+msgid "Chat room locale"
+msgstr "Locale místnosti chatu"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignorovat pozvání do konferencí a místností chatu"
+
+msgid "Chat room list URL"
+msgstr "URL seznamu místností chatu"
+
+msgid "Yahoo Chat server"
+msgstr "Server Yahoo Chat"
+
+msgid "Yahoo Chat port"
+msgstr "Port Yahoo Chat"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo ID..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Zásuvný modul protokolu Yahoo"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9552,28 +9466,18 @@ msgstr "Přidání kamaráda zamítnuto"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  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
@@ -9611,37 +9515,32 @@ msgstr "Váš účet je uzamčen, přihlaste se prosím na WWW stránkách Yahoo
 msgid "Unknown error number %d. 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í."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "Nemohu přidat kamaráda %s do skupiny %s do seznamu serveru na účtu %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Nemohu přidat kamaráda do seznamu na serveru"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Slyšitelné %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Přijata neočekávaná odpověď HTTP od serveru."
 
-msgid "Connection problem"
-msgstr "Problém se spojením"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Ztraceno spojení s %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Nemohu navázat spojení s %s:\n"
+"Nemohu navázat spojení se serverem:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9704,73 +9603,15 @@ msgstr "Připojit se k uživateli v chatu..."
 msgid "Open Inbox"
 msgstr "Otevřít Příchozí poštu"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;místnost&gt;:  Připojit se k místnosti chatu v síti Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Vypsat místnosti v síti Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Požádat uživatele, aby začal sezení kreslení"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo ID..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Zásuvný modul protokolu Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japonsko"
-
-msgid "Pager server"
-msgstr "Server pageru"
-
-msgid "Japan Pager server"
-msgstr "Server pageru v Japonsku"
-
-msgid "Pager port"
-msgstr "Port pageru"
-
-msgid "File transfer server"
-msgstr "Server přenosu souborů"
-
-msgid "Japan file transfer server"
-msgstr "Server přenosu souborů v Japonsku"
-
-msgid "File transfer port"
-msgstr "Port přenosu souborů"
-
-msgid "Chat room locale"
-msgstr "Locale místnosti chatu"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignorovat pozvání do konferencí a místností chatu"
-
-msgid "Chat room list URL"
-msgstr "URL seznamu místností chatu"
-
-msgid "Yahoo Chat server"
-msgstr "Server Yahoo Chat"
-
-msgid "Yahoo Chat port"
-msgstr "Port Yahoo Chat"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Odeslán požadavek o kreslení."
 
+msgid "Unable to connect."
+msgstr "Nemohu se připojit."
+
 msgid "Unable to establish file descriptor."
 msgstr "Nemohu získat deskriptor souboru."
 
@@ -9778,6 +9619,9 @@ msgstr "Nemohu získat deskriptor souboru."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s zkouší vám poslat %d souborů.\n"
 
+msgid "Write Error"
+msgstr "Chyba při zápisu"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Profil Yahoo! Japonsko"
 
@@ -9896,23 +9740,19 @@ msgstr "Hlasy"
 msgid "Webcams"
 msgstr "WWW kamery"
 
+msgid "Connection problem"
+msgstr "Problém se spojením"
+
 msgid "Unable to fetch room list."
 msgstr "Nemohu získat seznam místností."
 
 msgid "User Rooms"
 msgstr "Místnosti uživatele"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Problém se spojením k servery YCHT."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Ztraceno spojení se serverem\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10041,33 +9881,22 @@ msgstr "Realm"
 msgid "Exposure"
 msgstr "Vystavení"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Nemohu vytvořit socket:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Nemohu zpracovat odpověď od HTTP proxy: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Chyba připojení k HTTP proxy %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Přístup odepřen: HTTP proxy server zakazuje tunelování portu %d."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Chyba při překladu %s"
 
-msgid "Could not resolve host name"
-msgstr "Nemohu přeložit název počítače"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Vyžaduji pozornost %s..."
@@ -10275,12 +10104,6 @@ msgstr "Chyba při zápisu do %s: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "Nemohu se připojit k %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "Server pro přihlášení vyžaduje SSL. Nebyla nalezena podpora TLS/SSL."
-
 #, c-format
 msgid " - %s"
 msgstr " - %s"
@@ -10533,9 +10356,14 @@ msgstr "Přidat sledování _kamaráda..."
 msgid "View _Log"
 msgstr "Zobrazit záz_nam"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Skrýt při odpojení"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Zobrazit při odpojení"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
@@ -11038,6 +10866,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Změnit informace o uživateli %s"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Zadejte jméno hostitele pro který je tento certifikát."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL servery"
@@ -11083,7 +10915,8 @@ msgstr "Ignorovat"
 msgid "Get Away Message"
 msgstr "Získat zprávu o nepřítomnosti"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Naposledy řečeno"
 
 msgid "Unable to save icon file to disk."
@@ -11975,7 +11808,8 @@ msgstr "Barva, kterou kreslit odkazy."
 msgid "Hyperlink visited color"
 msgstr "Barva navštívených odkazů"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+#, fuzzy
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Barva, kterou kreslit odkazy, když jsou navštíveny (nebo aktivovány)."
 
 msgid "Hyperlink prelight color"
@@ -12011,13 +11845,22 @@ msgstr "Barva akční zprávy."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Barva akční zprávy pro šeptané zprávy"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Barva akční zprávy."
+
 msgid "Whisper Message Name Color"
 msgstr "Barva šeptané zprávy"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Barva akční zprávy."
+
 msgid "Typing notification color"
 msgstr "Barva pro upozornění na psaní"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "Barva pro upozornění na psaní"
 
 msgid "Typing notification font"
@@ -12412,6 +12255,10 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Byl zvolen 'Ruční' příkaz prohlížeče, ale nebyl nastaven žádný příkaz."
 
+#, fuzzy
+msgid "No message"
+msgstr "Neznámá zpráva"
+
 msgid "Open All Messages"
 msgstr "Otevřít všechny zprávy"
 
@@ -12429,10 +12276,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Máte poštu!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Neznámá zpráva"
-
 msgid "The following plugins will be unloaded."
 msgstr "Následující zásuvné moduly budou odebrány."
 
@@ -12646,8 +12489,9 @@ msgstr "Zobrazovat _ikonu v panelu:"
 msgid "On unread messages"
 msgstr "Při nepřečtených zprávách"
 
-msgid "Conversation Window Hiding"
-msgstr "Skrývání okna konverzace"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Okna IM konverzace"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Skrýt nové konverzace IM:"
@@ -12655,6 +12499,9 @@ msgstr "_Skrýt nové konverzace IM:"
 msgid "When away"
 msgstr "Při nepřítomnosti"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "_Minimalizovat nová okna konverzací"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Záložky"
@@ -12713,9 +12560,6 @@ msgstr "Používat hladké posouvání"
 msgid "F_lash window when IMs are received"
 msgstr "_Bliknout oknem, když jsou přijaty IM"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "_Minimalizovat nová okna konverzací"
-
 msgid "Minimum input area height in lines:"
 msgstr "Minimální výška plochy pro zadání v řádcích:"
 
@@ -12750,7 +12594,8 @@ msgstr "Nemohu spustit konfiguraci prohlížeče."
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Příklad: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Autodetekovat IP adresu"
 
 msgid "Public _IP:"
@@ -13119,21 +12964,6 @@ msgstr "Uložit _a použít"
 msgid "Status for %s"
 msgstr "Stav pro %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "Uživatelský smajlík"
-
-msgid "More Data needed"
-msgstr "Je potřeba více dat"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Nastavte klávesovou zkratku asociovanou se smajlíkem."
-
 #, fuzzy, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
@@ -13141,12 +12971,12 @@ msgstr ""
 "Už existuje uživatelský smajlík pro vybranou klávesovou zkratku. "
 "Specifikujte jinou."
 
+msgid "Custom Smiley"
+msgstr "Uživatelský smajlík"
+
 msgid "Duplicate Shortcut"
 msgstr "Duplikovat klávesovou zkratku"
 
-msgid "Please select an image for the smiley."
-msgstr "Prosím vyberte obrázek pro smajlík."
-
 msgid "Edit Smiley"
 msgstr "Upravit smajlík"
 
@@ -13258,9 +13088,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Nemohu odeslat spouštěč"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Přetáhli jste spouštěč pracovní plochy. Pravděpodobně jste chtěli odeslat, "
 "na co tento spouštěč ukazuje, místo přímo tohoto spouštěče."
@@ -13852,9 +13683,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Zásuvný modul music messaging pro spolupráci při skládání."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Zásuvný modul music messaging umožňuje několika uživatelům zároveň pracovat "
 "na hudebním díle upravováním společné partitury v reálném čase."
@@ -14106,9 +13938,10 @@ msgid "Conversation Window Send Button."
 msgstr "Tlačítko Odeslat okna konverzace."
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Přidá tlačítko Odeslat do plochy pro psaní konverzačního okna. Určeno, když "
 "není fyzická klávesnice."
@@ -14439,8 +14272,9 @@ msgstr "Možnosti Pidginu ve Windows"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Možnosti specifické pro Pidgin pro Windows."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Poskytuje možnosti specifické pro Pidgin pro Windows, například dokování "
 "seznamu kamarádů."
@@ -14482,6 +14316,314 @@ msgstr "Přijímat a odesílat přímo sekce XMPP."
 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 "Cannot open socket"
+#~ msgstr "Nemohu otevřít socket"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Nemohu poslouchat na socketu"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Nemohu číst ze socketu"
+
+#~ msgid "Connection failed."
+#~ msgstr "Spojení selhalo."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Server se odpojil"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Nemohu vytvořit socket"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Nemohu se připojit k hostiteli"
+
+#~ msgid "Read error"
+#~ msgstr "Chyba čtení"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nemohu navázat spojení se serverem:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Chyba zápisu"
+
+#~ msgid "Last Activity"
+#~ msgstr "Poslední aktivita"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Informace vyhledání služby"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Položky hledání služeb"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Rozšířené Stanza adresování"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Víceuživatelský chat"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Rozšířené informace vzhledu chatu"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "In-Band Bytestreamy"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ad-Hoc příkazy"
+
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub služba"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5 Bytestreamy"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Mino Band data"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "In-Band registrace"
+
+#~ msgid "User Location"
+#~ msgstr "Umístění uživatele"
+
+#~ msgid "User Avatar"
+#~ msgstr "Avatar uživatele"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Upozornění na stav chatu"
+
+#~ msgid "Software Version"
+#~ msgstr "Verze softwaru"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Iniciace streamu"
+
+#~ msgid "User Mood"
+#~ msgstr "Nálada uživatele"
+
+#~ msgid "User Activity"
+#~ msgstr "Aktivita uživatele"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Schopnosti"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Šifrované vyjednávání"
+
+#~ msgid "User Tune"
+#~ msgstr "Poslech uživatele"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Výměna položky seznamu"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Dostupnost adres"
+
+#~ msgid "User Profile"
+#~ msgstr "Profil"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Jingle Audio"
+
+#~ msgid "User Nickname"
+#~ msgstr "Přezdívka"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle Raw UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Jingle video"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Potvrzení zprávy"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Zveřejnění veřejného klíče"
+
+#~ msgid "User Chatting"
+#~ msgstr "Uživatel chatuje"
+
+#~ msgid "User Browsing"
+#~ msgstr "Uživatel brouzdá"
+
+#~ msgid "User Gaming"
+#~ msgstr "Uživatel hraje"
+
+#~ msgid "User Viewing"
+#~ msgstr "Uživatel prohlíží"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Šifrování Stanza"
+
+#~ msgid "Entity Time"
+#~ msgstr "Čas položky"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Zpožděné doručení"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Spolupracující datové objekty"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Úložiště souboru a sdílení"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "STUN Service Discovery pro Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Zjednodušené šifrované vyjednávání"
+
+#~ msgid "Hop Check"
+#~ msgstr "Kontrola hopu"
+
+#~ msgid "Read Error"
+#~ msgstr "Chyba čtení"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Nemohu se připojit k serveru."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Vyrovnávací paměť čtení plná (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Nezpracovatelná zpráva"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Nemohu se připojit k počítači: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Přihlášení selhalo (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Nemohu se připojit k serveru."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Byli jste odhlášeni, protože jste se přihlásili u jiné pracovní stanice."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Chyba. Není nainstalována podpora SSL."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Nesprávné heslo."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nemohu se připojit k serveru BOS:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Možná budete brzo odpojen. Hledejte aktualizace na %s."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Nemohu se připojit"
+
+#~ msgid "Invalid username."
+#~ msgstr "Neplatné jméno uživatele."
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Nemohu dešifrovat odpověď serveru"
+
+#~ msgid "Connection lost"
+#~ msgstr "Spojení ztraceno"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Nemohu najít počítač"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Spojení uzavřeno (zápis)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Spojení přerušeno"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Chyba při čtení ze socketu: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Nemohu se připojit k počítači"
+
+#~ msgid "Could not write"
+#~ msgstr "Nemohu zapisovat"
+
+#~ msgid "Could not connect"
+#~ msgstr "Nemohu se připojit"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Nemohu vytvořit socket pro poslouchání"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Nemohu přeložit název počítače"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Nesprávné heslo"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nemohu navázat spojení s %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japonsko"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Server pageru v Japonsku"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Server přenosu souborů v Japonsku"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ztraceno spojení se serverem\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Nemohu přeložit název počítače"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Server pro přihlášení vyžaduje SSL. Nebyla nalezena podpora TLS/SSL."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Skrývání okna konverzace"
+
+#~ msgid "More Data needed"
+#~ msgstr "Je potřeba více dat"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Nastavte klávesovou zkratku asociovanou se smajlíkem."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Prosím vyberte obrázek pro smajlík."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Které ID aktivovat?"
 
@@ -14965,9 +15107,6 @@ msgstr "Tento zásuvný modul je užitečný pro ladění serverů nebo klientů
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "Nemohu se přihlásit. Zkontrolujte ladicí výpis"
 
-#~ msgid "Unable to login"
-#~ msgstr "Nemohu se přihlásit"
-
 #~ msgid "Failed room reply"
 #~ msgstr "Odpověď místnosti selhala"
 
@@ -15094,14 +15233,6 @@ msgstr "Tento zásuvný modul je užitečný pro ladění serverů nebo klientů
 #~ "supported by MySpace."
 #~ msgstr "Lituji, MySpace nepodporuje hesla delší než %d znaků (vaše má %d)."
 
-#~ msgid ""
-#~ "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username and choose a username and try to login again."
-#~ msgstr ""
-#~ "Jděte prosím na http://editprofile.myspace.com/index.cfm?"
-#~ "fuseaction=profile.username, zvolte jméno uživatele, a zkuste se "
-#~ "přihlásit znovu."
-
 #~ msgid "Unable to make SSL connection to server."
 #~ msgstr "Nemohu vytvořit připojení SSL k serveru."
 
@@ -15190,10 +15321,6 @@ msgstr "Tento zásuvný modul je užitečný pro ladění serverů nebo klientů
 #~ msgstr "Aktuální token"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Nemohu se připojit k serveru."
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "Z_práva:"
 
diff --git a/po/da.po b/po/da.po
index 9194eff549..42b443e923 100644
--- a/po/da.po
+++ b/po/da.po
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2009-02-23 18:17+0100\n"
 "Last-Translator: Peter Bach <bach.peter@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -2588,9 +2588,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Inkludér andre klienters logs i logviseren."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2646,8 +2647,9 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 "Gem beskeder sendt til en afkoblet bruger som automatisk praj ved indlogning."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Resten af beskeden vil blive gemt som automatisk praj ved indlogning. Du kan "
@@ -2897,14 +2899,16 @@ msgstr ""
 "Ikke i stand til at opdage ActiveTCL installation. Hvis du ønsker at bruge "
 "TCL-udvidelsesmoduler, installér ActiveTCL fra http://www.activestate.com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Apple Bonjour-værktøjssættet til Windows blev ikke fundet, se oss på: http://"
 "d.pidgin.im/BonjourWindows for mere information."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Ude af stand til at lytte for indgående beskeder\n"
 
 msgid ""
@@ -2956,14 +2960,21 @@ msgstr "%s har afsluttet samtalen."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Kunne ikke sende beskedn; samtalen kunne ikke startes."
 
-msgid "Cannot open socket"
-msgstr "Kan ikke åbne socket"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Kunne ikke oprette sokkel:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Kan ikke binde socket til port"
 
-msgid "Could not listen on socket"
-msgstr "Kan ikke lytte på socket"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Kunne ikke oprette sokkel:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Fejl under kommunikation med lokal mDNSResponder."
@@ -3011,13 +3022,16 @@ msgstr "Gem venneliste..."
 msgid "Load buddylist from file..."
 msgstr "Indlæs venneliste fra fil..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Udfyld registreringsfelterne."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Adgangskoder er ikke ens."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Kunne ikke registrere en ny konto. En fejl skete.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3029,14 +3043,15 @@ msgstr "Registering lykkedes!"
 msgid "Password"
 msgstr "Adgangskode"
 
-msgid "Password (retype)"
-msgstr "Adgangskode (tast igen)"
+msgid "Password (again)"
+msgstr "Adgangskode (igen)"
 
-msgid "Enter current token"
-msgstr "Indtast nuværende nøgle"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Nuværende nøgle"
+#, fuzzy
+msgid "Captcha"
+msgstr "Captcha-billede"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrér ny Gadu-Gadu konto"
@@ -3089,6 +3104,15 @@ msgstr "Adgangskoden blev ændret!"
 msgid "Current password"
 msgstr "Nuværende adgangskode"
 
+msgid "Password (retype)"
+msgstr "Adgangskode (tast igen)"
+
+msgid "Enter current token"
+msgstr "Indtast nuværende nøgle"
+
+msgid "Current token"
+msgstr "Nuværende nøgle"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Indtast din nuværende og nye adgangskode til UIN: "
 
@@ -3136,8 +3160,8 @@ msgstr "Ikke-matchende brugere fundet"
 msgid "There are no users matching your search criteria."
 msgstr "Der er ingen brugere der matcher dine søgekriterier."
 
-msgid "Unable to read socket"
-msgstr "Kan ikke læse fra netværket"
+msgid "Unable to read from socket"
+msgstr "Kan ikke læse fra sokkel"
 
 msgid "Buddy list downloaded"
 msgstr "Venneliste overført"
@@ -3151,8 +3175,14 @@ msgstr "Venneliste overført"
 msgid "Your buddy list was stored on the server."
 msgstr "Din venneliste blev gemt på serveren."
 
-msgid "Connection failed."
-msgstr "Forbindelse fejlede."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Tilsluttet"
+
+msgid "Connection failed"
+msgstr "Forbindelse fejlede"
 
 msgid "Add to chat"
 msgstr "Tilføj til samtale"
@@ -3160,18 +3190,23 @@ msgstr "Tilføj til samtale"
 msgid "Chat _name:"
 msgstr "Samtale_navn:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Kunne ikke kontakte server."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Tilslutter"
+
 msgid "Chat error"
 msgstr "Fejl i samtale"
 
 msgid "This chat name is already in use"
 msgstr "Dette samtalenavn eksisterer allerede"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Ikke forbundet til serveren."
 
 msgid "Find buddies..."
@@ -3231,7 +3266,8 @@ msgstr "Inet emne er sat"
 msgid "File Transfer Failed"
 msgstr "Filoverførsel fejlede"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Kunne ikke åbne en lyttende port."
 
 msgid "Error displaying MOTD"
@@ -3247,8 +3283,18 @@ msgstr "Der er ingen MOTD tilknyttet denne forbindelse."
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-msgid "Server has disconnected"
-msgstr "Server har afbrudt forbindelse"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Mistede forbindelsen til server:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Vis MOTD"
@@ -3263,22 +3309,20 @@ msgstr "_Adgangskode:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC navne må ikke indeholde mellemrum og lignende"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Tilslutter"
-
 msgid "SSL support unavailable"
 msgstr "SSL-understøttelse ikke tilgængelig"
 
-msgid "Couldn't create socket"
-msgstr "Kunne ikke oprette sokkel"
+msgid "Unable to connect"
+msgstr "Kunne ikke forbinde"
 
-msgid "Couldn't connect to host"
-msgstr "Kunne ikke kontakte vært"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Kunne ikke forbinde til %s"
 
-msgid "Read error"
-msgstr "Læsefejl"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Server lukkede forbindelsen."
 
 msgid "Users"
 msgstr "Brugere"
@@ -3705,10 +3749,12 @@ msgstr "Ad-Hoc-kommando fejlede"
 msgid "execute"
 msgstr "kør"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Server kræver SSL til logind. Ingen TLS/SSL-understøttelse fundet."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Du kræver kryptering, men ingen TLS/SSL-understøttelse blev fundet."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3725,7 +3771,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Godkendelse i klartekst"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Godkendelse fejlede"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Ugyldigt svar fra server."
 
 msgid "Server does not use any supported authentication method"
@@ -3737,7 +3788,8 @@ msgstr "Du kræver kryptering, men det er ikke tilrådighed på denne server."
 msgid "Invalid challenge from server"
 msgstr "Ugyldigt svar fra server"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL fejl"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3757,10 +3809,8 @@ msgstr ""
 "Kunne ikke etablere en forbindelse til server:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Kunne ikke etablere en forbindelse til server:\n"
 "%s"
@@ -3769,12 +3819,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "Kunne ikke initialisere forbindelse"
 
-msgid "Unable to create socket"
-msgstr "Kunne ikke oprette sokkel"
-
-msgid "Write error"
-msgstr "Fejl ved skrivning"
-
 msgid "Full Name"
 msgstr "Fulde navn"
 
@@ -3845,159 +3889,6 @@ msgstr "Operativsystem"
 msgid "Local Time"
 msgstr "Lokal fil:"
 
-msgid "Last Activity"
-msgstr "Sidste aktivitet"
-
-msgid "Service Discovery Info"
-msgstr "Besked ved tjenesteopdagelse"
-
-msgid "Service Discovery Items"
-msgstr "Elementer for tjenesteopdagelse"
-
-msgid "Extended Stanza Addressing"
-msgstr "Udvidet Stanza-adressering"
-
-msgid "Multi-User Chat"
-msgstr "Flerbrugersamtale"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Flerbrugersamtale udvidede tilstedeværelsesinformation"
-
-msgid "In-Band Bytestreams"
-msgstr "In-Band-bytestrømme"
-
-msgid "Ad-Hoc Commands"
-msgstr "Ad-Hoc-kommandoer"
-
-msgid "PubSub Service"
-msgstr "PubSub-tjeneste"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5-bytestrømme"
-
-msgid "Out of Band Data"
-msgstr "Out of Band Data"
-
-msgid "XHTML-IM"
-msgstr "XHTML-besked"
-
-msgid "In-Band Registration"
-msgstr "In-Band-registrering"
-
-msgid "User Location"
-msgstr "Brugerplacering"
-
-msgid "User Avatar"
-msgstr "Brugeravatar"
-
-msgid "Chat State Notifications"
-msgstr "Samtalestatus påmindelser"
-
-msgid "Software Version"
-msgstr "Software version"
-
-msgid "Stream Initiation"
-msgstr "Klargøring af strøm"
-
-msgid "File Transfer"
-msgstr "Filoverførsel"
-
-msgid "User Mood"
-msgstr "Brugerhumør"
-
-msgid "User Activity"
-msgstr "Brugeraktivitet"
-
-msgid "Entity Capabilities"
-msgstr "Enhedsegenskaber"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Krypterede sessionsforhandlinger"
-
-msgid "User Tune"
-msgstr "Brugermelodi"
-
-msgid "Roster Item Exchange"
-msgstr "Navneliste over elementudveksling"
-
-msgid "Reachability Address"
-msgstr "E-post-adresse"
-
-msgid "User Profile"
-msgstr "Brugerprofil"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle-lyd"
-
-msgid "User Nickname"
-msgstr "Brugerkælenavn"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle Raw UDP"
-
-msgid "Jingle Video"
-msgstr "Jingle video"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Beskedmodtagere"
-
-msgid "Public Key Publishing"
-msgstr "Udgivelse af offentlig nøgle"
-
-msgid "User Chatting"
-msgstr "Bruger samtaler"
-
-msgid "User Browsing"
-msgstr "Bruger browser"
-
-msgid "User Gaming"
-msgstr "Bruger spiller"
-
-msgid "User Viewing"
-msgstr "Bruger ser"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Stanza-kryptering"
-
-msgid "Entity Time"
-msgstr "Tidsenhed"
-
-msgid "Delayed Delivery"
-msgstr "Forsinket levering"
-
-msgid "Collaborative Data Objects"
-msgstr "Samarbejdende dataobjekter"
-
-msgid "File Repository and Sharing"
-msgstr "Filarkiv og -deling"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "STUN-tjenesteopdagelse for Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Simplificeret krypteret sessionsforhandling"
-
-msgid "Hop Check"
-msgstr "Hop-kontrol"
-
-msgid "Capabilities"
-msgstr "Klient understøtter"
-
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -4009,7 +3900,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Logget ind"
 
 msgid "Middle Name"
@@ -4190,16 +4081,13 @@ msgstr "Ikke-matchende brugere fundet"
 msgid "Roles:"
 msgstr "Rolle"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Ping tidsudløb"
 
-msgid "Read Error"
-msgstr "Læsefejl"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4375,9 +4263,6 @@ msgstr "Din adgangskode blev ændret."
 msgid "Error changing password"
 msgstr "Fejl ved ændring af adgangskode"
 
-msgid "Password (again)"
-msgstr "Adgangskode (igen)"
-
 msgid "Change XMPP Password"
 msgstr "Ændr XMPP-adgangskode"
 
@@ -4762,6 +4647,14 @@ msgstr "XML læsningsfejl"
 msgid "Unknown Error in presence"
 msgstr "Ukendt fejlkode i tilstedeværelse"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Fejl ved tilslutning til samtale %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Fejl i samtale %s"
+
 msgid "Create New Room"
 msgstr "Opret nyt rum"
 
@@ -4778,16 +4671,20 @@ msgstr "_Konfigurér rum"
 msgid "_Accept Defaults"
 msgstr "_Acceptér standardindstillinger"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Fejl ved tilslutning til samtale %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Ingen grund givet"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Fejl i samtale %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Du er blevet smidt ud af %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Smidt ud af %s: (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "En fejl skete ved forsøg på at åbne filen."
 
 #, fuzzy
@@ -5280,9 +5177,6 @@ msgstr ""
 "SSL-understøttelse er krævet til MSN. Installér et understøttet SSL-"
 "bibliotek."
 
-msgid "Failed to connect to server."
-msgstr "Kunne ikke forbinde til server."
-
 msgid "Error retrieving profile"
 msgstr "Fejl ved modtagelse af profil"
 
@@ -5536,9 +5430,6 @@ msgstr "Besked blev ikke sendt, fordi en ukendt kodningsfejl opstod."
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Besked blev ikke sendt, fordi en ukendt fejl opstod."
 
-msgid "Unable to connect"
-msgstr "Kunne ikke forbinde"
-
 msgid "Writing error"
 msgstr "Skrivningsfejl"
 
@@ -5553,20 +5444,24 @@ msgstr ""
 "Forbindelsesfejl fra %s server:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Vores protokol understøttes ikke af denne server."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Fejl ved fortolkning af HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Du er logget ind fra en anden maskine."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN-serverne er midlertidigt utilgængelige. Vent og forsøg igen senere."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN-serverne lukkes midlertidigt."
 
 #, c-format
@@ -5578,9 +5473,6 @@ msgid ""
 msgstr ""
 "Din MSN venneliste er midlertidigt utilgængelig. Vent og førsøg igen senere."
 
-msgid "Unknown error."
-msgstr "Ukendt fejl."
-
 msgid "Handshaking"
 msgstr "Forhandler"
 
@@ -5680,6 +5572,9 @@ msgstr "MSN-protokoludvidelsesmodul"
 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)"
@@ -5790,12 +5685,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Tilføj kontakter fra server"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Tilsluttet"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protokol fejlkode %d: %s"
@@ -5819,16 +5708,6 @@ msgstr "MySpaceIM-fejl"
 msgid "Invalid input condition"
 msgstr "Ugyldig indtastningsbetingelse"
 
-msgid "Read buffer full (2)"
-msgstr "Læsebuffer fuld (2)"
-
-msgid "Unparseable message"
-msgstr "Kunne ikke fortolke beskeden"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Kunne ikke forbinde til vært: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Kunne ikke tilføje ven"
 
@@ -5914,6 +5793,12 @@ msgstr "Totale venner"
 msgid "Client Version"
 msgstr "Klientversion"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Brugernavn tilgængeligt"
 
@@ -6171,9 +6056,9 @@ msgstr "Brugeren er enten afkoblet, eller du er blokeret"
 msgid "Unknown error: 0x%X"
 msgstr "Ukendt fejl: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Logind slog fejl (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Ude af stand til at pinge bruger %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6275,9 +6160,6 @@ msgstr "GroupWise konference %d"
 msgid "Authenticating..."
 msgstr "Godkender..."
 
-msgid "Unable to connect to server."
-msgstr "Kunne ikke kontakte server."
-
 msgid "Waiting for response..."
 msgstr "Venter på svar..."
 
@@ -6301,25 +6183,20 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Vil du tilslutte samtalen?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Du er blevet logget af, fordi du er logget på en anden maskine."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 "%s ser ud til at være afkoblet, og har ikke modtaget beskeden du har sendt."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Kunne ikke forbinde til server. Indtast adressen på serveren du vil forbinde "
 "til."
 
-msgid "Error. SSL support is not installed."
-msgstr "Fejl. SSL-understøttelse er ikke installeret."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Konferencen er blevet afsluttet. Der kan ikke sendes flere beskeder."
 
@@ -6358,10 +6235,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6370,18 +6244,8 @@ msgstr "Kunne ikke tilslutte samtalerum"
 msgid "Invalid chat room name"
 msgstr "Ugyldigt navn på samtalerum"
 
-msgid "Server closed the connection."
-msgstr "Server lukkede forbindelsen."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Mistede forbindelsen til server:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Modtog ugyldig data ved forbindelse med server."
 
 #. *< type
@@ -6429,7 +6293,8 @@ msgstr "Mistede forbindelse til fjernbrugeren:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Modtog ugyldige data ved forbindelse til fjern bruger."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Kunne ikke etablere en forbindelse til en fjernbruger."
 
 msgid "Direct IM established"
@@ -6629,21 +6494,15 @@ msgstr "Advarselsniveau"
 msgid "Buddy Comment"
 msgstr "Vennekommentar"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Kunne ikke forbinde til godkendelsesserveren:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Kunne ikke forbinde til BOS-server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Kunne ikke kontakte server."
 
 msgid "Username sent"
 msgstr "Brugernavn sendt"
@@ -6655,11 +6514,11 @@ msgstr "Forbindelse oprettet, cookie sendt"
 msgid "Finalizing connection"
 msgstr "Færddiggører forbindelse"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Kunne ikke logge ind: Kunne ikke logge på som %s, fordi brugernavnet er "
 "ugyldigt. Brugernavne skal være en gyldig e-postadresse, eller starte med et "
@@ -6675,26 +6534,22 @@ msgstr ""
 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."
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Bruger eksisterer ikke"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Din konto er ikke aktiv for øjeblikket."
 
 #. service temporarily unavailable
@@ -6714,7 +6569,8 @@ 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 længere."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "SecurID-nøglen du indtastede er ugyldig."
 
 msgid "Enter SecurID"
@@ -6890,6 +6746,9 @@ msgstr "Tilkoblet siden"
 msgid "Member Since"
 msgstr "Medlem siden"
 
+msgid "Capabilities"
+msgstr "Klient understøtter"
+
 msgid "Profile"
 msgstr "Profil"
 
@@ -7071,9 +6930,9 @@ msgstr[1] ""
 msgid "Away message too long."
 msgstr "Fraværsbesked for lang."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7098,9 +6957,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Tabte"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Kunne ikke tilføje vennen %s fordi du har for mange venner i din venneliste."
@@ -7109,8 +6968,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(intet navn)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Kunne ikke tilføje vennen %s af en ukendt årsag."
 
 #, c-format
@@ -7887,7 +7746,8 @@ msgstr "Hold i live interval (sekunder)"
 msgid "Update interval (seconds)"
 msgstr "Opdateringsinterval (sekunder)"
 
-msgid "Cannot decrypt server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "Kan ikke afkryptere serversvar"
 
 #, c-format
@@ -7912,9 +7772,6 @@ msgstr "Aktivering krævet"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Ukendt svarkode ved indlogning i (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Kunne ikke afkryptere serversvar"
-
 msgid "Requesting captcha"
 msgstr "Anmoder om captcha"
 
@@ -7948,29 +7805,18 @@ msgstr ""
 "Ukendt svarkode ved indlogning i (0x%02X):\n"
 "%s"
 
-msgid "Unable to connect."
-msgstr "Kunne ikke få kontakt."
-
 msgid "Socket error"
 msgstr "Sokkel-fejl"
 
-msgid "Unable to read from socket"
-msgstr "Kan ikke læse fra sokkel"
-
-msgid "Write Error"
-msgstr "Skrive fejl"
-
-msgid "Connection lost"
-msgstr "Forbindelse mistet"
-
 msgid "Getting server"
 msgstr "Finder server"
 
 msgid "Requesting token"
 msgstr "Anmoder om nøgle"
 
-msgid "Couldn't resolve host"
-msgstr "Kunne ikke slå vært op"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Kunne ikke kontakte server."
 
 msgid "Invalid server or port"
 msgstr "Ugyldig server eller port"
@@ -8023,7 +7869,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "QQ Qun-kommando"
 
-msgid "Could not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "Kan ikke afkryptere logindsvar"
 
 msgid "Unknown LOGIN CMD"
@@ -8043,9 +7890,6 @@ msgstr "Send fil"
 msgid "%d canceled the transfer of %s"
 msgstr "%d annullerede overførslen af %s"
 
-msgid "Connection closed (writing)"
-msgstr "Forbindelse lukket (skrivning)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Gruppe titel:</b> %s<br>"
@@ -8100,17 +7944,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime administrator annoncering"
 
-msgid "Connection reset"
-msgstr "Forbindelse lukket"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Fejl under læsning fra sokkel: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Kunne ikke forbinde til vært"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Annoncering fra %s"
@@ -8133,6 +7966,9 @@ msgstr "Højtalere"
 msgid "Video Camera"
 msgstr "Videokamera"
 
+msgid "File Transfer"
+msgstr "Filoverførsel"
+
 msgid "Supports"
 msgstr "Understøtter"
 
@@ -8947,6 +8783,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Netværk statistik"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping fejlede"
 
@@ -9010,7 +8849,8 @@ msgstr "Ikke understøttet offentlige nøgle type"
 msgid "Disconnected by server"
 msgstr "Afbrudt af server"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Fejl ved forbindelse til SILC-server"
 
 msgid "Key Exchange failed"
@@ -9022,26 +8862,26 @@ msgstr ""
 "Genoptagelse af tidligere session fejlede. Lav en ny forbindelse ved at "
 "trykke på gentabler forbindelse."
 
-msgid "Connection failed"
-msgstr "Forbindelse fejlede"
-
 msgid "Performing key exchange"
 msgstr "Udfører nøgleudveksling"
 
-msgid "Unable to create connection"
-msgstr "Kunne ikke oprette forbindelse"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Kunne ikke indlæse SILC-nøglepar"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Tilslutter til SILC-server"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Kunne ikke indlæse SILC-nøglepar"
+
 msgid "Out of memory"
 msgstr "Løb tør for hukommelse"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Kan ikke initialisere SILC-protokol"
 
 msgid "Error loading SILC key pair"
@@ -9334,7 +9174,8 @@ msgstr "Skriv alle beskeder under med digital underskrift og godkend dem"
 msgid "Creating SILC key pair..."
 msgstr "Opretter SILC-nøglepar..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Kan ikke oprette SILC-nøglepar\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9428,6 +9269,9 @@ msgstr "Tavle"
 msgid "No server statistics available"
 msgstr "Ingen serverstatistik tilgængelig"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Fejl ved forbindelse til SILC-server"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Fejl: Version uoverensstemmelse, opgradér din klient"
@@ -9468,30 +9312,27 @@ msgstr "Fejl: Ugyldig cookie"
 msgid "Failure: Authentication failed"
 msgstr "Fejl: Godkendelse fejlede"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Kan ikke initialisere SILC-klient forbindelse"
 
 msgid "John Noname"
 msgstr "Intet navn"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Kunne ikke indlæse SILC-nøglepar: %s"
 
-msgid "Could not write"
-msgstr "Kunne ikke skrive"
-
-msgid "Could not connect"
-msgstr "Kunne ikke forbinde"
+msgid "Unable to create connection"
+msgstr "Kunne ikke oprette forbindelse"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Ukendt serversvar."
 
-msgid "Could not create listen socket"
-msgstr "Kunne ikke oprette lyttende sokkel"
-
-msgid "Could not resolve hostname"
-msgstr "Kunne ikke slå værtsnavn op"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Kunne ikke oprette sokkel"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-brugernavne må ikke indeholde mellemrum og @-tegn"
@@ -9532,6 +9373,77 @@ msgstr "Autentificering bruger"
 msgid "Auth Domain"
 msgstr "Autentificering domæne"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;rum&gt;:  Tilslut samtalerum på Yahoo-netværket"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Vis rum på Yahoo-netværket"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Anmod en bruger om at starte en \"Doodle\"-session"
+
+msgid "Yahoo ID..."
+msgstr "Yahoo-id..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo protokolmodul"
+
+msgid "Pager server"
+msgstr "Bipper-server"
+
+msgid "Pager port"
+msgstr "Bipper port"
+
+msgid "File transfer server"
+msgstr "Filoverførselsserver"
+
+msgid "File transfer port"
+msgstr "Filoverførsel port"
+
+msgid "Chat room locale"
+msgstr "Samtalerum tegnsæt"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignorér konference og samtalerum invitationer"
+
+msgid "Chat room list URL"
+msgstr "Adresse på liste over samtalerum"
+
+msgid "Yahoo Chat server"
+msgstr "Yahoo-samtaleserver"
+
+msgid "Yahoo Chat port"
+msgstr "Yahoo-samtaleport"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo-id..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo protokolmodul"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9565,30 +9477,20 @@ msgstr "Vennetilføjelse nægtet"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  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."
@@ -9631,37 +9533,32 @@ msgstr ""
 "Ukendt fejl nummer %d. Prøv at logge ind på Yahoo!webstedet for at fixe "
 "dette."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "Kunne ikke tilføje ven %s til gruppe %s til serverlisten på konto %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Kunne ikke tilføje ven til serverliste"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hørbar %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Modtog ugyldigt HTTP-svar fra server."
 
-msgid "Connection problem"
-msgstr "Forbindelsesfejl"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Mistede forbindelsen til %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Kunne ikke etablere en forbindelse til %s:\n"
+"Kunne ikke etablere en forbindelse til server:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9724,73 +9621,15 @@ msgstr "Tilslut bruger i samtale..."
 msgid "Open Inbox"
 msgstr "Åbn indbakke"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;rum&gt;:  Tilslut samtalerum på Yahoo-netværket"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Vis rum på Yahoo-netværket"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Anmod en bruger om at starte en \"Doodle\"-session"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo-id..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo protokolmodul"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-msgid "Pager server"
-msgstr "Bipper-server"
-
-msgid "Japan Pager server"
-msgstr "Japan Bipper-server"
-
-msgid "Pager port"
-msgstr "Bipper port"
-
-msgid "File transfer server"
-msgstr "Filoverførselsserver"
-
-msgid "Japan file transfer server"
-msgstr "Japan filoverførselsserver"
-
-msgid "File transfer port"
-msgstr "Filoverførsel port"
-
-msgid "Chat room locale"
-msgstr "Samtalerum tegnsæt"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignorér konference og samtalerum invitationer"
-
-msgid "Chat room list URL"
-msgstr "Adresse på liste over samtalerum"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo-samtaleserver"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo-samtaleport"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Sendte Doodle anmodning."
 
+msgid "Unable to connect."
+msgstr "Kunne ikke få kontakt."
+
 msgid "Unable to establish file descriptor."
 msgstr "Kunne ikke etablere fildeskriptor."
 
@@ -9798,6 +9637,9 @@ msgstr "Kunne ikke etablere fildeskriptor."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s prøver at sende dig en gruppe på %d filer.\n"
 
+msgid "Write Error"
+msgstr "Skrive fejl"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan profil"
 
@@ -9916,23 +9758,19 @@ msgstr "Stemmer"
 msgid "Webcams"
 msgstr "Webkameraer"
 
+msgid "Connection problem"
+msgstr "Forbindelsesfejl"
+
 msgid "Unable to fetch room list."
 msgstr "Ikke i stand til at hente rumliste."
 
 msgid "User Rooms"
 msgstr "Brugerrum"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Forbindelsesfejl med YCHT serveren."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Mistede forbindelsen til server\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10057,33 +9895,22 @@ msgstr "Rige"
 msgid "Exposure"
 msgstr "Fremvisning"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Kunne ikke oprette sokkel:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Kunne ikke fortolke svar fra HTTP-proxy: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP-proxy forbindelsesfejl %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Adgang nægtet: HTTP-proxyserver tillader ikke port %d tunnel."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Fejl ved opløsning af %s"
 
-msgid "Could not resolve host name"
-msgstr "Kunne ikke slå værtsnavn op"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Anmoder om %s's opmærksomhed..."
@@ -10285,12 +10112,6 @@ msgstr "Fejl ved skrivning til %s: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "Kunne ikke forbinde til %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "Server kræver SSL til logind. Ingen TLS/SSL-understøttelse fundet."
-
 #, c-format
 msgid " - %s"
 msgstr " - %s"
@@ -10540,9 +10361,14 @@ msgstr "Tilføj venne_overvågning..."
 msgid "View _Log"
 msgstr "Vis _log"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Skjul når afkoblet"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Vis når afkoblet"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
@@ -11048,6 +10874,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Ændr brugeroplysninger for %s"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Indtast værtsnavnet som dette certifikat er beregnet til."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL-servere"
@@ -11095,7 +10925,8 @@ msgstr "Ignorér"
 msgid "Get Away Message"
 msgstr "Hent fraværsbesked"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Sidst sagt"
 
 msgid "Unable to save icon file to disk."
@@ -11983,7 +11814,8 @@ msgstr "Farve på henvisninger."
 msgid "Hyperlink visited color"
 msgstr "Farve på besøgt henvisning"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+#, fuzzy
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Farve på henvisning efter at de er blevet besøgt (eller aktiveret)."
 
 # virkelig dårlig oversættelse!
@@ -12021,13 +11853,22 @@ msgstr "Farve som bruges på navnet til en handlingsbesked."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Farve som bruges på navnet til hvisket handlingsbesked"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Farve som bruges på navnet til en handlingsbesked."
+
 msgid "Whisper Message Name Color"
 msgstr "Farve som bruges på navnet til hviskebesked"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Farve som bruges på navnet til en handlingsbesked."
+
 msgid "Typing notification color"
 msgstr "Farve på påmindelse af indtastning"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "Skriftfarven for indtastningspåmindelse"
 
 msgid "Typing notification font"
@@ -12425,6 +12266,10 @@ msgstr ""
 "\"Manuel\" browser-kommandoen er blevet valgt, men ingen kommando er blevet "
 "angivet."
 
+#, fuzzy
+msgid "No message"
+msgstr "Ukendt besked"
+
 msgid "Open All Messages"
 msgstr "Åbn alle beskeder"
 
@@ -12442,10 +12287,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Du har fået post!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Ukendt besked"
-
 msgid "The following plugins will be unloaded."
 msgstr "De følgende moduler kunne ikke udlæses."
 
@@ -12661,8 +12502,9 @@ msgstr "_Vis statusområde ikon:"
 msgid "On unread messages"
 msgstr "Ulæste beskeder"
 
-msgid "Conversation Window Hiding"
-msgstr "Skjul beskedsamtalevindue"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Beskedsamtalevinduer"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Skjul nye samtaler:"
@@ -12670,6 +12512,9 @@ msgstr "_Skjul nye samtaler:"
 msgid "When away"
 msgstr "Hvis fraværende"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Min_imér nye samtalevinduer"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Faner"
@@ -12728,9 +12573,6 @@ msgstr "Brug blød rullebjælke"
 msgid "F_lash window when IMs are received"
 msgstr "_Blink vindue når beskeder modtages"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Min_imér nye samtalevinduer"
-
 msgid "Minimum input area height in lines:"
 msgstr "Mindste højde, i linjer, af indtastningsfelt:"
 
@@ -12765,7 +12607,8 @@ msgstr "Kan ikke starte konfigurationsprogram til browser."
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Eksempel: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "Find IP-adresse _automatisk"
 
 msgid "Public _IP:"
@@ -13133,21 +12976,6 @@ msgstr "G_em og brug"
 msgid "Status for %s"
 msgstr "Status for %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "Tilpasset smiley"
-
-msgid "More Data needed"
-msgstr "Der er behov for flere data"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Angiv en genvej der skal tilknyttes smileyen."
-
 #, fuzzy, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
@@ -13155,12 +12983,12 @@ msgstr ""
 "En tilpasset smiley for den valgte genvej findes allerede. Angiv en anden "
 "genvej."
 
+msgid "Custom Smiley"
+msgstr "Tilpasset smiley"
+
 msgid "Duplicate Shortcut"
 msgstr "Dublet genvej"
 
-msgid "Please select an image for the smiley."
-msgstr "Vælg et billede til smileyen."
-
 msgid "Edit Smiley"
 msgstr "Redigér smiley"
 
@@ -13273,9 +13101,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Kan ikke sende starter"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Du har trukket en skrivebords starter. Højst sandsynligt vil du sende hvad "
 "starteren peger på og ikke starten selv."
@@ -13874,9 +13703,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Musik besked udvidelsesmodul for samarbejdskomposition."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Musik beskeds udvidelsesmodulet tillader flere bruger af gangen, til "
 "samtidig at arbejde på et stykke musik ved at redigere en fælles score i "
@@ -14135,9 +13965,10 @@ msgid "Conversation Window Send Button."
 msgstr "Samtalevindue sendknap."
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Tilføjer en sendknap til indtastningsområdet i samtalevinduet. Beregnet til "
 "når der ikke er noget fysisk tastatur tilstede."
@@ -14465,8 +14296,9 @@ msgstr "Indstillinger for Pidgin til Windows"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Specifikke indstillinger for Pidgin til Windows."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Indstillinger specifikt for Pidgin for Windows, såsom venneliste dokning."
 
@@ -14509,6 +14341,312 @@ msgstr ""
 "Dette udvidelsesmodul er nyttigt for fejlsøgning af XMPP-servere eller "
 "klienter."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Kan ikke åbne socket"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Kan ikke lytte på socket"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Kan ikke læse fra netværket"
+
+#~ msgid "Connection failed."
+#~ msgstr "Forbindelse fejlede."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Server har afbrudt forbindelse"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Kunne ikke oprette sokkel"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Kunne ikke kontakte vært"
+
+#~ msgid "Read error"
+#~ msgstr "Læsefejl"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kunne ikke etablere en forbindelse til server:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Fejl ved skrivning"
+
+#~ msgid "Last Activity"
+#~ msgstr "Sidste aktivitet"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Besked ved tjenesteopdagelse"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Elementer for tjenesteopdagelse"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Udvidet Stanza-adressering"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Flerbrugersamtale"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Flerbrugersamtale udvidede tilstedeværelsesinformation"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "In-Band-bytestrømme"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ad-Hoc-kommandoer"
+
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub-tjeneste"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5-bytestrømme"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Out of Band Data"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-besked"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "In-Band-registrering"
+
+#~ msgid "User Location"
+#~ msgstr "Brugerplacering"
+
+#~ msgid "User Avatar"
+#~ msgstr "Brugeravatar"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Samtalestatus påmindelser"
+
+#~ msgid "Software Version"
+#~ msgstr "Software version"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Klargøring af strøm"
+
+#~ msgid "User Mood"
+#~ msgstr "Brugerhumør"
+
+#~ msgid "User Activity"
+#~ msgstr "Brugeraktivitet"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Enhedsegenskaber"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Krypterede sessionsforhandlinger"
+
+#~ msgid "User Tune"
+#~ msgstr "Brugermelodi"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Navneliste over elementudveksling"
+
+#~ msgid "Reachability Address"
+#~ msgstr "E-post-adresse"
+
+#~ msgid "User Profile"
+#~ msgstr "Brugerprofil"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Jingle-lyd"
+
+#~ msgid "User Nickname"
+#~ msgstr "Brugerkælenavn"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle Raw UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Jingle video"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Beskedmodtagere"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Udgivelse af offentlig nøgle"
+
+#~ msgid "User Chatting"
+#~ msgstr "Bruger samtaler"
+
+#~ msgid "User Browsing"
+#~ msgstr "Bruger browser"
+
+#~ msgid "User Gaming"
+#~ msgstr "Bruger spiller"
+
+#~ msgid "User Viewing"
+#~ msgstr "Bruger ser"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Stanza-kryptering"
+
+#~ msgid "Entity Time"
+#~ msgstr "Tidsenhed"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Forsinket levering"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Samarbejdende dataobjekter"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Filarkiv og -deling"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "STUN-tjenesteopdagelse for Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Simplificeret krypteret sessionsforhandling"
+
+#~ msgid "Hop Check"
+#~ msgstr "Hop-kontrol"
+
+#~ msgid "Read Error"
+#~ msgstr "Læsefejl"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Kunne ikke forbinde til server."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Læsebuffer fuld (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Kunne ikke fortolke beskeden"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Kunne ikke forbinde til vært: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Logind slog fejl (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Kunne ikke kontakte server."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Du er blevet logget af, fordi du er logget på en anden maskine."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Fejl. SSL-understøttelse er ikke installeret."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Forkert adgangskode."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kunne ikke forbinde til BOS-server:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Du vil måske blive frakoblet snart. Kontrollér %s for opdateringer."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Forbindelse fejlede"
+
+#~ msgid "Invalid username."
+#~ msgstr "Ugyldigt brugernavn."
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Kunne ikke afkryptere serversvar"
+
+#~ msgid "Connection lost"
+#~ msgstr "Forbindelse mistet"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Kunne ikke slå vært op"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Forbindelse lukket (skrivning)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Forbindelse lukket"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Fejl under læsning fra sokkel: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Kunne ikke forbinde til vært"
+
+#~ msgid "Could not write"
+#~ msgstr "Kunne ikke skrive"
+
+#~ msgid "Could not connect"
+#~ msgstr "Kunne ikke forbinde"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Kunne ikke oprette lyttende sokkel"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Kunne ikke slå værtsnavn op"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Forkert adgangskode"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kunne ikke etablere en forbindelse til %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Japan Bipper-server"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japan filoverførselsserver"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Mistede forbindelsen til server\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Kunne ikke slå værtsnavn op"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "Server kræver SSL til logind. Ingen TLS/SSL-understøttelse fundet."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Skjul beskedsamtalevindue"
+
+#~ msgid "More Data needed"
+#~ msgstr "Der er behov for flere data"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Angiv en genvej der skal tilknyttes smileyen."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Vælg et billede til smileyen."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Aktivér hvilket id?"
 
@@ -15213,10 +15351,6 @@ msgstr ""
 #~ msgstr "Nuværende medie"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Kunne ikke kontakte server."
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_Besked:"
 
diff --git a/po/de.po b/po/de.po
index cf01cc6aa7..d2d9e5eb45 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-05 13:02+0200\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2009-07-05 13:02+0200\n"
 "Last-Translator: Jochen Kemnade <jochenkemnade@web.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
@@ -1562,6 +1562,7 @@ msgstr "Gnt-Verlauf"
 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"
 
@@ -2905,15 +2907,17 @@ msgstr ""
 "ActiveTCL-Installation nicht erkannt. Wenn Sie TCL-Plugins benutzen wollen, "
 "dann installieren Sie ActiveTCL von http://www.activestate.com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Apples Bonjour-Toolkit für Windows konnte nicht gefunden werden. Besuchen "
 "Sie die FAQ unter http://d.pidgin.im/BonjourWindows für weitere "
 "Informationen."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Kann nicht auf eingehende IM-Verbindungen hören\n"
 
 msgid ""
@@ -2968,14 +2972,21 @@ msgstr ""
 "Die Nachricht kann nicht gesendet werden, das Gespräch kann nicht gestartet "
 "werden."
 
-msgid "Cannot open socket"
-msgstr "Kann die Socket nicht öffnen"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Kann Socket nicht erstellen:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Kann die Socket nicht an den Port binden"
 
-msgid "Could not listen on socket"
-msgstr "Kann nicht an der Socket hören"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Kann Socket nicht erstellen:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Fehler bei der Kommunikation mit lokalem mDNSResponder."
@@ -3022,13 +3033,16 @@ msgstr "Buddy-Liste speichern..."
 msgid "Load buddylist from file..."
 msgstr "Buddy-Liste aus Datei laden..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Füllen Sie die Registrierungsfelder aus."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Passwörter stimmen nicht überein."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Kann neues Konto nicht anlegen. Es ist ein Fehler aufgetreten.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3040,14 +3054,15 @@ msgstr "Registrierung erfolgreich abgeschlossen!"
 msgid "Password"
 msgstr "Passwort"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr "Passwort (nochmal)"
 
-msgid "Enter current token"
-msgstr "Geben Sie das aktuelle Token ein"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Aktuelles Token"
+#, fuzzy
+msgid "Captcha"
+msgstr "Captcha-Bild"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrierung eines neuen Gadu-Gadu-Kontos"
@@ -3100,6 +3115,15 @@ msgstr "Das Passwort wurde erfolgreich geändert!"
 msgid "Current password"
 msgstr "Aktuelles Passwort"
 
+msgid "Password (retype)"
+msgstr "Passwort (nochmal)"
+
+msgid "Enter current token"
+msgstr "Geben Sie das aktuelle Token ein"
+
+msgid "Current token"
+msgstr "Aktuelles Token"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 "Bitte geben Sie Ihr aktuelles und Ihr neues Passwort für folgende UIN ein: "
@@ -3148,7 +3172,7 @@ msgstr "Keine entsprechenden Benutzer gefunden"
 msgid "There are no users matching your search criteria."
 msgstr "Es gibt keine Benutzer, die Ihrer Anfrage entsprechen."
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "Socket kann nicht gelesen werden"
 
 msgid "Buddy list downloaded"
@@ -3163,8 +3187,14 @@ msgstr "Buddy-Liste hochgeladen"
 msgid "Your buddy list was stored on the server."
 msgstr "Ihre Buddy-Liste wurde auf dem Server gespeichert."
 
-msgid "Connection failed."
-msgstr "Verbindung fehlgeschlagen."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Verbunden"
+
+msgid "Connection failed"
+msgstr "Verbindung fehlgeschlagen"
 
 msgid "Add to chat"
 msgstr "Zum Chat hinzufügen"
@@ -3172,17 +3202,23 @@ msgstr "Zum Chat hinzufügen"
 msgid "Chat _name:"
 msgstr "Chat_name:"
 
-#. should this be a settings error?
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Verbindung zum Server nicht möglich"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Verbindungsaufbau"
+
 msgid "Chat error"
 msgstr "Chatfehler"
 
 msgid "This chat name is already in use"
 msgstr "Dieser Chatname existiert bereits"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Nicht mit dem Server verbunden."
 
 msgid "Find buddies..."
@@ -3241,7 +3277,8 @@ msgstr "Kein Thema gesetzt"
 msgid "File Transfer Failed"
 msgstr "Dateiübertragung gescheitert"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Konnte keinen Listener-Port öffnen."
 
 msgid "Error displaying MOTD"
@@ -3257,8 +3294,18 @@ msgstr "Es gibt kein MOTD zu dieser Verbindung."
 msgid "MOTD for %s"
 msgstr "MOTD für %s"
 
-msgid "Server has disconnected"
-msgstr "Serververbindung wurde unterbrochen"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Verbindung zum Server verloren:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "MOTD anzeigen"
@@ -3272,22 +3319,20 @@ msgstr "_Passwort:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC- Server und -Nicknamen dürfen keine Leerzeichen enthalten"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Verbindungsaufbau"
-
 msgid "SSL support unavailable"
 msgstr "SSL-Unterstützung nicht verfügbar"
 
-msgid "Couldn't create socket"
-msgstr "Kann Socket nicht erstellen"
+msgid "Unable to connect"
+msgstr "Verbindung nicht möglich"
 
-msgid "Couldn't connect to host"
-msgstr "Keine Verbindung zum Host"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Verbindung zu %s nicht möglich"
 
-msgid "Read error"
-msgstr "Fehler beim Lesen"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Der Server hat die Verbindung beendet."
 
 msgid "Users"
 msgstr "Benutzer"
@@ -3719,12 +3764,14 @@ msgstr "Ad Hoc-Kommando gescheitert"
 msgid "execute"
 msgstr "Ausführen"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "Der Server benötigt TLS/SSL zur Anmeldung.  Es wurde kein TLS/SSL-Support "
 "gefunden."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "Sie fordern Verschlüsselung, aber es wurde keine TLS/SSL-Unterstützung "
 "gefunden."
@@ -3746,7 +3793,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Klartext-Authentifizierung"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Authentifizierung fehlgeschlagen"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Ungültige Serverantwort."
 
 msgid "Server does not use any supported authentication method"
@@ -3759,7 +3811,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "Ungültige Challenge vom Server"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL-Fehler"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3774,23 +3827,13 @@ msgstr "Nicht-unterstützte Version des BOSH-Protokolls"
 msgid "Unable to establish a connection with the server"
 msgstr "Die Verbindung mit dem Server konnte nicht hergestellt werden"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"Die Verbindung mit dem Server konnte nicht hergestellt werden:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Die Verbindung mit dem Server konnte nicht hergestellt werden"
 
 msgid "Unable to establish SSL connection"
 msgstr "Kann SSL-Verbindung nicht erstellen"
 
-msgid "Unable to create socket"
-msgstr "Kann Socket nicht erstellen"
-
-msgid "Write error"
-msgstr "Schreibfehler"
-
 msgid "Full Name"
 msgstr "Vollständiger Name"
 
@@ -4053,15 +4096,13 @@ msgstr "Keine Benutzer gefunden"
 msgid "Roles:"
 msgstr "Funktion"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Ping-Zeitüberschreitung"
 
-msgid "Read Error"
-msgstr "Fehler beim Lesen"
-
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4239,9 +4280,6 @@ msgstr "Ihr Passwort wurde geändert."
 msgid "Error changing password"
 msgstr "Fehler beim Ändern des Passworts"
 
-msgid "Password (again)"
-msgstr "Passwort (nochmal)"
-
 msgid "Change XMPP Password"
 msgstr "XMPP-Passwort ändern"
 
@@ -4631,6 +4669,14 @@ msgstr "Fehler bei Einlesen von XML-Daten"
 msgid "Unknown Error in presence"
 msgstr "Unbekannter Fehlercode"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Fehler beim Betreten des Chats %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Fehler im Chat %s"
+
 msgid "Create New Room"
 msgstr "Einen neuen Chat-Raum erstellen"
 
@@ -4647,13 +4693,17 @@ msgstr "Raum _konfigurieren"
 msgid "_Accept Defaults"
 msgstr "Standards _akzeptieren"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Fehler beim Betreten des Chats %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Kein Grund angegeben"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Fehler im Chat %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Sie wurden hinausgeworfen von %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Hinausgeworfen durch %s (%s)"
 
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
@@ -4762,166 +4812,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"
 
@@ -5098,9 +5201,6 @@ msgstr ""
 "Für MSN wird SSL-Unterstützung benötigt. Bitte installieren Sie eine "
 "unterstützte SSL-Bibliothek."
 
-msgid "Failed to connect to server."
-msgstr "Verbindung zum Server nicht möglich."
-
 msgid "Error retrieving profile"
 msgstr "Fehler beim Empfangen des Profils"
 
@@ -5362,9 +5462,6 @@ msgstr ""
 "Nachricht konnte nicht gesendet werden, da ein unbekannter Fehler "
 "aufgetreten ist."
 
-msgid "Unable to connect"
-msgstr "Verbindung nicht möglich"
-
 msgid "Writing error"
 msgstr "Schreibfehler"
 
@@ -5379,13 +5476,16 @@ msgstr ""
 "Verbindungsfehler vom %s-Server:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Unser Protokoll wird vom Server nicht unterstützt."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Fehler beim Verarbeiten von HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Sie haben sich von einem anderen Ort angemeldet."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5393,7 +5493,8 @@ msgstr ""
 "Die MSN-Server sind temporär nicht verfügbar. Bitte warten Sie und versuchen "
 "Sie es später nochmal."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Die MSN-Server werden kurzzeitig heruntergefahren."
 
 #, c-format
@@ -5406,9 +5507,6 @@ msgstr ""
 "Ihre MSN-Buddy-Liste ist temporär nicht verfügbar. Bitte warten Sie und "
 "versuchen Sie es später nochmal."
 
-msgid "Unknown error."
-msgstr "Unbekannter Fehler."
-
 msgid "Handshaking"
 msgstr "Abgleich"
 
@@ -5518,6 +5616,9 @@ msgstr "MSN-Protokoll-Plugin"
 msgid "%s is not a valid group."
 msgstr "%s ist keine gültige Gruppe."
 
+msgid "Unknown error."
+msgstr "Unbekannter Fehler."
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s auf %s (%s)"
@@ -5629,12 +5730,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Kontakte vom Server hinzufügen"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Verbunden"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protokollfehler, Code %d: %s"
@@ -5659,16 +5754,6 @@ msgstr "MySpaceIM-Fehler"
 msgid "Invalid input condition"
 msgstr "Ungültige Eingabebedingung"
 
-msgid "Read buffer full (2)"
-msgstr "Lesepuffer voll (2)"
-
-msgid "Unparseable message"
-msgstr "Kann die Nachricht nicht parsen"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Konnte nicht zum Host verbinden: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Kontakt konnte nicht hinzugefügt werden"
 
@@ -5755,6 +5840,12 @@ msgstr "Freunde insgesamt"
 msgid "Client Version"
 msgstr "Client-Version"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Benutzername verfügbar"
 
@@ -6014,9 +6105,9 @@ msgstr "Der Benutzer ist entweder offline oder Sie werden blockiert"
 msgid "Unknown error: 0x%X"
 msgstr "Unbekannter Fehler: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Anmeldung fehlgeschlagen (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Kann den Benutzer %s nicht anpingen"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6124,9 +6215,6 @@ msgstr "GroupWise-Konferenz %d"
 msgid "Authenticating..."
 msgstr "Authentifizierung..."
 
-msgid "Unable to connect to server."
-msgstr "Verbindung zum Server nicht möglich."
-
 msgid "Waiting for response..."
 msgstr "Warte auf Antwort..."
 
@@ -6150,11 +6238,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Möchten der Konferenz beitreten?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Sie wurden abgemeldet, weil Sie sich an einer anderen Workstation angemeldet "
-"haben."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6169,9 +6252,6 @@ msgstr ""
 "Kann keine Verbindung zum Server herstellen. Bitte geben Sie die Adresse des "
 "Servers ein, mit dem Sie sich verbinden wollen."
 
-msgid "Error. SSL support is not installed."
-msgstr "Fehler. SSL ist nicht installiert."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 "Diese Konferenz wurde geschlossen. Es können keine Nachrichten mehr gesendet "
@@ -6208,14 +6288,11 @@ msgstr ""
 "versuchen Sie es noch einmal. Wenn Sie es weiterversuchen, müssen Sie sogar "
 "noch länger warten."
 
-#, fuzzy
+#, 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6224,18 +6301,8 @@ msgstr "Konnte Chatraum nicht betreten"
 msgid "Invalid chat room name"
 msgstr "Ungültiger Chatraumname"
 
-msgid "Server closed the connection."
-msgstr "Der Server hat die Verbindung beendet."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Verbindung zum Server verloren:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Ungültige Daten in der Verbindung mit dem Server empfangen."
 
 #. *< type
@@ -6284,7 +6351,8 @@ msgid "Received invalid data on connection with remote user."
 msgstr ""
 "Ungültige Daten in der Verbindung mit dem entfernten Benutzer empfangen."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr ""
 "Die Verbindung mit dem entfernten Benutzer konnte nicht hergestellt werden."
 
@@ -6487,21 +6555,15 @@ msgstr "Warnstufe"
 msgid "Buddy Comment"
 msgstr "Buddy-Kommentar"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Verbindung zum Authentifizierungsserver nicht möglich:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Verbindung zum BOS-Server nicht möglich\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Verbindung zum Server nicht möglich."
 
 msgid "Username sent"
 msgstr "Benutzername gesendet"
@@ -6513,11 +6575,11 @@ msgstr "Verbindung hergestellt. Cookie gesendet"
 msgid "Finalizing connection"
 msgstr "Verbindung herstellen"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Anmeldung fehlgeschlagen: Sie konnten nicht als %s angemeldet werden, da der "
 "Benutzername fehlerhaft ist.  Benutzernamen müssen gültige E-Mail-Adressen "
@@ -6533,27 +6595,21 @@ msgstr ""
 msgid "Unable to get a valid AIM login hash."
 msgstr "Konnte keinen gültigen AIM Login-Hash bekommen."
 
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"Sie wurden in kurzer Zeit abgemeldet.  Überprüfen Sie %s wegen Updates."
-
 msgid "Unable to get a valid login hash."
 msgstr "Konnte keinen gültigen Login-Hash bekommen."
 
-msgid "Could Not Connect"
-msgstr "Verbinden nicht möglich"
-
 msgid "Received authorization"
 msgstr "Autorisierung empfangen"
 
 #. Unregistered username
+#. uid is not exist
 #. the username does not exist
 msgid "Username does not exist"
 msgstr "Benutzername existiert nicht"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Ihr Benutzerkonto ist momentan gesperrt."
 
 #. service temporarily unavailable
@@ -6574,7 +6630,8 @@ msgstr ""
 "versuchen Sie es noch einmal. Wenn Sie es weiterversuchen, müssen Sie sogar "
 "noch länger warten."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Der eingegebene SecurID-Schlüssel ist falsch."
 
 msgid "Enter SecurID"
@@ -6948,9 +7005,9 @@ msgstr[1] ""
 msgid "Away message too long."
 msgstr "Abwesenheitsmitteilungen zu lang."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6976,9 +7033,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Waisen"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Kann den Buddy %s nicht hinzufügen, weil Sie schon zu viele Buddys in Ihrer "
@@ -6987,8 +7044,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(kein Name)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Konnte den Buddy %s aus einem unbekannten Grund nicht hinzufügen."
 
 #, c-format
@@ -7763,7 +7820,8 @@ msgstr "Intervall zum Aufrechterhalten der Verbindung (Sekunden)"
 msgid "Update interval (seconds)"
 msgstr "Aktualisierungsintervall (Sekunden)"
 
-msgid "Cannot decrypt server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "Kann die Antwort des Servers nicht entschlüsseln"
 
 #, c-format
@@ -7788,9 +7846,6 @@ msgstr "Aktivierung erforderlich"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Unbekannte Antwort bei der Anmeldung (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Konnte die Antwort des Servers nicht entschlüsseln"
-
 msgid "Requesting captcha"
 msgstr "Captcha anfordern"
 
@@ -7812,10 +7867,6 @@ msgstr "QQ-Captcha-Überprüfung"
 msgid "Enter the text from the image"
 msgstr "Bitte geben Sie den Text aus dem Bild ein"
 
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Ungültiger Benutzername."
-
 #, c-format
 msgid "Unknown reply when checking password (0x%02X)"
 msgstr "Unbekannte Antwort bei Überprüfungen des Passwortes (0x%02X)"
@@ -7828,29 +7879,18 @@ msgstr ""
 "Unbekannte Antwort bei der Anmeldung (0x%02X):\n"
 "%s"
 
-msgid "Unable to connect."
-msgstr "Verbindung nicht möglich."
-
 msgid "Socket error"
 msgstr "Socket-Fehler"
 
-msgid "Unable to read from socket"
-msgstr "Socket kann nicht gelesen werden"
-
-msgid "Write Error"
-msgstr "Schreibfehler"
-
-msgid "Connection lost"
-msgstr "Verbindung verloren"
-
 msgid "Getting server"
 msgstr "Hole server"
 
 msgid "Requesting token"
 msgstr "Fordere Token an"
 
-msgid "Couldn't resolve host"
-msgstr "Kann den Hostnamen nicht auflösen"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Verbindung zum Server nicht möglich"
 
 msgid "Invalid server or port"
 msgstr "Ungültiger Server oder Port"
@@ -7903,7 +7943,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "QQ-Qun-Kommando"
 
-msgid "Could not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "Konnte die Antwort der Anmeldung nicht entschlüsseln"
 
 msgid "Unknown LOGIN CMD"
@@ -7923,9 +7964,6 @@ msgstr "Dateiübertragung"
 msgid "%d canceled the transfer of %s"
 msgstr "%d hat die Übertragung von %s abgebrochen"
 
-msgid "Connection closed (writing)"
-msgstr "Verbindung geschlossen (schreibend)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Gruppentitel:</b> %s<br>"
@@ -7980,17 +8018,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime-Administrator-Ankündigung"
 
-msgid "Connection reset"
-msgstr "Verbindung zurückgesetzt"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Fehler beim Lesen des Socket: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Verbindung zum Server nicht möglich"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Ankündigung von %s"
@@ -8526,6 +8553,7 @@ msgstr "<br><b>Kanal-HMAC:</b> %s"
 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> "
 
@@ -8550,6 +8578,7 @@ msgstr "Kanal-Passphrase"
 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 "
@@ -8910,7 +8939,8 @@ msgstr "Nicht-unterstützter Typ für den öffentlichen Schlüssel"
 msgid "Disconnected by server"
 msgstr "Abgemeldet vom Server"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Fehler beim Verbinden mit dem SILC-Server"
 
 msgid "Key Exchange failed"
@@ -8922,26 +8952,26 @@ msgstr ""
 "Das Fortsetzen der angehaltenen Sitzung ist fehlgeschlagen. Bitte drücken "
 "Sie „Neu Verbinden“, um eine neue Verbindung zu erzeugen."
 
-msgid "Connection failed"
-msgstr "Verbindung fehlgeschlagen"
-
 msgid "Performing key exchange"
 msgstr "Schlüsselaustausch"
 
-msgid "Unable to create connection"
-msgstr "Kann Verbindung nicht erstellen"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Konnte SILC-Schlüsselpaar nicht laden"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Verbinde mit SILC-Server"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Konnte SILC-Schlüsselpaar nicht laden"
+
 msgid "Out of memory"
 msgstr "Kein Speicher verfügbar"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Kann das SILC-Protokoll nicht initialisieren"
 
 msgid "Error loading SILC key pair"
@@ -8954,6 +8984,7 @@ msgstr "Download %s: %s"
 msgid "Your Current Mood"
 msgstr "Ihre momentane Stimmung"
 
+#, c-format
 msgid "Normal"
 msgstr "Normal"
 
@@ -9241,7 +9272,8 @@ msgstr "Alle IM-Nachrichten digital unterschreiben und überprüfen"
 msgid "Creating SILC key pair..."
 msgstr "Erstelle SILC-Schlüsselpaar..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Kann SILC-Schlüsselpaar nicht erstellen\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9339,64 +9371,74 @@ msgstr "Whiteboard"
 msgid "No server statistics available"
 msgstr "Keine Serverstatistik verfügbar"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Fehler beim Verbinden mit dem SILC-Server"
+
+#, 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"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Konnte die SILC-Client-Verbindung nicht herstellen"
 
 msgid "John Noname"
 msgstr "Max Mustermann"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Konnte SILC-Schlüsselpaar nicht laden: %s"
 
-msgid "Could not write"
-msgstr "Konnte nicht schreiben"
-
-msgid "Could not connect"
-msgstr "Verbinden nicht möglich"
+msgid "Unable to create connection"
+msgstr "Kann Verbindung nicht erstellen"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Unbekannte Serverantwort."
 
-msgid "Could not create listen socket"
-msgstr "Kann Listen-Socket nicht erstellen"
-
-msgid "Could not resolve hostname"
-msgstr "Konnte den Hostnamen nicht auflösen"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Kann Socket nicht erstellen"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-Benutzernamen dürfen keine Leerzeichen oder @-Symbole enthalten"
@@ -9437,6 +9479,77 @@ msgstr "Auth-Benutzer"
 msgid "Auth Domain"
 msgstr "Auth-Domain"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;Raum&gt;:  Einen Chatraum im Yahoo-Netzwerk betreten"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Liste Räume im Yahoo-Netzwerk auf"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Einen Benutzer auffordern, eine Mal-Sitzung zu starten"
+
+msgid "Yahoo ID..."
+msgstr "Yahoo-ID..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo-Protokoll-Plugin"
+
+msgid "Pager server"
+msgstr "Pager-Server"
+
+msgid "Pager port"
+msgstr "Pager-Port"
+
+msgid "File transfer server"
+msgstr "Server für Dateiübertragungen"
+
+msgid "File transfer port"
+msgstr "Port für Dateiübertragungen"
+
+msgid "Chat room locale"
+msgstr "Chatraum-Gebiet"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Konferenz- und Chateinladungen ignorieren"
+
+msgid "Chat room list URL"
+msgstr "Chatraumliste (URL)"
+
+msgid "Yahoo Chat server"
+msgstr "Yahoo-Chat-Server"
+
+msgid "Yahoo Chat port"
+msgstr "Yahoo-Chat-Port"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo-ID..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo-Protokoll-Plugin"
+
 msgid "Your SMS was not delivered"
 msgstr "Ihre SMS wurde nicht ausgeliefert"
 
@@ -9468,22 +9581,21 @@ msgstr "Hinzufügen des Buddys zurückgewiesen"
 msgid "Received invalid data"
 msgstr "Ungültige Daten empfangen"
 
-msgid "Incorrect Password"
-msgstr "Falsches Passwort"
-
 #. 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."
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
 msgstr ""
 "Konto gesperrt: Zu viele fehlgeschlagene Login-Versuche\n"
 "Eventuell können Sie dies beheben, wenn Sie sich auf der Yahoo!-Webseite "
 "anmelden."
 
 #. indicates a lock of some description
+#, fuzzy
 msgid ""
-"Account locked: Unknown reason.\n"
-"Logging into the Yahoo! website may fix this."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 "Konto gesperrt: Unbekannter Grund\n"
 " Eventuell können Sie dies beheben, wenn Sie sich auf der Yahoo!-Webseite "
@@ -9527,40 +9639,33 @@ msgstr ""
 "Unbekannte Fehlernummer %d. Vielleicht kann dies repariert werden, wenn Sie "
 "sich auf der Yahoo! Webseite anmelden."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Konnte den Buddy %s der Gruppe %s nicht zur Serverliste des Kontos %s "
 "hinzufügen."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Konnte den Buddy nicht zur Serverliste hinzufügen"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hörbar %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Ungültige HTTP-Antwort vom Server empfangen."
 
-msgid "Connection problem"
-msgstr "Verbindungsfehler"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Verbindung zu %s verloren:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"Die Verbindung mit %s konnte nicht hergestellt werden:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Die Verbindung mit dem Server konnte nicht hergestellt werden"
 
 msgid "Not at Home"
 msgstr "Nicht zu Hause"
@@ -9622,73 +9727,15 @@ msgstr "Einen Benutzer zum Chat einladen..."
 msgid "Open Inbox"
 msgstr "Öffne Posteingang"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;Raum&gt;:  Einen Chatraum im Yahoo-Netzwerk betreten"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Liste Räume im Yahoo-Netzwerk auf"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Einen Benutzer auffordern, eine Mal-Sitzung zu starten"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo-ID..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo-Protokoll-Plugin"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-msgid "Pager server"
-msgstr "Pager-Server"
-
-msgid "Japan Pager server"
-msgstr "Pager-Server (Japan)"
-
-msgid "Pager port"
-msgstr "Pager-Port"
-
-msgid "File transfer server"
-msgstr "Server für Dateiübertragungen"
-
-msgid "Japan file transfer server"
-msgstr "Server für Dateiübertragungen (Japan)"
-
-msgid "File transfer port"
-msgstr "Port für Dateiübertragungen"
-
-msgid "Chat room locale"
-msgstr "Chatraum-Gebiet"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Konferenz- und Chateinladungen ignorieren"
-
-msgid "Chat room list URL"
-msgstr "Chatraumliste (URL)"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo-Chat-Server"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo-Chat-Port"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Doodle-Anfrage senden."
 
+msgid "Unable to connect."
+msgstr "Verbindung nicht möglich."
+
 msgid "Unable to establish file descriptor."
 msgstr "Konnte Dateibeschreibung nicht erstellen."
 
@@ -9696,6 +9743,9 @@ msgstr "Konnte Dateibeschreibung nicht erstellen."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s versucht, Ihnen eine Gruppe von %d Dateien zu senden.\n"
 
+msgid "Write Error"
+msgstr "Schreibfehler"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo!-Japan-Profil"
 
@@ -9814,23 +9864,19 @@ msgstr "Stimmen"
 msgid "Webcams"
 msgstr "Webcams"
 
+msgid "Connection problem"
+msgstr "Verbindungsfehler"
+
 msgid "Unable to fetch room list."
 msgstr "Kamm die Raumliste nicht abrufen."
 
 msgid "User Rooms"
 msgstr "Benutzerräume"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Verbindungsproblem mit dem YCHT-Server."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Verbindung zum Server verloren\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -9963,24 +10009,16 @@ msgstr "Realm"
 msgid "Exposure"
 msgstr "Aussetzen"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Kann Socket nicht erstellen:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Kann Antwort vom HTTP-Proxy nicht verarbeiten: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP-Proxy-Verbindungsfehler %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "Zugriff verboten: Der HTTP-Proxy-Server verbietet das Tunneling über Port %d."
 
@@ -9988,9 +10026,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr "Fehler beim Auflösen von %s"
 
-msgid "Could not resolve host name"
-msgstr "Kann den Hostnamen nicht auflösen"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Bitte um %ss Aufmerksamkeit..."
@@ -10193,14 +10228,6 @@ msgid "Unable to connect to %s: %s"
 msgstr "Verbindung zu %s nicht möglich: %s"
 
 #, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"Verbindung zu %s fehlgeschlagen: Der Server verlangt TLS/SSL, es wurde "
-"jedoch kein TLS/SSL-Support gefunden."
-
-#, c-format
 msgid " - %s"
 msgstr " - %s"
 
@@ -10209,24 +10236,29 @@ msgid " (%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."
 
@@ -10449,9 +10481,14 @@ msgstr "_Buddy-Alarm hinzufügen..."
 msgid "View _Log"
 msgstr "Mi_tschnitt anzeigen"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Verstecken, wenn im Offline-Modus"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Anzeigen, wenn im Offline-Modus"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
@@ -11006,7 +11043,8 @@ msgstr "Ignorieren"
 msgid "Get Away Message"
 msgstr "Neue Abwesenheitsnachricht abholen"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Zuletzt gesagt"
 
 msgid "Unable to save icon file to disk."
@@ -11616,6 +11654,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/>"
@@ -11623,6 +11662,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@pidgin.im"
 "\">support@pidgin.im</A><BR/><BR/>"
@@ -11630,11 +11670,13 @@ msgstr ""
 "<FONT SIZE=\"4\">Hilfe per E-Mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
 "\">support@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@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">XMPP-MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 
@@ -12300,6 +12342,7 @@ msgstr ""
 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"
 
@@ -12490,36 +12533,47 @@ msgstr "_Wiederkehrend"
 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!"
 
@@ -12565,8 +12619,9 @@ msgstr "Kontrollleisten-Icon _anzeigen:"
 msgid "On unread messages"
 msgstr "Bei ungelesenen Nachrichten"
 
-msgid "Conversation Window Hiding"
-msgstr "Gesprächsfenster verstecken"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "IM Gesprächsfenster"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Neue IM-Gespräche verstecken:"
@@ -12574,6 +12629,9 @@ msgstr "_Neue IM-Gespräche verstecken:"
 msgid "When away"
 msgstr "Bei Abwesenheit"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Neue Gesprächsfenster mi_nimieren"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Reiter"
@@ -12632,9 +12690,6 @@ msgstr "Weiches Scrollen aktivieren"
 msgid "F_lash window when IMs are received"
 msgstr "Fenster b_linkt, wenn IM-Nachrichten empfangen werden"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Neue Gesprächsfenster mi_nimieren"
-
 msgid "Minimum input area height in lines:"
 msgstr "Minimale Höhe des Eingabefeldes in Zeilen:"
 
@@ -12807,21 +12862,27 @@ msgstr "Schneide alle _Statusveränderungen im System-Mitschnitt mit"
 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"
 
@@ -13905,6 +13966,7 @@ msgstr "Benachrichtigungsdialog"
 msgid "Select Color"
 msgstr "Farbe auswählen"
 
+#, c-format
 msgid "Select Interface Font"
 msgstr "Schriftart wählen"
 
@@ -14207,6 +14269,7 @@ msgstr "Zeige alle N Minuten iChat-ähnliche Zeitstempel an."
 msgid "Timestamp Format Options"
 msgstr "Zeitstempelformat-Optionen"
 
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr "_Erzwinge 24-Stunden Zeitformat"
 
@@ -14374,3 +14437,156 @@ msgstr "Sendet und empfängt RAW-XMPP-Blöcke."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Dieses Plugin ist nützlich zur Fehlersuche in XMPP-Servern oder -Clients."
+
+#~ msgid "Cannot open socket"
+#~ msgstr "Kann die Socket nicht öffnen"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Kann nicht an der Socket hören"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Socket kann nicht gelesen werden"
+
+#~ msgid "Connection failed."
+#~ msgstr "Verbindung fehlgeschlagen."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Serververbindung wurde unterbrochen"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Kann Socket nicht erstellen"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Keine Verbindung zum Host"
+
+#~ msgid "Read error"
+#~ msgstr "Fehler beim Lesen"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Die Verbindung mit dem Server konnte nicht hergestellt werden:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Schreibfehler"
+
+#~ msgid "Read Error"
+#~ msgstr "Fehler beim Lesen"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Verbindung zum Server nicht möglich."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Lesepuffer voll (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Kann die Nachricht nicht parsen"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Konnte nicht zum Host verbinden: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Anmeldung fehlgeschlagen (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Sie wurden abgemeldet, weil Sie sich an einer anderen Workstation "
+#~ "angemeldet haben."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Fehler. SSL ist nicht installiert."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Falsches Passwort."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Verbindung zum BOS-Server nicht möglich\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "Sie wurden in kurzer Zeit abgemeldet.  Überprüfen Sie %s wegen Updates."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Verbinden nicht möglich"
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Konnte die Antwort des Servers nicht entschlüsseln"
+
+#~ msgid "Invalid username."
+#~ msgstr "Ungültiger Benutzername."
+
+#~ msgid "Connection lost"
+#~ msgstr "Verbindung verloren"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Kann den Hostnamen nicht auflösen"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Verbindung geschlossen (schreibend)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Verbindung zurückgesetzt"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Fehler beim Lesen des Socket: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Verbindung zum Server nicht möglich"
+
+#~ msgid "Could not write"
+#~ msgstr "Konnte nicht schreiben"
+
+#~ msgid "Could not connect"
+#~ msgstr "Verbinden nicht möglich"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Kann Listen-Socket nicht erstellen"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Konnte den Hostnamen nicht auflösen"
+
+#~ msgid "Incorrect Password"
+#~ msgstr "Falsches Passwort"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Die Verbindung mit %s konnte nicht hergestellt werden:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Pager-Server (Japan)"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Server für Dateiübertragungen (Japan)"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Verbindung zum Server verloren\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Kann den Hostnamen nicht auflösen"
+
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Verbindung zu %s fehlgeschlagen: Der Server verlangt TLS/SSL, es wurde "
+#~ "jedoch kein TLS/SSL-Support gefunden."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Gesprächsfenster verstecken"
diff --git a/po/dz.po b/po/dz.po
index 17d2c3341e..cb4dd82c03 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2006-11-09 17:11+0530\n"
 "Last-Translator: wangmo sherpa <rinwanshe@yahoo.com>\n"
 "Language-Team:  <pgeygel@dit.gov.bt>\n"
@@ -2663,9 +2663,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "ཨའི་ཨེམ་ཞབས་ཏོག་སྤྱོད་མི་གཞན་མི་ཚུ་གྲངས་སུ་བཙུགས་ཏེ་ ལོག་མཐོན་བྱེད་ནང་དྲན་དེབ་བཀོདཔ་ཨིན།"
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2721,7 +2722,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2969,11 +2970,12 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "ནང་འབྱོར་ཨའི་ཨེམ་མཐུད་ལམ་ཚུའི་དོན་ལུ་ཉན་མ་ཚུགསཔ།\n"
 
 msgid ""
@@ -3030,14 +3032,21 @@ msgstr "%s གིས་ གྲོས་གླེང་ཁ་བསྡམས་�
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "འཕྲིན་དོན་འདི་གཏང་མ་ཚུགས་ གྲོས་གླེང་འདི་འགོ་བཙུགས་མ་ཚུགས།"
 
-msgid "Cannot open socket"
-msgstr "སོ་ཀེཊི་ཁ་ཕྱེ་མ་ཚུགས།"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"སོ་ཀེཊི་གསར་བསྐྲུན་འབད་མ་ཚུགསཔ་:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "འདྲེན་ལམ་ལུ་ སོ་ཀེཊི་བསྡམས་མ་ཚུགས།"
 
-msgid "Could not listen on socket"
-msgstr "སོ་ཀེཊི་གུ་ལུ་ ཉན་མ་ཚུགས།"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"སོ་ཀེཊི་གསར་བསྐྲུན་འབད་མ་ཚུགསཔ་:\n"
+"%s"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3087,13 +3096,16 @@ msgstr "ཆ་རོགས་ཐོ་ཡིག་སྲུངས་བཞག...
 msgid "Load buddylist from file..."
 msgstr "ཡིག་སྣོད་ལས་ ཆ་རོགས་ཐོ་ཡིག་མངོན་གསལ་འབད།..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "ཐོ་བཀོད་ས་སྒོ་ཚུ་བཀང་།"
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "ཆོག་ཡིག་འདི་མི་མཐུན་པས།"
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "རྩིས་ཐོ་གསརཔ་ཐོ་འགོད་འབད་མ་ཚུགས། འཛོལ་བ་བྱུང་ཡི།\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3105,14 +3117,15 @@ msgstr "ཐོ་འགོད་འདི་ མཐར་འཁྱོལ་ས�
 msgid "Password"
 msgstr "ཆོག་ཡིག"
 
-msgid "Password (retype)"
-msgstr "ཆོག་ཡིག་(ལོག་ཡིག་དཔར་བརྐྱབ)།"
+msgid "Password (again)"
+msgstr "ཆོག་ཡིག(ལོག་སྟེ)"
 
-msgid "Enter current token"
-msgstr "ད་ལྟོའི་ངོ་རྟགས་བཙུགས།"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "ད་ལྟོའི་ངོ་རྟགས།"
+#, fuzzy
+msgid "Captcha"
+msgstr "གཟུགས་བརྙན་སྲུང་བཞག་འབད།"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "ག་ཌུ་-ག་ཌུ་ རྩིས་ཐོ་གསརཔ་ཐོ་འགོད་འབད།"
@@ -3165,6 +3178,15 @@ msgstr "ཆོག་ཡིག་འདི་མཐར་འཁྱོལ་སྦ
 msgid "Current password"
 msgstr "ད་ལྟོའི་ཆོག་ཡིག"
 
+msgid "Password (retype)"
+msgstr "ཆོག་ཡིག་(ལོག་ཡིག་དཔར་བརྐྱབ)།"
+
+msgid "Enter current token"
+msgstr "ད་ལྟོའི་ངོ་རྟགས་བཙུགས།"
+
+msgid "Current token"
+msgstr "ད་ལྟོའི་ངོ་རྟགས།"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "ཡུ་ཨའི་ཨེེན་དོན་ལུ་ ད་ལྟོའི་ཆོག་ཡིག་དང་ ཆོག་ཡིག་གསརཔ་བཙུགས་གནང་།:"
 
@@ -3212,8 +3234,8 @@ msgstr "ལག་ལེན་པ་མཐུན་སྒྲིག་ཚུ་འ
 msgid "There are no users matching your search criteria."
 msgstr "ཁྱོད་ཀྱི་ འཚོལ་ཞིབ་ཁྱད་ཚད་མཐུན་སྒྲིག་འབད་བའི་ལག་ལེན་པ་ཚུ་གཅིག་ཡང་མིན་འདུག"
 
-msgid "Unable to read socket"
-msgstr "སོ་ཀེཊི་ལྷག་མི་ཚུགས།"
+msgid "Unable to read from socket"
+msgstr "སོ་ཀེཊི་ལས་ ལྷག་མ་ཚུགས།"
 
 msgid "Buddy list downloaded"
 msgstr "ཆ་རོགས་ཐོ་ཡིག་ཕབ་ལེན་འབད་ཡོདཔ།"
@@ -3227,8 +3249,14 @@ msgstr "ཆ་རོགས་ཐོ་ཡིག་སྐྱེལ་བཙུག
 msgid "Your buddy list was stored on the server."
 msgstr "ཁྱོད་ཀྱི་ ཆ་རོགས་ཐོ་ཡིག་འདི་ སར་བར་གུ་ལུ་གསོག་འཇོག་འབད་བཞག་ནུག"
 
-msgid "Connection failed."
-msgstr "མཐུད་ལམ་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "མཐུད་ཡོདཔ།"
+
+msgid "Connection failed"
+msgstr "མཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
 msgid "Add to chat"
 msgstr "ཁ་སླབ་ལུ་ཁ་སྐོང་བརྐྱབ།"
@@ -3236,18 +3264,23 @@ msgstr "ཁ་སླབ་ལུ་ཁ་སྐོང་བརྐྱབ།"
 msgid "Chat _name:"
 msgstr "ཁ་སླབ་ མིང་།:(_n)"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "སར་བར་ པིང་འབད་མ་ཚུགས།"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "མཐུད་དོ།"
+
 msgid "Chat error"
 msgstr "ཁ་སླབ་འཛོལ་བ།"
 
 msgid "This chat name is already in use"
 msgstr "འ་ནི་ཁ་སླབ་འདི་ ཧེ་མ་ལས་རང་ལག་ལེན་འཐབ་བཞིན་ཡོད།"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "སར་བར་ལུ་མཐུད་དེ་མེདཔ།"
 
 msgid "Find buddies..."
@@ -3308,7 +3341,7 @@ msgid "File Transfer Failed"
 msgstr "ཡིག་སྣོད་གནས་སོར་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "གཱེམ་གྱིས་ཉན་ནིའི་འདྲེན་ལམ་ཁ་ཕྱེ་མི་ཚུགས།"
 
 msgid "Error displaying MOTD"
@@ -3324,8 +3357,18 @@ msgstr "མཐུད་ལམ་འདི་དང་ འབྲེལ་བའ�
 msgid "MOTD for %s"
 msgstr "ཨེམ་ཨོ་ཊི་ཌིའི་ དོན་ལུ་  %s"
 
-msgid "Server has disconnected"
-msgstr "སར་བར་འདི་ མཐུད་བཏོག་ནུག"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"སར་བར་དང་གཅིག་ཁར་ མཐུད་ལམ་བརླག་སྟོར་ཞུགས་ནུག:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "ཨེམ་ཨོ་ཊི་ཌི་ བལྟ།"
@@ -3340,22 +3383,20 @@ msgstr "ཆོག་ཡིག:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "ཨའི་ཨར་སི་ ནིཀསི་ནང་ལུ་ བར་སྟོང་དཀརཔོ་མེདཔ་འོང་།"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "མཐུད་དོ།"
-
 msgid "SSL support unavailable"
 msgstr "SSL རྒྱབ་སྐྱོར་མི་ཐོབ།"
 
-msgid "Couldn't create socket"
-msgstr "སོ་ཀེཊི་ གསར་བསྐྲུན་འབད་མི་ཚུགས།"
+msgid "Unable to connect"
+msgstr "མཐུད་མ་ཚུགས།"
 
-msgid "Couldn't connect to host"
-msgstr "ཧོསཊི་ལུ་མཐུད་མ་ཚུགས།"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "%sལུ་མཐུད་མ་ཚུགས།"
 
-msgid "Read error"
-msgstr "འཛོལ་བ་ལྷག"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "སར་བར་གྱིས་ མཐུད་ལམ་ཁ་བསྡམས་ད་ནུག"
 
 msgid "Users"
 msgstr "ལག་ལེན་པ་ཚུ།"
@@ -3791,13 +3832,14 @@ msgstr "བརྡ་བཀོད་ལྕོགས་མིན་ཐལ།"
 msgid "execute"
 msgstr "རེ་བ་མ་བསྐྱེད།"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "ནང་བསྐྱོད་ཀྱི་དོན་ལས་ སར་བར་ལུ་ ཊི་ཨེལ་ཨེསི/ཨེསི་ཨེསི་ཨེལ་ དགོས་མཁོ་ཡོདཔ་ཨིན།  ཊི་ཨེལ་ཨེསི/ཨེསི་ཨེསི་ཨེལ་ "
 "རྒྱབ་སྐྱོར་མིན་འདུག"
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "ནང་བསྐྱོད་ཀྱི་དོན་ལས་ སར་བར་ལུ་ ཊི་ཨེལ་ཨེསི/ཨེསི་ཨེསི་ཨེལ་ དགོས་མཁོ་ཡོདཔ་ཨིན།  ཊི་ཨེལ་ཨེསི/ཨེསི་ཨེསི་ཨེལ་ "
 "རྒྱབ་སྐྱོར་མིན་འདུག"
@@ -3817,7 +3859,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "ཚིག་ཡིག་ཉག་རྐྱང་གི་བདེན་བཤད།"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "བདེན་བཤད་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "སར་བར་ལས་ནུས་མེད་ཀྱི་ལན།"
 
 msgid "Server does not use any supported authentication method"
@@ -3829,7 +3876,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "སར་བར་ལས་ ནུས་མེད་ཀྱི་དོ་འགྲན།"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "ཨེསི་ཨེ་ཨེསི་ཨེལ་ འཛོལ་བ།"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3849,10 +3897,8 @@ msgstr ""
 "སར་བར་དང་གཅིག་ཁར་ མཐུད་ལམ་གཞི་འཛུགས་འབད་མ་ཚུགས།:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "སར་བར་དང་གཅིག་ཁར་ མཐུད་ལམ་གཞི་འཛུགས་འབད་མ་ཚུགས།:\n"
 "%s"
@@ -3861,12 +3907,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "མཐུད་ལམ་གསར་བསྐྲུན་འབད་མ་ཚུགསཔ།"
 
-msgid "Unable to create socket"
-msgstr "སོ་ཀེཊི་བཟོ་བསྐྲུན་འབད་མི་ཚུགས་པས།"
-
-msgid "Write error"
-msgstr "འཛོལ་བ་བྲིས།"
-
 msgid "Full Name"
 msgstr "ངོ་མིང་ཆ་ཚང་།"
 
@@ -3937,188 +3977,6 @@ msgstr "རིམ་ལུགས་བཀོལ་སྤྱོད་འབད་
 msgid "Local Time"
 msgstr "ཉེ་གནས་ཀྱི་ཡིག་སྣོད:"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "Dir བརྡ་དོན་གཞི་སྒྲིག་འབད།"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "རྒྱ་བསྐྱེད་ཅན་གྱི་ཁ་བྱང་།"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "ཁ་སླབ་མིང་གཞན།"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "ལག་ལེན་པ་ལུ་ སྣོད་ཐོའི་བརྡ་དོན་མིན་འདུག"
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "བརྡ་བཀོད།"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "ཨེཅི་ཊི་ཨེམ་ཨེལ།"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "ཐོ་འགོད་འབད་ནིའི་འཛོལ་བ།"
-
-#, fuzzy
-msgid "User Location"
-msgstr "གནས་ཁོངས།"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "ལག་ལེན་པ་གི་འཚོལ་ཞིབ།"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "ཆ་རོགས་ཀྱི་གནས་ལུགས་བརྡ་བསྐུལ་འབད་ནི།"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "རྒྱབ་སྐྱོར་མ་འབད་བའི་ཐོན་རིམ།"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "ཕྱོགས།"
-
-msgid "File Transfer"
-msgstr "ཡིག་སྣོད་གནས་སོར།"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "ལག་ལེན་པའི་ཐབས་ལམ་ཚུ།"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "ལག་ལེན་པའི་ཚད།"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "ལྕོགས་གྲུབ།"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "ལག་ལེན་པའི་མིང་།"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "ཨའི་ཨེམ་དང་བཅས་ལྡེ་མིག་བརྗེ་སོར།"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "གློག་འཕྲིན་ཁ་བྱང་།"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "གསལ་སྡུད་གཞི་སྒྲིག་འབད།"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "མཐུད་ནི།"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "ལག་ལེན་པའི་ མིང་།"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "མངོན་མཐོང་ ཝི་ཌིའོ།"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "འཕྲིན་དོན་ཐོབ་ཅི།"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "མི་མང་ལྡེ་མིག་ བ་བཱལ པིརིནཊི།"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "ལག་ལེན་པའི་གདམ་ཁ་ཚུ།"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "ལག་ལེན་པའི་ཐབས་ལམ་ཚུ།"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "ལག་ལེན་པའི་ མིང་།"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "ལག་ལེན་པའི་ཚད།"
-
-msgid "Ping"
-msgstr "པིང་།"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "ཊིལིཡེན་ གསང་བཟོ།"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "ལྕོགས་གྲུབ།"
-
 msgid "Priority"
 msgstr "གཙོ་རིམ།"
 
@@ -4130,7 +3988,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "ཕྱིར་བསྐྱོད།"
 
 msgid "Middle Name"
@@ -4316,16 +4174,12 @@ msgid "Roles:"
 msgstr "ལས་འགན།"
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "ཉག་རྐྱང་གི་ཚིག་ཡིག"
 
-msgid "Read Error"
-msgstr "འཛོལ་བ་ལྷག"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 #, fuzzy
@@ -4515,9 +4369,6 @@ msgstr "ཁྱོད་ཀྱི་ཆོག་ཡིག་འདི་བསྒ
 msgid "Error changing password"
 msgstr "འཛོལ་བ་བསྒྱུར་བཅེོས་ཀྱི་ཆོག་ཡིག"
 
-msgid "Password (again)"
-msgstr "ཆོག་ཡིག(ལོག་སྟེ)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "ཆོག་ཡིག་བསྒྱུར་བཅོས་འབད།"
@@ -4914,6 +4765,14 @@ msgstr "ཨེགསི་ཨེམ་ཨེལ་ འཛོལ་བ་མི�
 msgid "Unknown Error in presence"
 msgstr "ངོ་འཛོམས་ནང་ ངོ་མ་ཤེས་པའི་འཛོལ་བ།"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "ཁ་སླབ་ %sནང་འཛུལ་ནི་ འཛོལ་བ།"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "ཁ་སླབ་ %sནང་ལུ་ འཛོལ་བ།"
+
 msgid "Create New Room"
 msgstr "ཁང་མིག་གསརཔ་བཟོ་བསྐྲུན་འབད།"
 
@@ -4930,16 +4789,20 @@ msgstr "ཁང་མིག་རིམ་སྒྲིག་འབད།(_C)"
 msgid "_Accept Defaults"
 msgstr "སྔོན་སྒྲིག་ཚུ་དང་ལེན་འབད།(_A)"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "ཁ་སླབ་ %sནང་འཛུལ་ནི་ འཛོལ་བ།"
+#, fuzzy
+msgid "No reason"
+msgstr "རྒྱུ་མཚན་མ་བཀོད་པས།"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "ཁ་སླབ་ %sནང་ལུ་ འཛོལ་བ།"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "ཁྱོད་  %s: (%s)ཀྱིས་བཏོན་བཏང་ནུག"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s (%s)ཀྱིས་ བཏོན་བཏང་ཡི།"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "ཡིག་སྣོད་ཁ་ཕྱེཝ་ད་ འཛོལ་བ་བྱུང་ནུག"
 
 #, fuzzy
@@ -5455,9 +5318,6 @@ msgstr ""
 "མཛོད་འདི་གཞི་བཙུགས་འབད་གནང་།     བརྡ་དོན་ཁ་གསལ་གྱི་དོན་ལུ http://གཱེམsf.net/faq-ssl.php "
 "ནང་བལྟ།"
 
-msgid "Failed to connect to server."
-msgstr "སར་བར་ལུ་མཐུད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-
 msgid "Error retrieving profile"
 msgstr "འཛོལ་བ་ སླར་འདྲེན་འབད་བའི་གསལ་སྡུད།"
 
@@ -5715,9 +5575,6 @@ msgstr "འཕྲིན་དོན་འདི་མ་གཏང་འོང་
 msgid "Message was not sent because an unknown error occurred."
 msgstr "འཕྲིན་དོན་འདི་མ་གཏང་འོང་ནི་མས་ ག་ཅི་འབད་ཟེར་བ་ཅིན་ ངོ་མ་ཤེས་པའི་འཛོལ་བ་བྱུང་ནུག:"
 
-msgid "Unable to connect"
-msgstr "མཐུད་མ་ཚུགས།"
-
 msgid "Writing error"
 msgstr "འཛོལ་བ་བྲིས་དོ།"
 
@@ -5732,19 +5589,23 @@ msgstr ""
 "%s སར་བར་ལས་ མཐུད་ལམ་འཛོལ་བ།:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "ང་བཅས་ཀྱི་གནད་སྤེལ་ལམ་ལུགས་འདི་ སར་བར་གྱིས་རྒྱབ་སྐྱོར་འབད་འབདཝ་མེན།"
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "འཛོལ་བ་མིང་དཔྱད་འབད་དོ་ ཨེཆ་ཊི་ཊི་པི།"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "ཁྱོད་ གནས་ཁོངས་གཞན་ཅིག་ཁ་ལས་ ནང་ན་འཛུལ་ནུག"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "ཨེམ་ཨེསི་ཨེན་ སར་བར་ཚུ་ གནས་སྐབས་ཅིག་ཐོབ་མི་ཚུགས། ཨ་ཙི་བསྒུག་ཞིན་ན་འབད་རྩོལ་བསྐྱེད་གནང་།"
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "ཨེམ་ཨེསི་ཨེན་ སར་བར་ཚུ་ གནས་སྐབས་ཅིག་ ལཱ་མི་འབད།"
 
 #, c-format
@@ -5757,9 +5618,6 @@ msgstr ""
 "ཁྱོད་ཀྱི་ ཨེམ་ཨེསི་ཨེན་ ཆ་རོགས་ཐོ་ཡིག་འདི་ གནས་སྐབས་ཅིག་ ཐོབ་མི་ཚུགས།  ཨ་ཙི་བསྒུག་ཞིན་ན་འབད་རྩོལ་"
 "བསྐྱེད་གནང་།"
 
-msgid "Unknown error."
-msgstr "ངོ་མ་ཤེས་པའི་འཛོལ་བ།"
-
 msgid "Handshaking"
 msgstr "ལགཔ་མཐུད་དོ།"
 
@@ -5860,6 +5718,9 @@ msgstr "ཨེ་ཨའི་ཨེམ/ཨའི་སི་ཀིའུ་  ག
 msgid "%s is not a valid group."
 msgstr "%s འདི་ནུས་ཅན་གྱི་སྡེ་ཚན་མེན།"
 
+msgid "Unknown error."
+msgstr "ངོ་མ་ཤེས་པའི་འཛོལ་བ།"
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s གུ %s (%s)"
@@ -5977,12 +5838,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "སར་བར་ལས་ནུས་མེད་ཀྱི་ལན།"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "མཐུད་ཡོདཔ།"
-
 #, fuzzy, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "སླར་ལོག་འབད་ཡོད་པའི་ཨང་རྟགས་ %d ལས་སྦྱོར་འབད།"
@@ -6006,18 +5861,6 @@ msgid "Invalid input condition"
 msgstr "མཐུད་ལམ་མཐའ་དཔྱད་འབད་དོ།"
 
 #, fuzzy
-msgid "Read buffer full (2)"
-msgstr "གྲལ་རིམ་གང་།"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "འཕྲིན་དོན་མིང་དཔྱད་འབད་མ་ཚུགས།"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "ཧོསཊི་ལུ་མཐུད་མ་ཚུགས།"
-
-#, fuzzy
 msgid "Failed to add buddy"
 msgstr "ཆ་རོགས་འདི་  ཁ་སླབ་གྲངས་སུ་འཛུལ་ནི་འཐུས་ཤོར་བྱུང་ནུག"
 
@@ -6114,6 +5957,12 @@ msgstr ""
 msgid "Client Version"
 msgstr "གྲོས་གླེང་ཁ་བསྡམ།"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 #, fuzzy
 msgid "MySpaceIM - Username Available"
 msgstr "ཞབས་ཏོག་ཐོབ་མ་ཚུགས།"
@@ -6384,9 +6233,9 @@ msgstr "ལག་ལེན་པ་འདི་ཨོཕ་ལ་ཡིན་ �
 msgid "Unknown error: 0x%X"
 msgstr "ངོ་མ་ཤེས་པའི་འཛོལ་བ: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "ནང་བསྐྱོད་འཐུས་ཤོར་བྱུང་ཡོདཔ(%s)།"
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "ལག་ལེན་པ %s འདི་བཀག་དམ་འབད་མི་ཚུགས།"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6488,9 +6337,6 @@ msgstr "སྡེ་ཚན་ལྟར་གྱི་གྲོས་ཚོགས
 msgid "Authenticating..."
 msgstr "བདེན་བཤད་འབད་དོ..."
 
-msgid "Unable to connect to server."
-msgstr "སར་བར་ལུ་མཐུད་མ་ཚུགས།"
-
 msgid "Waiting for response..."
 msgstr "ལན་གྱི་དོན་ལུ་བསྒུག་དོ..."
 
@@ -6514,23 +6360,17 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "ཁྱོད་ གྲོས་གླེང་གི་གྲངས་སུ་འཛུལ་ནིའི་དང་འདོད་ཡོད་ག?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"ཁྱོད་ ཕྱིར་བསྐྱོད་འབད་དེ་ཡོདཔ་ཨིན་ ག་ཅི་འབད་ཟེར་བ་ཅིན་ ཁྱོད་ཀྱིས་ལཱ་གི་ལྟེ་བ་སོ་སོ་ནང་ ནང་བསྐྱོད་འབད་ནུག"
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%sའདི་ ཨོཕ་ལ་ཡིན་འབད་བྱུངམ་ཨིནམ་དང་ཁྱོད་ཀྱིས་བཏང་མི་འཕྲིན་དོན་འདི་མ་ཐོབ།"
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr "སར་བར་ལུ་ མཐུད་མ་ཚུགས། ཁྱོད་ཀྱིས་མཐུད་དགོ་མནོ་མི སར་བར་གྱི་ ཁ་བྱང་འདི་བཙུགས་གནང་།"
 
-msgid "Error. SSL support is not installed."
-msgstr "འཛོལ་བ། ཨེསི་ཨེསི་ཨེལ་གྱི་རྒྱབ་སྐྱོར་འདི་ གཞི་བཙུགས་འབད་མ་ཚུགས་པས།"
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "གྲོས་ཚོགས་འདི་ཁ་བསྡམས་ཚར་ཡི། ད་འབདན་འཕྲིན་དོན་ཚུ་གཏང་ནི་མེད།"
 
@@ -6569,10 +6409,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "མཐུད་ལམ་གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ།"
 
-msgid "Incorrect password."
-msgstr "བདེན་མེད་ཀྱི་ཆོག་ཡིག"
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, fuzzy
@@ -6583,18 +6420,8 @@ msgstr "མཐུད་མ་ཚུགས།"
 msgid "Invalid chat room name"
 msgstr "ནུས་མེད་ཁང་མིག་གི་མིང་།"
 
-msgid "Server closed the connection."
-msgstr "སར་བར་གྱིས་ མཐུད་ལམ་ཁ་བསྡམས་ད་ནུག"
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"སར་བར་དང་གཅིག་ཁར་ མཐུད་ལམ་བརླག་སྟོར་ཞུགས་ནུག:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "སར་བར་དང་གཅིག་ཁར་མཐུད་ལམ་གུ་ལུ་ ནུས་མེད་གནས་སྡུད་ཐོབ་ཡོདཔ།"
 
 #. *< type
@@ -6645,7 +6472,8 @@ msgstr "ཐག་རིང་གི་ལག་ལེན་པ་:<br>%s དང�
 msgid "Received invalid data on connection with remote user."
 msgstr "ཐག་རིང་གི་ལག་ལེན་པ་དང་གཅིག་ཁར་ མཐུད་ལམ་གུ་ལུ་ ནུས་མེད་གནས་སྡུད་གཅིག་ཐོབ་ཅི།"
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "ཐག་རིང་གི་ལག་ལེན་པ་དང་གཅིག་ཁར་ མཐུད་ལམ་གཞི་འཛུགས་འབད་མ་ཚུགསཔ།"
 
 msgid "Direct IM established"
@@ -6844,21 +6672,15 @@ msgstr "ཉེན་བརྡའི་གནས་རིམ།"
 msgid "Buddy Comment"
 msgstr "ཆ་རོགས་ཀྱི་བསམ་བཀོད།"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "བདེན་བཤད་སར་བར་ལུ་ མཐུད་མ་ཚུགས།:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"བི་ཨོ་ཨེསི་ སར་བར་ལུ་ མཐུད་མ་ཚུགས།:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "སར་བར་ལུ་མཐུད་མ་ཚུགས།"
 
 #, fuzzy
 msgid "Username sent"
@@ -6873,9 +6695,9 @@ msgstr "མཐུད་ལམ་མཐའ་དཔྱད་འབད་དོ།
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "ནང་བསྐྱོད་འབད་མ་ཚུགས: %sབཟུམ་སྦེ་ ནང་ན་འཛུལ་མ་ཚུགས་ ག་ཅི་འབད་ཟེར་བ་ཅིན་ གསལ་གཞི་མིང་འདི་ ནུས་"
 "མེད་ཨིན་པས། གསལ་གཞི་མིང་ཚུ་ ཡི་གུ་ལས་འགོ་བཙུགས་ནི་དང་ ནང་ན་ཡི་གུ་དང་  ཨང་གྲངས་དེ་ལས་ བར་སྟོང་"
@@ -6889,27 +6711,23 @@ msgstr "ཁྱོད་ དུམ་གྲ་ཅིག་མཐུད་ལམ�
 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 "ནུས་མེད་ ལག་ལེན་པའི་མིང་།"
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "ལག་ལེན་པ་མེད།"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "ཁྱོད་ཀྱི་ རྩིས་ཐོ་འདི་ ད་ལྟོ་རང་བཀག་ད་ནུག"
 
 #. service temporarily unavailable
@@ -6930,7 +6748,8 @@ msgstr ""
 "ཁྱོད་  འཕྲལ་འཕྲལ་འབད་རང་ མཐུད་ནི་དང་མཐུད་བཏོག་སྟེ་འདུག  སྐར་མ་བཅུ་ཐམ་དེ་ཅིག་བསྒུག་ཞིན་ན་ དེ་ལས་"
 "འབད་རྩོལ་བསྐྱེད།  ཁྱོད་ཀྱིས་འཕྲོ་མཐུད་དེ་རང་འབད་རྩོལ་བསྐྱེད་པ་ཅིན་ ཧེང་བཀལ་རང་བསྒུག་དགོ"
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "མཐའ་བཙན་གྱི་ ཨའི་ཌི་ ལྡེ་མིག་བཙུགས་མི་འདི་ ནུས་མེད་ཨིན་པས།"
 
 msgid "Enter SecurID"
@@ -7111,6 +6930,9 @@ msgstr "ལས་ཚུར་ གློག་ཐོག"
 msgid "Member Since"
 msgstr "ལས་ཚུར་ འཐུས་མི།"
 
+msgid "Capabilities"
+msgstr "ལྕོགས་གྲུབ།"
+
 msgid "Profile"
 msgstr "གསལ་སྡུད།"
 
@@ -7289,7 +7111,7 @@ msgstr "ཕྱི་ཁའི་འཕྲིན་དོན་འདི་རི
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7316,9 +7138,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "དྭ་ཕྲུག་ཚུ།"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "ཆ་རོགས་ %sའདི ཁ་སྐོང་རྐྱབས་མི་ཚུགས་པས་ ག་ཅི་འབད་ཟེར་བ་ཅིན་ ཁྱོད་ཀྱི་ཆ་རོགས་ཐོ་ཡིག་ནང་ ཆ་རོགས་ཀྱི་"
@@ -7328,7 +7150,7 @@ msgid "(no name)"
 msgstr "(མིང་མེད)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "རྒྱུ་མཚན་མ་ཤེསཔ་ལས་བརྟེན་ ཁྱོད་ཀྱི་བརྡ་བཀོད་འདི་འཐུས་ཤོར་བྱུང་ནུག"
 
 #, fuzzy, c-format
@@ -8182,7 +8004,7 @@ msgid "Update interval (seconds)"
 msgstr "འཛོལ་བ་ལྷག་དོ།"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "སལ་བར་ བརྡ་དོན་ཐོབ་མི་ཚུགས།"
 
 #, c-format
@@ -8209,10 +8031,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "སལ་བར་ བརྡ་དོན་ཐོབ་མི་ཚུགས།"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "ཌའི་ལོག་ཞུ།"
 
@@ -8248,22 +8066,9 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "མཐུད་མི་ཚུགས།"
-
 msgid "Socket error"
 msgstr "སོ་ཀེཊི་འཛོལ་བ།"
 
-msgid "Unable to read from socket"
-msgstr "སོ་ཀེཊི་ལས་ ལྷག་མ་ཚུགས།"
-
-msgid "Write Error"
-msgstr "འཛོལ་བ་འབྲི།"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "མཐུད་ལམ་བརླག་སྟོར་ཞུགས་ཡོདཔ།"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "ལག་ལེན་པའི་བརྡ་དོན་གཞི་སྒྲིག་འབད..."
@@ -8272,8 +8077,9 @@ msgstr "ལག་ལེན་པའི་བརྡ་དོན་གཞི་ས
 msgid "Requesting token"
 msgstr "ཞུ་བ་ངོས་ལེན་འབད་མ་བཏུབ་པས།"
 
-msgid "Couldn't resolve host"
-msgstr "ཧོསཊི་མོས་མཐུན་འབད་མ་ཚུགས།"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "སར་བར་ པིང་འབད་མ་ཚུགས།"
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8324,7 +8130,7 @@ msgid "QQ Qun Command"
 msgstr "བརྡ་བཀོད།"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "སལ་བར་ བརྡ་དོན་ཐོབ་མི་ཚུགས།"
 
 #, fuzzy
@@ -8346,9 +8152,6 @@ msgstr "ཡིག་སྣོད་གཏང་།"
 msgid "%d canceled the transfer of %s"
 msgstr "%d གིས་ %s གི་ གནས་སོར་འདི་ཆ་མེད་བཏང་ཡོདཔ།"
 
-msgid "Connection closed (writing)"
-msgstr "མཐུད་ལམ་ཁ་མ་བསྡམ་ཡོདཔ་(རྩོམ་སྒྲིག)།"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>སྡེ་ཚན་མགོ་མིང་།:</b> %s<br>"
@@ -8402,17 +8205,6 @@ msgstr "དུས་ཚོད་གཅིག་པའི་བདག་སྐྱ
 msgid "Sametime Administrator Announcement"
 msgstr "དུས་ཚོད་གཅིག་པའི་བདག་སྐྱོང་པ་ཁྱབ་བསྒྲགས།"
 
-msgid "Connection reset"
-msgstr "མཐུད་ལམ་སླར་སྒྲིག"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "སོ་ཀེཊི་ %s ལས་ལྷག་པའི་འཛོལ་བ།:"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "ཧོསཊི་ལུ་མཐུད་མ་ཚུགས།"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr " %s ལས་ཁྱབ་བསྒྲགས།"
@@ -8435,6 +8227,9 @@ msgstr "གསལ་བཤདཔ་ཚུ།"
 msgid "Video Camera"
 msgstr "ཝི་ཌིའོ་ པར་ཆས།"
 
+msgid "File Transfer"
+msgstr "ཡིག་སྣོད་གནས་སོར།"
+
 #, fuzzy
 msgid "Supports"
 msgstr "རྒྱབ་སྐྱོར།"
@@ -9261,6 +9056,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "ཡོངས་འབྲེལ་ཚད་རྩིས་ཚུ།"
 
+msgid "Ping"
+msgstr "པིང་།"
+
 msgid "Ping failed"
 msgstr "པིང་ འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
@@ -9325,7 +9123,8 @@ msgstr "རྒྱབ་སྐྱོར་མ་འབད་བའི་མི་
 msgid "Disconnected by server"
 msgstr "སར་བར་གྱིས་ མཐུད་ལམ་བཏོག་དའི།"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "ཨེསི་ཨའི་ཨེལ་སི་ལུ་  མཐུད་པའི་སྐབས་ལུ འཛོལ་བ།"
 
 msgid "Key Exchange failed"
@@ -9337,27 +9136,26 @@ msgstr ""
 "བསྐྱར་ལོག་གི་ལཱ་ཡུན་ཁ་འཕྱལ་འཕྱལཝ་ཚུ་འཐུས་ཤོར་བྱུང་ནུག  སླར་མཐུད་གཡེབ་སྟེ མཐུད་ལམ་གསརཔ་གསར་བསྐྲུན་"
 "འབད།"
 
-msgid "Connection failed"
-msgstr "མཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-
 msgid "Performing key exchange"
 msgstr "ལྡེ་མིག་བརྗེ་སོར་གྱི་ལག་ལེན་འཐབ་དོ།"
 
-msgid "Unable to create connection"
-msgstr "མཐུད་ལམ་གསར་བསྐྲུན་འབད་མ་ཚུགསཔ།"
-
 #, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "ཨེསི་ཨའི་ཨེལ་སི་ ལྡེ་མིག་ཟུང་: %s འདི་མངོན་གསལ་འབད་མ་ཚུགས།"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "ཨེསི་ཨའི་ཨེལ་སི་ སར་བར་ལུ་ མཐུད་དོ།"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "ཨེསི་ཨའི་ཨེལ་སི་ ལྡེ་མིག་ཟུང་: %s འདི་མངོན་གསལ་འབད་མ་ཚུགས།"
+
 msgid "Out of memory"
 msgstr "དྲན་ཚད་མེདཔ།"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "ཨེསི་ཨའི་ཨེལ་སི་ གནད་སྤེལ་ལམ་ལུགས་འགོ་འབྱེད་འབད་མི་ཚུགས།"
 
 #, fuzzy
@@ -9651,7 +9449,7 @@ msgid "Creating SILC key pair..."
 msgstr "ཨེསི་ཨའི་ཨེལ་སི་  ལྡེ་མིག་ཟུང་ བཟོ་བསྐྲུན་འབད་དོ..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "ཨེསི་ཨའི་ཨེལ་སི་  ལྡེ་མིག་ཟུང་ བཟོ་བསྐྲུན་འབད་དོ..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9747,6 +9545,9 @@ msgstr "པང་དེབ་དཀརཔོ།"
 msgid "No server statistics available"
 msgstr "སར་བར་ ཚད་རྩིས་ཚུ་མི་ཐོབ།"
 
+msgid "Error during connecting to SILC Server"
+msgstr "ཨེསི་ཨའི་ཨེལ་སི་ལུ་  མཐུད་པའི་སྐབས་ལུ འཛོལ་བ།"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "འཐུས་ཤོར:ཐོན་རིམ་མི་མཐུན་པས་  ཁྱོད་རའི་ ཞབས་ཏོག་སྤྱོད་མི་ཡར་བསྐྱེད་འབད།"
@@ -9787,32 +9588,28 @@ msgstr "འཐུས་ཤོར:ནུས་མེད་ཀྱི་ཀཱུ�
 msgid "Failure: Authentication failed"
 msgstr "འཐུས་ཤོར:བདེན་བཤད་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "ཨེསི་ཨའི་ཨེལ་སི་  ཞབས་ཏོད་སྤྱོད་མི་ མཐུད་ལམ་འདི་ འགོ་བྱེད་འབད་མི་ཚུགས་པས།"
 
 #, fuzzy
 msgid "John Noname"
 msgstr "མིང་མེད།"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "ཨེསི་ཨའི་ཨེལ་སི་ ལྡེ་མིག་ཟུང་: %s འདི་མངོན་གསལ་འབད་མ་ཚུགས།"
 
-msgid "Could not write"
-msgstr "འབྲི་མ་ཚུགས།"
-
-msgid "Could not connect"
-msgstr "མཐུད་མ་ཚུགས།"
+msgid "Unable to create connection"
+msgstr "མཐུད་ལམ་གསར་བསྐྲུན་འབད་མ་ཚུགསཔ།"
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "ངོ་མ་ཤེས་པའི་རྒྱུ་མཚན།"
 
-msgid "Could not create listen socket"
-msgstr "ཉན་སོ་ཀེཊི་གསར་བསྐྲུན་འབད་མ་ཚུགས།"
-
-msgid "Could not resolve hostname"
-msgstr "ཧོསཊི་མིང་མོས་མཐུན་འབད་མ་ཚུགས།"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "སོ་ཀེཊི་བཟོ་བསྐྲུན་འབད་མི་ཚུགས་པས།"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -9855,6 +9652,78 @@ msgstr "ལག་ལེན་པ་བདེན་ཅན།"
 msgid "Auth Domain"
 msgstr "བདེན་ཅན་ཌོ་མེན།"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "གྲངས་སུ་འཛུལ་ &lt;ཁང་མིག&gt;: ཡ་ཧུ་  ཡོངས་འབྲེལ་གུ་ལུ ཁ་སླབ་ཁང་མིག་ནང་འཛུལ།"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "ཐོ་ཡིག: ཡ་ཧུ་ཡོངས་འབྲེལ་གུ་ལུ་ ཁང་མིག་ཚུ་ཐོ་བཀོད་འབད།"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "ཌུ་ཌཱལ་: ཌུ་ཌཱལ་ལཱ་ཡུན་འགོ་བཙུགས་ནིའི་དོན་ལུ་ ལག་ལེན་པ་ཞུ་བ་འབད།"
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "ཡ་ཧུ!ཨའི་ཌི།"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "ཡ་ཧུ་ གནད་སྤེལ་ལམ་ལུགས་ པ་ལག་ཨིན།"
+
+msgid "Pager server"
+msgstr "བརྡ་འཕྲུལ་སར་བར།"
+
+msgid "Pager port"
+msgstr "བརྡ་འཕྲུལ་ འདྲེན་ལམ།"
+
+msgid "File transfer server"
+msgstr "ཡིག་སྣོད་གནས་སོར་ སར་བར།"
+
+msgid "File transfer port"
+msgstr "ཡིག་སྣོད་གནས་སོར་འདྲེན་ལམ།"
+
+msgid "Chat room locale"
+msgstr "ཁ་སླབ་ཁང་མིག་ ལོ་ཀེལ།"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "གྲོས་ཚོགས་དང་ ཁ་སླབ་ཁང་མིག་མགྲོན་བརྡ་ཚུ་སྣང་མེད་སྦེ་བཞག"
+
+msgid "Chat room list URL"
+msgstr "ཁ་སླབ་ཁང་མིག་ ཐོ་ཡིག་ ཡུ་ཨར་ཨེལ།"
+
+msgid "Yahoo Chat server"
+msgstr "ཡ་ཧུ་ ཁ་སླབ་སར་བར།"
+
+msgid "Yahoo Chat port"
+msgstr "ཡ་ཧུ་ ཁ་སླབ་འདྲེན་ལམ།"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "ཡ་ཧུ!ཨའི་ཌི།"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "ཡ་ཧུ་ གནད་སྤེལ་ལམ་ལུགས་ པ་ལག་ཨིན།"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9885,30 +9754,20 @@ msgstr "དང་ལེན་སྤང་བའི་ཆ་རོགས་ཁ་
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 "ངོ་མ་ཤེས་པའི་ འཛོལ་བའི་ ཨང་གྲངས %d ། ཡ་ཧུ! ཝེབ་ས་ཁོངས་ནང་ དྲན་དེབ་བཀོད་མི་འདི་གིས་ དཀའ་ངལ་"
 "སེལ་ཚུགསཔ་འོང་།"
@@ -9951,35 +9810,30 @@ msgstr ""
 "ངོ་མ་ཤེས་པའི་ འཛོལ་བའི་ ཨང་གྲངས %d ། ཡ་ཧུ! ཝེབ་ས་ཁོངས་ནང་ དྲན་དེབ་བཀོད་མི་འདི་གིས་ དཀའ་ངལ་"
 "སེལ་ཚུགསཔ་འོང་།"
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "ཆ་རོགས་ %s འདི་ སྡེ་ཚན་ %s སར་བར་ཐོ་ཡིག་ལུ་  རྩིས་ཐོ་  %s གུ་ ཁ་སྐོང་འབད་མ་ཚུགས།"
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "སར་བར་ཐོ་ཡིག་ནང་ཆ་རོགས་ཁ་སྐོང་འབད་མ་ཚུགས།"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "སར་བར་ལས་ རེ་བ་མེད་པའི་ཨེཅ་ཊི་ཊི་པི་ ལན་ཐོབ་ཡོདཔ།"
 
-msgid "Connection problem"
-msgstr "མཐུད་ལམ་ དཀའ་ངལ།"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr ""
 "སར་བར་དང་གཅིག་ཁར་ མཐུད་ལམ་བརླག་སྟོར་ཞུགས་ནུག:\n"
 "%s"
 
 #, fuzzy, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
 "སར་བར་དང་གཅིག་ཁར་ མཐུད་ལམ་གཞི་འཛུགས་འབད་མ་ཚུགས།:\n"
 "%s"
@@ -10045,74 +9899,15 @@ msgstr "ལག་ལེན་པའི་ཁ་སླབ་ནང་འཛུལ
 msgid "Open Inbox"
 msgstr "ཧོཊ་མཱེལ་ ནང་སྒྲོམ་ཁ་ཕྱེ།"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "གྲངས་སུ་འཛུལ་ &lt;ཁང་མིག&gt;: ཡ་ཧུ་  ཡོངས་འབྲེལ་གུ་ལུ ཁ་སླབ་ཁང་མིག་ནང་འཛུལ།"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "ཐོ་ཡིག: ཡ་ཧུ་ཡོངས་འབྲེལ་གུ་ལུ་ ཁང་མིག་ཚུ་ཐོ་བཀོད་འབད།"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "ཌུ་ཌཱལ་: ཌུ་ཌཱལ་ལཱ་ཡུན་འགོ་བཙུགས་ནིའི་དོན་ལུ་ ལག་ལེན་པ་ཞུ་བ་འབད།"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "ཡ་ཧུ!ཨའི་ཌི།"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "ཡ་ཧུ་ གནད་སྤེལ་ལམ་ལུགས་ པ་ལག་ཨིན།"
-
-msgid "Yahoo Japan"
-msgstr "ཡ་ཧུ་ ཇ་པཱན།"
-
-msgid "Pager server"
-msgstr "བརྡ་འཕྲུལ་སར་བར།"
-
-msgid "Japan Pager server"
-msgstr "ཇ་པཱན་ བརྡ་འཕྲུལ་ སར་བར།"
-
-msgid "Pager port"
-msgstr "བརྡ་འཕྲུལ་ འདྲེན་ལམ།"
-
-msgid "File transfer server"
-msgstr "ཡིག་སྣོད་གནས་སོར་ སར་བར།"
-
-msgid "Japan file transfer server"
-msgstr "ཇ་པཱན་ ཡིག་སྣོད་གནས་སོར་ སར་བར།"
-
-msgid "File transfer port"
-msgstr "ཡིག་སྣོད་གནས་སོར་འདྲེན་ལམ།"
-
-msgid "Chat room locale"
-msgstr "ཁ་སླབ་ཁང་མིག་ ལོ་ཀེལ།"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "གྲོས་ཚོགས་དང་ ཁ་སླབ་ཁང་མིག་མགྲོན་བརྡ་ཚུ་སྣང་མེད་སྦེ་བཞག"
-
-msgid "Chat room list URL"
-msgstr "ཁ་སླབ་ཁང་མིག་ ཐོ་ཡིག་ ཡུ་ཨར་ཨེལ།"
-
-msgid "Yahoo Chat server"
-msgstr "ཡ་ཧུ་ ཁ་སླབ་སར་བར།"
-
-msgid "Yahoo Chat port"
-msgstr "ཡ་ཧུ་ ཁ་སླབ་འདྲེན་ལམ།"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "ཌུ་ཌཱལ་ཞུ་བ་བཏང་ཡོདཔ།"
 
+msgid "Unable to connect."
+msgstr "མཐུད་མི་ཚུགས།"
+
 msgid "Unable to establish file descriptor."
 msgstr "ཡིག་སྣོད་འགྲེལ་བཤད་པ་ གཞི་འཛུགས་འབད་མ་ཚུགས།"
 
@@ -10120,6 +9915,9 @@ msgstr "ཡིག་སྣོད་འགྲེལ་བཤད་པ་ གཞ�
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%sའདི་གིས་ཡིག་སྣོད་%sགཏང་ནིའི་དང་ལེན་འབདཝ་མས།"
 
+msgid "Write Error"
+msgstr "འཛོལ་བ་འབྲི།"
+
 msgid "Yahoo! Japan Profile"
 msgstr "ཡ་ཧུ!ཇ་པཱན་ གསལ་སྡུད།"
 
@@ -10241,23 +10039,19 @@ msgstr "སྐད་ཚུ།"
 msgid "Webcams"
 msgstr "ཝེབ་ཀེམསི།"
 
+msgid "Connection problem"
+msgstr "མཐུད་ལམ་ དཀའ་ངལ།"
+
 msgid "Unable to fetch room list."
 msgstr "ཁང་མིག་ཐོ་ཡིག་ལེན་མི་ཚུགས་པས།"
 
 msgid "User Rooms"
 msgstr "ལག་ལེན་པའི་ཁང་མིག་ཚུ།"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "ཝའི་སི་ཨེཅ་ཊི་ སར་བར་དང་བཅསམཐུད་ལམ་གྱི་དཀའ་ངལ།"
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"སར་བར་དང་གཅིག་ཁར་ མཐུད་ལམ་བརླག་སྟོར་ཞུགས་ནུག\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10386,24 +10180,16 @@ msgstr "རྒྱལ་ཁམས།"
 msgid "Exposure"
 msgstr "མདངས་ཕོག"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"སོ་ཀེཊི་གསར་བསྐྲུན་འབད་མ་ཚུགསཔ་:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "ཨེཅ་ཊི་ཊི་པི་ པོརོ་སི་: %s ལས་ ལན་མིང་དཔྱད་འབད་མ་ཚུགས།\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "ཨེཅ་ཊི་ཊི་པི་པོརོ་སི་ མཐུད་ལམ་ འཛོལ་བ་ %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "འཛུལ་སྤྱོད་འབད་ནི་ འདི་ ཉན་མ་བཏུབ་པས: ཨེཅ་ཊི་ཊི་པི་ པོརོ་སི་ སར་བར་གྱིས་ འདྲེན་ལམ %d ཊ་ན་ལིང་"
 "བཀགཔ་མས།"
@@ -10412,9 +10198,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr " %s མོས་མཐུན་འབད་བའི་སྐབས་ འཛོལ་བ།"
 
-msgid "Could not resolve host name"
-msgstr "ཧོསཊི་མིང་མོས་མཐུན་འབད་མི་ཚུགས་པས།"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10628,14 +10411,6 @@ msgstr "%s: %s ལུ་ རྩོམ་སྒྲིག་འབད་ནིའ�
 msgid "Unable to connect to %s: %s"
 msgstr "%s: %s ལུ་མཐུད་མ་ཚུགས།"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"ནང་བསྐྱོད་ཀྱི་དོན་ལས་ སར་བར་ལུ་ ཊི་ཨེལ་ཨེསི/ཨེསི་ཨེསི་ཨེལ་ དགོས་མཁོ་ཡོདཔ་ཨིན།  ཊི་ཨེལ་ཨེསི/ཨེསི་ཨེསི་ཨེལ་ "
-"རྒྱབ་སྐྱོར་མིན་འདུག"
-
 #, c-format
 msgid " - %s"
 msgstr ""
@@ -10886,7 +10661,11 @@ msgid "View _Log"
 msgstr "དྲན་དེབ་སྟོན།(_L)"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "ཨོཕ་ལ་ཡིན་གྱི་སྐབས་འབད་མི་ཆོགཔ་ཨིན།"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "ཨོཕ་ལ་ཡིན་གྱི་སྐབས་འབད་མི་ཆོགཔ་ཨིན།"
 
 msgid "_Alias..."
@@ -11428,6 +11207,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "%sགི་དོན་ལུ་བརྡ་དོན་ལག་ལེན་པ་འདི་སོར།་"
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11475,7 +11257,8 @@ msgstr "སྣང་མེད་བཞག"
 msgid "Get Away Message"
 msgstr "ཕྱི་ཁའི་འཕྲིན་དོན་ལེན།"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "མཇུག་ལུ་སླབ་ཡོདཔ།"
 
 msgid "Unable to save icon file to disk."
@@ -12392,7 +12175,7 @@ msgid "Hyperlink visited color"
 msgstr "ཧའི་པར་ལིངཀ་ ཚོས་གཞི།"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "མཱའུསི་འདི་ ཁོང་རའི་གུ་ལུ་ཡོདཔ་ད་ ཚད་བརྒལ་འབྲེལ་ལམ་ཚུ་འབྲི་ནིའི་ཚོས་གཞི།"
 
 msgid "Hyperlink prelight color"
@@ -12430,15 +12213,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "བརྡ་བསྐུལ་རྩ་བསྐྲད་གཏང་ནི།"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "ཡིག་འཕྲིན་གསརཔ་གི་བརྡ་བསྐུལ།"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12854,6 +12644,10 @@ msgid ""
 msgstr ""
 "ལག་དེབ་བརའུ་ཟར་བརྡ་བཀོད་འདི་གདམ་ཁ་བརྐྱབས་ནུག དེ་འབདཝ་ད་ བརྡ་བཀོད་འདི་གཞི་སྒྲིག་མ་འབད་བས།"
 
+#, fuzzy
+msgid "No message"
+msgstr "(༡ འཕྲིན་དོན)"
+
 msgid "Open All Messages"
 msgstr "འཕྲིན་དོན་ཚུ་ཆ་མཉམ་རང་ཁ་ཕྱེ།"
 
@@ -12871,10 +12665,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">ཁྱོད་ལུ་ཡིག་འཕྲིན་གཅིག་ཡོད།!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "(༡ འཕྲིན་དོན)"
-
 msgid "The following plugins will be unloaded."
 msgstr "འོག་ལུ་ཡོད་པའི་པ་ལག་ཨིནསི་འདི་ སྐྱེལ་བཙུགས་འབད་ནི་ཨིན།"
 
@@ -13100,7 +12890,7 @@ msgid "On unread messages"
 msgstr "མ་ལྷག་པའི་འཕྲིན་དོན་ཚུ།"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "ཨའི་ཨེམ་གྲོས་གླེང་སྒོ་སྒྲིག་ཚུ།"
 
 #, fuzzy
@@ -13110,6 +12900,10 @@ msgstr "ཨའི་ཨེམ་གྲོས་གླེང་གསརཔ་ཚ
 msgid "When away"
 msgstr "ཕྱི་ཁ་ཨིན་པའི་སྐབས།"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "གྲོས་གླེང་ཝིན་ཌོ་ ཆེར་བསྐྱེད་འབད།(_a)"
+
 #. All the tab options!
 #, fuzzy
 msgid "Tabs"
@@ -13170,10 +12964,6 @@ msgstr "བཤུད་སྒྲིལ་འབད་ནི་ཧུམ་ཁྱ
 msgid "F_lash window when IMs are received"
 msgstr "ཨའི་ཨེམ་ཚུ་ ཐོབ་ཡོད་པའི་སྐབས་སུ་ ཝིན་ཌོ་ རིབ་སྟོན་འབད།(_l)"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "གྲོས་གླེང་ཝིན་ཌོ་ ཆེར་བསྐྱེད་འབད།(_a)"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -13213,7 +13003,8 @@ msgstr "ལགལེན་པའི་བརྡ་དོན་ཐོབ་མ་
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">དཔེར་བརྗོད།: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "རང་བཞིན་སྐྱོན་འཛིན་ནི་ཨའི་པི་ཁ་བྱང་།(_A)"
 
 msgid "Public _IP:"
@@ -13594,34 +13385,18 @@ msgstr "སྲུང་བཞག་འབད་ཞིནམ་ལས་ལག་
 msgid "Status for %s"
 msgstr "%s དོན་ལུ་ གནས་ཚད་ཚུ།"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "སི་མའི་ལི་ནང་ན་བཙུགས།"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
 #, fuzzy
-msgid "Duplicate Shortcut"
-msgstr "ནོར་བཅོས་ངོ་བཤུས།"
+msgid "Custom Smiley"
+msgstr "སི་མའི་ལི་ནང་ན་བཙུགས།"
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "%s དོན་ལུ་ མིང་གསརཔ་བཙུགས་གནང་།"
+msgid "Duplicate Shortcut"
+msgstr "ནོར་བཅོས་ངོ་བཤུས།"
 
 #, fuzzy
 msgid "Edit Smiley"
@@ -13741,9 +13516,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "གསར་བཙུགས་འབད་མི་གཏང་མི་ཚུགས་པས།"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "ཁྱོད་ཀྱིས་ ཌེཀསི་ཊོཔ་ གསར་བཙུགས་འབད་མི་འདྲུད་ཡོདཔ་ཨིན་པས། ཁྱོད་ཀྱིས་ གསར་བཙུགས་འབད་མིའི་ཚབ་མ་ལུ་ "
 "གསར་བཙུགས་འབད་མི་གིས་ག་ཅི་དཔག་མིའི་འདི་གཏང་ནི་ཨིནམ་འོང་།"
@@ -14359,9 +14135,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "སྣ་སྡུད་མཉམ་རུབ་དོན་ལུ་སྙན་ཆ་འཕྲིན་གཏོང་པ་ལག་ཨིན།"
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "སྙན་ཆ་འཕྲིན་གཏོང་པ་ལག་ཨིན་གྱིས་ ལག་ལེན་པ་ལེ་ཤ་ཅིག་ལུ་རང་ སྙན་ཆ་གི་པིསི་གཅིག་གུ་དུས་ཚོད་-ངོ་མ་ནང་"
 "སྐུགས་མཐུན་མོང་ཞུན་དག་འབད་ཐོག་ལས་ལཱ་འབད་བཅུགཔ་ཨིན།"
@@ -14630,7 +14407,7 @@ msgstr "ཨའི་ཨེམ་གྲོས་གླེང་སྒོ་སྒ
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14965,7 +14742,7 @@ msgstr "ཝིན་ཌོསི་གཱེམ་ལུ་དམིགས་བ
 
 #, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "ཝིན་ཌོཝསི་གེམ་ལུ་ དམིགས་བསལ་གྱི་ ཆ་རོགས་ཐོ་ཡིག་ཌོ་ཀིང་ བཟུམ་མའི་གདམ་ཁ་ཚུ་བྱིནམ་ཨིན།"
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -15007,6 +14784,290 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
+#~ msgid "Cannot open socket"
+#~ msgstr "སོ་ཀེཊི་ཁ་ཕྱེ་མ་ཚུགས།"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "སོ་ཀེཊི་གུ་ལུ་ ཉན་མ་ཚུགས།"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "སོ་ཀེཊི་ལྷག་མི་ཚུགས།"
+
+#~ msgid "Connection failed."
+#~ msgstr "མཐུད་ལམ་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "སར་བར་འདི་ མཐུད་བཏོག་ནུག"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "སོ་ཀེཊི་ གསར་བསྐྲུན་འབད་མི་ཚུགས།"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "ཧོསཊི་ལུ་མཐུད་མ་ཚུགས།"
+
+#~ msgid "Read error"
+#~ msgstr "འཛོལ་བ་ལྷག"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "སར་བར་དང་གཅིག་ཁར་ མཐུད་ལམ་གཞི་འཛུགས་འབད་མ་ཚུགས།:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "འཛོལ་བ་བྲིས།"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "Dir བརྡ་དོན་གཞི་སྒྲིག་འབད།"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "རྒྱ་བསྐྱེད་ཅན་གྱི་ཁ་བྱང་།"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "ཁ་སླབ་མིང་གཞན།"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "ལག་ལེན་པ་ལུ་ སྣོད་ཐོའི་བརྡ་དོན་མིན་འདུག"
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "བརྡ་བཀོད།"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "ཨེཅི་ཊི་ཨེམ་ཨེལ།"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "ཐོ་འགོད་འབད་ནིའི་འཛོལ་བ།"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "གནས་ཁོངས།"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "ལག་ལེན་པ་གི་འཚོལ་ཞིབ།"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "ཆ་རོགས་ཀྱི་གནས་ལུགས་བརྡ་བསྐུལ་འབད་ནི།"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "རྒྱབ་སྐྱོར་མ་འབད་བའི་ཐོན་རིམ།"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "ཕྱོགས།"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "ལག་ལེན་པའི་ཐབས་ལམ་ཚུ།"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "ལག་ལེན་པའི་ཚད།"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "ལྕོགས་གྲུབ།"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "ལག་ལེན་པའི་མིང་།"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "ཨའི་ཨེམ་དང་བཅས་ལྡེ་མིག་བརྗེ་སོར།"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "གློག་འཕྲིན་ཁ་བྱང་།"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "གསལ་སྡུད་གཞི་སྒྲིག་འབད།"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "མཐུད་ནི།"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "ལག་ལེན་པའི་ མིང་།"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "མངོན་མཐོང་ ཝི་ཌིའོ།"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "འཕྲིན་དོན་ཐོབ་ཅི།"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "མི་མང་ལྡེ་མིག་ བ་བཱལ པིརིནཊི།"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "ལག་ལེན་པའི་གདམ་ཁ་ཚུ།"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "ལག་ལེན་པའི་ཐབས་ལམ་ཚུ།"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "ལག་ལེན་པའི་ མིང་།"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "ལག་ལེན་པའི་ཚད།"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "ཊིལིཡེན་ གསང་བཟོ།"
+
+#~ msgid "Read Error"
+#~ msgstr "འཛོལ་བ་ལྷག"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "སར་བར་ལུ་མཐུད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "གྲལ་རིམ་གང་།"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "འཕྲིན་དོན་མིང་དཔྱད་འབད་མ་ཚུགས།"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "ཧོསཊི་ལུ་མཐུད་མ་ཚུགས།"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "ནང་བསྐྱོད་འཐུས་ཤོར་བྱུང་ཡོདཔ(%s)།"
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "སར་བར་ལུ་མཐུད་མ་ཚུགས།"
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "ཁྱོད་ ཕྱིར་བསྐྱོད་འབད་དེ་ཡོདཔ་ཨིན་ ག་ཅི་འབད་ཟེར་བ་ཅིན་ ཁྱོད་ཀྱིས་ལཱ་གི་ལྟེ་བ་སོ་སོ་ནང་ ནང་བསྐྱོད་"
+#~ "འབད་ནུག"
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "འཛོལ་བ། ཨེསི་ཨེསི་ཨེལ་གྱི་རྒྱབ་སྐྱོར་འདི་ གཞི་བཙུགས་འབད་མ་ཚུགས་པས།"
+
+#~ msgid "Incorrect password."
+#~ msgstr "བདེན་མེད་ཀྱི་ཆོག་ཡིག"
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "བི་ཨོ་ཨེསི་ སར་བར་ལུ་ མཐུད་མ་ཚུགས།:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "ཁྱོད་ དུམ་གྲ་ཅིག་མཐུད་ལམ་བཏོག་ནི་འོང་། དུས་མཐུན་བཟོ་ནིའི་ཚུའི་དོན་ལུ་ %s ཞིབ་དཔྱད་འབད།"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "མཐུད་མ་ཚུགས།"
+
+#~ msgid "Invalid username."
+#~ msgstr "ནུས་མེད་ ལག་ལེན་པའི་མིང་།"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "སལ་བར་ བརྡ་དོན་ཐོབ་མི་ཚུགས།"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "མཐུད་ལམ་བརླག་སྟོར་ཞུགས་ཡོདཔ།"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "ཧོསཊི་མོས་མཐུན་འབད་མ་ཚུགས།"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "མཐུད་ལམ་ཁ་མ་བསྡམ་ཡོདཔ་(རྩོམ་སྒྲིག)།"
+
+#~ msgid "Connection reset"
+#~ msgstr "མཐུད་ལམ་སླར་སྒྲིག"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "སོ་ཀེཊི་ %s ལས་ལྷག་པའི་འཛོལ་བ།:"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "ཧོསཊི་ལུ་མཐུད་མ་ཚུགས།"
+
+#~ msgid "Could not write"
+#~ msgstr "འབྲི་མ་ཚུགས།"
+
+#~ msgid "Could not connect"
+#~ msgstr "མཐུད་མ་ཚུགས།"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "ཉན་སོ་ཀེཊི་གསར་བསྐྲུན་འབད་མ་ཚུགས།"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "ཧོསཊི་མིང་མོས་མཐུན་འབད་མ་ཚུགས།"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "བདེན་མེད་ཀྱི་ཆོག་ཡིག"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "སར་བར་དང་གཅིག་ཁར་ མཐུད་ལམ་གཞི་འཛུགས་འབད་མ་ཚུགས།:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "ཡ་ཧུ་ ཇ་པཱན།"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "ཇ་པཱན་ བརྡ་འཕྲུལ་ སར་བར།"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "ཇ་པཱན་ ཡིག་སྣོད་གནས་སོར་ སར་བར།"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "སར་བར་དང་གཅིག་ཁར་ མཐུད་ལམ་བརླག་སྟོར་ཞུགས་ནུག\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "ཧོསཊི་མིང་མོས་མཐུན་འབད་མི་ཚུགས་པས།"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "ནང་བསྐྱོད་ཀྱི་དོན་ལས་ སར་བར་ལུ་ ཊི་ཨེལ་ཨེསི/ཨེསི་ཨེསི་ཨེལ་ དགོས་མཁོ་ཡོདཔ་ཨིན།  ཊི་ཨེལ་ཨེསི/ཨེསི་ཨེསི་"
+#~ "ཨེལ་ རྒྱབ་སྐྱོར་མིན་འདུག"
+
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "ཨའི་ཨེམ་གྲོས་གླེང་སྒོ་སྒྲིག་ཚུ།"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "%s དོན་ལུ་ མིང་གསརཔ་བཙུགས་གནང་།"
+
 #, fuzzy
 #~ msgid "Activate which ID?"
 #~ msgstr "ཨའི་ཌི་ག་འདི་ཤུགས་ལྡན་སྨོ?"
@@ -15709,10 +15770,6 @@ msgstr ""
 #~ msgstr "ད་ལྟོའི་ངོ་རྟགས།"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "སར་བར་ལུ་མཐུད་མ་ཚུགས།"
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "འཕྲིན་དོན་:(_M)"
 
diff --git a/po/el.po b/po/el.po
index a05dea611a..805e10c36f 100644
--- a/po/el.po
+++ b/po/el.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin[el]\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2008-12-17 23:56+0200\n"
 "Last-Translator: Bouklis Panos <panos@echidna-band.com>\n"
 "Language-Team: Greek <i18ngr@lists.hellug.gr>\n"
@@ -2585,9 +2585,10 @@ msgstr ""
 "καταγραφών."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2643,8 +2644,9 @@ msgstr ""
 "Αποθήκευση μηνυμάτων που στέλνονται σε έναν αποσυνδεδεμένο χρήστη ως "
 "εφόρμηση."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Τα υπόλοιπα μηνύματα θα αποθηκευτούν ως εφόρμηση. Μπορείτε να επεξεργαστείτε/"
@@ -2898,15 +2900,17 @@ msgstr ""
 "χρησιμοποιήσετε πρόσθετα TCL εγκαταστήστε το ActiveTCL από το http://www."
 "activestate.com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Δε βρέθηκε το σετ εργαλείων Apple Bonjour για Windows, δείτε τις Συχνές "
 "Ερωτήσεις στο: http://d.pidgin.im/BonjourWindows για περισσότερες "
 "πληροφορίες."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Αδυναμία ακρόασης εισερχόμενων συνδέσεων άμεσων μηνυμάτων\n"
 
 msgid ""
@@ -2961,14 +2965,21 @@ msgstr "%s έκλεισε τη συνομιλία."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Αδύνατο να σταλεί το μήνυμα, η συνομιλία δεν ξεκίνησε."
 
-msgid "Cannot open socket"
-msgstr "Δεν είναι δυνατό το άνοιγμα του υποδοχέα"
-
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
 msgstr ""
+"Αδυναμία δημιουργίας υποδοχέα\n"
+"%s"
 
-msgid "Could not listen on socket"
-msgstr "Δεν ήταν δυνατή η ακρόαση του υποδοχέα"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "Αδυναμία απαγόρευσης εισόδου σε %s"
+
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Αδυναμία δημιουργίας υποδοχέα\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
@@ -3017,13 +3028,16 @@ msgstr "Αποθήκευση λίστας φίλων..."
 msgid "Load buddylist from file..."
 msgstr "Φόρτωμα λίστας φίλων από αρχείο..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Συμπληρώστε τα πεδία καταχώρησης."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Οι κωδικοί δεν ταιριάζουν."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Αδυναμία καταχώρησης νέου λογαριασμού. Συνέβη σφάλμα.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3035,13 +3049,13 @@ msgstr "Η καταχώρηση ολοκληρώθηκε επιτυχώς!"
 msgid "Password"
 msgstr "Κωδικός"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr "Κωδικός (ξανά)"
 
-msgid "Enter current token"
+msgid "Enter captcha text"
 msgstr ""
 
-msgid "Current token"
+msgid "Captcha"
 msgstr ""
 
 msgid "Register New Gadu-Gadu Account"
@@ -3095,6 +3109,15 @@ msgstr "Ο κωδικός άλλαξε επιτυχώς!"
 msgid "Current password"
 msgstr "Τρέχων κωδικός"
 
+msgid "Password (retype)"
+msgstr "Κωδικός (ξανά)"
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 "Παρακαλούμε εισάγετε τον παλιό και τον καινούριο κωδικό σας για το UIN. "
@@ -3143,8 +3166,8 @@ msgstr "Δε βρέθηκαν χρήστες που να ταιριάζουν"
 msgid "There are no users matching your search criteria."
 msgstr "Δε βρέθηκαν χρήστες που να ταιριάζουν με τα κριτήρια αναζήτησης."
 
-msgid "Unable to read socket"
-msgstr "Αδυναμία ανάγνωσης υποδοχέα"
+msgid "Unable to read from socket"
+msgstr "Αδυναμία ανάγνωσης από τον υποδοχέα"
 
 msgid "Buddy list downloaded"
 msgstr "Η λίστα φίλων λήφθηκε"
@@ -3158,8 +3181,14 @@ msgstr "Η λίστα φίλων στάλθηκε"
 msgid "Your buddy list was stored on the server."
 msgstr "Η λίστα φίλων σας αποθηκεύτηκε στον εξυπηρετητή."
 
-msgid "Connection failed."
-msgstr "Αποτυχία σύνδεσης."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Συνδέθηκε"
+
+msgid "Connection failed"
+msgstr "Αποτυχία σύνδεσης"
 
 msgid "Add to chat"
 msgstr "Προσθήκη στη συζήτηση"
@@ -3167,18 +3196,23 @@ msgstr "Προσθήκη στη συζήτηση"
 msgid "Chat _name:"
 msgstr "Όνομα _συζήτησης:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Αδύνατη η σύνδεση με τον εξυπηρετητή."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Γίνεται σύνδεση"
+
 msgid "Chat error"
 msgstr "Σφάλμα συζήτησης"
 
 msgid "This chat name is already in use"
 msgstr "Αυτό το όνομα συζήτησης χρησιμοποιείται ήδη"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Δεν είστε συνδεδεμένοι με τον εξυπηρετητή."
 
 msgid "Find buddies..."
@@ -3238,7 +3272,8 @@ msgstr "Δεν ορίστηκε θέμα συζήτησης"
 msgid "File Transfer Failed"
 msgstr "Αποτυχία μεταφοράς αρχείου"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Αδυναμία ανοίγματος μιας θύρας ακρόασης."
 
 msgid "Error displaying MOTD"
@@ -3254,8 +3289,18 @@ msgstr "Δεν υπάρχει μήνυμα της ημέρας σχετικό μ
 msgid "MOTD for %s"
 msgstr "Μήνυμα της ημέρας για %s"
 
-msgid "Server has disconnected"
-msgstr "Ο εξυπηρετητής αποσυνδέθηκε"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Η σύνδεση με τον εξυπηρετητή χάθηκε:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Εμφάνιση μηνύματος της ημέρας"
@@ -3270,22 +3315,20 @@ msgstr "_Κωδικός:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "Τα ψευδώνυμα IRC δεν πρέπει να περιέχουν κενά"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Γίνεται σύνδεση"
-
 msgid "SSL support unavailable"
 msgstr "Υποστήριξη SSL μη διαθέσιμη"
 
-msgid "Couldn't create socket"
-msgstr "Δεν ήταν δυνατή η δημιουργία υποδοχέα"
+msgid "Unable to connect"
+msgstr "Αδυναμία σύνδεσης"
 
-msgid "Couldn't connect to host"
-msgstr "Δεν ήταν δυνατή η σύνδεση με τον κεντρικό υπολογιστή"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Αδυναμία σύνδεσης με %s"
 
-msgid "Read error"
-msgstr "Σφάλμα ανάγνωσης"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Ο εξυπηρετητής έκλεισε τη σύνδεση"
 
 msgid "Users"
 msgstr "Χρήστες"
@@ -3718,12 +3761,14 @@ msgstr ""
 msgid "execute"
 msgstr "εκτέλεση"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "Ο εξυπηρετητής απαιτεί TLS/SSL για να γίνει σύνδεση.  Δε βρέθηκε υποστήριξη "
 "TLS/SSL."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Θέλετε κρυπτογράφηση αλλά δε βρέθηκε υποστήριξη TLS/SSL."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3742,7 +3787,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Έγκριση με σκέτο κείμενο"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Αποτυχία έγκρισης"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Λανθασμένη ανταπόκριση του εξυπηρετητή."
 
 msgid "Server does not use any supported authentication method"
@@ -3755,7 +3805,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "Μη έγκυρη πρόκληση από τον εξυπηρετητή"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Σφάλμα SASL"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3775,10 +3826,8 @@ msgstr ""
 "Αδυναμία δημιουργίας σύνδεσης με τον εξυπηρετητή:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Αδυναμία δημιουργίας σύνδεσης με τον εξυπηρετητή:\n"
 "%s"
@@ -3787,12 +3836,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "Αδυναμία δημιουργίας σύνδεσης"
 
-msgid "Unable to create socket"
-msgstr "Αδυναμία δημιουργίας υποδοχέα"
-
-msgid "Write error"
-msgstr "Σφάλμα εγγραφής"
-
 msgid "Full Name"
 msgstr "Ονοματεπώνυμο"
 
@@ -3863,159 +3906,6 @@ msgstr "Λειτουργικό σύστημα"
 msgid "Local Time"
 msgstr "Τοπικό αρχείο:"
 
-msgid "Last Activity"
-msgstr "Τελευταία ενέργεια"
-
-msgid "Service Discovery Info"
-msgstr ""
-
-msgid "Service Discovery Items"
-msgstr ""
-
-msgid "Extended Stanza Addressing"
-msgstr ""
-
-msgid "Multi-User Chat"
-msgstr "Συζήτηση πολλών ατόμων"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr ""
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr ""
-
-msgid "User Location"
-msgstr "Τοποθεσία χρήστη"
-
-msgid "User Avatar"
-msgstr "Εικόνα χρήστη"
-
-msgid "Chat State Notifications"
-msgstr "Ειδοποιήσεις κατάστασης συζήτησης"
-
-msgid "Software Version"
-msgstr "Έκδοση λογισμικού"
-
-msgid "Stream Initiation"
-msgstr ""
-
-msgid "File Transfer"
-msgstr "Μεταφορές αρχείων"
-
-msgid "User Mood"
-msgstr "Διάθεση χρήστη"
-
-msgid "User Activity"
-msgstr "Δραστηριότητα χρήστη"
-
-msgid "Entity Capabilities"
-msgstr ""
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-msgid "User Tune"
-msgstr ""
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-msgid "Reachability Address"
-msgstr ""
-
-msgid "User Profile"
-msgstr "Προφίλ χρήστη"
-
-msgid "Jingle"
-msgstr ""
-
-msgid "Jingle Audio"
-msgstr ""
-
-msgid "User Nickname"
-msgstr "Όνομα χρήστη"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr ""
-
-msgid "Jingle DTMF"
-msgstr ""
-
-msgid "Message Receipts"
-msgstr "Λήψεις μηνυμάτων"
-
-msgid "Public Key Publishing"
-msgstr ""
-
-msgid "User Chatting"
-msgstr "Ο χρήστης συζητάει"
-
-msgid "User Browsing"
-msgstr "Ο χρήστης περιηγείται"
-
-msgid "User Gaming"
-msgstr "Ο χρήστης παίζει"
-
-msgid "User Viewing"
-msgstr "Ο χρήστεις προβάλλει"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr ""
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr "Καθυστερημένη παράδοση"
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Δυνατότητες"
-
 msgid "Priority"
 msgstr "Προτεραιότητα"
 
@@ -4027,7 +3917,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Συνδεδεμένος"
 
 msgid "Middle Name"
@@ -4208,16 +4098,13 @@ msgstr "Δε βρέθηκαν χρήστες που να ταιριάζουν"
 msgid "Roles:"
 msgstr "Ρόλος"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Τέλος χρονικού ορίου για ping"
 
-msgid "Read Error"
-msgstr "Σφάλμα ανάγνωσης"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4397,9 +4284,6 @@ msgstr "Ο κωδικός σας έχει αλλάξει."
 msgid "Error changing password"
 msgstr "Σφάλμα αλλαγής κωδικού"
 
-msgid "Password (again)"
-msgstr "Κωδικός (ξανά)"
-
 msgid "Change XMPP Password"
 msgstr "Αλλαγή κωδικού XMPP"
 
@@ -4783,6 +4667,14 @@ msgstr "Σφάλμα ανάλυσης XML"
 msgid "Unknown Error in presence"
 msgstr "Υπάρχει άγνωστο σφάλμα"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Σφάλμα κατά τη συμμετοχή στη συζήτηση %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Σφάλμα στη συζήτηση %s"
+
 msgid "Create New Room"
 msgstr "Δημιουργία νέου δωματίου"
 
@@ -4799,16 +4691,20 @@ msgstr "_Ρύθμιση δωματίου"
 msgid "_Accept Defaults"
 msgstr "_Αποδοχή προεπιλεγμένων"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Σφάλμα κατά τη συμμετοχή στη συζήτηση %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Δεν δόθηκε αιτία"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Σφάλμα στη συζήτηση %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Έχετε εκδιωχθεί από τον %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Εκδιωγμένος από τον %s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Ένα σφάλμα συνέβη κατά το άνοιγμα του αρχείου."
 
 #, fuzzy
@@ -5300,9 +5196,6 @@ msgstr ""
 "Χρειάζεται υποστήριξη SSL για το MSN. Παρακαλούμε εγκαταστήστε μία "
 "υποστηριζόμενη βιβλιοθήκη SSL."
 
-msgid "Failed to connect to server."
-msgstr "Αποτυχία σύνδεσης με τον εξυπηρετητή."
-
 msgid "Error retrieving profile"
 msgstr "Σφάλμα κατά τη λήψη του προφίλ"
 
@@ -5556,9 +5449,6 @@ msgstr "Το μήνυμα δε στάλθηκε επειδή συνέβη ένα
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Το μήνυμα δε στάλθηκε επειδή συνέβη ένα άγνωστο σφάλμα."
 
-msgid "Unable to connect"
-msgstr "Αδυναμία σύνδεσης"
-
 msgid "Writing error"
 msgstr "Σφάλμα εγγραφής"
 
@@ -5573,13 +5463,16 @@ msgstr ""
 "Σφάλμα σύνδεσης από %s διακομιστή:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Το πρωτόκολλό μας δεν υποστηρίζεται από τον εξυπηρετητή."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Σφάλμα ανάλυσης HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Έχετε συνδεθεί από άλλη τοποθεσία."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5587,7 +5480,8 @@ msgstr ""
 "Οι εξυπηρετητές του MSN είναι προσωρινά μη διαθέσιμοι. Παρακαλούμε "
 "περιμένετε και ξαναδοκιμάστε."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Οι εξυπηρετητές του MSN κλείνουν προσωρινά."
 
 #, c-format
@@ -5600,9 +5494,6 @@ msgstr ""
 "Ο λίστα φίλων σας του MSN είναι προσωρινά μη διαθέσιμη. Παρακαλούμε "
 "περιμένετε και ξαναπροσπαθήστε."
 
-msgid "Unknown error."
-msgstr "Άγνωστο σφάλμα."
-
 msgid "Handshaking"
 msgstr "Γίνεται χειραψία"
 
@@ -5706,6 +5597,9 @@ msgstr "Πρόσθετο πρωτοκόλλου MSN"
 msgid "%s is not a valid group."
 msgstr "%s δεν είναι έγκυρη ομάδα."
 
+msgid "Unknown error."
+msgstr "Άγνωστο σφάλμα."
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s σε %s (%s)"
@@ -5816,12 +5710,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Προσθήκη επαφών από τον εξυπηρετητή"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Συνδέθηκε"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Σφάλμα πρωτοκόλλου, κώδικας %d: %s"
@@ -5846,16 +5734,6 @@ msgstr "Σφάλμα MySpaceIM"
 msgid "Invalid input condition"
 msgstr "λανθασμένη συνθήκη εισόδου"
 
-msgid "Read buffer full (2)"
-msgstr "Η ενδιάμεση μνήμη ανάγνωσης είναι γεμάτη (2)"
-
-msgid "Unparseable message"
-msgstr "Μη αναλυόμενο μήνυμα"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Αδυναμία σύνδεσης στον υπολογιστή: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Αδυναμία προσθήκης φίλου"
 
@@ -5940,6 +5818,12 @@ msgstr "Σύνολο φίλων"
 msgid "Client Version"
 msgstr "Έκδοση πελάτη"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Το όνομα χρήστη είναι διαθέσιμο"
 
@@ -6201,9 +6085,9 @@ msgstr "Ο χρήστης είτε δεν είναι συνδεδεμένος ε
 msgid "Unknown error: 0x%X"
 msgstr "Άγνωστο σφάλμα: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Η σύνδεση απέτυχε (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Αδυναμία εισόδου"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6313,9 +6197,6 @@ msgstr "Συζήτηση GroupWise %d"
 msgid "Authenticating..."
 msgstr "Γίνεται έγκριση..."
 
-msgid "Unable to connect to server."
-msgstr "Αδύνατη η σύνδεση με τον εξυπηρετητή."
-
 msgid "Waiting for response..."
 msgstr "Αναμονή ανταπόκρισης..."
 
@@ -6339,9 +6220,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Θέλετε να συμμετάσχετε στη συζήτηση;"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Αποσυνδεθήκατε επειδή είστε συνδεδεμένοι από άλλο σταθμό εργασίας."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6349,16 +6227,14 @@ msgstr ""
 "%s φαίνεται ότι δεν είναι συνδεδεμένος και δεν έλαβε το μήνυμα που μόλις "
 "στείλατε."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Αδύνατη η σύνδεση με τον εξυπηρετητή. Παρακαλούμε εισάγετε τη διεύθυνση του "
 "εξυπηρετητή με τον οποίο επιθυμείτε να συνδεθείτε."
 
-msgid "Error. SSL support is not installed."
-msgstr "Σφάλμα. Δεν είναι εγκατεστημένη η υποστήριξη SSL."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Αυτή η συζήτηση έκλεισε. Δεν είναι δυνατή η αποστολή άλλων μηνυμάτων."
 
@@ -6398,10 +6274,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "Σφάλμα εύρεσης του %s"
 
-msgid "Incorrect password."
-msgstr "Λανθασμένος κωδικός."
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6410,18 +6283,8 @@ msgstr "Δεν ήταν δυνατή η είσοδος στο δωμάτιο σ�
 msgid "Invalid chat room name"
 msgstr "Μη έγκυρο όνομα δωματίου"
 
-msgid "Server closed the connection."
-msgstr "Ο εξυπηρετητής έκλεισε τη σύνδεση"
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Η σύνδεση με τον εξυπηρετητή χάθηκε:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Λήφθηκαν μη έγκυρα δεδομένα κατά τη σύνδεση με τον εξυπηρετητή."
 
 #. *< type
@@ -6470,7 +6333,8 @@ msgid "Received invalid data on connection with remote user."
 msgstr ""
 "Λήφθηκαν μη έγκυρα δεδομένα κατά τη σύνδεση με τον απομακρυσμένο χρήστη."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Δεν ήταν δυνατή η δημιουργία σύνδεσης με τον απομακρυσμένο χρήστη."
 
 msgid "Direct IM established"
@@ -6673,21 +6537,15 @@ msgstr "Επίπεδο προειδοποίησης"
 msgid "Buddy Comment"
 msgstr "Σχόλιο φίλου"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Δεν ήταν δυνατή η σύνδεση με τον εξυπηρετητή πιστοποίησης:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Δεν ήταν δυνατή η σύνδεση με τον εξυπηρετητή BOS:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Αδύνατη η σύνδεση με τον εξυπηρετητή."
 
 msgid "Username sent"
 msgstr "Το όνομα χρήστη στάλθηκε"
@@ -6699,11 +6557,11 @@ msgstr "Η σύνδεση πραγματοποιήθηκε, το cookie στάλ
 msgid "Finalizing connection"
 msgstr "Ολοκλήρωση σύνδεσης"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Αδυναμία εισόδου: Δεν ήταν δυνατό να συνδεθείτε ως %s επειδή το όνομα χρήστη "
 "δεν είναι έγκυρο.  Τα ονόματα χρήστη πρέπει είτε να είναι μία έγκυρη "
@@ -6717,26 +6575,22 @@ msgstr "Αποσυνδεθήκατε πολύ γρήγορα.  Ελέγξτε τ
 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 "Μη έγκυρο όνομα χρήστη."
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Ο χρήστης δεν υπάρχει"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Ο λογαριασμός σας είναι προς το παρόν σε αναστολή."
 
 #. service temporarily unavailable
@@ -6759,7 +6613,8 @@ msgstr ""
 "ξαναπροσπαθήστε. Αν συνεχίσετε να προσπαθείτε, θα πρέπει να περιμένετε ακόμα "
 "περισσότερο."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Το SecurID που πληκτρολογήθηκε είναι λανθασμένο."
 
 msgid "Enter SecurID"
@@ -6935,6 +6790,9 @@ msgstr "Συνδεδεμένος από"
 msgid "Member Since"
 msgstr "Μέλος από"
 
+msgid "Capabilities"
+msgstr "Δυνατότητες"
+
 msgid "Profile"
 msgstr "Προφίλ"
 
@@ -7118,9 +6976,9 @@ msgstr[1] ""
 msgid "Away message too long."
 msgstr "Πολύ μεγάλο μήνυμα απουσίας."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7145,9 +7003,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Ορφανά"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Αδύνατη η προσθήκη του %s επειδή έχετε πάρα πολλούς φίλους στη λίστα φίλων "
@@ -7156,8 +7014,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(χωρίς όνομα)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Δεν ήταν δυνατή η προσθήκη του φίλου %s για άγνωστο λόγο."
 
 #, c-format
@@ -7938,7 +7796,8 @@ msgstr ""
 msgid "Update interval (seconds)"
 msgstr ""
 
-msgid "Cannot decrypt server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "Δεν ήταν δυνατή η απόκρυψη της απάντησης του εξυπηρετητή"
 
 #, c-format
@@ -7963,9 +7822,6 @@ msgstr "Απαιτείται ενεργοποίηση"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Άγνωστος κωδικός απάντησης κατά την είσοδο (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Δεν ήταν δυνατή η αποκρυπτογράφηση της απάντησης του εξυπηρετητή"
-
 msgid "Requesting captcha"
 msgstr ""
 
@@ -7999,29 +7855,18 @@ msgstr ""
 "Άγνωστος κωδικός απάντησης κατά την είσοδο (0x%02X):\n"
 "%s"
 
-msgid "Unable to connect."
-msgstr "Αδυναμία σύνδεσης."
-
 msgid "Socket error"
 msgstr "Σφάλμα υποδοχέα"
 
-msgid "Unable to read from socket"
-msgstr "Αδυναμία ανάγνωσης από τον υποδοχέα"
-
-msgid "Write Error"
-msgstr "Σφάλμα εγγραφής"
-
-msgid "Connection lost"
-msgstr "Η σύνδεση χάθηκε"
-
 msgid "Getting server"
 msgstr "Λήψη εξυπηρετητή"
 
 msgid "Requesting token"
 msgstr ""
 
-msgid "Couldn't resolve host"
-msgstr "Δεν ήταν δυνατή η εύρεση του κεντρικού υπολογιστή"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Αδύνατη η σύνδεση με τον εξυπηρετητή."
 
 msgid "Invalid server or port"
 msgstr "Μη έγκυρος εξυπηρετητής ή θύρα"
@@ -8074,7 +7919,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "Εντολή QQ Qun"
 
-msgid "Could not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "Δεν ήταν δυνατή η αποκρυπτογράφηση της απάντησης εισόδου"
 
 msgid "Unknown LOGIN CMD"
@@ -8094,9 +7940,6 @@ msgstr "Αποστολή αρχείου"
 msgid "%d canceled the transfer of %s"
 msgstr "%d ακύρωσε τη μεταφορά του %s"
 
-msgid "Connection closed (writing)"
-msgstr "Η σύνδεση έκλεισε (γίνεται εγγραφή)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Τίτλος Ομάδας:</b> %s<br>"
@@ -8152,17 +7995,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Ανακοίνωση διαχειριστή Sametime"
 
-msgid "Connection reset"
-msgstr "Επαναφορά σύνδεσης"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Σφάλμα ανάγνωσης από τον υποδοχέα: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Αδύνατη η σύνδεση με τον κεντρικό υπολογιστή"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Ανακοίνωση από %s"
@@ -8185,6 +8017,9 @@ msgstr "Ηχεία"
 msgid "Video Camera"
 msgstr "Βιντεοκάμερα"
 
+msgid "File Transfer"
+msgstr "Μεταφορές αρχείων"
+
 msgid "Supports"
 msgstr "Υποστηρίζει"
 
@@ -8996,6 +8831,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Στατιστικά δικτύου"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Αποτυχία Ping"
 
@@ -9057,7 +8895,8 @@ msgstr "Μη υποστηριζόμενος τύπος δημοσίου κλει
 msgid "Disconnected by server"
 msgstr "Έγινε αποσύνδεση από τον εξυπηρετητή"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Σφάλμα κατά τη σύνδεση με τον εξυπηρετητή SILC"
 
 msgid "Key Exchange failed"
@@ -9069,26 +8908,26 @@ msgstr ""
 "Αποτυχία συνέχειας αποδεσμευμένης συνεδρίας. Πατήστε Επανασύνδεση για να "
 "δημιουργήσετε νέα σύνδεση"
 
-msgid "Connection failed"
-msgstr "Αποτυχία σύνδεσης"
-
 msgid "Performing key exchange"
 msgstr "Γίνεται ανταλλαγή κλειδιού"
 
-msgid "Unable to create connection"
-msgstr "Αδυναμία δημιουργίας σύνδεσης"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Αδυναμία φορτώματος του κλειδιού SILC"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Γίνεται σύνδεση με τον εξυπηρετητή SILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Αδυναμία φορτώματος του κλειδιού SILC"
+
 msgid "Out of memory"
 msgstr "Τέλος μνήμης"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Αδυναμία εκκίνησης πρωτοκόλλου SILC"
 
 msgid "Error loading SILC key pair"
@@ -9396,7 +9235,8 @@ msgstr "Ψηφιακή υπογραφή και έλεγχος όλων των μ
 msgid "Creating SILC key pair..."
 msgstr "Δημιουργία κλειδιού SILC..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Αδύνατη η δημιουργία κλειδιού SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9488,6 +9328,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr "Δεν υπάρχουν διαθέσιμα στατιστικά εξυπηρετητή"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Σφάλμα κατά τη σύνδεση με τον εξυπηρετητή SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Αποτυχία: Δεν ταιριάζουν οι εκδόσεις, αναβαθμίστε τον πελάτη σας"
@@ -9533,30 +9376,27 @@ msgstr "Αποτυχία: Μη έγκυρο cookie"
 msgid "Failure: Authentication failed"
 msgstr "Αποτυχία: Η έγκρισή απέτυχε"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Αδυναμία έναρξης σύνδεσης του πελάτη SILC"
 
 msgid "John Noname"
 msgstr "Γιάννης Χωρίς-όνομα"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Δεν ήταν δυνατό το φόρτωμα του ζεύγους κλειδιών SILC: %s"
 
-msgid "Could not write"
-msgstr "Δεν ήταν δυνατή η εγγραφή"
-
-msgid "Could not connect"
-msgstr "Δεν ήταν δυνατή η σύνδεση"
+msgid "Unable to create connection"
+msgstr "Αδυναμία δημιουργίας σύνδεσης"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Άγνωστη απάντηση εξυπηρετητή."
 
-msgid "Could not create listen socket"
-msgstr "Δεν ήταν δυνατή η δημιουργία υποδοχέα ακρόασης"
-
-msgid "Could not resolve hostname"
-msgstr "Δεν ήταν δυνατή η εύρεση του ονόματος του κεντρικού υπολογιστή"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Αδυναμία δημιουργίας υποδοχέα"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Τα ονόματα χρήστη χρηστών SIP δεν πρέπει να περιέχουν κενά ή σύμβολα @"
@@ -9598,6 +9438,78 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr ""
+"join &lt;δωμάτιο&gt;:  συμμετοχή σε ένα δωμάτιο συζήτησης στο δίκτυο Yahoo"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Λίστα των καναλιών στο δίκτυο Yahoo"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+msgid "Yahoo ID..."
+msgstr "Yahoo ID..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Πρόσθετο πρωτοκόλλου Yahoo"
+
+msgid "Pager server"
+msgstr "Εξυπηρετητής τηλεειδοποίησης"
+
+msgid "Pager port"
+msgstr "Θύρα τηλεειδοποιητή"
+
+msgid "File transfer server"
+msgstr "Εξυπηρετητής μεταφοράς αρχείων"
+
+msgid "File transfer port"
+msgstr "Θύρα μεταφοράς αρχείων"
+
+msgid "Chat room locale"
+msgstr "Εντοπιότητα δωματίου συζήτησης"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Παράβλεψη προσκλήσεων συζητήσεων και δωματίων συζητήσεων"
+
+msgid "Chat room list URL"
+msgstr "URL λίστας δωματίων συζήτησης"
+
+msgid "Yahoo Chat server"
+msgstr "Εξυπηρετητής συζητήσεων Yahoo"
+
+msgid "Yahoo Chat port"
+msgstr "Θύρα συζητήσεων Yahoo"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo ID..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Πρόσθετο πρωτοκόλλου Yahoo"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9629,30 +9541,20 @@ msgstr "Η προσθήκη φίλου απορρίφθηκε"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 "Άγνωστο σφάλμα με αριθμό %d. Αν συνδεθείτε στην ιστοσελίδα του Yahoo! ίσως "
 "διορθωθεί."
@@ -9697,39 +9599,34 @@ msgstr ""
 "Άγνωστο σφάλμα με αριθμό %d. Αν συνδεθείτε στην ιστοσελίδα του Yahoo! ίσως "
 "διορθωθεί."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Δεν ήταν δυνατή η προσθήκη του φίλου %s στην ομάδα %s της λίστας εξυπηρετητή "
 "στο λογαριασμό %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Δεν ήταν δυνατή η προσθήκη του φίλου στη λίστα εξυπηρετητή"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ %s/%s/%s.swf με ήχο ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Λήφθηκε αναπάντεχη ανταπόκριση HTTP από τον εξυπηρετητή."
 
-msgid "Connection problem"
-msgstr "Πρόβλημα σύνδεσης"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Χάθηκε η σύνδεση με %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Αδυναμία δημιουργίας σύνδεσης με %s:\n"
+"Αδυναμία δημιουργίας σύνδεσης με τον εξυπηρετητή:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9792,74 +9689,15 @@ msgstr "Συμμετοχή χρήστη σε συζήτηση..."
 msgid "Open Inbox"
 msgstr "Άνοιγμα εισερχομένων"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-"join &lt;δωμάτιο&gt;:  συμμετοχή σε ένα δωμάτιο συζήτησης στο δίκτυο Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Λίστα των καναλιών στο δίκτυο Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-msgid "Yahoo ID..."
-msgstr "Yahoo ID..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Πρόσθετο πρωτοκόλλου Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Ιαπωνίας"
-
-msgid "Pager server"
-msgstr "Εξυπηρετητής τηλεειδοποίησης"
-
-msgid "Japan Pager server"
-msgstr "Εξυπηρετητής τηλεειδοποίησης Ιαπωνίας"
-
-msgid "Pager port"
-msgstr "Θύρα τηλεειδοποιητή"
-
-msgid "File transfer server"
-msgstr "Εξυπηρετητής μεταφοράς αρχείων"
-
-msgid "Japan file transfer server"
-msgstr "Εξυπηρετητής μεταφοράς αρχείων Ιαπωνίας"
-
-msgid "File transfer port"
-msgstr "Θύρα μεταφοράς αρχείων"
-
-msgid "Chat room locale"
-msgstr "Εντοπιότητα δωματίου συζήτησης"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Παράβλεψη προσκλήσεων συζητήσεων και δωματίων συζητήσεων"
-
-msgid "Chat room list URL"
-msgstr "URL λίστας δωματίων συζήτησης"
-
-msgid "Yahoo Chat server"
-msgstr "Εξυπηρετητής συζητήσεων Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "Θύρα συζητήσεων Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "Αδυναμία σύνδεσης."
+
 msgid "Unable to establish file descriptor."
 msgstr "Αδυναμία σύνδεσης με τον περιγραφέα αρχείων."
 
@@ -9867,6 +9705,9 @@ msgstr "Αδυναμία σύνδεσης με τον περιγραφέα αρ�
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s προσπαθεί να σας στείλει ένα σύνολο %d αρχείων.\n"
 
+msgid "Write Error"
+msgstr "Σφάλμα εγγραφής"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Προφίλ Yahoo! Ιαπωνίας"
 
@@ -9984,23 +9825,19 @@ msgstr "Φωνές"
 msgid "Webcams"
 msgstr "Ιστοκάμερες"
 
+msgid "Connection problem"
+msgstr "Πρόβλημα σύνδεσης"
+
 msgid "Unable to fetch room list."
 msgstr "Αδύνατη η λήψη της λίστας δωματίων."
 
 msgid "User Rooms"
 msgstr "Δωμάτια χρηστών"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Πρόβλημα σύνδεσης με τον εξυπηρετητή YCHT."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Η σύνδεση με τον εξυπηρετητή χάθηκε\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10118,24 +9955,16 @@ msgstr "Σφαίρα"
 msgid "Exposure"
 msgstr "Έκθεση"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Αδυναμία δημιουργίας υποδοχέα\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Αδυναμία ανάλυσης της ανταπόκρισης του διακομιστή HTTP: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Σφάλμα σύνδεσης διαμεσολαβητή HTTP %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "Άρνηση πρόσβασης: ο διαμεσολαβητής HTTP απαγορεύει την σηράγγωση της θύρας %"
 "d."
@@ -10144,9 +9973,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr "Σφάλμα εύρεσης του %s"
 
-msgid "Could not resolve host name"
-msgstr "Δεν ήταν δυνατή η εύρεση του ονόματος του κεντρικού υπολογιστή"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Ζητείται η προσοχή του %s..."
@@ -10348,14 +10174,6 @@ msgstr "Σφάλμα εγγραφής του %s: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "Αδυναμία σύνδεσης με %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"Ο εξυπηρετητής απαιτεί TLS/SSL για να γίνει σύνδεση.  Δε βρέθηκε υποστήριξη "
-"TLS/SSL."
-
 #, c-format
 msgid " - %s"
 msgstr " - %s"
@@ -10605,9 +10423,13 @@ msgstr "Προσθήκη ε_φόρμησης φίλου..."
 msgid "View _Log"
 msgstr "Εμφάνιση _καταγραφής"
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
 msgstr ""
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Εμφάνιση μη συνδεδεμένων φίλων"
+
 msgid "_Alias..."
 msgstr "_Γνωστός ως..."
 
@@ -11115,6 +10937,11 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Αλλαγή πληροφοριών χρήστη για %s"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr ""
+"Εισάγετε το όνομα του υπολογιστή για τον οποίο είναι αυτό το πιστοποιητικό."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Εξυπηρετητές SSL"
@@ -11162,7 +10989,8 @@ msgstr "Παράβλεψη"
 msgid "Get Away Message"
 msgstr "Λήψη μηνύματος απουσίας"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Τελευταία φράση"
 
 msgid "Unable to save icon file to disk."
@@ -12054,7 +11882,8 @@ msgstr "Χρώμα για να ζωγραφιστούν οι υπερσύνδε�
 msgid "Hyperlink visited color"
 msgstr ""
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+#, fuzzy
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 "Χρώμα για να ζωγραφιστούν οι υπερσύνδεσμοι αφού τους έχετε επισκεφτεί (ή "
 "ενεργοποιήσει)."
@@ -12095,13 +11924,22 @@ msgstr "Χρώμα που θα ζωγραφίζεται το όνομα ενός
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Χρώμα που θα ζωγραφίζεται το όνομα ενός μηνύματος ενέργειας."
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Χρώμα που θα ζωγραφίζεται το όνομα ενός μηνύματος ενέργειας."
+
 msgid "Typing notification color"
 msgstr "Χρώμα ειδοποίησης πληκτρολόγησης"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr ""
 "Το χρώμα που θα χρησιμοποιείται για τη γραμματοσειρά ειδοποίησης "
 "πληκτρολόγησης"
@@ -12493,6 +12331,10 @@ msgstr ""
 "Έχει επιλεχθεί η 'με το χέρι' εντολή του περιηγητή, αλλά δεν έχει ορισθεί "
 "καμία εντολή."
 
+#, fuzzy
+msgid "No message"
+msgstr "Άγνωστο μήνυμα"
+
 msgid "Open All Messages"
 msgstr "Άνοιγμα όλων των μηνυμάτων"
 
@@ -12516,10 +12358,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, fuzzy
-msgid "No message"
-msgstr "Άγνωστο μήνυμα"
-
 msgid "The following plugins will be unloaded."
 msgstr "Τα ακόλουθα πρόσθετα θα αποφορτωθούν."
 
@@ -12735,8 +12573,9 @@ msgstr "Εμφάνιση εικονιδίου εργαλειοθήκης συσ�
 msgid "On unread messages"
 msgstr "Όταν υπάρχουν μη αναγνωσμένα μηνύματα"
 
-msgid "Conversation Window Hiding"
-msgstr "Απόκρυψη παραθύρων συνομιλιών"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Παράθυρα άμεσων μηνυμάτων"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Απόκρυψη νέων συνομιλιών άμεσων μηνυμάτων:"
@@ -12744,6 +12583,9 @@ msgstr "_Απόκρυψη νέων συνομιλιών άμεσων μηνυμ�
 msgid "When away"
 msgstr "Κατά την απουσία"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Ελαχιστοποίηση παραθύρων _νέων συνομιλιών"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Καρτέλες"
@@ -12802,9 +12644,6 @@ msgstr "Χρήση ομαλής κύλισης"
 msgid "F_lash window when IMs are received"
 msgstr "Να ανα_βοσβήνει το παράθυρο όταν λαμβάνονται άμεσα μηνύματα"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Ελαχιστοποίηση παραθύρων _νέων συνομιλιών"
-
 msgid "Minimum input area height in lines:"
 msgstr "Ελάχιστο ύψος περιοχής εισαγωγής κειμένου σε γραμμές:"
 
@@ -12839,7 +12678,8 @@ msgstr "Δεν είναι δυνατή η εκκίνηση του προγράμ
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Παράδειγμα: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Αυτόματος εντοπισμός διεύθυνσης IP"
 
 msgid "Public _IP:"
@@ -13215,21 +13055,6 @@ msgstr "_Αποθήκευση & Χρήση"
 msgid "Status for %s"
 msgstr "Κατάσταση %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "Προσαρμοσμένη φατσούλα"
-
-msgid "More Data needed"
-msgstr "Χρειάζονται περισσότερα δεδομένα"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Παρακαλούμε εισάγετε μία συντόμευση για να συσχετιστεί με τη φατσούλα."
-
 #, fuzzy, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
@@ -13237,12 +13062,12 @@ msgstr ""
 "Υπάρχει ήδη μία προσπαρμοσμένη φατσούλα για την επιλεγμένη συντόμευση. "
 "Παρακαλούμε εισάγετε μία διαφορετική συντόμευση."
 
+msgid "Custom Smiley"
+msgstr "Προσαρμοσμένη φατσούλα"
+
 msgid "Duplicate Shortcut"
 msgstr "Αντιγραφή συντόμευσης"
 
-msgid "Please select an image for the smiley."
-msgstr "Παρακαλούμε επιλέξτε μία εικόνα για τη φατσούλα."
-
 msgid "Edit Smiley"
 msgstr "Επεξεργασία φατσούλας"
 
@@ -13357,9 +13182,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Δεν είναι δυνατή η αποστολή συντόμευσης"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Σύρατε μία συντόμευση της επιφάνειας εργασίας. Το πιθανότερο είναι να θέλετε "
 "να στείλετε το στόχο αυτής της συντόμευσης και όχι την ίδια τη συντόμευση."
@@ -13974,9 +13800,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Πρόσθετο μουσικών μηνυμάτων για συνεργαζόμενη σύνθεση."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Το πρόσθετο μηνυμάτων μουσικής επιτρέπει σε έναν αριθμό χρηστών να δουλεύουν "
 "ταυτόχρονα πάνω σε ένα κομμάτι μουσικής καθώς επεξεργάζονται μία κοινή "
@@ -14235,9 +14062,10 @@ msgid "Conversation Window Send Button."
 msgstr "Κουμπί αποστολής παραθύρου συνομιλίας."
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Προσθέτει ένα κουμπί αποστολής στο πεδίο εισαγωγής στο παράθυρο συνομιλίας. "
 "Προορίζεται για περιπτώσης που δεν υπάρχει πραγματικό πληκτρολόγιο."
@@ -14569,8 +14397,9 @@ msgstr "Επιλογές Windows Pidgin"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Επιλογές ειδικά για το Pidgin για Windows."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Παρέχει επιλογές ειδικά για το Windows Pidgin, όπως είναι η προσάρτηση της "
 "λίστας φίλων."
@@ -14614,6 +14443,219 @@ msgstr ""
 "Αυτό το πρόσθετο είναι χρήσιμο για την αποσφαλμάτωση εξυπηρετητών και "
 "πελατών XMPP."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Δεν είναι δυνατό το άνοιγμα του υποδοχέα"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Δεν ήταν δυνατή η ακρόαση του υποδοχέα"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Αδυναμία ανάγνωσης υποδοχέα"
+
+#~ msgid "Connection failed."
+#~ msgstr "Αποτυχία σύνδεσης."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Ο εξυπηρετητής αποσυνδέθηκε"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Δεν ήταν δυνατή η δημιουργία υποδοχέα"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Δεν ήταν δυνατή η σύνδεση με τον κεντρικό υπολογιστή"
+
+#~ msgid "Read error"
+#~ msgstr "Σφάλμα ανάγνωσης"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Αδυναμία δημιουργίας σύνδεσης με τον εξυπηρετητή:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Σφάλμα εγγραφής"
+
+#~ msgid "Last Activity"
+#~ msgstr "Τελευταία ενέργεια"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Συζήτηση πολλών ατόμων"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "User Location"
+#~ msgstr "Τοποθεσία χρήστη"
+
+#~ msgid "User Avatar"
+#~ msgstr "Εικόνα χρήστη"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Ειδοποιήσεις κατάστασης συζήτησης"
+
+#~ msgid "Software Version"
+#~ msgstr "Έκδοση λογισμικού"
+
+#~ msgid "User Mood"
+#~ msgstr "Διάθεση χρήστη"
+
+#~ msgid "User Activity"
+#~ msgstr "Δραστηριότητα χρήστη"
+
+#~ msgid "User Profile"
+#~ msgstr "Προφίλ χρήστη"
+
+#~ msgid "User Nickname"
+#~ msgstr "Όνομα χρήστη"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Λήψεις μηνυμάτων"
+
+#~ msgid "User Chatting"
+#~ msgstr "Ο χρήστης συζητάει"
+
+#~ msgid "User Browsing"
+#~ msgstr "Ο χρήστης περιηγείται"
+
+#~ msgid "User Gaming"
+#~ msgstr "Ο χρήστης παίζει"
+
+#~ msgid "User Viewing"
+#~ msgstr "Ο χρήστεις προβάλλει"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Καθυστερημένη παράδοση"
+
+#~ msgid "Read Error"
+#~ msgstr "Σφάλμα ανάγνωσης"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Αποτυχία σύνδεσης με τον εξυπηρετητή."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Η ενδιάμεση μνήμη ανάγνωσης είναι γεμάτη (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Μη αναλυόμενο μήνυμα"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Αδυναμία σύνδεσης στον υπολογιστή: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Η σύνδεση απέτυχε (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Αποσυνδεθήκατε επειδή είστε συνδεδεμένοι από άλλο σταθμό εργασίας."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Σφάλμα. Δεν είναι εγκατεστημένη η υποστήριξη SSL."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Λανθασμένος κωδικός."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Δεν ήταν δυνατή η σύνδεση με τον εξυπηρετητή BOS:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Αποσυνδεθήκατε πολύ γρήγορα.  Ελέγξτε το %s για αναβαθμίσεις."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Δεν ήταν δυνατή η σύνδεση"
+
+#~ msgid "Invalid username."
+#~ msgstr "Μη έγκυρο όνομα χρήστη."
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Δεν ήταν δυνατή η αποκρυπτογράφηση της απάντησης του εξυπηρετητή"
+
+#~ msgid "Connection lost"
+#~ msgstr "Η σύνδεση χάθηκε"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Δεν ήταν δυνατή η εύρεση του κεντρικού υπολογιστή"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Η σύνδεση έκλεισε (γίνεται εγγραφή)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Επαναφορά σύνδεσης"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Σφάλμα ανάγνωσης από τον υποδοχέα: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Αδύνατη η σύνδεση με τον κεντρικό υπολογιστή"
+
+#~ msgid "Could not write"
+#~ msgstr "Δεν ήταν δυνατή η εγγραφή"
+
+#~ msgid "Could not connect"
+#~ msgstr "Δεν ήταν δυνατή η σύνδεση"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Δεν ήταν δυνατή η δημιουργία υποδοχέα ακρόασης"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Δεν ήταν δυνατή η εύρεση του ονόματος του κεντρικού υπολογιστή"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Λανθασμένος κωδικός."
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Αδυναμία δημιουργίας σύνδεσης με %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Ιαπωνίας"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Εξυπηρετητής τηλεειδοποίησης Ιαπωνίας"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Εξυπηρετητής μεταφοράς αρχείων Ιαπωνίας"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Η σύνδεση με τον εξυπηρετητή χάθηκε\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Δεν ήταν δυνατή η εύρεση του ονόματος του κεντρικού υπολογιστή"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Ο εξυπηρετητής απαιτεί TLS/SSL για να γίνει σύνδεση.  Δε βρέθηκε "
+#~ "υποστήριξη TLS/SSL."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Απόκρυψη παραθύρων συνομιλιών"
+
+#~ msgid "More Data needed"
+#~ msgstr "Χρειάζονται περισσότερα δεδομένα"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr ""
+#~ "Παρακαλούμε εισάγετε μία συντόμευση για να συσχετιστεί με τη φατσούλα."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Παρακαλούμε επιλέξτε μία εικόνα για τη φατσούλα."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Ενεργοποίηση ποιανού ID;"
 
@@ -15125,9 +15167,6 @@ msgstr ""
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "Αδυναμία εισόδου. Ελέγξτε την καταγραφή αποσφαλμάτωσης."
 
-#~ msgid "Unable to login"
-#~ msgstr "Αδυναμία εισόδου"
-
 #~ msgid "TCP Address"
 #~ msgstr "Διεύθυνση TCP"
 
diff --git a/po/en_AU.po b/po/en_AU.po
index dc76b23492..3c2052cfdd 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2005-01-19 07:55+1100\n"
 "Last-Translator: Peter (Bleeter) Lawler <trans@six-by-nine.com.au>\n"
 "Language-Team: English/AU <trans@six-by-nine.com.au>\n"
@@ -2677,7 +2677,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2729,7 +2729,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2977,12 +2977,12 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
 #, fuzzy
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr "Unable to create new connection."
 
 msgid ""
@@ -3042,17 +3042,17 @@ msgstr "%s has been invited to this conversation."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Unable to send message. The message is too large."
 
-#, fuzzy
-msgid "Cannot open socket"
-msgstr "Unable to open socket"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Unable to create socket"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Couldn't create socket"
 
-#, fuzzy
-msgid "Could not listen on socket"
-msgstr "Couldn't create socket"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Unable to create socket"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3111,15 +3111,15 @@ msgstr "Send Buddy List"
 msgid "Load buddylist from file..."
 msgstr "Import Buddy List from Server"
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
 #, fuzzy
-msgid "Passwords do not match."
+msgid "Passwords do not match"
 msgstr "New passwords do not match."
 
 #, fuzzy
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Unable to create new connection."
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3132,17 +3132,15 @@ msgstr "Registration Successful"
 msgid "Password"
 msgstr "Password"
 
-#, fuzzy
-msgid "Password (retype)"
-msgstr "Password sent"
+msgid "Password (again)"
+msgstr "Password (again)"
 
-#, fuzzy
-msgid "Enter current token"
-msgstr "%s not currently logged in."
+msgid "Enter captcha text"
+msgstr ""
 
 #, fuzzy
-msgid "Current token"
-msgstr "Currently on"
+msgid "Captcha"
+msgstr "Save Image"
 
 #, fuzzy
 msgid "Register New Gadu-Gadu Account"
@@ -3204,6 +3202,18 @@ msgid "Current password"
 msgstr "Incorrect password."
 
 #, fuzzy
+msgid "Password (retype)"
+msgstr "Password sent"
+
+#, fuzzy
+msgid "Enter current token"
+msgstr "%s not currently logged in."
+
+#, fuzzy
+msgid "Current token"
+msgstr "Currently on"
+
+#, fuzzy
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Please enter your current password and your new password."
 
@@ -3257,7 +3267,8 @@ msgstr "Non-matching Hosts"
 msgid "There are no users matching your search criteria."
 msgstr "Please enter your new password"
 
-msgid "Unable to read socket"
+#, fuzzy
+msgid "Unable to read from socket"
 msgstr "Unable to read socket"
 
 #, fuzzy
@@ -3276,8 +3287,14 @@ msgstr "Buddy Display"
 msgid "Your buddy list was stored on the server."
 msgstr "There is no Buddy List stored on the Gadu-Gadu server."
 
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
 #, fuzzy
-msgid "Connection failed."
+msgid "Connected"
+msgstr "Connect"
+
+msgid "Connection failed"
 msgstr "Connection failed"
 
 #, fuzzy
@@ -3288,11 +3305,15 @@ msgstr "Add Chat"
 msgid "Chat _name:"
 msgstr "Last name:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Unable to ping server"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Connecting"
+
 #, fuzzy
 msgid "Chat error"
 msgstr "Read error"
@@ -3302,7 +3323,7 @@ msgid "This chat name is already in use"
 msgstr "That file already exists"
 
 #, fuzzy
-msgid "Not connected to the server."
+msgid "Not connected to the server"
 msgstr "You were disconnected from the server."
 
 #, fuzzy
@@ -3371,7 +3392,7 @@ msgid "File Transfer Failed"
 msgstr "File transfer cancelled"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Pidgin could not open a listening port."
 
 msgid "Error displaying MOTD"
@@ -3387,8 +3408,16 @@ msgstr "There is no MOTD associated with this connection."
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-msgid "Server has disconnected"
-msgstr "Server has disconnected"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "You were disconnected from the server."
 
 msgid "View MOTD"
 msgstr "View MOTD"
@@ -3403,22 +3432,20 @@ msgstr "_Password:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC nicks may not contain whitespace"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Connecting"
-
 msgid "SSL support unavailable"
 msgstr "SSL support unavailable"
 
-msgid "Couldn't create socket"
-msgstr "Couldn't create socket"
+msgid "Unable to connect"
+msgstr "Unable to connect"
 
-msgid "Couldn't connect to host"
-msgstr "Couldn't connect to host"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Unable to connect to server."
 
-msgid "Read error"
-msgstr "Read error"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Error creating connection"
 
 msgid "Users"
 msgstr "Users"
@@ -3859,11 +3886,12 @@ msgstr "Command disabled"
 msgid "execute"
 msgstr "Not expected"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Server requires TLS/SSL for login.  No TLS/SSL support found."
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Server requires TLS/SSL for login.  No TLS/SSL support found."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3880,7 +3908,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Plaintext Authentication"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Authentication failed"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Invalid response from server."
 
 msgid "Server does not use any supported authentication method"
@@ -3892,8 +3925,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "Invalid challenge from server"
 
-#, fuzzy
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Read error"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3911,22 +3944,14 @@ msgstr "Unsupported Version"
 msgid "Unable to establish a connection with the server"
 msgstr "Unable to make SSL connection to server."
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Unable to make SSL connection to server."
 
 #, fuzzy
 msgid "Unable to establish SSL connection"
 msgstr "Unable to create new connection."
 
-msgid "Unable to create socket"
-msgstr "Unable to create socket"
-
-msgid "Write error"
-msgstr "Write error"
-
 msgid "Full Name"
 msgstr "Full Name"
 
@@ -3999,188 +4024,6 @@ msgstr "Hide Operating System"
 msgid "Local Time"
 msgstr "Local Users"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "Set Dir Info"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "Extended Address"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "Alias Chat"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "User has no directory information."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "Command"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "Registration Error"
-
-#, fuzzy
-msgid "User Location"
-msgstr "Location"
-
-msgid "User Avatar"
-msgstr ""
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "Buddy State Notification"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "Unsupported Version"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "Organisation"
-
-#, fuzzy
-msgid "File Transfer"
-msgstr "File Transfers"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "User Modes"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "User Limit"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "Capabilities"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "Username"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "IM with Key Exchange"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "Email Address"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "Set Profile"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "Ping"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "Nickname"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "Live Video"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "Message received"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "Public Key Babbleprint"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "User Options"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "User Modes"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "User Limit"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "User Limit"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Trillian Encryption"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Capabilities"
-
 #, fuzzy
 msgid "Priority"
 msgstr "Port"
@@ -4193,7 +4036,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Logged out"
 
 msgid "Middle Name"
@@ -4383,16 +4226,12 @@ msgid "Roles:"
 msgstr "Role"
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "Plain text"
 
-msgid "Read Error"
-msgstr "Read Error"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4581,9 +4420,6 @@ msgstr "Your password has been changed."
 msgid "Error changing password"
 msgstr "Error changing password"
 
-msgid "Password (again)"
-msgstr "Password (again)"
-
 msgid "Change XMPP Password"
 msgstr "Change XMPP Password"
 
@@ -4971,6 +4807,14 @@ msgstr "XML Parse error"
 msgid "Unknown Error in presence"
 msgstr "Unknown Error in presence"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Error joining chat %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Error in chat %s"
+
 msgid "Create New Room"
 msgstr "Create New Room"
 
@@ -4989,16 +4833,20 @@ msgstr "Configure Room"
 msgid "_Accept Defaults"
 msgstr "Accept Defaults"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Error joining chat %s"
+#, fuzzy
+msgid "No reason"
+msgstr "No reason given."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Error in chat %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "You have been kicked by %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Kicked by %s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "An error occurred while opening the file."
 
 #, fuzzy
@@ -5516,10 +5364,6 @@ msgstr ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://Pidgin.sf.net/faq-ssl.php for more information."
 
-#, fuzzy
-msgid "Failed to connect to server."
-msgstr "Unable to connect to server."
-
 msgid "Error retrieving profile"
 msgstr "Error retrieving profile"
 
@@ -5813,9 +5657,6 @@ msgstr "Message may have not been sent because an unknown error occurred:"
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Message may have not been sent because an unknown error occurred:"
 
-msgid "Unable to connect"
-msgstr "Unable to connect"
-
 msgid "Writing error"
 msgstr "Writing error"
 
@@ -5830,13 +5671,16 @@ msgstr ""
 "Connection error from %s server (%s):\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Our protocol is not supported by the server."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Error parsing HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "You have signed on from another location."
 
 #, fuzzy
@@ -5844,7 +5688,8 @@ msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "The MSN servers are going down temporarily."
 
 #, c-format
@@ -5856,9 +5701,6 @@ msgid ""
 msgstr ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 
-msgid "Unknown error."
-msgstr "Unknown error."
-
 msgid "Handshaking"
 msgstr "Handshaking"
 
@@ -5958,6 +5800,9 @@ msgstr "MSN Protocol Plugin"
 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)"
@@ -6074,13 +5919,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Invalid response from server."
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-#, fuzzy
-msgid "Connected"
-msgstr "Connect"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr ""
@@ -6104,18 +5942,6 @@ msgid "Invalid input condition"
 msgstr "Finalising connection"
 
 #, fuzzy
-msgid "Read buffer full (2)"
-msgstr "Queue full"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "Unable to parse message"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Couldn't connect to host"
-
-#, fuzzy
 msgid "Failed to add buddy"
 msgstr "Failed to join buddy in chat"
 
@@ -6210,6 +6036,12 @@ msgstr ""
 msgid "Client Version"
 msgstr "Close conversation"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 #, fuzzy
 msgid "MySpaceIM - Username Available"
 msgstr "Service Unavailable"
@@ -6480,9 +6312,9 @@ msgstr "The user is either offline or you are blocked"
 msgid "Unknown error: 0x%X"
 msgstr "Unknown error: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Login failed (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Unable to ban user %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6584,9 +6416,6 @@ msgstr "GroupWise Conference %d"
 msgid "Authenticating..."
 msgstr "Authenticating..."
 
-msgid "Unable to connect to server."
-msgstr "Unable to connect to server."
-
 msgid "Waiting for response..."
 msgstr "Waiting for response..."
 
@@ -6610,25 +6439,20 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Would you like to join the conversation?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "You have been logged out because you logged in at another workstation."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 "%s appears to be offline and did not receive the message that you just sent."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 
-msgid "Error. SSL support is not installed."
-msgstr "Error. SSL support is not installed."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "This conference has been closed. No more messages can be sent."
 
@@ -6667,10 +6491,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, fuzzy
@@ -6682,17 +6503,7 @@ msgid "Invalid chat room name"
 msgstr "Invalid Room Name"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "Error creating connection"
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "You were disconnected from the server."
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "Unable to make SSL connection to server."
 
 #. *< type
@@ -6745,8 +6556,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Unable to make SSL connection to server."
 
 #, fuzzy
 msgid "Direct IM established"
@@ -6942,15 +6754,11 @@ msgid "Buddy Comment"
 msgstr "Buddy Comment"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "Could not connect for transfer."
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
 msgstr "Unable to connect to server."
 
 #, fuzzy
@@ -6966,9 +6774,9 @@ msgstr "Finalising connection"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Unable to login: Could not sign on as %s because the screen name is "
 "invalid.  Screen names must either start with a letter and contain only "
@@ -6984,30 +6792,23 @@ msgstr ""
 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
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "Invalid Username"
+msgid "Username does not exist"
+msgstr "User does not exist"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Your account is currently suspended."
 
 #. service temporarily unavailable
@@ -7027,7 +6828,8 @@ 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."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "The SecurID key entered is invalid."
 
 msgid "Enter SecurID"
@@ -7197,6 +6999,9 @@ msgstr "Online Since"
 msgid "Member Since"
 msgstr "Member Since"
 
+msgid "Capabilities"
+msgstr "Capabilities"
+
 msgid "Profile"
 msgstr "Profile"
 
@@ -7385,7 +7190,7 @@ msgstr "Away message too long."
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7413,9 +7218,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Orphans"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7425,7 +7230,7 @@ msgid "(no name)"
 msgstr "(no name)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Your command failed for an unknown reason."
 
 #, fuzzy, c-format
@@ -8303,7 +8108,7 @@ msgid "Update interval (seconds)"
 msgstr "Reading error"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Cannot get server information"
 
 #, c-format
@@ -8330,10 +8135,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Cannot get server information"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "Request ambiguous"
 
@@ -8369,26 +8170,11 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "Unable to connect."
-
 #, fuzzy
 msgid "Socket error"
 msgstr "Unknown Error"
 
 #, fuzzy
-msgid "Unable to read from socket"
-msgstr "Unable to read socket"
-
-#, fuzzy
-msgid "Write Error"
-msgstr "Write error"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "Connection Closed"
-
-#, fuzzy
 msgid "Getting server"
 msgstr "Set User Info..."
 
@@ -8397,8 +8183,8 @@ msgid "Requesting token"
 msgstr "Request denied"
 
 #, fuzzy
-msgid "Couldn't resolve host"
-msgstr "Couldn't connect to host"
+msgid "Unable to resolve hostname"
+msgstr "Unable to ping server"
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8449,7 +8235,7 @@ msgid "QQ Qun Command"
 msgstr "Command"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Cannot get server information"
 
 #, fuzzy
@@ -8472,10 +8258,6 @@ msgstr "File Send Failed"
 msgid "%d canceled the transfer of %s"
 msgstr "%s canceled the transfer of %s"
 
-#, fuzzy
-msgid "Connection closed (writing)"
-msgstr "Connection Closed"
-
 #, fuzzy, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>User:</b> %s<br>"
@@ -8537,19 +8319,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#, fuzzy
-msgid "Connection reset"
-msgstr "Connection Closed"
-
-#, fuzzy, c-format
-msgid "Error reading from socket: %s"
-msgstr "Error while reading from socket."
-
-#. this is a regular connect, error out
-#, fuzzy
-msgid "Unable to connect to host"
-msgstr "Unable to connect to server."
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -8577,6 +8346,10 @@ msgid "Video Camera"
 msgstr "Video Chat"
 
 #, fuzzy
+msgid "File Transfer"
+msgstr "File Transfers"
+
+#, fuzzy
 msgid "Supports"
 msgstr "support"
 
@@ -9411,6 +9184,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Network Statistics"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping failed"
 
@@ -9476,7 +9252,8 @@ msgstr "Unsupported public key type"
 msgid "Disconnected by server"
 msgstr "Disconnected by server"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Error during connecting to SILC Server"
 
 msgid "Key Exchange failed"
@@ -9487,29 +9264,26 @@ msgid ""
 msgstr ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 
-msgid "Connection failed"
-msgstr "Connection failed"
-
 msgid "Performing key exchange"
 msgstr "Performing key exchange"
 
 #, fuzzy
-msgid "Unable to create connection"
-msgstr "Unable to create new connection."
-
-#, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "Could not load public key"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Connecting to SILC Server"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Could not load public key"
+
 msgid "Out of memory"
 msgstr "Out of memory"
 
 #, fuzzy
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "Cannot initialise SILC Client connection"
 
 #, fuzzy
@@ -9818,7 +9592,7 @@ msgid "Creating SILC key pair..."
 msgstr "Creating SILC key pair..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "Creating SILC key pair..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9912,6 +9686,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr "No server statistics available"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Error during connecting to SILC Server"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Failure: Version mismatch, upgrade your client"
@@ -9952,7 +9729,8 @@ msgstr "Failure: Invalid cookie"
 msgid "Failure: Authentication failed"
 msgstr "Failure: Authentication failed"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Cannot initialise SILC Client connection"
 
 #, fuzzy
@@ -9960,27 +9738,20 @@ msgid "John Noname"
 msgstr "Last name:"
 
 #, fuzzy, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "Could not load public key"
 
 #, fuzzy
-msgid "Could not write"
-msgstr "Could not send"
-
-msgid "Could not connect"
-msgstr "Could not connect"
+msgid "Unable to create connection"
+msgstr "Unable to create new connection."
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "Unknown error."
 
 #, fuzzy
-msgid "Could not create listen socket"
-msgstr "Couldn't create socket"
-
-#, fuzzy
-msgid "Could not resolve hostname"
-msgstr "Unable to resolve hostname."
+msgid "Unable to create listen socket"
+msgstr "Unable to create socket"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -10030,6 +9801,85 @@ msgstr "AP User"
 msgid "Auth Domain"
 msgstr "Automatic"
 
+#, fuzzy
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;room&gt; [server]:  Join a chat on this server."
+
+#, fuzzy
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  List channels on this network"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo Protocol Plugin"
+
+#, fuzzy
+msgid "Pager server"
+msgstr "Proxy Server"
+
+msgid "Pager port"
+msgstr "Pager port"
+
+#, fuzzy
+msgid "File transfer server"
+msgstr "File transfer host"
+
+msgid "File transfer port"
+msgstr "File transfer port"
+
+#, fuzzy
+msgid "Chat room locale"
+msgstr "Chat Room List Url"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
+
+#, fuzzy
+msgid "Chat room list URL"
+msgstr "Chat Room List Url"
+
+msgid "Yahoo Chat server"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo Chat port"
+msgstr "Yahoo Japan"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo Protocol Plugin"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -10060,28 +9910,18 @@ msgstr "Add buddy rejected"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  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
@@ -10120,11 +9960,12 @@ msgstr "Your account is locked, please log in to the Yahoo! website."
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "Could not add buddy %s to group %s to the server list on account %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Could not add buddy to server list"
 
 #, c-format
@@ -10132,23 +9973,16 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
 #, fuzzy
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "Invalid response from server."
 
-msgid "Connection problem"
-msgstr "Connection problem"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "Conversations with %s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Unable to make SSL connection to server."
 
 #, fuzzy
 msgid "Not at Home"
@@ -10219,83 +10053,15 @@ msgstr "Join user in chat..."
 msgid "Open Inbox"
 msgstr ""
 
-#, fuzzy
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;room&gt; [server]:  Join a chat on this server."
-
-#, fuzzy
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  List channels on this network"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo Protocol Plugin"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "Proxy Server"
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "Japan Pager host"
-
-msgid "Pager port"
-msgstr "Pager port"
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "File transfer host"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "Japan File transfer host"
-
-msgid "File transfer port"
-msgstr "File transfer port"
-
-#, fuzzy
-msgid "Chat room locale"
-msgstr "Chat Room List Url"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-#, fuzzy
-msgid "Chat room list URL"
-msgstr "Chat Room List Url"
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "Yahoo Japan"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "Unable to connect."
+
 msgid "Unable to establish file descriptor."
 msgstr "Unable to establish file descriptor."
 
@@ -10303,6 +10069,10 @@ msgstr "Unable to establish file descriptor."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "Offering to send %s to %s"
 
+#, fuzzy
+msgid "Write Error"
+msgstr "Write error"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan Profile"
 
@@ -10424,21 +10194,19 @@ msgstr "Voices"
 msgid "Webcams"
 msgstr "Webcams"
 
+msgid "Connection problem"
+msgstr "Connection problem"
+
 msgid "Unable to fetch room list."
 msgstr "Unable to fetch room list."
 
 msgid "User Rooms"
 msgstr "User Rooms"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Connection problem with the YCHT server."
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "You were disconnected from the server."
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10571,31 +10339,21 @@ msgid "Exposure"
 msgstr "Exposure"
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "Unable to create socket"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Unable to send message: %s"
 
 #, fuzzy, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Proxy connection error %d"
 
 #, fuzzy, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Access denied: proxy server forbids port %d tunnelling."
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr "Error joining chat %s"
 
-#, fuzzy
-msgid "Could not resolve host name"
-msgstr "Unable to resolve hostname."
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10811,12 +10569,6 @@ msgstr ""
 msgid "Unable to connect to %s: %s"
 msgstr "Unable to connect to server."
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "Server requires TLS/SSL for login.  No TLS/SSL support found."
-
 #, c-format
 msgid " - %s"
 msgstr ""
@@ -11075,7 +10827,11 @@ msgid "View _Log"
 msgstr "View _Log"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "Not allowed when offline"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "Not allowed when offline"
 
 msgid "_Alias..."
@@ -11639,6 +11395,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Change user information for %s"
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11690,7 +11449,7 @@ msgid "Get Away Message"
 msgstr "New Away Message"
 
 #, fuzzy
-msgid "Last said"
+msgid "Last Said"
 msgstr "Last name:"
 
 msgid "Unable to save icon file to disk."
@@ -12649,7 +12408,7 @@ msgid "Hyperlink visited color"
 msgstr "Hyperlink colour"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Colour to draw hyperlinks."
 
 #, fuzzy
@@ -12689,15 +12448,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "Notification Removal"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "New mail notifications"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -13069,6 +12835,10 @@ msgstr ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 
 #, fuzzy
+msgid "No message"
+msgstr "(1 message)"
+
+#, fuzzy
 msgid "Open All Messages"
 msgstr "Send Message"
 
@@ -13093,10 +12863,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, fuzzy
-msgid "No message"
-msgstr "(1 message)"
-
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -13335,7 +13101,7 @@ msgid "On unread messages"
 msgstr "Send a _message"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "IM Conversation Windows"
 
 #, fuzzy
@@ -13345,6 +13111,10 @@ msgstr "Close conversation"
 msgid "When away"
 msgstr "When away"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "IM Conversation Windows"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -13409,10 +13179,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr "_Flash Window when messages are received"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "IM Conversation Windows"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -13451,8 +13217,8 @@ msgstr "Cannot get user information"
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-#, fuzzy
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Autodetect IP Address"
 
 msgid "Public _IP:"
@@ -13847,34 +13613,18 @@ msgstr "Sa_ve & Use"
 msgid "Status for %s"
 msgstr "Status: %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "Insert smiley"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
 #, fuzzy
-msgid "Duplicate Shortcut"
-msgstr "Public key file"
+msgid "Custom Smiley"
+msgstr "Insert smiley"
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Please enter a new name for the selected group."
+msgid "Duplicate Shortcut"
+msgstr "Public key file"
 
 #, fuzzy
 msgid "Edit Smiley"
@@ -13997,8 +13747,8 @@ msgid "Cannot send launcher"
 msgstr "Cannot send file"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -14627,7 +14377,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -14902,7 +14652,7 @@ msgstr "IM Conversation Windows"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -15241,9 +14991,10 @@ msgstr "Login Options"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Options specific to Windows Pidgin."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "Options specific to Windows Pidgin."
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr ""
@@ -15286,6 +15037,285 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Cannot open socket"
+#~ msgstr "Unable to open socket"
+
+#, fuzzy
+#~ msgid "Could not listen on socket"
+#~ msgstr "Couldn't create socket"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Unable to read socket"
+
+#, fuzzy
+#~ msgid "Connection failed."
+#~ msgstr "Connection failed"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Server has disconnected"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Couldn't create socket"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Couldn't connect to host"
+
+#~ msgid "Read error"
+#~ msgstr "Read error"
+
+#~ msgid "Write error"
+#~ msgstr "Write error"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "Set Dir Info"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Extended Address"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "Alias Chat"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "User has no directory information."
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Command"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "Registration Error"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "Location"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "Buddy State Notification"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "Unsupported Version"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "Organisation"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "User Modes"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "User Limit"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "Capabilities"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "Username"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "IM with Key Exchange"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "Email Address"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "Set Profile"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "Ping"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "Nickname"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "Live Video"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "Message received"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "Public Key Babbleprint"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "User Options"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "User Modes"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "User Limit"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "User Limit"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Trillian Encryption"
+
+#~ msgid "Read Error"
+#~ msgstr "Read Error"
+
+#, fuzzy
+#~ msgid "Failed to connect to server."
+#~ msgstr "Unable to connect to server."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Queue full"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "Unable to parse message"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Couldn't connect to host"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Login failed (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Unable to connect to server."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "You have been logged out because you logged in at another workstation."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Error. SSL support is not installed."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Incorrect password."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "Unable to connect to server."
+
+#, fuzzy
+#~ 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."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Could Not Connect"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "Invalid Username"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Cannot get server information"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "Connection Closed"
+
+#, fuzzy
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Couldn't connect to host"
+
+#, fuzzy
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Connection Closed"
+
+#, fuzzy
+#~ msgid "Connection reset"
+#~ msgstr "Connection Closed"
+
+#, fuzzy
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Error while reading from socket."
+
+#, fuzzy
+#~ msgid "Unable to connect to host"
+#~ msgstr "Unable to connect to server."
+
+#, fuzzy
+#~ msgid "Could not write"
+#~ msgstr "Could not send"
+
+#~ msgid "Could not connect"
+#~ msgstr "Could not connect"
+
+#, fuzzy
+#~ msgid "Could not create listen socket"
+#~ msgstr "Couldn't create socket"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Unable to resolve hostname."
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Incorrect password."
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "Japan Pager host"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japan File transfer host"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "You were disconnected from the server."
+
+#, fuzzy
+#~ msgid "Could not resolve host name"
+#~ msgstr "Unable to resolve hostname."
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "Server requires TLS/SSL for login.  No TLS/SSL support found."
+
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "IM Conversation Windows"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Please enter a new name for the selected group."
+
+#, fuzzy
 #~ msgid "Activate which ID?"
 #~ msgstr "Active which ID?"
 
@@ -15913,10 +15943,6 @@ msgstr ""
 #~ msgstr "Currently on"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Unable to connect to server."
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_Message:"
 
diff --git a/po/en_CA.po b/po/en_CA.po
index fb3e35aaa3..9f9bb40e76 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2005-03-17 19:45-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
@@ -2677,7 +2677,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2729,7 +2729,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2977,12 +2977,12 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
 #, fuzzy
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr "Unable to create new connection."
 
 msgid ""
@@ -3042,17 +3042,17 @@ msgstr "%s has been invited to this conversation."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Unable to send message. The message is too large."
 
-#, fuzzy
-msgid "Cannot open socket"
-msgstr "Unable to open socket"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Unable to create socket"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Couldn't create socket"
 
-#, fuzzy
-msgid "Could not listen on socket"
-msgstr "Couldn't create socket"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Unable to create socket"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3111,15 +3111,15 @@ msgstr "Send Buddy List"
 msgid "Load buddylist from file..."
 msgstr "Import Buddy List from Server"
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
 #, fuzzy
-msgid "Passwords do not match."
+msgid "Passwords do not match"
 msgstr "New passwords do not match."
 
 #, fuzzy
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Unable to create new connection."
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3132,17 +3132,15 @@ msgstr "Registration Successful"
 msgid "Password"
 msgstr "Password"
 
-#, fuzzy
-msgid "Password (retype)"
-msgstr "Password sent"
+msgid "Password (again)"
+msgstr "Password (again)"
 
-#, fuzzy
-msgid "Enter current token"
-msgstr "%s not currently logged in."
+msgid "Enter captcha text"
+msgstr ""
 
 #, fuzzy
-msgid "Current token"
-msgstr "Currently on"
+msgid "Captcha"
+msgstr "Save Image"
 
 #, fuzzy
 msgid "Register New Gadu-Gadu Account"
@@ -3204,6 +3202,18 @@ msgid "Current password"
 msgstr "Incorrect password."
 
 #, fuzzy
+msgid "Password (retype)"
+msgstr "Password sent"
+
+#, fuzzy
+msgid "Enter current token"
+msgstr "%s not currently logged in."
+
+#, fuzzy
+msgid "Current token"
+msgstr "Currently on"
+
+#, fuzzy
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Please enter your current password and your new password."
 
@@ -3257,7 +3267,8 @@ msgstr "Non-matching Hosts"
 msgid "There are no users matching your search criteria."
 msgstr "Please enter your new password"
 
-msgid "Unable to read socket"
+#, fuzzy
+msgid "Unable to read from socket"
 msgstr "Unable to read socket"
 
 #, fuzzy
@@ -3276,8 +3287,14 @@ msgstr "Buddy Display"
 msgid "Your buddy list was stored on the server."
 msgstr "There is no Buddy List stored on the Gadu-Gadu server."
 
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
 #, fuzzy
-msgid "Connection failed."
+msgid "Connected"
+msgstr "Connect"
+
+msgid "Connection failed"
 msgstr "Connection failed"
 
 #, fuzzy
@@ -3288,11 +3305,15 @@ msgstr "Add Chat"
 msgid "Chat _name:"
 msgstr "Last name:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Unable to ping server"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Connecting"
+
 #, fuzzy
 msgid "Chat error"
 msgstr "Read error"
@@ -3302,7 +3323,7 @@ msgid "This chat name is already in use"
 msgstr "That file already exists"
 
 #, fuzzy
-msgid "Not connected to the server."
+msgid "Not connected to the server"
 msgstr "You were disconnected from the server."
 
 #, fuzzy
@@ -3371,7 +3392,7 @@ msgid "File Transfer Failed"
 msgstr "File transfer cancelled"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Pidgin could not open a listening port."
 
 msgid "Error displaying MOTD"
@@ -3387,8 +3408,16 @@ msgstr "There is no MOTD associated with this connection."
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-msgid "Server has disconnected"
-msgstr "Server has disconnected"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "You were disconnected from the server."
 
 msgid "View MOTD"
 msgstr "View MOTD"
@@ -3403,22 +3432,20 @@ msgstr "_Password:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC nicks may not contain whitespace"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Connecting"
-
 msgid "SSL support unavailable"
 msgstr "SSL support unavailable"
 
-msgid "Couldn't create socket"
-msgstr "Couldn't create socket"
+msgid "Unable to connect"
+msgstr "Unable to connect"
 
-msgid "Couldn't connect to host"
-msgstr "Couldn't connect to host"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Unable to connect to server."
 
-msgid "Read error"
-msgstr "Read error"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Error creating connection"
 
 msgid "Users"
 msgstr "Users"
@@ -3861,11 +3888,12 @@ msgstr "Command disabled"
 msgid "execute"
 msgstr "Not expected"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Server requires TLS/SSL for login.  No TLS/SSL support found."
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Server requires TLS/SSL for login.  No TLS/SSL support found."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3882,7 +3910,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Plaintext Authentication"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Authentication failed"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Invalid response from server."
 
 msgid "Server does not use any supported authentication method"
@@ -3894,8 +3927,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "Invalid challenge from server"
 
-#, fuzzy
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Read error"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3913,22 +3946,14 @@ msgstr "Unsupported Version"
 msgid "Unable to establish a connection with the server"
 msgstr "Unable to make SSL connection to server."
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Unable to make SSL connection to server."
 
 #, fuzzy
 msgid "Unable to establish SSL connection"
 msgstr "Unable to create new connection."
 
-msgid "Unable to create socket"
-msgstr "Unable to create socket"
-
-msgid "Write error"
-msgstr "Write error"
-
 msgid "Full Name"
 msgstr "Full Name"
 
@@ -4001,188 +4026,6 @@ msgstr "Hide Operating System"
 msgid "Local Time"
 msgstr "Local Users"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "Set Dir Info"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "Extended Address"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "Alias Chat"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "User has no directory information."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "Command"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "Registration Error"
-
-#, fuzzy
-msgid "User Location"
-msgstr "Location"
-
-msgid "User Avatar"
-msgstr ""
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "Buddy State Notification"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "Unsupported Version"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "Organization"
-
-#, fuzzy
-msgid "File Transfer"
-msgstr "File Transfers"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "User Modes"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "User Limit"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "Capabilities"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "Username"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "IM with Key Exchange"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "Email Address"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "Set Profile"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "Ping"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "Nickname"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "Live Video"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "Message received"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "Public Key Babbleprint"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "User Options"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "User Modes"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "User Limit"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "User Limit"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Trillian Encryption"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Capabilities"
-
 #, fuzzy
 msgid "Priority"
 msgstr "Port"
@@ -4195,7 +4038,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Logged out"
 
 msgid "Middle Name"
@@ -4385,16 +4228,12 @@ msgid "Roles:"
 msgstr "Role"
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "Plain text"
 
-msgid "Read Error"
-msgstr "Read Error"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4583,9 +4422,6 @@ msgstr "Your password has been changed."
 msgid "Error changing password"
 msgstr "Error changing password"
 
-msgid "Password (again)"
-msgstr "Password (again)"
-
 msgid "Change XMPP Password"
 msgstr "Change XMPP Password"
 
@@ -4973,6 +4809,14 @@ msgstr "XML Parse error"
 msgid "Unknown Error in presence"
 msgstr "Unknown Error in presence"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Error joining chat %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Error in chat %s"
+
 msgid "Create New Room"
 msgstr "Create New Room"
 
@@ -4991,16 +4835,20 @@ msgstr "Configure Room"
 msgid "_Accept Defaults"
 msgstr "Accept Defaults"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Error joining chat %s"
+#, fuzzy
+msgid "No reason"
+msgstr "No reason given."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Error in chat %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "You have been kicked by %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Kicked by %s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "An error occurred while opening the file."
 
 #, fuzzy
@@ -5518,9 +5366,6 @@ msgstr ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://Pidgin.sf.net/faq-ssl.php for more information."
 
-msgid "Failed to connect to server."
-msgstr "Failed to connect to server."
-
 msgid "Error retrieving profile"
 msgstr "Error retrieving profile"
 
@@ -5804,9 +5649,6 @@ msgstr "Message may have not been sent because an unknown error occurred:"
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Message may have not been sent because an unknown error occurred:"
 
-msgid "Unable to connect"
-msgstr "Unable to connect"
-
 msgid "Writing error"
 msgstr "Writing error"
 
@@ -5821,20 +5663,24 @@ msgstr ""
 "Connection error from %s server (%s):\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Our protocol is not supported by the server."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Error parsing HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "You have signed on from another location."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "The MSN servers are temporarily unavailable. Please wait and try again."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "The MSN servers are going down temporarily."
 
 #, c-format
@@ -5846,9 +5692,6 @@ msgid ""
 msgstr ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 
-msgid "Unknown error."
-msgstr "Unknown error."
-
 msgid "Handshaking"
 msgstr "Handshaking"
 
@@ -5948,6 +5791,9 @@ msgstr "MSN Protocol Plugin"
 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)"
@@ -6064,13 +5910,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Invalid response from server."
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-#, fuzzy
-msgid "Connected"
-msgstr "Connect"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr ""
@@ -6094,18 +5933,6 @@ msgid "Invalid input condition"
 msgstr "Finalizing connection"
 
 #, fuzzy
-msgid "Read buffer full (2)"
-msgstr "Queue full"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "Unable to parse message"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Couldn't connect to host"
-
-#, fuzzy
 msgid "Failed to add buddy"
 msgstr "Failed to join buddy in chat"
 
@@ -6200,6 +6027,12 @@ msgstr ""
 msgid "Client Version"
 msgstr "Close conversation"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 #, fuzzy
 msgid "MySpaceIM - Username Available"
 msgstr "Service Unavailable"
@@ -6470,9 +6303,9 @@ msgstr "The user is either offline or you are blocked"
 msgid "Unknown error: 0x%X"
 msgstr "Unknown error: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Login failed (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Unable to ban user %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6574,9 +6407,6 @@ msgstr "GroupWise Conference %d"
 msgid "Authenticating..."
 msgstr "Authenticating..."
 
-msgid "Unable to connect to server."
-msgstr "Unable to connect to server."
-
 msgid "Waiting for response..."
 msgstr "Waiting for response..."
 
@@ -6600,25 +6430,20 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Would you like to join the conversation?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "You have been logged out because you logged in at another workstation."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 "%s appears to be offline and did not receive the message that you just sent."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 
-msgid "Error. SSL support is not installed."
-msgstr "Error. SSL support is not installed."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "This conference has been closed. No more messages can be sent."
 
@@ -6657,10 +6482,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, fuzzy
@@ -6672,17 +6494,7 @@ msgid "Invalid chat room name"
 msgstr "Invalid Room Name"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "Error creating connection"
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "You were disconnected from the server."
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "Unable to make SSL connection to server."
 
 #. *< type
@@ -6735,8 +6547,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Unable to make SSL connection to server."
 
 #, fuzzy
 msgid "Direct IM established"
@@ -6932,16 +6745,12 @@ msgid "Buddy Comment"
 msgstr "Buddy Comment"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "Could not connect for transfer."
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr "Failed to connect to server."
+msgid "Unable to connect to BOS server: %s"
+msgstr "Unable to connect to server."
 
 #, fuzzy
 msgid "Username sent"
@@ -6956,9 +6765,9 @@ msgstr "Finalizing connection"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Unable to login: Could not sign on as %s because the screen name is "
 "invalid.  Screen names must either start with a letter and contain only "
@@ -6974,30 +6783,23 @@ msgstr ""
 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
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "Invalid Username"
+msgid "Username does not exist"
+msgstr "User does not exist"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Your account is currently suspended."
 
 #. service temporarily unavailable
@@ -7017,7 +6819,8 @@ 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."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "The SecurID key entered is invalid."
 
 msgid "Enter SecurID"
@@ -7189,6 +6992,9 @@ msgstr "Online Since"
 msgid "Member Since"
 msgstr "Member Since"
 
+msgid "Capabilities"
+msgstr "Capabilities"
+
 msgid "Profile"
 msgstr "Profile"
 
@@ -7373,7 +7179,7 @@ msgstr "Away message too long."
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7401,9 +7207,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Orphans"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7413,7 +7219,7 @@ msgid "(no name)"
 msgstr "(no name)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Your command failed for an unknown reason."
 
 #, fuzzy, c-format
@@ -8291,7 +8097,7 @@ msgid "Update interval (seconds)"
 msgstr "Reading error"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Cannot get server information"
 
 #, c-format
@@ -8318,10 +8124,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Cannot get server information"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "Request ambiguous"
 
@@ -8357,26 +8159,11 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "Unable to connect."
-
 #, fuzzy
 msgid "Socket error"
 msgstr "Unknown Error"
 
 #, fuzzy
-msgid "Unable to read from socket"
-msgstr "Unable to read socket"
-
-#, fuzzy
-msgid "Write Error"
-msgstr "Write error"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "Connection Closed"
-
-#, fuzzy
 msgid "Getting server"
 msgstr "Set User Info..."
 
@@ -8385,8 +8172,8 @@ msgid "Requesting token"
 msgstr "Request denied"
 
 #, fuzzy
-msgid "Couldn't resolve host"
-msgstr "Couldn't connect to host"
+msgid "Unable to resolve hostname"
+msgstr "Unable to ping server"
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8437,7 +8224,7 @@ msgid "QQ Qun Command"
 msgstr "Command"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Cannot get server information"
 
 #, fuzzy
@@ -8460,10 +8247,6 @@ msgstr "File Send Failed"
 msgid "%d canceled the transfer of %s"
 msgstr "%s cancelled the transfer of %s"
 
-#, fuzzy
-msgid "Connection closed (writing)"
-msgstr "Connection Closed"
-
 #, fuzzy, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>User:</b> %s<br>"
@@ -8525,19 +8308,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#, fuzzy
-msgid "Connection reset"
-msgstr "Connection Closed"
-
-#, fuzzy, c-format
-msgid "Error reading from socket: %s"
-msgstr "Error while reading from socket."
-
-#. this is a regular connect, error out
-#, fuzzy
-msgid "Unable to connect to host"
-msgstr "Unable to connect to server."
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -8565,6 +8335,10 @@ msgid "Video Camera"
 msgstr "Video Chat"
 
 #, fuzzy
+msgid "File Transfer"
+msgstr "File Transfers"
+
+#, fuzzy
 msgid "Supports"
 msgstr "support"
 
@@ -9399,6 +9173,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Network Statistics"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping failed"
 
@@ -9464,7 +9241,8 @@ msgstr "Unsupported public key type"
 msgid "Disconnected by server"
 msgstr "Disconnected by server"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Error during connecting to SILC Server"
 
 msgid "Key Exchange failed"
@@ -9475,29 +9253,26 @@ msgid ""
 msgstr ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 
-msgid "Connection failed"
-msgstr "Connection failed"
-
 msgid "Performing key exchange"
 msgstr "Performing key exchange"
 
 #, fuzzy
-msgid "Unable to create connection"
-msgstr "Unable to create new connection."
-
-#, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "Could not load public key"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Connecting to SILC Server"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Could not load public key"
+
 msgid "Out of memory"
 msgstr "Out of memory"
 
 #, fuzzy
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "Cannot initialize SILC Client connection"
 
 #, fuzzy
@@ -9806,7 +9581,7 @@ msgid "Creating SILC key pair..."
 msgstr "Creating SILC key pair..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "Creating SILC key pair..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9900,6 +9675,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr "No server statistics available"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Error during connecting to SILC Server"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Failure: Version mismatch; upgrade your client"
@@ -9940,7 +9718,8 @@ msgstr "Failure: Invalid cookie"
 msgid "Failure: Authentication failed"
 msgstr "Failure: Authentication failed"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Cannot initialize SILC Client connection"
 
 #, fuzzy
@@ -9948,27 +9727,20 @@ msgid "John Noname"
 msgstr "Last name:"
 
 #, fuzzy, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "Could not load public key"
 
 #, fuzzy
-msgid "Could not write"
-msgstr "Could not send"
-
-msgid "Could not connect"
-msgstr "Could not connect"
+msgid "Unable to create connection"
+msgstr "Unable to create new connection."
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "Unknown error."
 
 #, fuzzy
-msgid "Could not create listen socket"
-msgstr "Couldn't create socket"
-
-#, fuzzy
-msgid "Could not resolve hostname"
-msgstr "Unable to resolve hostname."
+msgid "Unable to create listen socket"
+msgstr "Unable to create socket"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -10018,6 +9790,85 @@ msgstr "AP User"
 msgid "Auth Domain"
 msgstr "Automatic"
 
+#, fuzzy
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;room&gt; [server]:  Join a chat on this server."
+
+#, fuzzy
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  List channels on this network"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo Protocol Plugin"
+
+#, fuzzy
+msgid "Pager server"
+msgstr "Proxy Server"
+
+msgid "Pager port"
+msgstr "Pager port"
+
+#, fuzzy
+msgid "File transfer server"
+msgstr "File transfer host"
+
+msgid "File transfer port"
+msgstr "File transfer port"
+
+#, fuzzy
+msgid "Chat room locale"
+msgstr "Chat Room List Url"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
+
+#, fuzzy
+msgid "Chat room list URL"
+msgstr "Chat Room List Url"
+
+msgid "Yahoo Chat server"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo Chat port"
+msgstr "Yahoo Japan"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo Protocol Plugin"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -10048,28 +9899,18 @@ msgstr "Add buddy rejected"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  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
@@ -10108,11 +9949,12 @@ msgstr "Your account is locked. Please log in to the Yahoo! website."
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "Could not add buddy %s to group %s to the server list on account %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Could not add buddy to server list"
 
 #, c-format
@@ -10120,23 +9962,16 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
 #, fuzzy
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "Invalid response from server."
 
-msgid "Connection problem"
-msgstr "Connection problem"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "Conversations with %s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Unable to make SSL connection to server."
 
 #, fuzzy
 msgid "Not at Home"
@@ -10207,83 +10042,15 @@ msgstr "Join user in chat..."
 msgid "Open Inbox"
 msgstr ""
 
-#, fuzzy
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;room&gt; [server]:  Join a chat on this server."
-
-#, fuzzy
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  List channels on this network"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo Protocol Plugin"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "Proxy Server"
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "Japan Pager host"
-
-msgid "Pager port"
-msgstr "Pager port"
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "File transfer host"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "Japan File transfer host"
-
-msgid "File transfer port"
-msgstr "File transfer port"
-
-#, fuzzy
-msgid "Chat room locale"
-msgstr "Chat Room List Url"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-#, fuzzy
-msgid "Chat room list URL"
-msgstr "Chat Room List Url"
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "Yahoo Japan"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "Unable to connect."
+
 msgid "Unable to establish file descriptor."
 msgstr "Unable to establish file descriptor."
 
@@ -10291,6 +10058,10 @@ msgstr "Unable to establish file descriptor."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "Offering to send %s to %s"
 
+#, fuzzy
+msgid "Write Error"
+msgstr "Write error"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan Profile"
 
@@ -10412,21 +10183,19 @@ msgstr "Voices"
 msgid "Webcams"
 msgstr "Webcams"
 
+msgid "Connection problem"
+msgstr "Connection problem"
+
 msgid "Unable to fetch room list."
 msgstr "Unable to fetch room list."
 
 msgid "User Rooms"
 msgstr "User Rooms"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Connection problem with the YCHT server."
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "You were disconnected from the server."
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10559,31 +10328,21 @@ msgid "Exposure"
 msgstr "Exposure"
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "Unable to create socket"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Unable to send message: %s"
 
 #, fuzzy, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Proxy connection error %d"
 
 #, fuzzy, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Access denied: proxy server forbids port %d tunnelling."
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr "Error joining chat %s"
 
-#, fuzzy
-msgid "Could not resolve host name"
-msgstr "Unable to resolve hostname."
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10799,12 +10558,6 @@ msgstr ""
 msgid "Unable to connect to %s: %s"
 msgstr "Unable to connect to server."
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "Server requires TLS/SSL for login.  No TLS/SSL support found."
-
 #, c-format
 msgid " - %s"
 msgstr ""
@@ -11063,7 +10816,11 @@ msgid "View _Log"
 msgstr "View _Log"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "Not allowed when offline"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "Not allowed when offline"
 
 msgid "_Alias..."
@@ -11627,6 +11384,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Change user information for %s"
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11678,7 +11438,7 @@ msgid "Get Away Message"
 msgstr "New Away Message"
 
 #, fuzzy
-msgid "Last said"
+msgid "Last Said"
 msgstr "Last name:"
 
 msgid "Unable to save icon file to disk."
@@ -12637,7 +12397,7 @@ msgid "Hyperlink visited color"
 msgstr "Hyperlink colour"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Colour to draw hyperlinks."
 
 #, fuzzy
@@ -12677,15 +12437,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "Notification Removal"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "New mail notifications"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -13057,6 +12824,10 @@ msgstr ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 
 #, fuzzy
+msgid "No message"
+msgstr "(1 message)"
+
+#, fuzzy
 msgid "Open All Messages"
 msgstr "Send Message"
 
@@ -13081,10 +12852,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, fuzzy
-msgid "No message"
-msgstr "(1 message)"
-
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -13323,7 +13090,7 @@ msgid "On unread messages"
 msgstr "Send a _message"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "IM Conversation Windows"
 
 #, fuzzy
@@ -13333,6 +13100,10 @@ msgstr "Close conversation"
 msgid "When away"
 msgstr "When away"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "IM Conversation Windows"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -13397,10 +13168,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr "_Flash Window when messages are received"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "IM Conversation Windows"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -13439,8 +13206,8 @@ msgstr "Cannot get user information"
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-#, fuzzy
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Autodetect IP Address"
 
 msgid "Public _IP:"
@@ -13835,34 +13602,18 @@ msgstr "Sa_ve & Use"
 msgid "Status for %s"
 msgstr "Status: %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "Insert smiley"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
 #, fuzzy
-msgid "Duplicate Shortcut"
-msgstr "Public key file"
+msgid "Custom Smiley"
+msgstr "Insert smiley"
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Please enter a new name for the selected group."
+msgid "Duplicate Shortcut"
+msgstr "Public key file"
 
 #, fuzzy
 msgid "Edit Smiley"
@@ -13985,8 +13736,8 @@ msgid "Cannot send launcher"
 msgstr "Cannot send file"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -14615,7 +14366,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -14890,7 +14641,7 @@ msgstr "IM Conversation Windows"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -15229,9 +14980,10 @@ msgstr "Login Options"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Options specific to Windows Pidgin."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "Options specific to Windows Pidgin."
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr ""
@@ -15274,6 +15026,284 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Cannot open socket"
+#~ msgstr "Unable to open socket"
+
+#, fuzzy
+#~ msgid "Could not listen on socket"
+#~ msgstr "Couldn't create socket"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Unable to read socket"
+
+#, fuzzy
+#~ msgid "Connection failed."
+#~ msgstr "Connection failed"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Server has disconnected"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Couldn't create socket"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Couldn't connect to host"
+
+#~ msgid "Read error"
+#~ msgstr "Read error"
+
+#~ msgid "Write error"
+#~ msgstr "Write error"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "Set Dir Info"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Extended Address"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "Alias Chat"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "User has no directory information."
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Command"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "Registration Error"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "Location"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "Buddy State Notification"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "Unsupported Version"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "Organization"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "User Modes"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "User Limit"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "Capabilities"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "Username"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "IM with Key Exchange"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "Email Address"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "Set Profile"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "Ping"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "Nickname"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "Live Video"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "Message received"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "Public Key Babbleprint"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "User Options"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "User Modes"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "User Limit"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "User Limit"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Trillian Encryption"
+
+#~ msgid "Read Error"
+#~ msgstr "Read Error"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Failed to connect to server."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Queue full"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "Unable to parse message"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Couldn't connect to host"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Login failed (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Unable to connect to server."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "You have been logged out because you logged in at another workstation."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Error. SSL support is not installed."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Incorrect password."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "Failed to connect to server."
+
+#, fuzzy
+#~ 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."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Could Not Connect"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "Invalid Username"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Cannot get server information"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "Connection Closed"
+
+#, fuzzy
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Couldn't connect to host"
+
+#, fuzzy
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Connection Closed"
+
+#, fuzzy
+#~ msgid "Connection reset"
+#~ msgstr "Connection Closed"
+
+#, fuzzy
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Error while reading from socket."
+
+#, fuzzy
+#~ msgid "Unable to connect to host"
+#~ msgstr "Unable to connect to server."
+
+#, fuzzy
+#~ msgid "Could not write"
+#~ msgstr "Could not send"
+
+#~ msgid "Could not connect"
+#~ msgstr "Could not connect"
+
+#, fuzzy
+#~ msgid "Could not create listen socket"
+#~ msgstr "Couldn't create socket"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Unable to resolve hostname."
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Incorrect password."
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "Japan Pager host"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japan File transfer host"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "You were disconnected from the server."
+
+#, fuzzy
+#~ msgid "Could not resolve host name"
+#~ msgstr "Unable to resolve hostname."
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "Server requires TLS/SSL for login.  No TLS/SSL support found."
+
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "IM Conversation Windows"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Please enter a new name for the selected group."
+
+#, fuzzy
 #~ msgid "Activate which ID?"
 #~ msgstr "Active which ID?"
 
@@ -15901,10 +15931,6 @@ msgstr ""
 #~ msgstr "Currently on"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Unable to connect to server."
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_Message:"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 67ef058216..13c0b83456 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2006-02-07 13:57+0000\n"
 "Last-Translator: Luke Ross <luke@lukeross.name>\n"
 "Language-Team:  <en_GB@li.org>\n"
@@ -2565,9 +2565,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Includes other IM clients' logs in the log viewer."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2621,8 +2622,9 @@ msgstr "Offline Message Emulation"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Save messages sent to an offline user as pounce."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "The rest of the messages will be saved as pounce. You can edit/delete the "
@@ -2874,14 +2876,15 @@ msgstr ""
 
 #, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
 "developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
 "LocalMessaging for more information."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Unable to listen for incoming IM connections\n"
 
 msgid ""
@@ -2935,14 +2938,21 @@ msgstr "%s has closed the conversation."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Unable to send the message: the conversation couldn't be started."
 
-msgid "Cannot open socket"
-msgstr "Cannot open socket"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Unable to create socket:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Could not bind socket to port"
 
-msgid "Could not listen on socket"
-msgstr "Could not listen on socket"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Unable to create socket:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Error communicating with local mDNSResponder."
@@ -2991,13 +3001,16 @@ msgstr "Save buddylist..."
 msgid "Load buddylist from file..."
 msgstr "Load buddylist from file..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Fill in the registration fields."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Passwords do not match."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Unable to register new account. Error occurred.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3009,14 +3022,15 @@ msgstr "Registration completed successfully!"
 msgid "Password"
 msgstr "Password"
 
-msgid "Password (retype)"
-msgstr "Password (retype)"
+msgid "Password (again)"
+msgstr "Password (again)"
 
-msgid "Enter current token"
-msgstr "Enter current token"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Current token"
+#, fuzzy
+msgid "Captcha"
+msgstr "Save Image"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Register New Gadu-Gadu Account"
@@ -3069,6 +3083,15 @@ msgstr "Password successfully changed!"
 msgid "Current password"
 msgstr "Current password"
 
+msgid "Password (retype)"
+msgstr "Password (retype)"
+
+msgid "Enter current token"
+msgstr "Enter current token"
+
+msgid "Current token"
+msgstr "Current token"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Please enter your current password and your new password for UIN: "
 
@@ -3116,8 +3139,8 @@ msgstr "No matching users found"
 msgid "There are no users matching your search criteria."
 msgstr "There are no users matching your search criteria."
 
-msgid "Unable to read socket"
-msgstr "Unable to read socket"
+msgid "Unable to read from socket"
+msgstr "Unable to read from socket"
 
 msgid "Buddy list downloaded"
 msgstr "Buddy list downloaded"
@@ -3131,8 +3154,14 @@ msgstr "Buddy list uploaded"
 msgid "Your buddy list was stored on the server."
 msgstr "Your buddy list was stored on the server."
 
-msgid "Connection failed."
-msgstr "Connection failed."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Connected"
+
+msgid "Connection failed"
+msgstr "Connection failed"
 
 msgid "Add to chat"
 msgstr "Add to chat"
@@ -3140,18 +3169,23 @@ msgstr "Add to chat"
 msgid "Chat _name:"
 msgstr "Chat _name:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Unable to connect to server."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Connecting"
+
 msgid "Chat error"
 msgstr "Chat error"
 
 msgid "This chat name is already in use"
 msgstr "This chat name is already in use"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Not connected to the server."
 
 msgid "Find buddies..."
@@ -3211,7 +3245,8 @@ msgstr "No topic is set"
 msgid "File Transfer Failed"
 msgstr "File Transfer Failed"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Could not open a listening port."
 
 msgid "Error displaying MOTD"
@@ -3227,8 +3262,18 @@ msgstr "There is no MOTD associated with this connection."
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-msgid "Server has disconnected"
-msgstr "Server has disconnected"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Lost connection with server:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "View MOTD"
@@ -3243,22 +3288,20 @@ msgstr "_Password:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC nicks may not contain whitespace"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Connecting"
-
 msgid "SSL support unavailable"
 msgstr "SSL support unavailable"
 
-msgid "Couldn't create socket"
-msgstr "Couldn't create socket"
+msgid "Unable to connect"
+msgstr "Unable to connect"
 
-msgid "Couldn't connect to host"
-msgstr "Couldn't connect to host"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Unable to connect to %s"
 
-msgid "Read error"
-msgstr "Read error"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Server closed the connection."
 
 msgid "Users"
 msgstr "Users"
@@ -3685,10 +3728,12 @@ msgstr "Ad-Hoc Command Failed"
 msgid "execute"
 msgstr "execute"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Server requires TLS/SSL for login.  No TLS/SSL support found."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "You require encryption, but no TLS/SSL support found."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3705,7 +3750,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Plaintext Authentication"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Authentication failed"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Invalid response from server."
 
 msgid "Server does not use any supported authentication method"
@@ -3717,7 +3767,8 @@ msgstr "You require encryption, but it is not available on this server."
 msgid "Invalid challenge from server"
 msgstr "Invalid challenge from server"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL error"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3737,10 +3788,8 @@ msgstr ""
 "Could not establish a connection with the server:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Could not establish a connection with the server:\n"
 "%s"
@@ -3749,12 +3798,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "Unable to initialise connection"
 
-msgid "Unable to create socket"
-msgstr "Unable to create socket"
-
-msgid "Write error"
-msgstr "Write error"
-
 msgid "Full Name"
 msgstr "Full Name"
 
@@ -3825,159 +3868,6 @@ msgstr "Operating System"
 msgid "Local Time"
 msgstr "Local File:"
 
-msgid "Last Activity"
-msgstr "Last Activity"
-
-msgid "Service Discovery Info"
-msgstr "Service Discovery Info"
-
-msgid "Service Discovery Items"
-msgstr "Service Discovery Items"
-
-msgid "Extended Stanza Addressing"
-msgstr "Extended Stanza Addressing"
-
-msgid "Multi-User Chat"
-msgstr "Multi-User Chat"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Multi-User Chat Extended Presence Information"
-
-msgid "In-Band Bytestreams"
-msgstr "In-Band Bytestreams"
-
-msgid "Ad-Hoc Commands"
-msgstr "Ad-Hoc Commands"
-
-msgid "PubSub Service"
-msgstr "PubSub Service"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 Bytestreams"
-
-msgid "Out of Band Data"
-msgstr "Out of Band Data"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "In-Band Registration"
-
-msgid "User Location"
-msgstr "User Location"
-
-msgid "User Avatar"
-msgstr "User Avatar"
-
-msgid "Chat State Notifications"
-msgstr "Chat State Notifications"
-
-msgid "Software Version"
-msgstr "Software Version"
-
-msgid "Stream Initiation"
-msgstr "Stream Initiation"
-
-msgid "File Transfer"
-msgstr "File Transfer"
-
-msgid "User Mood"
-msgstr "User Mood"
-
-msgid "User Activity"
-msgstr "User Activity"
-
-msgid "Entity Capabilities"
-msgstr "Entity Capabilities"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Encrypted Session Negotiations"
-
-msgid "User Tune"
-msgstr "User Tune"
-
-msgid "Roster Item Exchange"
-msgstr "Roster Item Exchange"
-
-msgid "Reachability Address"
-msgstr "Reachability Address"
-
-msgid "User Profile"
-msgstr "User Profile"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle Audio"
-
-msgid "User Nickname"
-msgstr "User Nickname"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle Raw UDP"
-
-msgid "Jingle Video"
-msgstr "Jingle Video"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Message Receipts"
-
-msgid "Public Key Publishing"
-msgstr "Public Key Publishing"
-
-msgid "User Chatting"
-msgstr "User Chatting"
-
-msgid "User Browsing"
-msgstr "User Browsing"
-
-msgid "User Gaming"
-msgstr "User Gaming"
-
-msgid "User Viewing"
-msgstr "User Viewing"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Stanza Encryption"
-
-msgid "Entity Time"
-msgstr "Entity Time"
-
-msgid "Delayed Delivery"
-msgstr "Delayed Delivery"
-
-msgid "Collaborative Data Objects"
-msgstr "Collaborative Data Objects"
-
-msgid "File Repository and Sharing"
-msgstr "File Repository and Sharing"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "STUN Service Discovery for Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Simplified Encrypted Session Negotiation"
-
-msgid "Hop Check"
-msgstr "Hop Check"
-
-msgid "Capabilities"
-msgstr "Capabilities"
-
 msgid "Priority"
 msgstr "Priority"
 
@@ -3989,7 +3879,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Logged In"
 
 msgid "Middle Name"
@@ -4170,16 +4060,13 @@ msgstr "No matching users found"
 msgid "Roles:"
 msgstr "Role"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Ping timeout"
 
-msgid "Read Error"
-msgstr "Read Error"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4356,9 +4243,6 @@ msgstr "Your password has been changed."
 msgid "Error changing password"
 msgstr "Error changing password"
 
-msgid "Password (again)"
-msgstr "Password (again)"
-
 msgid "Change XMPP Password"
 msgstr "Change XMPP Password"
 
@@ -4742,6 +4626,14 @@ msgstr "XML Parse error"
 msgid "Unknown Error in presence"
 msgstr "Unknown Error in presence"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Error joining chat %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Error in chat %s"
+
 msgid "Create New Room"
 msgstr "Create New Room"
 
@@ -4758,16 +4650,20 @@ msgstr "_Configure Room"
 msgid "_Accept Defaults"
 msgstr "_Accept Defaults"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Error joining chat %s"
+#, fuzzy
+msgid "No reason"
+msgstr "No reason given."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Error in chat %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "You have been kicked by %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Kicked by %s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "An error occurred while opening the file."
 
 #, fuzzy
@@ -5265,9 +5161,6 @@ msgstr "Initiate _Chat"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "SSL support is needed for MSN. Please install a supported SSL library."
 
-msgid "Failed to connect to server."
-msgstr "Failed to connect to server."
-
 msgid "Error retrieving profile"
 msgstr "Error retreiving profile"
 
@@ -5528,9 +5421,6 @@ msgstr "Message may have not been sent because an unknown error occurred:"
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Message may have not been sent because an unknown error occurred:"
 
-msgid "Unable to connect"
-msgstr "Unable to connect"
-
 msgid "Writing error"
 msgstr "Writing error"
 
@@ -5545,20 +5435,24 @@ msgstr ""
 "Connection error from %s server:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Our protocol is not supported by the server."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Error parsing HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "You have signed on from another location."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "The MSN servers are temporarily unavailable. Please wait and try again."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "The MSN servers are going down temporarily."
 
 #, c-format
@@ -5570,9 +5464,6 @@ msgid ""
 msgstr ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 
-msgid "Unknown error."
-msgstr "Unknown error."
-
 msgid "Handshaking"
 msgstr "Handshaking"
 
@@ -5672,6 +5563,9 @@ msgstr "MSN Protocol Plug-in"
 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)"
@@ -5785,12 +5679,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Add contacts from server"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Connected"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protocol error, code %d: %s"
@@ -5815,16 +5703,6 @@ msgstr "MySpaceIM Error"
 msgid "Invalid input condition"
 msgstr "Invalid input condition"
 
-msgid "Read buffer full (2)"
-msgstr "Read buffer full (2)"
-
-msgid "Unparseable message"
-msgstr "Unparseable message"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Couldn't connect to host: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Failed to add buddy"
 
@@ -5908,6 +5786,12 @@ msgstr "Total Friends"
 msgid "Client Version"
 msgstr "Client Version"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Username Available"
 
@@ -6166,9 +6050,9 @@ msgstr "The user is either offline or you are blocked"
 msgid "Unknown error: 0x%X"
 msgstr "Unknown error: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Login failed (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Unable to login"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6270,9 +6154,6 @@ msgstr "GroupWise Conference %d"
 msgid "Authenticating..."
 msgstr "Authenticating..."
 
-msgid "Unable to connect to server."
-msgstr "Unable to connect to server."
-
 msgid "Waiting for response..."
 msgstr "Waiting for response..."
 
@@ -6296,9 +6177,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Would you like to join the conversation?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "You have been logged out because you logged in at another workstation."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6306,16 +6184,14 @@ msgstr ""
 "%s appears to be offline and did not receive the message that you have just "
 "sent."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 
-msgid "Error. SSL support is not installed."
-msgstr "Error: SSL support is not installed."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "This conference has been closed. No more messages can be sent."
 
@@ -6354,10 +6230,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6366,18 +6239,8 @@ msgstr "Could not join chat room"
 msgid "Invalid chat room name"
 msgstr "Invalid chat room name"
 
-msgid "Server closed the connection."
-msgstr "Server closed the connection."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Lost connection with server:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Received invalid data on connection with server."
 
 #. *< type
@@ -6425,7 +6288,8 @@ msgstr "Lost connection with the remote user:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Received invalid data on connection with remote user."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Could not establish a connection with the remote user."
 
 msgid "Direct IM established"
@@ -6625,21 +6489,15 @@ msgstr "Warning Level"
 msgid "Buddy Comment"
 msgstr "Buddy Comment"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Could not connect to authentication server:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Could not connect to BOS server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Unable to connect to server."
 
 msgid "Username sent"
 msgstr "Username sent"
@@ -6651,11 +6509,11 @@ msgstr "Connection established, cookie sent"
 msgid "Finalizing connection"
 msgstr "Finalising connection"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Unable to login: Could not sign on as %s because the username is invalid.  "
 "Usernames must be a valid email address, or start with a letter and contain "
@@ -6668,26 +6526,22 @@ 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."
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "User does not exist"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Your account is currently suspended."
 
 #. service temporarily unavailable
@@ -6707,7 +6561,8 @@ 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."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "The SecurID key entered is invalid."
 
 msgid "Enter SecurID"
@@ -6875,6 +6730,9 @@ msgstr "Online Since"
 msgid "Member Since"
 msgstr "Member Since"
 
+msgid "Capabilities"
+msgstr "Capabilities"
+
 msgid "Profile"
 msgstr "Profile"
 
@@ -7055,9 +6913,9 @@ msgstr[1] ""
 msgid "Away message too long."
 msgstr "Away message too long."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7083,9 +6941,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Orphans"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7094,8 +6952,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(no name)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Could not add the buddy %s for an unknown reason."
 
 #, c-format
@@ -7935,7 +7793,7 @@ msgid "Update interval (seconds)"
 msgstr "Keep alive error"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Cannot get server information"
 
 #, c-format
@@ -7962,10 +7820,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Cannot get server information"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "Requesting %s's attention..."
 
@@ -8003,21 +7857,9 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "Unable to connect."
-
 msgid "Socket error"
 msgstr "Socket error"
 
-msgid "Unable to read from socket"
-msgstr "Unable to read from socket"
-
-msgid "Write Error"
-msgstr "Write Error"
-
-msgid "Connection lost"
-msgstr "Connection lost"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "Set User Info..."
@@ -8026,8 +7868,9 @@ msgstr "Set User Info..."
 msgid "Requesting token"
 msgstr "Request denied"
 
-msgid "Couldn't resolve host"
-msgstr "Couldn't resolve host"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Unable to connect to server."
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8078,7 +7921,7 @@ msgid "QQ Qun Command"
 msgstr "Command"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Cannot get server information"
 
 #, fuzzy
@@ -8100,9 +7943,6 @@ msgstr "File Send"
 msgid "%d canceled the transfer of %s"
 msgstr "%d cancelled the transfer of %s"
 
-msgid "Connection closed (writing)"
-msgstr "Connection closed (writing)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Group Title:</b> %s<br>"
@@ -8157,17 +7997,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime Administrator Announcement"
 
-msgid "Connection reset"
-msgstr "Connection reset"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Error reading from socket: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Unable to connect to host"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Announcement from %s"
@@ -8190,6 +8019,9 @@ msgstr "Speakers"
 msgid "Video Camera"
 msgstr "Video Camera"
 
+msgid "File Transfer"
+msgstr "File Transfer"
+
 msgid "Supports"
 msgstr "Supports"
 
@@ -9005,6 +8837,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Network Statistics"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping failed"
 
@@ -9068,7 +8903,8 @@ msgstr "Unsupported public key type"
 msgid "Disconnected by server"
 msgstr "Disconnected by server"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Error during connecting to SILC Server"
 
 msgid "Key Exchange failed"
@@ -9079,26 +8915,26 @@ msgid ""
 msgstr ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 
-msgid "Connection failed"
-msgstr "Connection failed"
-
 msgid "Performing key exchange"
 msgstr "Performing key exchange"
 
-msgid "Unable to create connection"
-msgstr "Unable to create connection"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Could not load SILC key pair"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Connecting to SILC Server"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Could not load SILC key pair"
+
 msgid "Out of memory"
 msgstr "Out of memory"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Cannot initialise SILC protocol"
 
 msgid "Error loading SILC key pair"
@@ -9389,7 +9225,8 @@ msgstr "Digitally sign and verify all messages"
 msgid "Creating SILC key pair..."
 msgstr "Creating SILC key pair..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Cannot create SILC key pair\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9485,6 +9322,9 @@ msgstr "Whiteboard"
 msgid "No server statistics available"
 msgstr "No server statistics available"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Error during connecting to SILC Server"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Failure: Version mismatch, upgrade your client"
@@ -9525,30 +9365,27 @@ msgstr "Failure: Invalid cookie"
 msgid "Failure: Authentication failed"
 msgstr "Failure: Authentication failed"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Cannot initialise SILC Client connection"
 
 msgid "John Noname"
 msgstr "No name"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Could not load SILC key pair: %s"
 
-msgid "Could not write"
-msgstr "Could not write"
-
-msgid "Could not connect"
-msgstr "Could not connect"
+msgid "Unable to create connection"
+msgstr "Unable to create connection"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Unknown server response."
 
-msgid "Could not create listen socket"
-msgstr "Could not create listen socket"
-
-msgid "Could not resolve hostname"
-msgstr "Could not resolve hostname"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Unable to create socket"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP usernames may not contain whitespaces or @ symbols"
@@ -9590,6 +9427,78 @@ msgstr "Auth User"
 msgid "Auth Domain"
 msgstr "Auth Domain"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  List rooms on the Yahoo network"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Request user to start a Doodle session"
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo Protocol Plug-in"
+
+msgid "Pager server"
+msgstr "Pager server"
+
+msgid "Pager port"
+msgstr "Pager port"
+
+msgid "File transfer server"
+msgstr "File transfer server"
+
+msgid "File transfer port"
+msgstr "File transfer port"
+
+msgid "Chat room locale"
+msgstr "Chat room locale"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignore conference and chatroom invitations"
+
+msgid "Chat room list URL"
+msgstr "Chat room list URL"
+
+msgid "Yahoo Chat server"
+msgstr "Yahoo Chat server"
+
+msgid "Yahoo Chat port"
+msgstr "Yahoo Chat port"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo Protocol Plug-in"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9620,28 +9529,18 @@ msgstr "Add buddy rejected"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  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
@@ -9680,37 +9579,32 @@ msgstr "Your account is locked, please log in to the Yahoo! website."
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "Could not add buddy %s to group %s to the server list on account %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Could not add buddy to server list"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Received unexpected HTTP response from server."
 
-msgid "Connection problem"
-msgstr "Connection problem"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Lost connection with %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Could not establish a connection with %s:\n"
+"Could not establish a connection with the server:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9773,74 +9667,15 @@ msgstr "Join User in Chat..."
 msgid "Open Inbox"
 msgstr "Open Inbox"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  List rooms on the Yahoo network"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Request user to start a Doodle session"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo Protocol Plug-in"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-msgid "Pager server"
-msgstr "Pager server"
-
-msgid "Japan Pager server"
-msgstr "Japan Pager server"
-
-msgid "Pager port"
-msgstr "Pager port"
-
-msgid "File transfer server"
-msgstr "File transfer server"
-
-msgid "Japan file transfer server"
-msgstr "Japan file transfer server"
-
-msgid "File transfer port"
-msgstr "File transfer port"
-
-msgid "Chat room locale"
-msgstr "Chat room locale"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignore conference and chatroom invitations"
-
-msgid "Chat room list URL"
-msgstr "Chat room list URL"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo Chat server"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo Chat port"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Sent Doodle request."
 
+msgid "Unable to connect."
+msgstr "Unable to connect."
+
 msgid "Unable to establish file descriptor."
 msgstr "Unable to establish file descriptor."
 
@@ -9848,6 +9683,9 @@ msgstr "Unable to establish file descriptor."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s is trying to send you a group of %d files.\n"
 
+msgid "Write Error"
+msgstr "Write Error"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan Profile"
 
@@ -9966,23 +9804,19 @@ msgstr "Voices"
 msgid "Webcams"
 msgstr "Webcams"
 
+msgid "Connection problem"
+msgstr "Connection problem"
+
 msgid "Unable to fetch room list."
 msgstr "Unable to fetch room list."
 
 msgid "User Rooms"
 msgstr "User Rooms"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Connection problem with the YCHT server."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Lost connection with server\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10107,33 +9941,22 @@ msgstr "Realm"
 msgid "Exposure"
 msgstr "Exposure"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Unable to create socket:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Unable to parse response from HTTP proxy: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP proxy connection error %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Access denied: HTTP proxy server forbids port %d tunnelling."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Error resolving %s"
 
-msgid "Could not resolve host name"
-msgstr "Could not resolve host name"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Requesting %s's attention..."
@@ -10338,12 +10161,6 @@ msgstr "Error writing to %s: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "Unable to connect to %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "Server requires TLS/SSL for login.  No TLS/SSL support found."
-
 #, c-format
 msgid " - %s"
 msgstr " - %s"
@@ -10596,9 +10413,14 @@ msgstr "Add Buddy _Pounce..."
 msgid "View _Log"
 msgstr "View _Log"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Hide when offline"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Show when offline"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
@@ -11106,6 +10928,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Change user information for %s"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Type the host name this certificate is for."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL Servers"
@@ -11152,7 +10978,8 @@ msgstr "Ignore"
 msgid "Get Away Message"
 msgstr "Get Away Message"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Last said"
 
 msgid "Unable to save icon file to disk."
@@ -12057,7 +11884,7 @@ msgid "Hyperlink visited color"
 msgstr "Hyperlink colour"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Colour to draw hyperlinks when mouse is over them."
 
 msgid "Hyperlink prelight color"
@@ -12096,13 +11923,22 @@ msgid "Action Message Name Color for Whispered Message"
 msgstr "Action Message Name Colour"
 
 #, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Colour to draw the name of an action message."
+
+#, fuzzy
 msgid "Whisper Message Name Color"
 msgstr "Sent Message Name Colour"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Colour to draw the name of an action message."
+
 msgid "Typing notification color"
 msgstr "Typing notification colour"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "The colour to use for the typing notification font"
 
 msgid "Typing notification font"
@@ -12503,6 +12339,10 @@ msgid ""
 msgstr ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 
+#, fuzzy
+msgid "No message"
+msgstr "Unknown message"
+
 msgid "Open All Messages"
 msgstr "Open All Messages"
 
@@ -12520,10 +12360,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Unknown message"
-
 msgid "The following plugins will be unloaded."
 msgstr "The following plug-ins will be unloaded."
 
@@ -12739,8 +12575,9 @@ msgstr "_Show system tray icon:"
 msgid "On unread messages"
 msgstr "On unread messages"
 
-msgid "Conversation Window Hiding"
-msgstr "Conversation Window Hiding"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "IM Conversation Windows"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Hide new IM conversations:"
@@ -12748,6 +12585,9 @@ msgstr "_Hide new IM conversations:"
 msgid "When away"
 msgstr "When away"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Minimi_ze new conversation windows"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Tabs"
@@ -12806,9 +12646,6 @@ msgstr "Use smooth-scrolling"
 msgid "F_lash window when IMs are received"
 msgstr "F_lash window when IMs are received"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Minimi_ze new conversation windows"
-
 msgid "Minimum input area height in lines:"
 msgstr "Minimum input area height in lines:"
 
@@ -12843,7 +12680,8 @@ msgstr "Cannot start browser configuration program."
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Example: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Autodetect IP address"
 
 msgid "Public _IP:"
@@ -13216,34 +13054,18 @@ msgstr "Sa_ve & Use"
 msgid "Status for %s"
 msgstr "Status for %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "Insert Smiley"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
 #, fuzzy
-msgid "Duplicate Shortcut"
-msgstr "Duplicate Correction"
+msgid "Custom Smiley"
+msgstr "Insert Smiley"
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Please select your mood from the list."
+msgid "Duplicate Shortcut"
+msgstr "Duplicate Correction"
 
 #, fuzzy
 msgid "Edit Smiley"
@@ -13364,9 +13186,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Cannot send launcher"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -13963,9 +13786,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Music Messaging Plugin for collaborative composition."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
@@ -14223,9 +14047,10 @@ msgid "Conversation Window Send Button."
 msgstr "Conversation Window Send Button."
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for when no physical keyboard is present."
@@ -14553,8 +14378,9 @@ msgstr "Windows Pidgin Options"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Options specific to Pidgin for Windows."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
 
@@ -14595,6 +14421,306 @@ msgstr "Send and receive raw XMPP stanzas."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "This plugin is useful for debugging XMPP servers or clients."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Cannot open socket"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Could not listen on socket"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Unable to read socket"
+
+#~ msgid "Connection failed."
+#~ msgstr "Connection failed."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Server has disconnected"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Couldn't create socket"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Couldn't connect to host"
+
+#~ msgid "Read error"
+#~ msgstr "Read error"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Write error"
+
+#~ msgid "Last Activity"
+#~ msgstr "Last Activity"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Service Discovery Info"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Service Discovery Items"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Extended Stanza Addressing"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Multi-User Chat"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Multi-User Chat Extended Presence Information"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "In-Band Bytestreams"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ad-Hoc Commands"
+
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub Service"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5 Bytestreams"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Out of Band Data"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "In-Band Registration"
+
+#~ msgid "User Location"
+#~ msgstr "User Location"
+
+#~ msgid "User Avatar"
+#~ msgstr "User Avatar"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Chat State Notifications"
+
+#~ msgid "Software Version"
+#~ msgstr "Software Version"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Stream Initiation"
+
+#~ msgid "User Mood"
+#~ msgstr "User Mood"
+
+#~ msgid "User Activity"
+#~ msgstr "User Activity"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Entity Capabilities"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Encrypted Session Negotiations"
+
+#~ msgid "User Tune"
+#~ msgstr "User Tune"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Roster Item Exchange"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Reachability Address"
+
+#~ msgid "User Profile"
+#~ msgstr "User Profile"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Jingle Audio"
+
+#~ msgid "User Nickname"
+#~ msgstr "User Nickname"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle Raw UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Jingle Video"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Message Receipts"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Public Key Publishing"
+
+#~ msgid "User Chatting"
+#~ msgstr "User Chatting"
+
+#~ msgid "User Browsing"
+#~ msgstr "User Browsing"
+
+#~ msgid "User Gaming"
+#~ msgstr "User Gaming"
+
+#~ msgid "User Viewing"
+#~ msgstr "User Viewing"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Stanza Encryption"
+
+#~ msgid "Entity Time"
+#~ msgstr "Entity Time"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Delayed Delivery"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Collaborative Data Objects"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "File Repository and Sharing"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "STUN Service Discovery for Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Simplified Encrypted Session Negotiation"
+
+#~ msgid "Hop Check"
+#~ msgstr "Hop Check"
+
+#~ msgid "Read Error"
+#~ msgstr "Read Error"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Failed to connect to server."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Read buffer full (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Unparseable message"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Couldn't connect to host: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Login failed (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "You have been logged out because you logged in at another workstation."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Error: SSL support is not installed."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Incorrect password."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "You may be disconnected shortly.  Check %s for updates."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Could Not Connect"
+
+#~ msgid "Invalid username."
+#~ msgstr "Invalid username."
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Cannot get server information"
+
+#~ msgid "Connection lost"
+#~ msgstr "Connection lost"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Couldn't resolve host"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Connection closed (writing)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Connection reset"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Error reading from socket: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Unable to connect to host"
+
+#~ msgid "Could not write"
+#~ msgstr "Could not write"
+
+#~ msgid "Could not connect"
+#~ msgstr "Could not connect"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Could not create listen socket"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Could not resolve hostname"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Incorrect password"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Japan Pager server"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japan file transfer server"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Lost connection with server\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Could not resolve host name"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "Server requires TLS/SSL for login.  No TLS/SSL support found."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Conversation Window Hiding"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Please select your mood from the list."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Activate which ID?"
 
@@ -15105,9 +15231,6 @@ msgstr "This plugin is useful for debugging XMPP servers or clients."
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "Unable to login. Check debug log"
 
-#~ msgid "Unable to login"
-#~ msgstr "Unable to login"
-
 #~ msgid "TCP Address"
 #~ msgstr "TCP Address"
 
diff --git a/po/eo.po b/po/eo.po
index 80a7bba739..badae16cde 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2008-03-02 13:39+0100\n"
 "Last-Translator: Stéphane Fillod <f8cfe@free.fr>\n"
 "Language-Team: Esperanto <kde-i18n-eo@kde.org>\n"
@@ -2502,7 +2502,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2550,7 +2550,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2795,12 +2795,13 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
+msgstr "Ne povas eki konekton"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2852,14 +2853,17 @@ msgstr "%s fermis la konversacion."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-msgid "Cannot open socket"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Ne konekteblas al %s"
 
-msgid "Could not bind socket to port"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "Ne konekteblas al %s: %s"
 
-msgid "Could not listen on socket"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Ne eblas sendi mesaĝon: %s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
@@ -2906,13 +2910,14 @@ msgstr "Konservu kunulliston..."
 msgid "Load buddylist from file..."
 msgstr "Ŝarĝu kunulliston el dosiero..."
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Pasvortoj ne kongruas."
 
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr ""
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2924,14 +2929,15 @@ msgstr "Registro pleniĝis sukcese!"
 msgid "Password"
 msgstr "Pasvorto"
 
-msgid "Password (retype)"
-msgstr "Pasvorto (retajpu)"
+msgid "Password (again)"
+msgstr "Pasvorto (denove)"
 
-msgid "Enter current token"
+msgid "Enter captcha text"
 msgstr ""
 
-msgid "Current token"
-msgstr ""
+#, fuzzy
+msgid "Captcha"
+msgstr "Konservu Bildon"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registru Novan Gadu-Gadu-an Konton"
@@ -2984,6 +2990,15 @@ msgstr ""
 msgid "Current password"
 msgstr "Aktuala pasvorto"
 
+msgid "Password (retype)"
+msgstr "Pasvorto (retajpu)"
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
@@ -3031,7 +3046,7 @@ msgstr ""
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr ""
 
 msgid "Buddy list downloaded"
@@ -3046,8 +3061,14 @@ msgstr ""
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
-msgid "Connection failed."
-msgstr "Konekto malsukcesis."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr ""
+
+msgid "Connection failed"
+msgstr "Konekto malsukcesis"
 
 msgid "Add to chat"
 msgstr "Aldonu al babilejo"
@@ -3055,18 +3076,23 @@ msgstr "Aldonu al babilejo"
 msgid "Chat _name:"
 msgstr "Babilejo _nomo:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Ne eblas alinomigi grupon"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Konektante"
+
 msgid "Chat error"
 msgstr "Babileraro"
 
 msgid "This chat name is already in use"
 msgstr "Tiu babil nomo jam estas uzata"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Ne konektita al servilo."
 
 msgid "Find buddies..."
@@ -3126,8 +3152,9 @@ msgstr "Neniu temo estas"
 msgid "File Transfer Failed"
 msgstr "Dosiero Transmeto Malsukcesis"
 
-msgid "Could not open a listening port."
-msgstr ""
+#, fuzzy
+msgid "Unable to open a listening port."
+msgstr "Dosiero malfermeblas."
 
 msgid "Error displaying MOTD"
 msgstr "Eraro montrante MOTD-n"
@@ -3142,8 +3169,18 @@ msgstr "Estas neniu MOTD kuniĝita kun tiu konekto."
 msgid "MOTD for %s"
 msgstr "MOTD por %s"
 
-msgid "Server has disconnected"
-msgstr "Servilo diskonektis"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Perdis konekton kun servilo:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Rigardu MOTD-n"
@@ -3158,22 +3195,20 @@ msgstr "_Pasvorto:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC karesnomoj ne enhaveblas blankan spacon"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Konektante"
-
 msgid "SSL support unavailable"
 msgstr "SSL subteno ne disponeblas"
 
-msgid "Couldn't create socket"
-msgstr ""
+msgid "Unable to connect"
+msgstr "Malkonekteblas"
 
-msgid "Couldn't connect to host"
-msgstr "Ne povis konekti al servilo"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Ne konekteblas al %s"
 
-msgid "Read error"
-msgstr "Legeraro"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Servilo fermis la konekton."
 
 msgid "Users"
 msgstr "Uzantoj"
@@ -3566,10 +3601,10 @@ msgstr ""
 msgid "execute"
 msgstr "ruligi"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3584,7 +3619,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Platteksta Aŭtentokontrolo"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Aŭtentokontrolo malsukcesis"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Malvalida respondo el servilo."
 
 msgid "Server does not use any supported authentication method"
@@ -3596,7 +3636,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr ""
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL eraro"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3615,22 +3656,16 @@ msgstr ""
 "Perdis konekto kun prokura servilo\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
+"Perdis konekto kun prokura servilo\n"
+"%s"
 
 #, fuzzy
 msgid "Unable to establish SSL connection"
 msgstr "Ne povas eki konekton"
 
-msgid "Unable to create socket"
-msgstr ""
-
-msgid "Write error"
-msgstr "Skriberaro"
-
 msgid "Full Name"
 msgstr "Plena Nomo"
 
@@ -3699,159 +3734,6 @@ msgstr ""
 msgid "Local Time"
 msgstr "Loka Doerisero:"
 
-msgid "Last Activity"
-msgstr ""
-
-msgid "Service Discovery Info"
-msgstr "Servico Malkovrado Informo"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-msgid "Extended Stanza Addressing"
-msgstr ""
-
-msgid "Multi-User Chat"
-msgstr "Multopa Babilejo"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr "Ad-Hoc Komandoj"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "En-Bando Registrado"
-
-msgid "User Location"
-msgstr "Uzanto Loko"
-
-msgid "User Avatar"
-msgstr ""
-
-msgid "Chat State Notifications"
-msgstr "Kunul Stato Avizoj"
-
-msgid "Software Version"
-msgstr "Programo Versio"
-
-msgid "Stream Initiation"
-msgstr ""
-
-msgid "File Transfer"
-msgstr ""
-
-msgid "User Mood"
-msgstr "Uzanto Agordo"
-
-msgid "User Activity"
-msgstr ""
-
-msgid "Entity Capabilities"
-msgstr "Eraj Kapablecoj"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-msgid "User Tune"
-msgstr ""
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-msgid "Reachability Address"
-msgstr ""
-
-msgid "User Profile"
-msgstr "Uzanto Profilo"
-
-msgid "Jingle"
-msgstr ""
-
-msgid "Jingle Audio"
-msgstr ""
-
-msgid "User Nickname"
-msgstr "Uzanto Karesnomo"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr "Viva Video"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-msgid "Message Receipts"
-msgstr "Mesaĝaj Ricevitaj Konfirmoj"
-
-msgid "Public Key Publishing"
-msgstr "Publika Ŝloŝilo Disdono"
-
-msgid "User Chatting"
-msgstr "Uzanto Babilante"
-
-msgid "User Browsing"
-msgstr "Uzanto Navigante"
-
-msgid "User Gaming"
-msgstr "Uzanto Ludante"
-
-msgid "User Viewing"
-msgstr "Uzanto Rigardante"
-
-msgid "Ping"
-msgstr ""
-
-msgid "Stanza Encryption"
-msgstr ""
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Kapablecoj"
-
 msgid "Priority"
 msgstr "Prioriteco"
 
@@ -3863,7 +3745,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Ensalutita"
 
 msgid "Middle Name"
@@ -4042,16 +3924,12 @@ msgstr "Neniu protokolo trovita"
 msgid "Roles:"
 msgstr "Rolo"
 
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr ""
 
-msgid "Read Error"
-msgstr "Legeraro"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4228,9 +4106,6 @@ msgstr "Via pasvorto estas ŝanĝita."
 msgid "Error changing password"
 msgstr "Erara ŝanĝante pasvorton"
 
-msgid "Password (again)"
-msgstr "Pasvorto (denove)"
-
 msgid "Change XMPP Password"
 msgstr "Ŝanĝu XMPP Pasvorton"
 
@@ -4606,6 +4481,14 @@ msgstr ""
 msgid "Unknown Error in presence"
 msgstr ""
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Eraro aliĝante babilejon %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Eraro en babilejo %s"
+
 msgid "Create New Room"
 msgstr "Kreu Novan Ĉambron"
 
@@ -4622,16 +4505,20 @@ msgstr "_Agordu Ĉambron"
 msgid "_Accept Defaults"
 msgstr "_Akceptu Apriorajn"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Eraro aliĝante babilejon %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Nenia kialo donita."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Eraro en babilejo %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Vi estas forigita de %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Forigita de %s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Eraro okazis malfermante la dosiero."
 
 #, fuzzy
@@ -5119,9 +5006,6 @@ msgstr "Iniciatu _Babilon"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-msgid "Failed to connect to server."
-msgstr "Malsukcesis konekti servilon."
-
 msgid "Error retrieving profile"
 msgstr "Eraro ricevante profilon"
 
@@ -5360,9 +5244,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 
-msgid "Unable to connect"
-msgstr "Malkonekteblas"
-
 msgid "Writing error"
 msgstr "Skriberaro"
 
@@ -5375,19 +5256,21 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Our protocol is not supported by the server."
+msgid "Our protocol is not supported by the server"
 msgstr ""
 
-msgid "Error parsing HTTP."
-msgstr ""
+#, fuzzy
+msgid "Error parsing HTTP"
+msgstr "Eraro lanĉante %s"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Vi ensalutis el alia loko."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr ""
 
 #, c-format
@@ -5398,9 +5281,6 @@ msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "Unknown error."
-msgstr "Nekonata eraro."
-
 msgid "Handshaking"
 msgstr ""
 
@@ -5498,6 +5378,9 @@ msgstr "MSN Protokol-Kromaĵo"
 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)"
@@ -5607,12 +5490,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Aldoni kontaktojn el servilo."
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr ""
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr ""
@@ -5634,16 +5511,6 @@ msgstr ""
 msgid "Invalid input condition"
 msgstr ""
 
-msgid "Read buffer full (2)"
-msgstr ""
-
-msgid "Unparseable message"
-msgstr ""
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Ne povis konekti al servilo: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Malsukcesis aldoni kunulon"
 
@@ -5725,6 +5592,12 @@ msgstr ""
 msgid "Client Version"
 msgstr "Klienta Version"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr ""
 
@@ -5980,9 +5853,9 @@ msgstr ""
 msgid "Unknown error: 0x%X"
 msgstr ""
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Ne konekteblas al %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6080,9 +5953,6 @@ msgstr ""
 msgid "Authenticating..."
 msgstr "Aŭtentokontrolas..."
 
-msgid "Unable to connect to server."
-msgstr ""
-
 msgid "Waiting for response..."
 msgstr "Atendante respondon..."
 
@@ -6106,21 +5976,16 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Ĉu vi deziras aliĝi al konversacio?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-
-msgid "Error. SSL support is not installed."
-msgstr ""
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
+msgstr "Bonvolu enmetu la nomon de uzanto kiun vi deziras bloki."
 
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Tiu konferenco fermiĝis. Ne pliaj mesaĝoj sendiĝeblas."
@@ -6158,10 +6023,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6170,20 +6032,12 @@ msgstr "Ne povis aliĝi babilejon"
 msgid "Invalid chat room name"
 msgstr "Malvalida babilejo nomo"
 
-msgid "Server closed the connection."
-msgstr "Servilo fermis la konekton."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr ""
-"Perdis konekton kun servilo:\n"
+"Perdis konekto kun prokura servilo\n"
 "%s"
 
-msgid "Received invalid data on connection with server."
-msgstr ""
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6229,8 +6083,11 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr ""
+"Perdis konekto kun prokura servilo\n"
+"%s"
 
 msgid "Direct IM established"
 msgstr "Rekta TM establiĝis"
@@ -6422,21 +6279,15 @@ msgstr ""
 msgid "Buddy Comment"
 msgstr "Kunul Komento"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Ne povis konekti al aŭtentokontrolo servilo:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Ne povis konekti al BOS servilo:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Ne konekteblas al %s: %s"
 
 #, fuzzy
 msgid "Username sent"
@@ -6451,9 +6302,9 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 
 #, c-format
@@ -6463,28 +6314,23 @@ 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
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "Malvalida Uzantonomo"
+msgid "Username does not exist"
+msgstr "Uzanto ne ekzistas"
 
 #. Suspended account
-msgid "Your account is currently suspended."
-msgstr ""
+#, fuzzy
+msgid "Your account is currently suspended"
+msgstr "Pasporta konto ne jam kontrolita"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
@@ -6500,8 +6346,9 @@ msgid ""
 "try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
-msgid "The SecurID key entered is invalid."
-msgstr ""
+#, fuzzy
+msgid "The SecurID key entered is invalid"
+msgstr "La nova formatumo malvalidas."
 
 msgid "Enter SecurID"
 msgstr ""
@@ -6651,6 +6498,9 @@ msgstr "Enrete Ek De"
 msgid "Member Since"
 msgstr "Membro Ek De"
 
+msgid "Capabilities"
+msgstr "Kapablecoj"
+
 msgid "Profile"
 msgstr "Profilo"
 
@@ -6807,7 +6657,7 @@ msgstr "Formesaĝo tro longa."
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6830,15 +6680,15 @@ msgstr "Senpatroj"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
 msgid "(no name)"
 msgstr "(sen nomo)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Ne povis aldoni kunulon %s pro nekonata kialo."
 
 #, fuzzy, c-format
@@ -7669,7 +7519,7 @@ msgid "Update interval (seconds)"
 msgstr "Aktualigi mian informon"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Konekto servilo"
 
 #, c-format
@@ -7696,10 +7546,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Konekto servilo"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "Peto Dialogujo"
 
@@ -7735,21 +7581,9 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "Ne konekteblas."
-
 msgid "Socket error"
 msgstr ""
 
-msgid "Unable to read from socket"
-msgstr ""
-
-msgid "Write Error"
-msgstr "Skriberaro"
-
-msgid "Connection lost"
-msgstr "Konekto perdita"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "Difinu Uzanto-Informon..."
@@ -7758,8 +7592,9 @@ msgstr "Difinu Uzanto-Informon..."
 msgid "Requesting token"
 msgstr "Peto Dialogujo"
 
-msgid "Couldn't resolve host"
-msgstr ""
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Ne eblas alinomigi grupon"
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -7810,7 +7645,7 @@ msgid "QQ Qun Command"
 msgstr "Komando"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Konekto servilo"
 
 #, fuzzy
@@ -7832,9 +7667,6 @@ msgstr ""
 msgid "%d canceled the transfer of %s"
 msgstr ""
 
-msgid "Connection closed (writing)"
-msgstr "Koneto fermita (skribante)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Grupo Titolo:</b> %s<br>"
@@ -7888,17 +7720,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-msgid "Connection reset"
-msgstr ""
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr ""
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr ""
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -7921,6 +7742,9 @@ msgstr ""
 msgid "Video Camera"
 msgstr ""
 
+msgid "File Transfer"
+msgstr ""
+
 msgid "Supports"
 msgstr "Subtenas"
 
@@ -8676,6 +8500,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr ""
 
+msgid "Ping"
+msgstr ""
+
 msgid "Ping failed"
 msgstr ""
 
@@ -8733,8 +8560,9 @@ msgstr ""
 msgid "Disconnected by server"
 msgstr ""
 
-msgid "Error during connecting to SILC Server"
-msgstr ""
+#, fuzzy
+msgid "Error connecting to SILC Server"
+msgstr "Konekto servilo"
 
 msgid "Key Exchange failed"
 msgstr ""
@@ -8743,27 +8571,27 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-msgid "Connection failed"
-msgstr "Konekto malsukcesis"
-
 msgid "Performing key exchange"
 msgstr ""
 
-msgid "Unable to create connection"
-msgstr ""
-
-msgid "Could not load SILC key pair"
-msgstr ""
+#, fuzzy
+msgid "Unable to load SILC key pair"
+msgstr "Ne eblas ŝargi kromaĵon"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr ""
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Ne eblas ŝargi kromaĵon"
+
 msgid "Out of memory"
 msgstr ""
 
-msgid "Cannot initialize SILC protocol"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
+msgstr "Ne povas eki konekton"
 
 msgid "Error loading SILC key pair"
 msgstr ""
@@ -9039,8 +8867,9 @@ msgstr ""
 msgid "Creating SILC key pair..."
 msgstr ""
 
-msgid "Cannot create SILC key pair\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to create SILC key pair"
+msgstr "Ne eblas alinomigi grupon"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9128,6 +8957,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr ""
 
+msgid "Error during connecting to SILC Server"
+msgstr ""
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -9168,30 +9000,27 @@ msgstr ""
 msgid "Failure: Authentication failed"
 msgstr ""
 
-msgid "Cannot initialize SILC Client connection"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
+msgstr "Ne povas eki konekton"
 
 msgid "John Noname"
 msgstr "Sennomulo"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr ""
-
-msgid "Could not write"
-msgstr ""
-
-msgid "Could not connect"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
+msgstr "Ne eblas ŝargi kromaĵon"
 
-msgid "Unknown server response."
+msgid "Unable to create connection"
 msgstr ""
 
-msgid "Could not create listen socket"
-msgstr ""
+#, fuzzy
+msgid "Unknown server response"
+msgstr "Nekonata kialo"
 
-msgid "Could not resolve hostname"
-msgstr ""
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Malsukcesis skribi reten"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -9234,6 +9063,78 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr ""
+
+msgid "list: List rooms on the Yahoo network"
+msgstr ""
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo Protokol-Kromaĵo"
+
+msgid "Pager server"
+msgstr "Paĝila servilo"
+
+msgid "Pager port"
+msgstr "Paĝila pordo"
+
+msgid "File transfer server"
+msgstr "Dosieralŝuto servilo"
+
+msgid "File transfer port"
+msgstr "Dosieralŝuto pordo"
+
+msgid "Chat room locale"
+msgstr "Babilejo lokaĵaro"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignoru konferencajn kaj babilejan invitojn"
+
+msgid "Chat room list URL"
+msgstr "Babilejolisto URL"
+
+msgid "Yahoo Chat server"
+msgstr "Yahoo Babil servilo"
+
+msgid "Yahoo Chat port"
+msgstr "Yahoo Babilo pordo"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo Protokol-Kromaĵo"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9261,26 +9162,16 @@ msgstr ""
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 
 #. username or password missing
@@ -9315,35 +9206,32 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-msgid "Could not add buddy to server list"
-msgstr ""
+#, fuzzy
+msgid "Unable to add buddy to server list"
+msgstr "Alŝutu kunulliston al Servilo"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Aŭdebla %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Ricevis neatendita HTTP respondo de servilo."
 
-msgid "Connection problem"
-msgstr "Konektado problemo"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Perdis konekton kun %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
+"Perdis konekto kun prokura servilo\n"
+"%s"
 
 msgid "Not at Home"
 msgstr "Malhejme"
@@ -9405,74 +9293,15 @@ msgstr "Kuniĝu Uzanto en Babilejo..."
 msgid "Open Inbox"
 msgstr "Malfermu Alkeston"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-
-msgid "list: List rooms on the Yahoo network"
-msgstr ""
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo Protokol-Kromaĵo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japanio"
-
-msgid "Pager server"
-msgstr "Paĝila servilo"
-
-msgid "Japan Pager server"
-msgstr "Japana Paĝila servilo"
-
-msgid "Pager port"
-msgstr "Paĝila pordo"
-
-msgid "File transfer server"
-msgstr "Dosieralŝuto servilo"
-
-msgid "Japan file transfer server"
-msgstr "Japana dosieralŝuto servilo"
-
-msgid "File transfer port"
-msgstr "Dosieralŝuto pordo"
-
-msgid "Chat room locale"
-msgstr "Babilejo lokaĵaro"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignoru konferencajn kaj babilejan invitojn"
-
-msgid "Chat room list URL"
-msgstr "Babilejolisto URL"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo Babil servilo"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo Babilo pordo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "Ne konekteblas."
+
 msgid "Unable to establish file descriptor."
 msgstr "Ne eblas estabi dosierotenilon."
 
@@ -9480,6 +9309,9 @@ msgstr "Ne eblas estabi dosierotenilon."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr ""
 
+msgid "Write Error"
+msgstr "Skriberaro"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japana profilo"
 
@@ -9584,23 +9416,19 @@ msgstr "Voĉoj"
 msgid "Webcams"
 msgstr "Retkameraoj"
 
+msgid "Connection problem"
+msgstr "Konektado problemo"
+
 msgid "Unable to fetch room list."
 msgstr "Ne eblas ricevi babilejliston."
 
 msgid "User Rooms"
 msgstr "Uzanto Babilejoj"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Konektproblemo kun la YCHT servilo."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Perdis konekto kun prokura servilo\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -9716,22 +9544,16 @@ msgstr "Sfero"
 msgid "Exposure"
 msgstr "Montreco"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Ne eblas sendi mesaĝon al %s:"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP prokura konekteraro %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "Aliro nepermesita: HTTP prokura servilo malpermesas pordon %d tunelumadon."
 
@@ -9739,9 +9561,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr ""
 
-msgid "Could not resolve host name"
-msgstr ""
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -9944,12 +9763,6 @@ msgid "Unable to connect to %s: %s"
 msgstr "Ne konekteblas al %s: %s"
 
 #, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-
-#, c-format
 msgid " - %s"
 msgstr ""
 
@@ -10185,9 +9998,14 @@ msgstr "Aldonu Kunul _Atentigon..."
 msgid "View _Log"
 msgstr "Montru Protoko_lon"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Kaŝu kiam senkonekta"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Montru kiam senkonekta"
+
 msgid "_Alias..."
 msgstr "_Alinomo..."
 
@@ -10691,6 +10509,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Ŝanĝu uzanto-informon de %s"
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL Serviloj"
@@ -10736,7 +10557,8 @@ msgstr "Ignoru"
 msgid "Get Away Message"
 msgstr "Montru Formesaĝon"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Laste diris"
 
 msgid "Unable to save icon file to disk."
@@ -11640,7 +11462,7 @@ msgstr "Koloro ligila."
 msgid "Hyperlink visited color"
 msgstr "Ligila koloro"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 
 msgid "Hyperlink prelight color"
@@ -11676,16 +11498,23 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 #, fuzzy
 msgid "Whisper Message Name Color"
 msgstr "Senditaj Mesaĝoj Nomoj Koloro"
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "Avizo Forigo"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "Nova retpoŝt-avizoj"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12065,6 +11894,10 @@ msgid ""
 msgstr ""
 "La 'Mana' foliumilo komando estis elektita, sed nenia komando estis difinita."
 
+#, fuzzy
+msgid "No message"
+msgstr "Nekonata mesaĝo"
+
 msgid "Open All Messages"
 msgstr "Malfermu Ĉiujn Mesaĝojn"
 
@@ -12082,10 +11915,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Vi ricevis retmesaĝon!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Nekonata mesaĝo"
-
 msgid "The following plugins will be unloaded."
 msgstr "La jenajn kromaĵoj estos malŝarĝitaj."
 
@@ -12304,8 +12133,9 @@ msgstr "_Montru sistemlistelan piktogramon:"
 msgid "On unread messages"
 msgstr "Je nelegitaj mesaĝoj"
 
-msgid "Conversation Window Hiding"
-msgstr "Konversacio Fenestroj Kaŝeco"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "TM Konversacio Fenestroj"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Kaŝu novajn TM-ajn konversaciojn:"
@@ -12313,6 +12143,9 @@ msgstr "_Kaŝu novajn TM-ajn konversaciojn:"
 msgid "When away"
 msgstr "Kiam fora"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Minimi_gu novajn konversaciajn fenestrojn"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Langetoj"
@@ -12371,9 +12204,6 @@ msgstr "Uzu dolĉan rulumon"
 msgid "F_lash window when IMs are received"
 msgstr "Fu_lmu ekranon kiam TM-oj riceviĝas"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Minimi_gu novajn konversaciajn fenestrojn"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12408,7 +12238,8 @@ msgstr ""
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Ekzemplo: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Aŭtodetekti IP adreson"
 
 msgid "Public _IP:"
@@ -12779,34 +12610,18 @@ msgstr "Konser_vu & Uzu"
 msgid "Status for %s"
 msgstr "Stato por %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "Enmetu Ridmienon"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
 #, fuzzy
-msgid "Duplicate Shortcut"
-msgstr "Duobligo Korekto"
+msgid "Custom Smiley"
+msgstr "Enmetu Ridmienon"
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Bonvolu enigi novan nomon por vi."
+msgid "Duplicate Shortcut"
+msgstr "Duobligo Korekto"
 
 #, fuzzy
 msgid "Edit Smiley"
@@ -12922,8 +12737,8 @@ msgid "Cannot send launcher"
 msgstr ""
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -13501,9 +13316,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Muzika Mesaĝilo Kromaĵo por kunlaboranta verkado."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "La Muzika Mesaĝilo Kromaĵo ebligas plurajn uzantojn samtempe labori muzikan "
 "pecon redaktante komunan orkestrumon realtempe."
@@ -13764,7 +13580,7 @@ msgstr "Konversacio Fenestroj Kaŝeco"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14086,9 +13902,10 @@ msgstr "Vindozaj Piĝinaj Opcioj"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opcioj apartaj al Piĝin Vindoza."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "Opcioj apartaj al Piĝin Vindoza."
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr ""
@@ -14127,6 +13944,141 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
+#~ msgid "Connection failed."
+#~ msgstr "Konekto malsukcesis."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Servilo diskonektis"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Ne povis konekti al servilo"
+
+#~ msgid "Read error"
+#~ msgstr "Legeraro"
+
+#~ msgid "Write error"
+#~ msgstr "Skriberaro"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Servico Malkovrado Informo"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Multopa Babilejo"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ad-Hoc Komandoj"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "En-Bando Registrado"
+
+#~ msgid "User Location"
+#~ msgstr "Uzanto Loko"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Kunul Stato Avizoj"
+
+#~ msgid "Software Version"
+#~ msgstr "Programo Versio"
+
+#~ msgid "User Mood"
+#~ msgstr "Uzanto Agordo"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Eraj Kapablecoj"
+
+#~ msgid "User Profile"
+#~ msgstr "Uzanto Profilo"
+
+#~ msgid "User Nickname"
+#~ msgstr "Uzanto Karesnomo"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Viva Video"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Mesaĝaj Ricevitaj Konfirmoj"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Publika Ŝloŝilo Disdono"
+
+#~ msgid "User Chatting"
+#~ msgstr "Uzanto Babilante"
+
+#~ msgid "User Browsing"
+#~ msgstr "Uzanto Navigante"
+
+#~ msgid "User Gaming"
+#~ msgstr "Uzanto Ludante"
+
+#~ msgid "User Viewing"
+#~ msgstr "Uzanto Rigardante"
+
+#~ msgid "Read Error"
+#~ msgstr "Legeraro"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Malsukcesis konekti servilon."
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Ne povis konekti al servilo: %s (%d)"
+
+#~ msgid "Incorrect password."
+#~ msgstr "Misa pasvorto."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ne povis konekti al BOS servilo:\n"
+#~ "%s"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Ne Povas Konekti"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "Malvalida Uzantonomo"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Konekto servilo"
+
+#~ msgid "Connection lost"
+#~ msgstr "Konekto perdita"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Koneto fermita (skribante)"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Misa pasvorto"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japanio"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Japana Paĝila servilo"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japana dosieralŝuto servilo"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Perdis konekto kun prokura servilo\n"
+#~ "%s"
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Konversacio Fenestroj Kaŝeco"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Bonvolu enigi novan nomon por vi."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Ŝaltu kiun ID?"
 
diff --git a/po/es.po b/po/es.po
index 9e3d1c2e74..e084f7a6f0 100644
--- a/po/es.po
+++ b/po/es.po
@@ -52,7 +52,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2009-01-05 00:05+0100\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team:  Spanish team <es@li.org>\n"
@@ -2654,9 +2654,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Incluir otros registros de clientes de MI en el visor de registro."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2712,8 +2713,9 @@ msgstr "Emulación de mensaje de desconectado"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Guardar los mensajes enviados como un aviso."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "El resto de los mensajes se guardarán como un aviso. Puede editar y eliminar "
@@ -2965,15 +2967,17 @@ msgstr ""
 "No se pudo detectar la instalación de ActiveTCL. Debe instalar ActiveTCL de "
 "http://www.activestate.com si desea utilizar los complementos TCL\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "No se encontró el conjunto de herramientas Apple Bonjour para Windows. Para "
 "más información consulte las preguntas frecuentas (FAQ) en http://d.pidgin."
 "im/wiki/BonjourWindows."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "No se pudieron escuchar las conexiones MI entrantes\n"
 
 msgid ""
@@ -3028,14 +3032,21 @@ msgstr "%s ha cerrado la conversación."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "No se pudo enviar el mensaje, no se pudo iniciar la conversación."
 
-msgid "Cannot open socket"
-msgstr "No se pudo abrir el socket"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"No se pudo crear el socket:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "No se pudo vincular el socket al puerto"
 
-msgid "Could not listen on socket"
-msgstr "No se pudo escuchar en el socket"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"No se pudo crear el socket:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Error comunicándose con el servicio «mDNSResponder» local."
@@ -3085,13 +3096,16 @@ msgstr "Guardar lista de amigos..."
 msgid "Load buddylist from file..."
 msgstr "Cargar la lista de amigos desde archivo..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Rellene los campos de registro."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Las contraseñas no coinciden."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "No se pudo registrar la cuenta nueva. Se produjo un error.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3103,14 +3117,15 @@ msgstr "¡Se completó el registro con éxito!"
 msgid "Password"
 msgstr "Contraseña"
 
-msgid "Password (retype)"
-msgstr "Contraseña (escribir de nuevo)"
+msgid "Password (again)"
+msgstr "Contraseña (de nuevo)"
 
-msgid "Enter current token"
-msgstr "Introduzca el token actual"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Token actual"
+#, fuzzy
+msgid "Captcha"
+msgstr "Guardar imagen"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrando cuenta nueva de Gadu-Gadu"
@@ -3163,6 +3178,15 @@ msgstr "¡Se cambió con éxito la contraseña!"
 msgid "Current password"
 msgstr "Contraseña actual"
 
+msgid "Password (retype)"
+msgstr "Contraseña (escribir de nuevo)"
+
+msgid "Enter current token"
+msgstr "Introduzca el token actual"
+
+msgid "Current token"
+msgstr "Token actual"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Introduzca su contraseña actual y la contraseña nueva para UIN: "
 
@@ -3210,8 +3234,8 @@ msgstr "No se encontraron usuarios que coincidan"
 msgid "There are no users matching your search criteria."
 msgstr "No hay usuarios que coincidan con sus criterios de búsqueda."
 
-msgid "Unable to read socket"
-msgstr "No se pudo leer el socket"
+msgid "Unable to read from socket"
+msgstr "No se pudo leer del socket"
 
 msgid "Buddy list downloaded"
 msgstr "Lista de amigos descargada"
@@ -3225,8 +3249,14 @@ msgstr "Lista de amigos exportada"
 msgid "Your buddy list was stored on the server."
 msgstr "Su lista de amigos fue almacenada en el servidor."
 
-msgid "Connection failed."
-msgstr "Falló la conexión."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Conectado"
+
+msgid "Connection failed"
+msgstr "Falló la conexión"
 
 msgid "Add to chat"
 msgstr "Añadir al chat"
@@ -3234,18 +3264,23 @@ msgstr "Añadir al chat"
 msgid "Chat _name:"
 msgstr "_Nombre de chat:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "No se pudo resolver el nombre del servidor."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Conectando"
+
 msgid "Chat error"
 msgstr "Error de chat"
 
 msgid "This chat name is already in use"
 msgstr "Ya existe un chat con ese nombre"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "No está conectado al servidor."
 
 msgid "Find buddies..."
@@ -3305,7 +3340,8 @@ msgstr "No hay tema establecido"
 msgid "File Transfer Failed"
 msgstr "Falló la transferencia de archivos"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "No se pudo abrir un puerto de escucha."
 
 msgid "Error displaying MOTD"
@@ -3321,8 +3357,18 @@ msgstr "No hay MOTD asociado con esta conexión."
 msgid "MOTD for %s"
 msgstr "MOTD para %s"
 
-msgid "Server has disconnected"
-msgstr "El servidor se ha desconectado"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Se perdió la conexión con el servidor:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Ver MOTD"
@@ -3337,22 +3383,20 @@ msgstr "Contra_seña:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "Los apodos de IRC no pueden tener espacios en blanco"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Conectando"
-
 msgid "SSL support unavailable"
 msgstr "Soporte SSL no disponible"
 
-msgid "Couldn't create socket"
-msgstr "No se pudo crear el socket"
+msgid "Unable to connect"
+msgstr "No se pudo conectar"
 
-msgid "Couldn't connect to host"
-msgstr "No se pudo conectar al servidor"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "No se pudo conectar a %s"
 
-msgid "Read error"
-msgstr "Error de lectura"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "El servidor ha cerrado la conexión."
 
 msgid "Users"
 msgstr "Usuarios"
@@ -3785,11 +3829,13 @@ msgstr "Falló la orden ad-hoc"
 msgid "execute"
 msgstr "ejecutar"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "El servidor requiere SSL para conectarse. No se dispone de soporte TLS/SSL."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Vd. solicita cifrado, pero no se dispone de soporte TLS/SSL."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3806,7 +3852,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Autenticación en claro"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Falló la autenticación"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Respuesta inválida del servidor."
 
 msgid "Server does not use any supported authentication method"
@@ -3818,7 +3869,8 @@ 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"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Error de SASL"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3838,10 +3890,8 @@ msgstr ""
 "No se pudo establecer una conexión con el servidor:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "No se pudo establecer una conexión con el servidor:\n"
 "%s"
@@ -3850,12 +3900,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "No se pudo inicializar la conexión"
 
-msgid "Unable to create socket"
-msgstr "No se pudo crear el socket"
-
-msgid "Write error"
-msgstr "Error de escritura"
-
 msgid "Full Name"
 msgstr "Nombre completo"
 
@@ -3926,160 +3970,6 @@ msgstr "Sistema operativo"
 msgid "Local Time"
 msgstr "Archivo local:"
 
-msgid "Last Activity"
-msgstr "Última actividad"
-
-msgid "Service Discovery Info"
-msgstr "Información de descubrimiento de servicio"
-
-msgid "Service Discovery Items"
-msgstr "Elementos de descubrimiento de servicio"
-
-msgid "Extended Stanza Addressing"
-msgstr "Dirección de grupo extendida"
-
-msgid "Multi-User Chat"
-msgstr "Chat multiusuario"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Información de presencia extendida en chat multiusuario"
-
-msgid "In-Band Bytestreams"
-msgstr "Flujos de bytes en banda"
-
-msgid "Ad-Hoc Commands"
-msgstr "Órdenes ad-hoc"
-
-msgid "PubSub Service"
-msgstr "Servicio PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "Flujos de bytes SOCKS5"
-
-msgid "Out of Band Data"
-msgstr "Datos fuera de banda"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "Registro en línea"
-
-msgid "User Location"
-msgstr "Ubicación del usuario"
-
-msgid "User Avatar"
-msgstr "Avatar del usuario"
-
-msgid "Chat State Notifications"
-msgstr "Notificaciones de estado de chat"
-
-msgid "Software Version"
-msgstr "Versión del programa"
-
-msgid "Stream Initiation"
-msgstr "Origen del flujo"
-
-msgid "File Transfer"
-msgstr "Transferencia de archivo"
-
-msgid "User Mood"
-msgstr "Estado de ánimo del usuario"
-
-msgid "User Activity"
-msgstr "Actividad de usuario"
-
-msgid "Entity Capabilities"
-msgstr "Capacidades de la entidad"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Negociaciones de sesiones cifradas"
-
-msgid "User Tune"
-msgstr "Música del usuario"
-
-msgid "Roster Item Exchange"
-msgstr "Intercambio de elementos de la lista"
-
-msgid "Reachability Address"
-msgstr "Dirección alcanzable"
-
-msgid "User Profile"
-msgstr "Perfil de usuario"
-
-# JFS: Jingle es un protocolo de transporte, no se traduce
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Audio Jingle"
-
-msgid "User Nickname"
-msgstr "Nombre de usuario"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle UDP en crudo"
-
-msgid "Jingle Video"
-msgstr "Vídeo Jingle"
-
-msgid "Jingle DTMF"
-msgstr "DTMF Jingle"
-
-msgid "Message Receipts"
-msgstr "Recibos de mensajes"
-
-msgid "Public Key Publishing"
-msgstr "Publicación de la clave pública"
-
-msgid "User Chatting"
-msgstr "Chatear con usuarios"
-
-msgid "User Browsing"
-msgstr "Navegar usuarios"
-
-msgid "User Gaming"
-msgstr "Jugar con usuarios"
-
-msgid "User Viewing"
-msgstr "Ver usuarios"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Cifrado de grupo"
-
-msgid "Entity Time"
-msgstr "Tiempo de entidad"
-
-msgid "Delayed Delivery"
-msgstr "Envío con demora"
-
-msgid "Collaborative Data Objects"
-msgstr "Objetods de datos colaborativos"
-
-msgid "File Repository and Sharing"
-msgstr "Repositorio de archivos y compartición"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "Servidor de descubrimiento STUN para Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Negociación de sesión cifrada simplificada"
-
-msgid "Hop Check"
-msgstr "Comprobación de saltos"
-
-msgid "Capabilities"
-msgstr "Capacidades"
-
 msgid "Priority"
 msgstr "Prioridad"
 
@@ -4091,7 +3981,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Conectado"
 
 msgid "Middle Name"
@@ -4274,16 +4164,13 @@ msgstr "No se encontraron usuarios que coincidan"
 msgid "Roles:"
 msgstr "Rol"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Tiempo de expiración del ping"
 
-msgid "Read Error"
-msgstr "Error de lectura"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4463,9 +4350,6 @@ msgstr "Su contraseña ha sido modificada."
 msgid "Error changing password"
 msgstr "Error al cambiar la contraseña"
 
-msgid "Password (again)"
-msgstr "Contraseña (de nuevo)"
-
 msgid "Change XMPP Password"
 msgstr "Cambiar contraseña XMPP"
 
@@ -4853,6 +4737,14 @@ msgstr "Error de tratamiento XML"
 msgid "Unknown Error in presence"
 msgstr "Error desconocido en presencia"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Error al unirse al chat %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Error en el chat %s"
+
 msgid "Create New Room"
 msgstr "Crear una sala nueva"
 
@@ -4869,16 +4761,20 @@ msgstr "_Configurar sala"
 msgid "_Accept Defaults"
 msgstr "_Aceptar valores por omisión"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Error al unirse al chat %s"
+#, fuzzy
+msgid "No reason"
+msgstr "No se indicó una razón"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Error en el chat %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Ha sido expulsado por %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Expulsado por %s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Se produjo un error al abrir el archivo."
 
 #, fuzzy
@@ -5379,9 +5275,6 @@ msgstr ""
 "El soporte SSL es necesario para MSN. Por favor, instale una biblioteca SSL "
 "soportada."
 
-msgid "Failed to connect to server."
-msgstr "No se pudo conectar al servidor."
-
 msgid "Error retrieving profile"
 msgstr "Error al obtener el perfil"
 
@@ -5642,9 +5535,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr "No se pudo enviar el mensaje porque se produjo un error desconocido:"
 
-msgid "Unable to connect"
-msgstr "No se pudo conectar"
-
 msgid "Writing error"
 msgstr "Error de escritura"
 
@@ -5659,13 +5549,16 @@ msgstr ""
 "Error de conexión del servidor %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "El servidor no soporta nuestro protocolo."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Error en el análisis HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Ha conectado desde otra ubicación."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5673,7 +5566,8 @@ msgstr ""
 "Su lista de amigos MSN está indisponible temporalmente. Por favor, espere y "
 "vuelva a intentarlo más tarde."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Los servidores de MSN van a sufrir un apagado temporal."
 
 #, c-format
@@ -5686,9 +5580,6 @@ 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"
 
@@ -5793,6 +5684,9 @@ msgstr "Complemento de protocolo MSN"
 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)"
@@ -5903,12 +5797,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Añadir contactos del servidor"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Conectado"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Error de prótocolo, código %d: %s"
@@ -5933,16 +5821,6 @@ msgstr "Error MySpaceIM"
 msgid "Invalid input condition"
 msgstr "Condición de entrada inválida"
 
-msgid "Read buffer full (2)"
-msgstr "Cola de lectura llena (2)"
-
-msgid "Unparseable message"
-msgstr "No se pudo interpretar el mensaje"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "No se pudo conectar al servidor: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "No se pudo añadir al amigo"
 
@@ -6028,6 +5906,16 @@ msgstr "Amigos en total"
 msgid "Client Version"
 msgstr "Versión del cliente"
 
+#, fuzzy
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"Por favor, vaya a http://editprofile.myspace.com/index.cfm?"
+"fuseaction=profile.username, escoja un nombre de usuario e intente "
+"conectarse de nuevo."
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Nombre de usuario disponible"
 
@@ -6286,9 +6174,9 @@ msgstr "El usuario no está conectado o vd. está siendo bloqueado"
 msgid "Unknown error: 0x%X"
 msgstr "Error desconocido: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Fallo en la conexión (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "No pudo conectarse"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6393,9 +6281,6 @@ msgstr "Conferencia GroupWise %d"
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-msgid "Unable to connect to server."
-msgstr "No se pudo conectar al servidor."
-
 msgid "Waiting for response..."
 msgstr "Esperando respuesta..."
 
@@ -6419,10 +6304,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "¿Desea unirse a la conversación?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Ha sido desconectado porque se ha conectado desde otra estación de trabajo."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6430,16 +6311,14 @@ msgstr ""
 "No parece que %s esté conectado y no ha recibido el mensaje que acaba de "
 "enviar."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "No se pudo contactar con el servidor. Por favor, indique la dirección del "
 "servidor con el que desea conectarse."
 
-msgid "Error. SSL support is not installed."
-msgstr "Error. El soporte de SSL no está instalado."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Se ha cerrado esta conferencia. No se pueden enviar más mensajes."
 
@@ -6479,10 +6358,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6491,18 +6367,8 @@ msgstr "No se pudo conectar a la sala de chat"
 msgid "Invalid chat room name"
 msgstr "Nombre de sala de chat inválida"
 
-msgid "Server closed the connection."
-msgstr "El servidor ha cerrado la conexión."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Se perdió la conexión con el servidor:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Se recibieron datos inválidos al conectarse al servidor."
 
 #. *< type
@@ -6550,7 +6416,8 @@ msgstr "Se perdió la conexión con el usuario remoto:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Se recibieron datos inválidos en la conexión con el usuario remoto."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "No se pudo establecer una conexión con el usuario remoto."
 
 msgid "Direct IM established"
@@ -6752,21 +6619,15 @@ msgstr "Niveles de aviso"
 msgid "Buddy Comment"
 msgstr "Comentario de amigo"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "No se pudo conectar al servidor de autenticación:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"No se pudo conectar al servidor BOS:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "No se pudo conectar al servidor."
 
 msgid "Username sent"
 msgstr "Nombre de usuario enviado"
@@ -6778,11 +6639,11 @@ msgstr "Conexión establecida, cookie enviada"
 msgid "Finalizing connection"
 msgstr "Terminando la conexión"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Incapaz de registrarse: No pudo conectarse como %s porque el nombre de "
 "usuario no es válido. Los nombres de usuario deben ser direcciones de correo "
@@ -6796,26 +6657,22 @@ 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."
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "El usuario no existe"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Su cuenta está deshabilitada actualmente."
 
 #. service temporarily unavailable
@@ -6839,7 +6696,8 @@ msgstr ""
 "inténtelo de nuevo. Si sigue intentándolo, necesitará esperar incluso más "
 "tiempo."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "La clave SecurID que se ha introducido no es válida."
 
 msgid "Enter SecurID"
@@ -7013,6 +6871,9 @@ msgstr "Conectado desde"
 msgid "Member Since"
 msgstr "Miembro desde"
 
+msgid "Capabilities"
+msgstr "Capacidades"
+
 msgid "Profile"
 msgstr "Perfil"
 
@@ -7195,9 +7056,9 @@ msgstr[1] ""
 msgid "Away message too long."
 msgstr "Mensaje de ausencia demasiado largo"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7222,9 +7083,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Huérfanos"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "No se ha podido añadir al amigo %s porque hay demasiados contactos en la "
@@ -7233,8 +7094,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(sin nombre)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "No se pudo añadir al amigo %s por motivos desconocidos."
 
 #, c-format
@@ -8016,7 +7877,8 @@ msgstr "Intervalo de comprobación de conexión (segundos)"
 msgid "Update interval (seconds)"
 msgstr "Intervalo de actualización (segundos)"
 
-msgid "Cannot decrypt server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "No se pudo descifrar la respuesta del servidor"
 
 #, c-format
@@ -8041,9 +7903,6 @@ msgstr "Es necesaria la activación"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Código de respuesta desconocido al conectarse (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "No se pudo descifrar la respuesta del servidor"
-
 msgid "Requesting captcha"
 msgstr "Solicitando el «captcha»"
 
@@ -8077,29 +7936,18 @@ msgstr ""
 "Respuesta desconocida al conectarse (0x%02X):\n"
 "%s"
 
-msgid "Unable to connect."
-msgstr "No se pudo conectar."
-
 msgid "Socket error"
 msgstr "Error de socket"
 
-msgid "Unable to read from socket"
-msgstr "No se pudo leer del socket"
-
-msgid "Write Error"
-msgstr "Error de escritura"
-
-msgid "Connection lost"
-msgstr "Conexión perdida"
-
 msgid "Getting server"
 msgstr "Obteniendo el servidor"
 
 msgid "Requesting token"
 msgstr "Solicitando testingo"
 
-msgid "Couldn't resolve host"
-msgstr "No se pudo resolver el nombre"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "No se pudo resolver el nombre del servidor."
 
 msgid "Invalid server or port"
 msgstr "Puerto o servidor no válido"
@@ -8152,7 +8000,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "Orden QQ Qun"
 
-msgid "Could not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "No se pudo descifrar la respuesta al intento de registro"
 
 msgid "Unknown LOGIN CMD"
@@ -8172,9 +8021,6 @@ msgstr "Archivo enviado"
 msgid "%d canceled the transfer of %s"
 msgstr "%d canceló la transferencia de %s"
 
-msgid "Connection closed (writing)"
-msgstr "Conexión cerrada (escribiendo)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Título de grupo:</b> %s<br>"
@@ -8230,17 +8076,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Anuncio del administrador «Sametime»"
 
-msgid "Connection reset"
-msgstr "Conexión rehusada"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Error al leer del socket: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "No se pudo conectar al servidor"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Aviso de %s"
@@ -8263,6 +8098,9 @@ msgstr "Altavoces"
 msgid "Video Camera"
 msgstr "Vídeo cámara"
 
+msgid "File Transfer"
+msgstr "Transferencia de archivo"
+
 msgid "Supports"
 msgstr "Soporta"
 
@@ -9089,6 +8927,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Estadísticas de red"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Falló el ping"
 
@@ -9152,7 +8993,8 @@ msgstr "Tipo de clave pública no soportada"
 msgid "Disconnected by server"
 msgstr "Desconectado por el servidor"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Se produjo un error durante la conexión al servidor SILC"
 
 msgid "Key Exchange failed"
@@ -9164,26 +9006,26 @@ msgstr ""
 "Se produjo un fallo al retomar la sesión desligada. Pulse «Reconectar» para "
 "crear una nueva conexión."
 
-msgid "Connection failed"
-msgstr "Falló la conexión"
-
 msgid "Performing key exchange"
 msgstr "Realizando intercambio de claves"
 
-msgid "Unable to create connection"
-msgstr "No se pudo crear la conexión"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "No se pudo cargar la clave pública SILC"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Conectando con el servidor SILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "No se pudo cargar la clave pública SILC"
+
 msgid "Out of memory"
 msgstr "Sin memoria"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "No se pudo inicializar el protocolo SILC"
 
 msgid "Error loading SILC key pair"
@@ -9483,7 +9325,8 @@ msgstr "Firmar digitalmente todos los mensajes instantáneos"
 msgid "Creating SILC key pair..."
 msgstr "Creando el par de claves SILC..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "No se pudo crear el par de claves SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9578,6 +9421,9 @@ msgstr "Pizarra"
 msgid "No server statistics available"
 msgstr "No se disponen de estadísticas del servidor"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Se produjo un error durante la conexión al servidor SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -9621,30 +9467,27 @@ msgstr "Fallo: Cookie inválida"
 msgid "Failure: Authentication failed"
 msgstr "Fallo: Falló la autenticación"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "No se pudo inicializar al conexión del cliente SILC"
 
 msgid "John Noname"
 msgstr "Pepe sin nombre"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "No se pudo cargar la clave pública SILC: %s"
 
-msgid "Could not write"
-msgstr "No se pudo escribir"
-
-msgid "Could not connect"
-msgstr "No se pudo conectar"
+msgid "Unable to create connection"
+msgstr "No se pudo crear la conexión"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Respuesta desconocida del servidor."
 
-msgid "Could not create listen socket"
-msgstr "No se pudo crear el socket de escucha"
-
-msgid "Could not resolve hostname"
-msgstr "No se pudo resolver el nombre de sistema"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "No se pudo crear el socket"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
@@ -9686,6 +9529,77 @@ msgstr "Usuario de autenticación"
 msgid "Auth Domain"
 msgstr "Dominio de autenticación"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;sala&gt;:  Unirse a una sala en la red de Yahoo."
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Mostrar los canales de la red Yahoo"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Solicitar al usuario el comienzo de una sesión Doodle"
+
+msgid "Yahoo ID..."
+msgstr "ID de Yahoo..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Complemento de protocolo Yahoo"
+
+msgid "Pager server"
+msgstr "Servidor buscapersonas"
+
+msgid "Pager port"
+msgstr "Puerto del buscapersonas"
+
+msgid "File transfer server"
+msgstr "Servidor de transferencia de archivos"
+
+msgid "File transfer port"
+msgstr "Puerto de transferencia de archivos"
+
+msgid "Chat room locale"
+msgstr "Localización de la sala de chat"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignorar las invitaciones a salas de conferencias o chat"
+
+msgid "Chat room list URL"
+msgstr "Url de lista de salas de chat"
+
+msgid "Yahoo Chat server"
+msgstr "Servidor de chat de Yahoo"
+
+msgid "Yahoo Chat port"
+msgstr "Puerto de chat de Yahoo"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "ID de Yahoo..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Complemento de protocolo Yahoo"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9718,30 +9632,20 @@ msgstr "Se rechazó la adición del amigo"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  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."
@@ -9785,39 +9689,34 @@ msgstr ""
 "Error desconocido número %d. Si se conecta al servidor de web de Yahoo! es "
 "posible que ésto se arregle."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "No se pudo añadir al amigo %s al grupo %s de la lista en el servidor para la "
 "cuenta %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "No se pudo añadir el amigo a la lista del servidor"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Se recibió una respuesta HTTP del servidor que no se esperaba."
 
-msgid "Connection problem"
-msgstr "Error de conexión"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Se perdió la conexión con %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"No se pudo establecer una conexión con %s:\n"
+"No se pudo establecer una conexión con el servidor:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9880,73 +9779,15 @@ msgstr "Juntarse con un usuario en un chat..."
 msgid "Open Inbox"
 msgstr "Abrir bandeja de entrada"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;sala&gt;:  Unirse a una sala en la red de Yahoo."
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Mostrar los canales de la red Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Solicitar al usuario el comienzo de una sesión Doodle"
-
-msgid "Yahoo ID..."
-msgstr "ID de Yahoo..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Complemento de protocolo Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japón"
-
-msgid "Pager server"
-msgstr "Servidor buscapersonas"
-
-msgid "Japan Pager server"
-msgstr "Servidor de buscapersonas japonés"
-
-msgid "Pager port"
-msgstr "Puerto del buscapersonas"
-
-msgid "File transfer server"
-msgstr "Servidor de transferencia de archivos"
-
-msgid "Japan file transfer server"
-msgstr "Servidor de transferencia de archivos japonés"
-
-msgid "File transfer port"
-msgstr "Puerto de transferencia de archivos"
-
-msgid "Chat room locale"
-msgstr "Localización de la sala de chat"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignorar las invitaciones a salas de conferencias o chat"
-
-msgid "Chat room list URL"
-msgstr "Url de lista de salas de chat"
-
-msgid "Yahoo Chat server"
-msgstr "Servidor de chat de Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "Puerto de chat de Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Enviar petición Doodle."
 
+msgid "Unable to connect."
+msgstr "No se pudo conectar."
+
 msgid "Unable to establish file descriptor."
 msgstr "No se pudo establecer el descriptor de archivo."
 
@@ -9954,6 +9795,9 @@ msgstr "No se pudo establecer el descriptor de archivo."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s se ofrece a enviarle un conjunto de %d archivos.\n"
 
+msgid "Write Error"
+msgstr "Error de escritura"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Perfil de Yahoo! Japón"
 
@@ -10070,23 +9914,19 @@ msgstr "Voces"
 msgid "Webcams"
 msgstr "Cámaras web"
 
+msgid "Connection problem"
+msgstr "Error de conexión"
+
 msgid "Unable to fetch room list."
 msgstr "No se pudo obtener la lista de salas."
 
 msgid "User Rooms"
 msgstr "Salas de usuarios"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Se produjo un problema al conectarse con el servidor YCHT."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Se ha perdido la conexión con el servidor\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10213,24 +10053,16 @@ msgstr "Dominio"
 msgid "Exposure"
 msgstr "Exposición"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"No se pudo crear el socket:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "No se pudo interpretar la respuesta del proxy HTTP: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Error de conexión en el proxy HTTP %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "Acceso denegado: el servidor proxy HTTP no permite túneles en el puerto %d."
 
@@ -10238,9 +10070,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr "Error al resolver %s"
 
-msgid "Could not resolve host name"
-msgstr "No se pudo resolver el nombre de equipo"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Solicitando la atención de %s..."
@@ -10443,13 +10272,6 @@ msgstr "Error al escribir a %s: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "No se pudo conectar a %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"El servidor requiere SSL para conectarse. No se dispone de soporte TLS/SSL."
-
 #, c-format
 msgid " - %s"
 msgstr " - %s"
@@ -10698,9 +10520,14 @@ msgstr "Añadir _aviso de amigo..."
 msgid "View _Log"
 msgstr "Ver _registro"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Ocultar cuando se esté desconectado"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Mostrar cuando se esté desconectado"
+
 msgid "_Alias..."
 msgstr "_Apodo..."
 
@@ -11212,6 +11039,11 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Cambiar la información del usuario %s"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr ""
+"Especifique el nombre de sistema para el que se utilizará este certificado."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Servidores SSL"
@@ -11258,7 +11090,8 @@ msgstr "Ignorar"
 msgid "Get Away Message"
 msgstr "Mensaje de ausencia"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Dicho la última vez"
 
 msgid "Unable to save icon file to disk."
@@ -12150,7 +11983,8 @@ msgstr "Color para dibujar hiperenlaces."
 msgid "Hyperlink visited color"
 msgstr "Color de hiperenlace visitado"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+#, fuzzy
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 "Color para dibujar hiperenlaces cuando ya han sido visitados (o activados)."
 
@@ -12189,13 +12023,22 @@ msgstr "Color con el que dibujar el nombre de un mensaje de acción."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Nombre de color de mensajes de accción para mensajes susurrados"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Color con el que dibujar el nombre de un mensaje de acción."
+
 msgid "Whisper Message Name Color"
 msgstr "Susurrar nombre de color de mensajes"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Color con el que dibujar el nombre de un mensaje de acción."
+
 msgid "Typing notification color"
 msgstr "Color de notificación de tecleo"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "Color a utilizar para la tipografía de notificación de tecleo"
 
 msgid "Typing notification font"
@@ -12602,6 +12445,10 @@ msgstr ""
 "Se ha definido un navegador «Manual», pero no se ha definido ningún comando "
 "para ejecutarlo."
 
+#, fuzzy
+msgid "No message"
+msgstr "(1 mensaje)"
+
 msgid "Open All Messages"
 msgstr "Abrir todos los mensajes"
 
@@ -12619,10 +12466,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">¡Tiene correo!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "(1 mensaje)"
-
 msgid "The following plugins will be unloaded."
 msgstr "Se van a desactivar los siguientes complementos."
 
@@ -12840,8 +12683,9 @@ msgstr "_Mostrar icono del área de notificación del sistema:"
 msgid "On unread messages"
 msgstr "Si hay mensajes sin leer"
 
-msgid "Conversation Window Hiding"
-msgstr "Ocultar ventana de conversación"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Ventanas de conversación de MI"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Ocultar nuevas conversaciones MI:"
@@ -12849,6 +12693,9 @@ msgstr "_Ocultar nuevas conversaciones MI:"
 msgid "When away"
 msgstr "Cuando estoy fuera"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Minimi_zar las nuevas ventana de conversación"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Solapas"
@@ -12907,9 +12754,6 @@ msgstr "Utilizar paginado suave"
 msgid "F_lash window when IMs are received"
 msgstr "_Destello de ventana cuando se reciben MIs"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Minimi_zar las nuevas ventana de conversación"
-
 msgid "Minimum input area height in lines:"
 msgstr "Altura mínima del área de entrada en líneas:"
 
@@ -12944,7 +12788,8 @@ msgstr "No se pudo iniciar el programa de configuración del navegador."
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Ejemplo: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Auto detectar la dirección IP"
 
 msgid "Public _IP:"
@@ -13315,22 +13160,6 @@ msgstr "Gua_rdar y usar"
 msgid "Status for %s"
 msgstr "Estado de %s"
 
-# No estoy muy seguro de usar emoticono, quizás «smiley» sería más apropiado
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "Emoticono a medida"
-
-msgid "More Data needed"
-msgstr "Son necesarios más datos"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Indique un atajo para asociarlo al emoticono."
-
 #, fuzzy, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
@@ -13338,12 +13167,13 @@ msgstr ""
 "Ya existe un emoticono a medida para el atajo de teclado seleccionado. "
 "Especifique un atajo distinto."
 
+# No estoy muy seguro de usar emoticono, quizás «smiley» sería más apropiado
+msgid "Custom Smiley"
+msgstr "Emoticono a medida"
+
 msgid "Duplicate Shortcut"
 msgstr "Atajo duplicado"
 
-msgid "Please select an image for the smiley."
-msgstr "Escoja una imagen para el emoticono."
-
 # No estoy muy seguro de usar emoticono, quizás «smiley» sería más apropiado
 msgid "Edit Smiley"
 msgstr "Editar emoticono"
@@ -13458,9 +13288,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "No se puede enviar un lanzador"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Vd. arrastró un lanzador de escritorio. Lo más probable es que quiera enviar "
 "a lo que apunta el lanzador más que el lanzador en sí."
@@ -14072,9 +13903,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Complemento de mensajería musical para composición colaborativa."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "El complemento de mensajería musical permite trabajar a distintos usuarios "
 "de forma simultánea en una pieza de música editando una partitura común en "
@@ -14335,9 +14167,10 @@ msgid "Conversation Window Send Button."
 msgstr "Botón «enviar» de la ventana de conversación."
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Añade un botón «Enviar» al área de entrada de datos de la ventana de "
 "conversación. Útil para cuando no hay un teclado físico disponible."
@@ -14673,8 +14506,9 @@ msgstr "Opciones de Pidgwin en Windows"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opciones específicas de %s para Windows."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Contiene las opciones específicas al Pidgin de Windows como el apilado de la "
 "lista de amigos."
@@ -14716,6 +14550,314 @@ msgstr "Enviar y recibir entradas XMPP en crudo."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "No se pudo abrir el socket"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "No se pudo escuchar en el socket"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "No se pudo leer el socket"
+
+#~ msgid "Connection failed."
+#~ msgstr "Falló la conexión."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "El servidor se ha desconectado"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "No se pudo crear el socket"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "No se pudo conectar al servidor"
+
+#~ msgid "Read error"
+#~ msgstr "Error de lectura"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No se pudo establecer una conexión con el servidor:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Error de escritura"
+
+#~ msgid "Last Activity"
+#~ msgstr "Última actividad"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Información de descubrimiento de servicio"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Elementos de descubrimiento de servicio"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Dirección de grupo extendida"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Chat multiusuario"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Información de presencia extendida en chat multiusuario"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "Flujos de bytes en banda"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Órdenes ad-hoc"
+
+#~ msgid "PubSub Service"
+#~ msgstr "Servicio PubSub"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "Flujos de bytes SOCKS5"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Datos fuera de banda"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "Registro en línea"
+
+#~ msgid "User Location"
+#~ msgstr "Ubicación del usuario"
+
+#~ msgid "User Avatar"
+#~ msgstr "Avatar del usuario"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Notificaciones de estado de chat"
+
+#~ msgid "Software Version"
+#~ msgstr "Versión del programa"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Origen del flujo"
+
+#~ msgid "User Mood"
+#~ msgstr "Estado de ánimo del usuario"
+
+#~ msgid "User Activity"
+#~ msgstr "Actividad de usuario"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Capacidades de la entidad"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Negociaciones de sesiones cifradas"
+
+#~ msgid "User Tune"
+#~ msgstr "Música del usuario"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Intercambio de elementos de la lista"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Dirección alcanzable"
+
+#~ msgid "User Profile"
+#~ msgstr "Perfil de usuario"
+
+# JFS: Jingle es un protocolo de transporte, no se traduce
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Audio Jingle"
+
+#~ msgid "User Nickname"
+#~ msgstr "Nombre de usuario"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle UDP en crudo"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Vídeo Jingle"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "DTMF Jingle"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Recibos de mensajes"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Publicación de la clave pública"
+
+#~ msgid "User Chatting"
+#~ msgstr "Chatear con usuarios"
+
+#~ msgid "User Browsing"
+#~ msgstr "Navegar usuarios"
+
+#~ msgid "User Gaming"
+#~ msgstr "Jugar con usuarios"
+
+#~ msgid "User Viewing"
+#~ msgstr "Ver usuarios"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Cifrado de grupo"
+
+#~ msgid "Entity Time"
+#~ msgstr "Tiempo de entidad"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Envío con demora"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Objetods de datos colaborativos"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Repositorio de archivos y compartición"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "Servidor de descubrimiento STUN para Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Negociación de sesión cifrada simplificada"
+
+#~ msgid "Hop Check"
+#~ msgstr "Comprobación de saltos"
+
+#~ msgid "Read Error"
+#~ msgstr "Error de lectura"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "No se pudo conectar al servidor."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Cola de lectura llena (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "No se pudo interpretar el mensaje"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "No se pudo conectar al servidor: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Fallo en la conexión (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Ha sido desconectado porque se ha conectado desde otra estación de "
+#~ "trabajo."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Error. El soporte de SSL no está instalado."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Contraseña incorrecta."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No se pudo conectar al servidor BOS:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Quizá sea desconectado en breve.  Compruebe %s para novedades."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "No se pudo conectar"
+
+#~ msgid "Invalid username."
+#~ msgstr "Nombre de usuario no válido."
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "No se pudo descifrar la respuesta del servidor"
+
+#~ msgid "Connection lost"
+#~ msgstr "Conexión perdida"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "No se pudo resolver el nombre"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Conexión cerrada (escribiendo)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Conexión rehusada"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Error al leer del socket: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "No se pudo conectar al servidor"
+
+#~ msgid "Could not write"
+#~ msgstr "No se pudo escribir"
+
+#~ msgid "Could not connect"
+#~ msgstr "No se pudo conectar"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "No se pudo crear el socket de escucha"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "No se pudo resolver el nombre de sistema"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Contraseña incorrecta"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No se pudo establecer una conexión con %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japón"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Servidor de buscapersonas japonés"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Servidor de transferencia de archivos japonés"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Se ha perdido la conexión con el servidor\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "No se pudo resolver el nombre de equipo"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "El servidor requiere SSL para conectarse. No se dispone de soporte TLS/"
+#~ "SSL."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Ocultar ventana de conversación"
+
+#~ msgid "More Data needed"
+#~ msgstr "Son necesarios más datos"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Indique un atajo para asociarlo al emoticono."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Escoja una imagen para el emoticono."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "¿Qué ID quiere activar?"
 
@@ -15215,9 +15357,6 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "No pudo conectarse, compruebe el registro de depuración."
 
-#~ msgid "Unable to login"
-#~ msgstr "No pudo conectarse"
-
 #~ msgid "Failed room reply"
 #~ msgstr "Fallo en la respuesta a la sala"
 
@@ -15325,14 +15464,6 @@ msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 #~ "Lo siento, MySpace no permite el uso de contraseñas de más de %d "
 #~ "caracteres de longitud (la suya tiene %d)."
 
-#~ msgid ""
-#~ "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username and choose a username and try to login again."
-#~ msgstr ""
-#~ "Por favor, vaya a http://editprofile.myspace.com/index.cfm?"
-#~ "fuseaction=profile.username, escoja un nombre de usuario e intente "
-#~ "conectarse de nuevo."
-
 #~ msgid "Screen name sent"
 #~ msgstr "Se ha enviado el nombre de usuario"
 
diff --git a/po/et.po b/po/et.po
index ae26ae7b1b..e3e0ae81b5 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin 2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2008-09-30 08:10+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -2562,9 +2562,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Teiste välksõnumiprogrammide logide kaasamine logivaatajasse."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2618,8 +2619,9 @@ msgstr "Võrguvabade sõnumite emuleerimine"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Ühendamata kasutajatele sõnumite salvestamine sõbramärguannetena."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Ülejäänud sõnumid salvestatakse sõbramärguannetena. Salvestatud märguandeid "
@@ -2870,15 +2872,17 @@ msgstr ""
 "kasutada, siis pead sa paigaldama ActiveTCL'i aadressilt http://www."
 "activestate.com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Apple Bonjour For Windows tööriistakomplekti ei leitud. Täiendavat teavet "
 "saad korduma kippuvate küsimuste (FAQ) alt aadressilt http://d.pidgin.im/"
 "BonjourWindows."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Sissetulevaid välksõnumiühendusi pole võimalik kuulata\n"
 
 msgid ""
@@ -2933,14 +2937,21 @@ msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 "Sõnumit pole võimalik saata ja seetõttu pole võimalik ka vestlust algatada."
 
-msgid "Cannot open socket"
-msgstr "Soklit pole võimalik avada"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Soklit pole võimalik luua:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Soklit pole võimalik porti kuulama panna"
 
-msgid "Could not listen on socket"
-msgstr "Soklit pole võimalik kuulata"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Soklit pole võimalik luua:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Viga kohaliku mDNSResponder'iga suhtlemisel."
@@ -2987,13 +2998,16 @@ msgstr "Sõbranimekirja salvestamine..."
 msgid "Load buddylist from file..."
 msgstr "Sõbranimekirja laadimine failist..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Täida registreerumiseks vajalikud väljad."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Paroolid ei klapi omavahel."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Uut kontot pole vea tõttu võimalik registreerida.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3005,14 +3019,15 @@ msgstr "Registreerimine edukalt läbi viidud!"
 msgid "Password"
 msgstr "Parool"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr "Parool (uuesti)"
 
-msgid "Enter current token"
-msgstr "Sisesta praegune tõend"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Praegune tõend"
+#, fuzzy
+msgid "Captcha"
+msgstr "Pildi salvestamine"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Uue Gadu-Gadu konto registreerimine"
@@ -3065,6 +3080,15 @@ msgstr "Parool on edukalt muudetud!"
 msgid "Current password"
 msgstr "Praegune parool"
 
+msgid "Password (retype)"
+msgstr "Parool (uuesti)"
+
+msgid "Enter current token"
+msgstr "Sisesta praegune tõend"
+
+msgid "Current token"
+msgstr "Praegune tõend"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Palun sisesta oma praegune parool ja uus parool UIN-i jaoks: "
 
@@ -3112,8 +3136,8 @@ msgstr "Sobivaid kasutajaid ei leitud"
 msgid "There are no users matching your search criteria."
 msgstr "Sellele otsingukriteeriumile vastavaid kasutajaid ei leitud."
 
-msgid "Unable to read socket"
-msgstr "Soklit pole võimalik lugeda"
+msgid "Unable to read from socket"
+msgstr "Soklist pole võimalik lugeda"
 
 msgid "Buddy list downloaded"
 msgstr "Sõbranimekiri alla laaditud"
@@ -3127,8 +3151,14 @@ msgstr "Sõbranimekiri üles laaditud"
 msgid "Your buddy list was stored on the server."
 msgstr "Sinu sõbranimekiri on serverisse üles laaditud."
 
-msgid "Connection failed."
-msgstr "Tõrge ühendumisel."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Ühendatud"
+
+msgid "Connection failed"
+msgstr "Tõrge ühendumisel"
 
 msgid "Add to chat"
 msgstr "Vestlusese lisamine"
@@ -3136,18 +3166,23 @@ msgstr "Vestlusese lisamine"
 msgid "Chat _name:"
 msgstr "Vestluse _nimi:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Serveriga pole võimalik ühenduda."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Ühendumine"
+
 msgid "Chat error"
 msgstr "Viga vestlusel"
 
 msgid "This chat name is already in use"
 msgstr "Selline vestluse nimi on juba kasutusel"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Puudub ühendus serveriga."
 
 msgid "Find buddies..."
@@ -3207,7 +3242,8 @@ msgstr "Teemat pole seatud"
 msgid "File Transfer Failed"
 msgstr "Tõrge faili ülekandmisel"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Kuulatavat porti pole võimalik avada."
 
 msgid "Error displaying MOTD"
@@ -3223,8 +3259,18 @@ msgstr "Selle ühendusega pole päevasõnumit seotud"
 msgid "MOTD for %s"
 msgstr "%s päevasõnum"
 
-msgid "Server has disconnected"
-msgstr "Server katkestas ühenduse"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Ühendus serveriga katkes:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Vaata päevasõnumit"
@@ -3239,22 +3285,20 @@ msgstr "_Parool:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC nimed ei tohi sisaldada tühje kohti"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Ühendumine"
-
 msgid "SSL support unavailable"
 msgstr "SSL-i tugi pole saadaval"
 
-msgid "Couldn't create socket"
-msgstr "Soklit pole võimalik luua"
+msgid "Unable to connect"
+msgstr "Ühendumine pole võimalik"
 
-msgid "Couldn't connect to host"
-msgstr "Hostiga pole võimalik ühenduda"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Ühendumine pole võimalik"
 
-msgid "Read error"
-msgstr "Viga lugemisel"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Server sulges ühenduse."
 
 msgid "Users"
 msgstr "Kasutajad"
@@ -3665,10 +3709,12 @@ msgstr "Tõrge Ad-Hoc käsu täitmisel"
 msgid "execute"
 msgstr ""
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Server vajab sisselogimiseks TLS/SSL-i.  TLS/SSL-i tuge ei leitud."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Sa vajad krüptimist, kuid TLS/SSL-i tuge ei leitud."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3685,7 +3731,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Avatekstiline autentimine"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Tõrge autentimisel"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Server tagastas vigase vastuse."
 
 msgid "Server does not use any supported authentication method"
@@ -3697,7 +3748,8 @@ msgstr "Sa nõuad krüptimist aga selles serveris pole see toetatud."
 msgid "Invalid challenge from server"
 msgstr ""
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL-i viga"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3717,10 +3769,8 @@ msgstr ""
 "Selle serveriga pole võimalik ühendust luua:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Selle serveriga pole võimalik ühendust luua:\n"
 "%s"
@@ -3729,12 +3779,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "Ühendust pole võimalik lähtestada"
 
-msgid "Unable to create socket"
-msgstr "Soklit pole võimalik luua"
-
-msgid "Write error"
-msgstr "Kirjutamise viga"
-
 msgid "Full Name"
 msgstr "Täisnimi"
 
@@ -3805,159 +3849,6 @@ msgstr "Operatsioonisüsteem"
 msgid "Local Time"
 msgstr "Kohalik fail:"
 
-msgid "Last Activity"
-msgstr "Viimati aktiivne"
-
-msgid "Service Discovery Info"
-msgstr "Teenuse avastamise andmed"
-
-msgid "Service Discovery Items"
-msgstr "Teenuse avastamise kirjed"
-
-msgid "Extended Stanza Addressing"
-msgstr ""
-
-msgid "Multi-User Chat"
-msgstr "Mitmekasutaja vestlus"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr "Ad-Hoc käsud"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 baidivood"
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr ""
-
-msgid "User Location"
-msgstr "Kasutaja asukoht"
-
-msgid "User Avatar"
-msgstr "Kasutaja avatar"
-
-msgid "Chat State Notifications"
-msgstr "Vestluste olekust teavitaja"
-
-msgid "Software Version"
-msgstr "Tarkvara versioon"
-
-msgid "Stream Initiation"
-msgstr "Voo lähtestamine"
-
-msgid "File Transfer"
-msgstr "Failiülekanne"
-
-msgid "User Mood"
-msgstr "Kasutaja meeleolu"
-
-msgid "User Activity"
-msgstr "Kasutaja aktiivsus"
-
-msgid "Entity Capabilities"
-msgstr ""
-
-msgid "Encrypted Session Negotiations"
-msgstr "Krüptitud seansi läbirääkimised"
-
-msgid "User Tune"
-msgstr ""
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-msgid "Reachability Address"
-msgstr ""
-
-msgid "User Profile"
-msgstr "Kasutajaprofiil"
-
-msgid "Jingle"
-msgstr ""
-
-msgid "Jingle Audio"
-msgstr ""
-
-msgid "User Nickname"
-msgstr "Kasutaja hüüdnimi"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr ""
-
-msgid "Jingle DTMF"
-msgstr ""
-
-msgid "Message Receipts"
-msgstr "Sõnumi vastuvõtjad"
-
-msgid "Public Key Publishing"
-msgstr "Avaliku võtme avalikustamine"
-
-msgid "User Chatting"
-msgstr "Kasutaja lobiseb"
-
-msgid "User Browsing"
-msgstr ""
-
-msgid "User Gaming"
-msgstr "Kasutaja mängib"
-
-msgid "User Viewing"
-msgstr ""
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr ""
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr "Viivitusega kohaletoimetamine"
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "STUN-teenuse avastamine Jingle jaoks"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Lihtsustatud krüptitud seansi läbirääkimised"
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Võimalused"
-
 msgid "Priority"
 msgstr "Tähtsus"
 
@@ -3969,7 +3860,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Sisse logitud"
 
 msgid "Middle Name"
@@ -4148,16 +4039,13 @@ msgstr "Sobivaid kasutajaid ei leitud"
 msgid "Roles:"
 msgstr "Roll"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Pingimine ületas ajapiirangu"
 
-msgid "Read Error"
-msgstr "Lugemise viga"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4333,9 +4221,6 @@ msgstr "Sinu parool on muudetud."
 msgid "Error changing password"
 msgstr "Viga parooli muutmisel"
 
-msgid "Password (again)"
-msgstr "Parool (uuesti)"
-
 msgid "Change XMPP Password"
 msgstr "XMPP parooli muutmine"
 
@@ -4716,6 +4601,14 @@ msgstr "XML'i parsimise viga"
 msgid "Unknown Error in presence"
 msgstr ""
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Viga vestlusega %s ühinemisel"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Viga vestluses %s"
+
 msgid "Create New Room"
 msgstr "Uue ruumi loomine"
 
@@ -4732,16 +4625,20 @@ msgstr "_Seadista tuba"
 msgid "_Accept Defaults"
 msgstr "_Nõustu vaikeväärtustega"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Viga vestlusega %s ühinemisel"
+#, fuzzy
+msgid "No reason"
+msgstr "Põhjendust pole määratud."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Viga vestluses %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Sind löödi kasutaja %s poolt välja (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Välja löödud kasutaja %s poolt (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Faili avamisel tekkis viga."
 
 #, fuzzy
@@ -5234,9 +5131,6 @@ msgstr "Algata _jututuba"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN-ile on vaja SSL-i tuge. Palun paigalda toetatud SSL-teek."
 
-msgid "Failed to connect to server."
-msgstr "Tõrge serveriga ühendumisel."
-
 msgid "Error retrieving profile"
 msgstr "Viga profiili vastuvõtmisel"
 
@@ -5479,9 +5373,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Sõnumit ei saadetud, kuna saatmisel tekkis tundmatu viga."
 
-msgid "Unable to connect"
-msgstr "Ühendumine pole võimalik"
-
 msgid "Writing error"
 msgstr "Viga kirjutamisel"
 
@@ -5496,20 +5387,24 @@ msgstr ""
 "Ühenduse viga %s serverist:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Meie protokoll pole serveri poolt toetatud."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Viga HTTP parsimisel."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Sa oled teisest kohast sisse loginud."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN-serverid pole ajutiselt kättesaadavad. Palun oota ja proovi uuesti."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN-serverid jäetakse ajutiselt seisma"
 
 #, c-format
@@ -5522,9 +5417,6 @@ 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"
 
@@ -5623,6 +5515,9 @@ msgstr "MSN protokolli plugin"
 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 ""
@@ -5737,12 +5632,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Serverist kontaktide lisamine"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Ühendatud"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protkolli viga, veakood %d: %s"
@@ -5763,16 +5652,6 @@ msgstr "MySpaceIM viga"
 msgid "Invalid input condition"
 msgstr ""
 
-msgid "Read buffer full (2)"
-msgstr "Lugemispuhver on täis (2)"
-
-msgid "Unparseable message"
-msgstr "Analüüsimatu sõnum"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Hostiga pole võimalik ühenduda: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Tõrge sõbra lisamisel"
 
@@ -5856,6 +5735,12 @@ msgstr "Sõpru kokku"
 msgid "Client Version"
 msgstr "Kliendi versioon"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Kasutajanimi on saadaval"
 
@@ -6114,9 +5999,9 @@ msgstr "Kasutaja pole võrgus või oled sa blokitud"
 msgid "Unknown error: 0x%X"
 msgstr "Tundmatu viga: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Tõrge sisselogimisel (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Kasutajat %s pole võimalik pingida"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6220,9 +6105,6 @@ msgstr "GroupWise konverents %d"
 msgid "Authenticating..."
 msgstr "Autentimine..."
 
-msgid "Unable to connect to server."
-msgstr "Serveriga pole võimalik ühenduda."
-
 msgid "Waiting for response..."
 msgstr "Vastuse ootamine..."
 
@@ -6246,24 +6128,19 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Kas sa soovid vestlusega ühineda?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Sind logiti välja, kuna sa logisid sisse teisest tööjaamast."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Serveriga pole võimalik ühendust saada. Palun sisesta serveri aadress, "
 "millega soovid ühenduda."
 
-msgid "Error. SSL support is not installed."
-msgstr "Viga. SSL-i tugi pole paigaldatud."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "See konverents on suletud. Rohkem sõnumeid pole võimalik saata."
 
@@ -6303,10 +6180,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6315,19 +6189,9 @@ msgstr "Jututoaga pole võimalik ühineda"
 msgid "Invalid chat room name"
 msgstr "Vigane jututoa nimi"
 
-msgid "Server closed the connection."
-msgstr "Server sulges ühenduse."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Ühendus serveriga katkes:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
-msgstr ""
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "Kaugkasutajaga ühendumisel võeti vastu vigased andmed."
 
 #. *< type
 #. *< ui_requirement
@@ -6374,7 +6238,8 @@ msgstr "Ühendus kaugkasutajaga katkes:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Kaugkasutajaga ühendumisel võeti vastu vigased andmed."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Kaugkasutajaga pole võimalik ühendust saada."
 
 msgid "Direct IM established"
@@ -6573,21 +6438,15 @@ msgstr "Hoiatuste tase"
 msgid "Buddy Comment"
 msgstr "Sõbra kommentaar"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Autentimisserveriga pole võimalik ühendust saada:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"BOS-serveriga pole võimalik ühendust saada:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Serveriga pole võimalik ühenduda."
 
 msgid "Username sent"
 msgstr "Kasutajanimi saadetud"
@@ -6601,9 +6460,9 @@ msgstr "Ühendumise lõpuleviimine"
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 
 #, c-format
@@ -6613,26 +6472,21 @@ 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."
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Kasutajat pole olemas"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+msgid "Your account is currently suspended"
 msgstr ""
 
 #. service temporarily unavailable
@@ -6655,7 +6509,8 @@ msgstr ""
 "minutit ja proovi siis uuesti. Kui sa aga samamoodi jätkad, siis pead pärast "
 "ka kauem ootama."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Sisestatud SecurID võti on vigane."
 
 msgid "Enter SecurID"
@@ -6807,6 +6662,9 @@ msgstr "Võrgus alates"
 msgid "Member Since"
 msgstr "Liige alates"
 
+msgid "Capabilities"
+msgstr "Võimalused"
+
 msgid "Profile"
 msgstr "Profiil"
 
@@ -6978,7 +6836,7 @@ msgstr "Eemaloleku teade on liiga pikk."
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6999,9 +6857,9 @@ msgstr ""
 msgid "Orphans"
 msgstr ""
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Sõpra %s pole võimalik lisada, kuna su sõbranimekirjas on juba liiga palju "
@@ -7010,8 +6868,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(nimi puudub)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Sõpra %s pole teadmata põhjusel võimalik lisada."
 
 #, c-format
@@ -7827,7 +7685,7 @@ msgid "Update interval (seconds)"
 msgstr "Uuenduste sagedus(ed)"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Sisselogimise vastust pole võimalik lahti krüptida"
 
 #, c-format
@@ -7854,10 +7712,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Vigane tõendi vastusekood, 0x%02X"
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Sisselogimise vastust pole võimalik lahti krüptida"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "Päringudialoog"
 
@@ -7894,21 +7748,9 @@ msgid ""
 "%s"
 msgstr "Vigane tõendi vastusekood, 0x%02X"
 
-msgid "Unable to connect."
-msgstr "Ühendumine pole võimalik."
-
 msgid "Socket error"
 msgstr "Sokli viga"
 
-msgid "Unable to read from socket"
-msgstr "Soklist pole võimalik lugeda"
-
-msgid "Write Error"
-msgstr "Viga kirjutamisel"
-
-msgid "Connection lost"
-msgstr "Ühendus katkes"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "Määra kasutajateave..."
@@ -7917,8 +7759,9 @@ msgstr "Määra kasutajateave..."
 msgid "Requesting token"
 msgstr "Päring on keelatud"
 
-msgid "Couldn't resolve host"
-msgstr "Hosti pole võimalik lahendada"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Serveriga pole võimalik ühenduda."
 
 msgid "Invalid server or port"
 msgstr "Vigane server või port"
@@ -7970,7 +7813,7 @@ msgid "QQ Qun Command"
 msgstr "Käsk"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Sisselogimise vastust pole võimalik lahti krüptida"
 
 #, fuzzy
@@ -7992,9 +7835,6 @@ msgstr "Faili saatmine"
 msgid "%d canceled the transfer of %s"
 msgstr "%d katkestas %s ülekandmise"
 
-msgid "Connection closed (writing)"
-msgstr "Ühendus suletud (kirjutamine)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Grupi pealkiri:</b> %s<br>"
@@ -8048,17 +7888,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-msgid "Connection reset"
-msgstr ""
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Viga soklist lugemisel: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Hostiga pole võimalik ühenduda"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -8081,6 +7910,9 @@ msgstr "Kõlarid"
 msgid "Video Camera"
 msgstr "Videokaamera"
 
+msgid "File Transfer"
+msgstr "Failiülekanne"
+
 msgid "Supports"
 msgstr ""
 
@@ -8860,6 +8692,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Võrgustatistika"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Tõrge ping'i läbiviimisel"
 
@@ -8917,7 +8752,8 @@ msgstr "Toetamata avaliku võtme liik"
 msgid "Disconnected by server"
 msgstr "Ühendus katkestatud serveri poolt"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Viga SILC-serveriga ühendumisel"
 
 msgid "Key Exchange failed"
@@ -8927,26 +8763,26 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-msgid "Connection failed"
-msgstr "Tõrge ühendumisel"
-
 msgid "Performing key exchange"
 msgstr "Võtmevahetuse läbiviimine"
 
-msgid "Unable to create connection"
-msgstr "Ühendust pole võimalik luua"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "SILC-võtmepaari pole võimalik laadida"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Ühendumine SILC-serverisse"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "SILC-võtmepaari pole võimalik laadida"
+
 msgid "Out of memory"
 msgstr "Vaba pole piisavalt mälu"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "SILC-protokolli pole võimalik lähtestada"
 
 msgid "Error loading SILC key pair"
@@ -9231,7 +9067,8 @@ msgstr "Kõikide sõnumite digitaalne signeerimine ja verifitseerimine"
 msgid "Creating SILC key pair..."
 msgstr "SILC võtmepaari loomine..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "SILC võtmepaari pole võimalik luua\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9323,6 +9160,9 @@ msgstr "Tahvel"
 msgid "No server statistics available"
 msgstr "Serveri statistika pole saadaval"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Viga SILC-serveriga ühendumisel"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Tõrge: Versioonid ei klapi, uuenda oma klienti"
@@ -9363,30 +9203,27 @@ msgstr "Tõrge: Vigane küpsis"
 msgid "Failure: Authentication failed"
 msgstr "Tõrge: Autentimine nurjus"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "SILC-kliendi ühendust pole võimalik lähtestada"
 
 msgid "John Noname"
 msgstr "Nimetu Nipitiri"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "SILC-võtmepaari pole võimalik laadida: %s"
 
-msgid "Could not write"
-msgstr "Pole võimalik kirjutada"
-
-msgid "Could not connect"
-msgstr "Pole võimalik ühenduda"
+msgid "Unable to create connection"
+msgstr "Ühendust pole võimalik luua"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Tundmatu vastus serverilt."
 
-msgid "Could not create listen socket"
-msgstr "Kuulavat soklit pole võimalik luua"
-
-msgid "Could not resolve hostname"
-msgstr "Hostinime pole võimalik lahendada"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Soklit pole võimalik luua"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-i kasutajanimed ei tohi sisaldada sõnavahe- ja @-märke"
@@ -9428,6 +9265,77 @@ msgstr "Autentimiskasutaja"
 msgid "Auth Domain"
 msgstr "Autentimisdomeen"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;tuba&gt;:  Yahoo võrgus oleva jututoaga ühinemine"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Yahoo võrgu jututubade nimekirja kuvamine"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Kasutajaga Doodle seansi algatamine"
+
+msgid "Yahoo ID..."
+msgstr "Yahoo ID..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo protokolli plugin"
+
+msgid "Pager server"
+msgstr ""
+
+msgid "Pager port"
+msgstr ""
+
+msgid "File transfer server"
+msgstr "Failiülekande server"
+
+msgid "File transfer port"
+msgstr "Failiülekande port"
+
+msgid "Chat room locale"
+msgstr "Jututoa lokaat"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Konverentside ja jututubade kutseid eiratakse"
+
+msgid "Chat room list URL"
+msgstr "Jututubade nimekirja URL"
+
+msgid "Yahoo Chat server"
+msgstr "Yahoo jututoaserver"
+
+msgid "Yahoo Chat port"
+msgstr "Yahoo jututoaport"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo ID..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo protokolli plugin"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9456,29 +9364,19 @@ msgstr ""
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 "Tundmatu veanumber %d. Yahoo! veebisaiti sisselogimine võib selle parandada."
 
@@ -9514,34 +9412,33 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Tundmatu veanumber %d. Yahoo! veebisaiti sisselogimine võib selle parandada."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "Sõpra %s pole võimalik serveri nimekirjas gruppi %s lisada (konto %s)."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Sõpra pole võimalik serveri nimekirja lisada."
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Serverist võeti vastu ootamatu HTTP-vastus."
 
-msgid "Connection problem"
-msgstr "Ühendumisprobleem"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
-
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
+"Ühendus serveriga katkes:\n"
 "%s"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
+"Selle serveriga pole võimalik ühendust luua:\n"
+"%s"
 
 msgid "Not at Home"
 msgstr "Pole kodus"
@@ -9603,73 +9500,15 @@ msgstr "Ühine kasutajaga vestluses..."
 msgid "Open Inbox"
 msgstr "Ava sisendkast"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;tuba&gt;:  Yahoo võrgus oleva jututoaga ühinemine"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Yahoo võrgu jututubade nimekirja kuvamine"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Kasutajaga Doodle seansi algatamine"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo ID..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo protokolli plugin"
-
-msgid "Yahoo Japan"
-msgstr "Jaapani Yahoo"
-
-msgid "Pager server"
-msgstr ""
-
-msgid "Japan Pager server"
-msgstr ""
-
-msgid "Pager port"
-msgstr ""
-
-msgid "File transfer server"
-msgstr "Failiülekande server"
-
-msgid "Japan file transfer server"
-msgstr "Jaapani failiülekandeserver"
-
-msgid "File transfer port"
-msgstr "Failiülekande port"
-
-msgid "Chat room locale"
-msgstr "Jututoa lokaat"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Konverentside ja jututubade kutseid eiratakse"
-
-msgid "Chat room list URL"
-msgstr "Jututubade nimekirja URL"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo jututoaserver"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo jututoaport"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Doodle päringu saatmine."
 
+msgid "Unable to connect."
+msgstr "Ühendumine pole võimalik."
+
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -9677,6 +9516,9 @@ msgstr ""
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s proovib sulle saata %d-failist koosnevat gruppi.\n"
 
+msgid "Write Error"
+msgstr "Viga kirjutamisel"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Jaapani Yahoo! profiil"
 
@@ -9791,19 +9633,17 @@ msgstr ""
 msgid "Webcams"
 msgstr "Veebikaamerad"
 
+msgid "Connection problem"
+msgstr "Ühendumisprobleem"
+
 msgid "Unable to fetch room list."
 msgstr "Tubade nimekirja pole võimalik hankida."
 
 msgid "User Rooms"
 msgstr ""
 
-msgid "Connection problem with the YCHT server."
-msgstr ""
-
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr ""
 "Ühendus serveriga katkes\n"
 "%s"
@@ -9925,33 +9765,22 @@ msgstr ""
 msgid "Exposure"
 msgstr ""
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Soklit pole võimalik luua:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "HTTP-proksi vastust pole võimalik analüüsida: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Proksi ühenduse viga %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Ligipääs keelatud: HTTP proksi server keelab pordi %d tunneldamise."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Viga %s lahendamisel"
 
-msgid "Could not resolve host name"
-msgstr "Hostinime pole võimalik lahendada"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10151,12 +9980,6 @@ msgstr ""
 msgid "Unable to connect to %s: %s"
 msgstr "Hostiga %s pole võimalik ühenduda: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "Server vajab sisselogimiseks TLS/SSL-i.  TLS/SSL-i tuge ei leitud."
-
 #, c-format
 msgid " - %s"
 msgstr " - %s"
@@ -10401,9 +10224,14 @@ msgstr "Lisa _sõbramärguanne..."
 msgid "View _Log"
 msgstr "Vaata _logi"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Peida, kui pole võrku ühendatud"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Näita, kui pole võrku ühendatud"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
@@ -10905,6 +10733,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Kasutaja %s andmete muutmine"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Sisesta hostinimi, mille kohta see sertifikaat mõeldud on."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL-serverid"
@@ -10950,7 +10782,8 @@ msgstr "Eira"
 msgid "Get Away Message"
 msgstr ""
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Viimati ütles"
 
 msgid "Unable to save icon file to disk."
@@ -11841,7 +11674,7 @@ msgid "Hyperlink visited color"
 msgstr "Hüperviida värv"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Hüperviitade joonistamise värv hiirekursori fookuse korral."
 
 msgid "Hyperlink prelight color"
@@ -11877,13 +11710,20 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 msgid "Typing notification color"
 msgstr "Tippimismärguande värvus"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "Tippimismärguande kuvamiseks kasutatav värvus"
 
 msgid "Typing notification font"
@@ -12266,6 +12106,10 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
+#, fuzzy
+msgid "No message"
+msgstr "Tundmatu sõnum"
+
 msgid "Open All Messages"
 msgstr "Ava kõik sõnumid"
 
@@ -12283,10 +12127,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Sulle on e-sõnum!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Tundmatu sõnum"
-
 msgid "The following plugins will be unloaded."
 msgstr "Järgnevad pluginad laaditakse mälust välja."
 
@@ -12500,8 +12340,9 @@ msgstr "Süsteemisalve _ikooni näidatakse:"
 msgid "On unread messages"
 msgstr "Lugemata sõnumite korral"
 
-msgid "Conversation Window Hiding"
-msgstr "Vestlusakna peitmine"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Välksõnumite aknad"
 
 msgid "_Hide new IM conversations:"
 msgstr "Välksõnumivestlused _peidetakse:"
@@ -12509,6 +12350,9 @@ msgstr "Välksõnumivestlused _peidetakse:"
 msgid "When away"
 msgstr "Kui olen eemal"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Uute vestluste aknad _minimeeritakse"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Kaardid"
@@ -12567,9 +12411,6 @@ msgstr "Kasutatakse pehmet kerimist"
 msgid "F_lash window when IMs are received"
 msgstr "Välksõnumite vastuvõtmisel vilgutatakse _aknaid"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Uute vestluste aknad _minimeeritakse"
-
 msgid "Minimum input area height in lines:"
 msgstr "Vähim sisestuskasti kõrgus ridades:"
 
@@ -12604,7 +12445,8 @@ msgstr "Veebisirvija seadistusprogrammi pole võimalik käivitada."
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Näide: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "IP-aadress tuvastatakse _automaatselt"
 
 msgid "Public _IP:"
@@ -12973,32 +12815,17 @@ msgstr "Sal_vesta ja kasuta"
 msgid "Status for %s"
 msgstr ""
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "Kohandatud tujunägu"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
+msgid "Custom Smiley"
+msgstr "Kohandatud tujunägu"
+
 msgid "Duplicate Shortcut"
 msgstr "Dubleeriuv kiirklahv"
 
-msgid "Please select an image for the smiley."
-msgstr "Palun vali tujunäo jaoks pilt."
-
 msgid "Edit Smiley"
 msgstr "Tujunäo muutmine"
 
@@ -13110,8 +12937,8 @@ msgid "Cannot send launcher"
 msgstr ""
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -13694,7 +13521,7 @@ msgstr "Muusikalise sõnumivahetuse plugin ühise komponeerimise tarbeks."
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -13942,9 +13769,10 @@ msgid "Conversation Window Send Button."
 msgstr "Vestlusakna saatmisnupp."
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Saatmisnupu lisamine vestlusakna sisestusala juurde. See on mõeldud "
 "kasutamiseks olukorras, kus klaviatuuri pole võimalik pruukida."
@@ -14274,8 +14102,9 @@ msgstr "Windowsi Pidgini valikud"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Windows'i Pidgin'ile omased valikud."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Windows'i Pidgin'ile omasete valikute tagamine (näiteks sõbranimekirja "
 "dokkimie)."
@@ -14317,6 +14146,216 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "See plugin sobib XMPP serverite ja klientide silumiseks"
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Soklit pole võimalik avada"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Soklit pole võimalik kuulata"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Soklit pole võimalik lugeda"
+
+#~ msgid "Connection failed."
+#~ msgstr "Tõrge ühendumisel."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Server katkestas ühenduse"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Soklit pole võimalik luua"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Hostiga pole võimalik ühenduda"
+
+#~ msgid "Read error"
+#~ msgstr "Viga lugemisel"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Selle serveriga pole võimalik ühendust luua:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Kirjutamise viga"
+
+#~ msgid "Last Activity"
+#~ msgstr "Viimati aktiivne"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Teenuse avastamise andmed"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Teenuse avastamise kirjed"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Mitmekasutaja vestlus"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ad-Hoc käsud"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5 baidivood"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "User Location"
+#~ msgstr "Kasutaja asukoht"
+
+#~ msgid "User Avatar"
+#~ msgstr "Kasutaja avatar"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Vestluste olekust teavitaja"
+
+#~ msgid "Software Version"
+#~ msgstr "Tarkvara versioon"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Voo lähtestamine"
+
+#~ msgid "User Mood"
+#~ msgstr "Kasutaja meeleolu"
+
+#~ msgid "User Activity"
+#~ msgstr "Kasutaja aktiivsus"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Krüptitud seansi läbirääkimised"
+
+#~ msgid "User Profile"
+#~ msgstr "Kasutajaprofiil"
+
+#~ msgid "User Nickname"
+#~ msgstr "Kasutaja hüüdnimi"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Sõnumi vastuvõtjad"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Avaliku võtme avalikustamine"
+
+#~ msgid "User Chatting"
+#~ msgstr "Kasutaja lobiseb"
+
+#~ msgid "User Gaming"
+#~ msgstr "Kasutaja mängib"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Viivitusega kohaletoimetamine"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "STUN-teenuse avastamine Jingle jaoks"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Lihtsustatud krüptitud seansi läbirääkimised"
+
+#~ msgid "Read Error"
+#~ msgstr "Lugemise viga"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Tõrge serveriga ühendumisel."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Lugemispuhver on täis (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Analüüsimatu sõnum"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Hostiga pole võimalik ühenduda: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Tõrge sisselogimisel (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Sind logiti välja, kuna sa logisid sisse teisest tööjaamast."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Viga. SSL-i tugi pole paigaldatud."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Vale parool."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "BOS-serveriga pole võimalik ühendust saada:\n"
+#~ "%s"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Pole võimalik ühenduda"
+
+#~ msgid "Invalid username."
+#~ msgstr "Vigane kasutajanimi."
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Sisselogimise vastust pole võimalik lahti krüptida"
+
+#~ msgid "Connection lost"
+#~ msgstr "Ühendus katkes"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Hosti pole võimalik lahendada"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Ühendus suletud (kirjutamine)"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Viga soklist lugemisel: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Hostiga pole võimalik ühenduda"
+
+#~ msgid "Could not write"
+#~ msgstr "Pole võimalik kirjutada"
+
+#~ msgid "Could not connect"
+#~ msgstr "Pole võimalik ühenduda"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Kuulavat soklit pole võimalik luua"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Hostinime pole võimalik lahendada"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Vigane parool"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Jaapani Yahoo"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Jaapani failiülekandeserver"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ühendus serveriga katkes\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Hostinime pole võimalik lahendada"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "Server vajab sisselogimiseks TLS/SSL-i.  TLS/SSL-i tuge ei leitud."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Vestlusakna peitmine"
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Palun vali tujunäo jaoks pilt."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Milline ID aktiveerida?"
 
diff --git a/po/eu.po b/po/eu.po
index ea0911b1e1..9affaeca00 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2006-05-25 23:48+0200\n"
 "Last-Translator: tamax\n"
 "Language-Team:  <en@li.org>\n"
@@ -2698,7 +2698,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2749,7 +2749,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2998,11 +2998,12 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Datozen BM konexio berriak entzutea ezinezkoa gertatu da\n"
 
 msgid ""
@@ -3060,16 +3061,17 @@ msgstr "%s erabiltzaileak solasaldi-leihoa itxi du. "
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Ezin da mezua bidali, solasaldia ezin izango da hasi."
 
-msgid "Cannot open socket"
-msgstr "Ezin da socket-a ireki "
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Ezin da socket-a sortu"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Ezin izan da socket -a ataka lotu"
 
-#, fuzzy
-msgid "Could not listen on socket"
-msgstr "Ezin da socket-tik entzun"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Ezin da socket-a sortu"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3120,13 +3122,16 @@ msgstr "Gorde lagunen-zerrenda..."
 msgid "Load buddylist from file..."
 msgstr "Kargatu lagunen-zerrenda fitxategi batetik..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Bete harpidetzarako eremuak"
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Pasahitz-ak ez datoz bat."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Ezin izan da kontu berria erregistratu. Errorea gertatu da.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3138,16 +3143,15 @@ msgstr "Erregistroa arrakastan betea izan da !"
 msgid "Password"
 msgstr "Pasahitza"
 
-msgid "Password (retype)"
-msgstr "Pasahitza (beridatzi)"
+msgid "Password (again)"
+msgstr "Pasahitza (berriro)"
 
-# , fuzzy
-msgid "Enter current token"
-msgstr "Sartu momentuko lekukoa"
+msgid "Enter captcha text"
+msgstr ""
 
-# , fuzzy
-msgid "Current token"
-msgstr "Momentuko lekukoa"
+#, fuzzy
+msgid "Captcha"
+msgstr "Gorde irudia"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Erregistratu Gadu-Gadu kontu berria"
@@ -3201,6 +3205,17 @@ msgstr "Pasahitza arrakastaz aldatua izan da !"
 msgid "Current password"
 msgstr "Egungo pasahitza"
 
+msgid "Password (retype)"
+msgstr "Pasahitza (beridatzi)"
+
+# , fuzzy
+msgid "Enter current token"
+msgstr "Sartu momentuko lekukoa"
+
+# , fuzzy
+msgid "Current token"
+msgstr "Momentuko lekukoa"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Idatzi egungo pasahitza eta pasahitz berria UIN -rentzako."
 
@@ -3249,7 +3264,8 @@ msgid "There are no users matching your search criteria."
 msgstr ""
 "Bilaketa egitean zure irizpideak erabiliz ez dira erabiltzailerik topatu."
 
-msgid "Unable to read socket"
+#, fuzzy
+msgid "Unable to read from socket"
 msgstr "Ezin da socket-a irakurri"
 
 msgid "Buddy list downloaded"
@@ -3264,8 +3280,14 @@ msgstr "Lagunen-zerrenda igota"
 msgid "Your buddy list was stored on the server."
 msgstr "Zure lagunen-zerrenda zerbitzaria gordea izan da."
 
-msgid "Connection failed."
-msgstr "Konexioak huts egin du "
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Konektatua"
+
+msgid "Connection failed"
+msgstr "Konexioak huts egin du"
 
 msgid "Add to chat"
 msgstr "Gehitu berriketa-ra"
@@ -3273,18 +3295,23 @@ msgstr "Gehitu berriketa-ra"
 msgid "Chat _name:"
 msgstr "Berreketan _Deitura:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Ezin da zerbitzariarekin konektatu."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Konektatzen"
+
 msgid "Chat error"
 msgstr "Berriketa-errorea"
 
 msgid "This chat name is already in use"
 msgstr "Berriketa honen izena dagoeneko erabiltzen ari da"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Zerbitzaritik deskonektatuta zaude."
 
 msgid "Find buddies..."
@@ -3345,7 +3372,7 @@ msgid "File Transfer Failed"
 msgstr "Fitxategi-transferentzia huts egin du"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Pidgin-ek ezin izan du ireki entzuteko ataka bat."
 
 msgid "Error displaying MOTD"
@@ -3361,8 +3388,16 @@ msgstr "Ez dago konexio honekin asoziatutako MOTDrik."
 msgid "MOTD for %s"
 msgstr "%s - MOTD"
 
-msgid "Server has disconnected"
-msgstr "Zerbitzaria deskonektatu da"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "Zerbitzaritik deskonektatuta zaude."
 
 msgid "View MOTD"
 msgstr "Ikusi MOTD"
@@ -3377,22 +3412,20 @@ msgstr "_Pasahitza:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC goitizenek ezin dute zuriunerik eduki"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Konektatzen"
-
 msgid "SSL support unavailable"
 msgstr "SSL euskarria ez dago erabilgarri"
 
-msgid "Couldn't create socket"
-msgstr "Ezin izan da socket-a sortu"
+msgid "Unable to connect"
+msgstr "Ezin da konektatu"
 
-msgid "Couldn't connect to host"
-msgstr "Ezin izan da ostalariarekin konektatu"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Ezin da ostalariarekin konektatu"
 
-msgid "Read error"
-msgstr "Irakurketa-errorea"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "%s erabiltzaileak solasaldi-leihoa itxi du. "
 
 msgid "Users"
 msgstr "Erabiltzaileak"
@@ -3830,12 +3863,13 @@ msgstr "Komandoa desgaitu da"
 msgid "execute"
 msgstr "Ez zen espero"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "Zerbitzariak TLS/SSL behar du konektatzeko. Ez da TLS/SSL euskarririk aurkitu"
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "Zerbitzariak TLS/SSL behar du konektatzeko. Ez da TLS/SSL euskarririk aurkitu"
 
@@ -3855,7 +3889,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Testu arruntaren autentifikazioa"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Huts egin du autentifikatzean."
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Erantzun baliogabea zerbitzaritik."
 
 msgid "Server does not use any supported authentication method"
@@ -3867,7 +3906,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "Erronka baliogabea zerbitzaritik"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL error"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3888,9 +3928,7 @@ msgstr ""
 "dago ?"
 
 #, fuzzy, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Ezinezkoa izan da konexioa ezatzea mDNS zerbitzari lokalarekin , martxan al "
 "dago ?"
@@ -3899,12 +3937,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "Ezin da konexio sortu."
 
-msgid "Unable to create socket"
-msgstr "Ezin da socket-a sortu"
-
-msgid "Write error"
-msgstr "Idazketa-errorea"
-
 msgid "Full Name"
 msgstr "Izen-deiturak"
 
@@ -3977,188 +4009,6 @@ msgstr ""
 msgid "Local Time"
 msgstr "Fitxagei lokala:"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "Ezarri Dir informazioa"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "Helbidearen jarraipena"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "Ezizena berriketarako"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Erabiltzaileak ez du direktorio-informaziorik."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "Komandoa"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "Erregistratze-errorea"
-
-#, fuzzy
-msgid "User Location"
-msgstr "Kokalekua"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "Erabiltzaile bilaketa"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "Lagunen egoeraren jakinarazpena"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "Bertsioa ez da onartzen"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "Orientazioa"
-
-msgid "File Transfer"
-msgstr "Fitxategi-transferentzia"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "Erabiltzaile-moduak"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "Erabiltzaile-muga"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "Gaitasunak"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "Erabiltzaile-izena"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "IM gako-trukearekin"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "Helbide elektronikoa"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "MSN profila"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "Ping"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "Erabiltzaile-izena "
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "Zuzeneko bideoa"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "Mezua iritsi da"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "Gako publikoaren 'babble'-marka"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "Erabiltzailearen aukerak"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "Erabiltzaile-moduak"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "Erabiltzaile-izena "
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "Erabiltzaile-muga"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Trillian enkriptatzea"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Gaitasunak"
-
 msgid "Priority"
 msgstr "Lehentasuna"
 
@@ -4170,7 +4020,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Konektatuta dago lehendik"
 
 msgid "Middle Name"
@@ -4358,16 +4208,12 @@ msgid "Roles:"
 msgstr "Funtzioa"
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "Testu arrunta"
 
-msgid "Read Error"
-msgstr "Irakurketa-errorea"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 #, fuzzy
@@ -4556,9 +4402,6 @@ msgstr "Zure pasahitza aldatu egin da."
 msgid "Error changing password"
 msgstr "Errorea pasahitza aldatzean"
 
-msgid "Password (again)"
-msgstr "Pasahitza (berriro)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "Aldatu pasahitza"
@@ -4962,6 +4805,14 @@ msgstr "XML analisi-errorea"
 msgid "Unknown Error in presence"
 msgstr "Presentzia-errore ezezaguna"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Errorea %s berriketan sartzean"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Errorea %s berriketan"
+
 msgid "Create New Room"
 msgstr "Sortu gela berria"
 
@@ -4978,16 +4829,20 @@ msgstr "Gela _Konfiguratu"
 msgid "_Accept Defaults"
 msgstr "Lehenetsiak _onartu"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Errorea %s berriketan sartzean"
+#, fuzzy
+msgid "No reason"
+msgstr "Ez da arrazoirik eman."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Errorea %s berriketan"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "%s erabiltzaileak kanporatu zaitu: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Honek kanporatu zaitu: %s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Errore bat gertatu da fitxategia irekitzean."
 
 #, fuzzy
@@ -5502,9 +5357,6 @@ msgstr ""
 "SSL euskarria behar da MSNrako. Instalatu SSL liburutegi onartu bat. "
 "Informazio gehiago: http://Pidgin.sf.net/faq-ssl.php."
 
-msgid "Failed to connect to server."
-msgstr "Huts egin du zerbitzariarekin konektatzean."
-
 msgid "Error retrieving profile"
 msgstr "Errorea profila eskuratzean"
 
@@ -5770,9 +5622,6 @@ msgstr "Mezua ezin izan da bidali errore ezezaguna gertatu delako:"
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Mezua ezin izan da bidali errore ezezaguna gertatu delako:"
 
-msgid "Unable to connect"
-msgstr "Ezin da konektatu"
-
 msgid "Writing error"
 msgstr "Idazketa-errorea"
 
@@ -5787,13 +5636,16 @@ msgstr ""
 "Konexio-errorea %s zerbitzarian :\n"
 "%s "
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Zerbitzariak ez du protokoloa hau onartzen"
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Errorea HTTP analizatzean"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Beste kokaleku batetik hasi duzu saioa."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5801,7 +5653,8 @@ msgstr ""
 "MSN zerbitzariak ez daude eskuragarri une honetan. Itxaron, eta saiatu "
 "berriro."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN zerbitzariak ixtera doaz aldi baterako."
 
 #, c-format
@@ -5814,9 +5667,6 @@ msgstr ""
 "MSN lagunen zerrenda ez dago erabilgarri une honetan. Itxaron, eta saiatu "
 "berriro."
 
-msgid "Unknown error."
-msgstr "Errore ezezaguna."
-
 msgid "Handshaking"
 msgstr "Negoziaketa"
 
@@ -5919,6 +5769,9 @@ msgstr "AIM/ICQ protokoloaren plugin-a"
 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)"
@@ -6034,12 +5887,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Erantzun baliogabea zerbitzaritik."
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Konektatua"
-
 #, fuzzy, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Prozesua errorea kodea itzuli du %d"
@@ -6063,18 +5910,6 @@ msgid "Invalid input condition"
 msgstr "Konexioa amaitzen"
 
 #, fuzzy
-msgid "Read buffer full (2)"
-msgstr "Ilara beteta dago"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "Ezin da mezua analizatu"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Ezin izan da ostalariarekin konektatu"
-
-#, fuzzy
 msgid "Failed to add buddy"
 msgstr "Huts egin du berriketako lagunarekin elkartzean"
 
@@ -6170,6 +6005,12 @@ msgstr ""
 msgid "Client Version"
 msgstr "Itxi solasaldia"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 #, fuzzy
 msgid "MySpaceIM - Username Available"
 msgstr "Zerbitzua ez dago erabilgarri"
@@ -6441,9 +6282,9 @@ msgstr "Erabiltzailea lineaz kanpo dago edo blokeatuta zaude"
 msgid "Unknown error: 0x%X"
 msgstr "Errore ezezaguna: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Huts egin du saioa hastean (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Ezin da %s erabiltzailea kanporatu"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6548,9 +6389,6 @@ msgstr "GroupWise konferentzia %d"
 msgid "Authenticating..."
 msgstr "Autentifikatzen..."
 
-msgid "Unable to connect to server."
-msgstr "Ezin da zerbitzariarekin konektatu."
-
 msgid "Waiting for response..."
 msgstr "Erantzunaren zain..."
 
@@ -6574,10 +6412,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Solasaldian sartu nahi duzu?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Deskonektatu egin zaituzte, beste lanpostu batetik hasi duzulako saioa."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6585,16 +6419,14 @@ msgstr ""
 "Badirudi %s lineaz kanpo dagoela, eta ez duela jaso zuk bidali berri diozun "
 "mezua."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Ezin da zerbitzariarekin konektatu. Sartu konektatu beharreko zerbitzariaren "
 "helbidea."
 
-msgid "Error. SSL support is not installed."
-msgstr "Errorea. SSL euskarria ez dago instalatuta."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Konferentzia hau itxi egin da, eta ezin da mezu gehiago bidali."
 
@@ -6634,10 +6466,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, fuzzy
@@ -6649,17 +6478,7 @@ msgid "Invalid chat room name"
 msgstr "Gela-izen baliogabea"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "%s erabiltzaileak solasaldi-leihoa itxi du. "
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "Zerbitzaritik deskonektatuta zaude."
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "Ezin da zerbitzariarekiko SSL konexiorik ezarri."
 
 #. *< type
@@ -6712,7 +6531,7 @@ msgid "Received invalid data on connection with remote user."
 msgstr ""
 
 #, fuzzy
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr ""
 "Ezinezkoa izan da konexioa ezatzea mDNS zerbitzari lokalarekin , martxan al "
 "dago ?"
@@ -6911,16 +6730,12 @@ msgid "Buddy Comment"
 msgstr "Lagunen iruzkinak"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "Ezin izan da konektatu transferentzia egiteko."
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr "Huts egin du zerbitzariarekin konektatzean."
+msgid "Unable to connect to BOS server: %s"
+msgstr "Ezin da zerbitzariarekin konektatu."
 
 #, fuzzy
 msgid "Username sent"
@@ -6935,9 +6750,9 @@ msgstr "Konexioa amaitzen"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Ezin da sartu: Ezin izan da saioa hasi %s gisa, pantaila-izena ez delako "
 "baliozkoa. Pantaila-izenek letra batekin hasi behar dute, eta letrak, "
@@ -6954,30 +6769,23 @@ msgstr ""
 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
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "Erabiltzaile-izena ez da baliozkoa"
+msgid "Username does not exist"
+msgstr "Erabiltzailea ez dago"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Zure kontua esekita dago une honetan."
 
 #. service temporarily unavailable
@@ -6998,7 +6806,8 @@ msgstr ""
 "saiatu berriro. Saiatzen jarraituz gero, agian gehiago ere itxaron beharko "
 "duzu."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Sartu duzun SecurID gakoa ez da baliozkoa"
 
 msgid "Enter SecurID"
@@ -7182,6 +6991,9 @@ msgstr "Noiztik linean"
 msgid "Member Since"
 msgstr "Noiztik kidea"
 
+msgid "Capabilities"
+msgstr "Gaitasunak"
+
 #, fuzzy
 msgid "Profile"
 msgstr "MSN profila"
@@ -7368,7 +7180,7 @@ msgstr "Kanpoan zaudeneko mezua luzeegia da."
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7396,9 +7208,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Umezurtzak"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Ezin izan da %s laguna gehitu, lagun gehiegi daudelako zure lagunen "
@@ -7408,7 +7220,7 @@ msgid "(no name)"
 msgstr "(ez dago izenik)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Komandoak huts egin du arrazoi ezezagunen batengatik."
 
 #, fuzzy, c-format
@@ -8288,7 +8100,7 @@ msgid "Update interval (seconds)"
 msgstr "Irakurketa-errorea"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Ezin da zerbitzariaren informazioa hartu"
 
 #, c-format
@@ -8315,10 +8127,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Ezin da zerbitzariaren informazioa hartu"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "Eskaera Elkarrizketa"
 
@@ -8354,25 +8162,11 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "Ezin da konektatu."
-
 #, fuzzy
 msgid "Socket error"
 msgstr "Testigu errorea"
 
 #, fuzzy
-msgid "Unable to read from socket"
-msgstr "Ezin da socket-a irakurri"
-
-msgid "Write Error"
-msgstr "Idazketa-errorea "
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "Konexioa itxi da"
-
-#, fuzzy
 msgid "Getting server"
 msgstr "Ezarri erabiltzailearen datuak..."
 
@@ -8380,9 +8174,9 @@ msgstr "Ezarri erabiltzailearen datuak..."
 msgid "Requesting token"
 msgstr "Eskaera ukatu da"
 
-# ,fuzzy
-msgid "Couldn't resolve host"
-msgstr "Ezin izan da ostalaria"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Ezin da zerbitzariarekin konektatu."
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8433,7 +8227,7 @@ msgid "QQ Qun Command"
 msgstr "Komandoa"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Ezin da zerbitzariaren informazioa hartu"
 
 #, fuzzy
@@ -8456,9 +8250,6 @@ msgstr "Huts egin du fitxategia bidaltzean"
 msgid "%d canceled the transfer of %s"
 msgstr "%s(e)k %s(r)en transferentzia bertan behera utzi du"
 
-msgid "Connection closed (writing)"
-msgstr "Konexioa itxi da (idazten)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Taldearen titulua:</b> %s<br>"
@@ -8517,17 +8308,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime-eko administratzailearen oharra"
 
-msgid "Connection reset"
-msgstr "Konexioa berabierazten "
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Errorea socket-etik irakurtzean:%s."
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Ezin da ostalariarekin konektatu"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Oharra  %s -tik"
@@ -8550,6 +8330,9 @@ msgstr "Bozgorailuak"
 msgid "Video Camera"
 msgstr "Bideo-kamera"
 
+msgid "File Transfer"
+msgstr "Fitxategi-transferentzia"
+
 #, fuzzy
 msgid "Supports"
 msgstr "euskarria"
@@ -9381,6 +9164,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Sareko estatistikak"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping-ek huts egin du"
 
@@ -9445,7 +9231,8 @@ msgstr "Gako publiko mota ez da onartzen"
 msgid "Disconnected by server"
 msgstr "Zerbitzariak deskonektatu zaitu "
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Errorea SILC zerbitzariarekin konektatzean"
 
 msgid "Key Exchange failed"
@@ -9457,27 +9244,26 @@ msgstr ""
 "Huts egin du askatutako saio berriro hastean. Konektatu berriro konexio "
 "berria sortzeko."
 
-msgid "Connection failed"
-msgstr "Konexioak huts egin du"
-
 msgid "Performing key exchange"
 msgstr "Gako-trukatzea lantzen"
 
-msgid "Unable to create connection"
-msgstr "Ezin da konexio sortu."
-
 #, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "Ezin da SILC gako-parea : %s kargatu."
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "SILC zerbitzariarekin konektatzen"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Ezin da SILC gako-parea : %s kargatu."
+
 msgid "Out of memory"
 msgstr "Memoriarik ez"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Ezin izan da SILC protokoloa hasieratu"
 
 #, fuzzy
@@ -9782,7 +9568,7 @@ msgid "Creating SILC key pair..."
 msgstr "SILC gako bikotea sortzen..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "SILC gako bikotea sortzen..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9881,6 +9667,9 @@ msgstr "\"Whiteboard\" "
 msgid "No server statistics available"
 msgstr "Ez dago zerbitzariaren estatistika eskuragarri"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Errorea SILC zerbitzariarekin konektatzean"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Hutsegitea: bertsioa falta da. Eguneratu bezeroa"
@@ -9921,34 +9710,28 @@ msgstr "Hutsegitea: cookie baliogabea"
 msgid "Failure: Authentication failed"
 msgstr "Hutsegitea: huts egin du autentifikatzean."
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Ezin izan da SILC bezeroaren konexioa hasieratu"
 
 #, fuzzy
 msgid "John Noname"
 msgstr "Ez dago izenik"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Ezin da SILC gako-parea : %s kargatu."
 
-msgid "Could not write"
-msgstr "Ezin izan da idatzi"
-
-msgid "Could not connect"
-msgstr "Ezin izan da konektatu"
+msgid "Unable to create connection"
+msgstr "Ezin da konexio sortu."
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "Zerbitzari errore ezezaguna."
 
-msgid "Could not create listen socket"
-msgstr "Ezin izan da entzuteko socket-a sortu"
-
-# ,fuzzy
 #, fuzzy
-msgid "Could not resolve hostname"
-msgstr "Ezin izan da ostalaria"
+msgid "Unable to create listen socket"
+msgstr "Ezin da socket-a sortu"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -9993,6 +9776,81 @@ msgstr "AP erabiltzailea"
 msgid "Auth Domain"
 msgstr "Automatikoa"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;gela&gt;:  konektatu Yahoo sareko berriketa-gelara"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "zerrendatu: ZerrendatuYahoo sareko kanalak"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Request user to start a Doodle session"
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! IDa"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo protokoloaren plugin-a"
+
+#, fuzzy
+msgid "Pager server"
+msgstr "Proxy zerbitzaria"
+
+msgid "Pager port"
+msgstr "Bilagailuaren ataka"
+
+#, fuzzy
+msgid "File transfer server"
+msgstr "Fitxategi-transferentzien ostalaria"
+
+msgid "File transfer port"
+msgstr "Fitxategi-transferentzien ataka"
+
+msgid "Chat room locale"
+msgstr "Berriketarako gela gunea"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Entzungor egin konferentzia eta berriketa-gela gonbidapenei"
+
+msgid "Chat room list URL"
+msgstr "Berriketa-gelen zerrendaren URLa "
+
+msgid "Yahoo Chat server"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo Chat port"
+msgstr "Japoniako yahoo"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! IDa"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo protokoloaren plugin-a"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -10025,30 +9883,20 @@ msgstr "Laguna gehitzea ezetsita"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 "%d errore-zenbaki ezezaguna. Yahoo-ren web gunean konektatzeak arazoa konpon "
 "dezake."
@@ -10091,12 +9939,13 @@ msgstr ""
 "%d errore-zenbaki ezezaguna. Yahoo-ren web gunean konektatzeak arazoa konpon "
 "dezake."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Ezin izan da %s laguna %s taldean gehitu, %s kontuko zerbitzari-zerrendan."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Ezin izan da laguna zerbitzari-zerrendan gehitu"
 
 #, c-format
@@ -10104,23 +9953,18 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Entzungai %s/%s/%s.swf ] %s"
 
 #, fuzzy
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "Erantzun baliogabea zerbitzaritik."
 
-msgid "Connection problem"
-msgstr "Konexio-arazoa"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "Solasaldiak %s(r)ekin"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
+"Ezinezkoa izan da konexioa ezatzea mDNS zerbitzari lokalarekin , martxan al "
+"dago ?"
 
 msgid "Not at Home"
 msgstr "Ez dago etxean "
@@ -10187,79 +10031,15 @@ msgstr "Join User in Chat..."
 msgid "Open Inbox"
 msgstr "Ireki Hotmail posta"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;gela&gt;:  konektatu Yahoo sareko berriketa-gelara"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "zerrendatu: ZerrendatuYahoo sareko kanalak"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Request user to start a Doodle session"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! IDa"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo protokoloaren plugin-a"
-
-msgid "Yahoo Japan"
-msgstr "Japoniako yahoo"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "Proxy zerbitzaria"
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "Japoniako bilagailuaren ostalaria"
-
-msgid "Pager port"
-msgstr "Bilagailuaren ataka"
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "Fitxategi-transferentzien ostalaria"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "Japoniako fitxategi-transferentzien ostalaria "
-
-msgid "File transfer port"
-msgstr "Fitxategi-transferentzien ataka"
-
-msgid "Chat room locale"
-msgstr "Berriketarako gela gunea"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Entzungor egin konferentzia eta berriketa-gela gonbidapenei"
-
-msgid "Chat room list URL"
-msgstr "Berriketa-gelen zerrendaren URLa "
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "Japoniako yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Bidalia izan da \"Doodle\" eskaera "
 
+msgid "Unable to connect."
+msgstr "Ezin da konektatu."
+
 msgid "Unable to establish file descriptor."
 msgstr "Fitxategi-deskriptorea ezin da ezarri."
 
@@ -10267,6 +10047,9 @@ msgstr "Fitxategi-deskriptorea ezin da ezarri."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s  fitxategia bidaltzeko %s(r)i eskaria egiten"
 
+msgid "Write Error"
+msgstr "Idazketa-errorea "
+
 msgid "Yahoo! Japan Profile"
 msgstr "Japoniako yahoo-ren profila"
 
@@ -10385,21 +10168,19 @@ msgstr "Ahotsak"
 msgid "Webcams"
 msgstr "Web kamerak"
 
+msgid "Connection problem"
+msgstr "Konexio-arazoa"
+
 msgid "Unable to fetch room list."
 msgstr "Ezin da gela-zerrenda hartu."
 
 msgid "User Rooms"
 msgstr "Erabiltzaile-gelak"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Konexio-arazoa YCHT zerbitzariarekin."
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "Zerbitzaritik deskonektatuta zaude."
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10531,13 +10312,7 @@ msgid "Exposure"
 msgstr "Agerpena"
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "Ezin da socket-a sortu"
-
-#, fuzzy, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "%s erabiltzaileari ezin zaio %s rola ezarri"
 
 #, fuzzy, c-format
@@ -10545,18 +10320,13 @@ msgid "HTTP proxy connection error %d"
 msgstr "Proxy konexioko %d errorea"
 
 #, fuzzy, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Sarbidea ukatuta: proxy zerbitzariak ez du tunelik onartzen %d atakan."
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr "Errorea martxan jartzean %s"
 
-# ,fuzzy
-#, fuzzy
-msgid "Could not resolve host name"
-msgstr "Ezin izan da ostalaria"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10768,13 +10538,6 @@ msgstr ""
 msgid "Unable to connect to %s: %s"
 msgstr "Ezin da ostalariarekin konektatu"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"Zerbitzariak TLS/SSL behar du konektatzeko. Ez da TLS/SSL euskarririk aurkitu"
-
 #, c-format
 msgid " - %s"
 msgstr ""
@@ -11023,7 +10786,11 @@ msgid "View _Log"
 msgstr "Ikusi _egunkaria"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "Ez da onartzen lineaz kanpo"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "Ez da onartzen lineaz kanpo"
 
 msgid "_Alias..."
@@ -11559,6 +11326,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Aldatu %s erabiltzailearen datuak"
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11606,7 +11376,8 @@ msgstr "Ez ikusi egin"
 msgid "Get Away Message"
 msgstr "Kanpoan nagoeneko mezua "
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Esandako azkena"
 
 msgid "Unable to save icon file to disk."
@@ -12539,7 +12310,7 @@ msgid "Hyperlink visited color"
 msgstr "Hiperestekaren kolorea"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Kolorea hiperestekak marrazteko sagua gainetik pasatzean."
 
 #, fuzzy
@@ -12578,15 +12349,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "Kendu jakinarazpenak"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "Mezu berrien jakinarazpenak"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12991,6 +12769,10 @@ msgstr ""
 "Arakatzailearen 'eskuzko' komandoa aukeratu da, baina ez da komandorik "
 "ezarri."
 
+#, fuzzy
+msgid "No message"
+msgstr "Mezu ezezaguna"
+
 msgid "Open All Messages"
 msgstr "Ireki mezu guztiak"
 
@@ -13008,10 +12790,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Posta-mezua daukazu!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Mezu ezezaguna"
-
 msgid "The following plugins will be unloaded."
 msgstr "Ondorengo plugin-ak  memoriatik deskargatuko  dira."
 
@@ -13239,7 +13017,7 @@ msgid "On unread messages"
 msgstr "Irakurri gabeko mezuak"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "IMko solasaldi-leihoak"
 
 #, fuzzy
@@ -13249,6 +13027,10 @@ msgstr "_Eskutatu BM solasaldi berria"
 msgid "When away"
 msgstr "Kanpora joatean"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "BMko solasaldi-leihoak"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -13309,10 +13091,6 @@ msgstr "Erabili mugimendu leuna norantza bertikalean"
 msgid "F_lash window when IMs are received"
 msgstr "_Erakutsi leihoa keinuka mezuak jasotzean"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "BMko solasaldi-leihoak"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -13352,7 +13130,8 @@ msgstr "Ezin da erabiltzailearen informazioa lortu"
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Automatikoki detektatu IP helbidea "
 
 msgid "Public _IP:"
@@ -13734,34 +13513,18 @@ msgstr "G_orde eta erabili"
 msgid "Status for %s"
 msgstr "Egoera : %s rako."
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "Txertatu aurpegiera"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
 #, fuzzy
-msgid "Duplicate Shortcut"
-msgstr "Bikoiztutako zuzenketa"
+msgid "Custom Smiley"
+msgstr "Txertatu aurpegiera"
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Erabili egoera _ezbedinak kontu batzuentzat"
+msgid "Duplicate Shortcut"
+msgstr "Bikoiztutako zuzenketa"
 
 #, fuzzy
 msgid "Edit Smiley"
@@ -13884,9 +13647,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Ezinezkoa  jaurtitzailea  bidaltzea"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Mahaingain-eko jaurtigailua herrestan eraman duzu. Seguraski beste zeozer "
 "bidali nahiko zenuen. "
@@ -14503,9 +14267,10 @@ msgstr "Musika mezuen Plugin-a kolaborazio bitarteko osaketarako."
 
 # , fuzzy
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Musika mezuen plugin-a hainbat erabiltzaile momentu berean musika zati "
 "batean amankumeko \"score\"-a editatzen lan egiteko aukera eskeintzen du "
@@ -14779,7 +14544,7 @@ msgstr "IMko solasaldi-leihoak"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -15116,7 +14881,7 @@ msgstr "Windows Pidgin-i bakarrik dagozkion aukerak."
 
 #, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Pidgin Windows-en ezarpenak zehazteko aukera eskeintzen du, hala nola "
 "lagunen-zerrenda gelditzea eta elkarrizketa kinuak."
@@ -15160,6 +14925,292 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Ezin da socket-a ireki "
+
+#, fuzzy
+#~ msgid "Could not listen on socket"
+#~ msgstr "Ezin da socket-tik entzun"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Ezin da socket-a irakurri"
+
+#~ msgid "Connection failed."
+#~ msgstr "Konexioak huts egin du "
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Zerbitzaria deskonektatu da"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Ezin izan da socket-a sortu"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Ezin izan da ostalariarekin konektatu"
+
+#~ msgid "Read error"
+#~ msgstr "Irakurketa-errorea"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ezinezkoa izan da konexioa ezatzea mDNS zerbitzari lokalarekin , martxan "
+#~ "al dago ?"
+
+#~ msgid "Write error"
+#~ msgstr "Idazketa-errorea"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "Ezarri Dir informazioa"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Helbidearen jarraipena"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "Ezizena berriketarako"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Erabiltzaileak ez du direktorio-informaziorik."
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Komandoa"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "Erregistratze-errorea"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "Kokalekua"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "Erabiltzaile bilaketa"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "Lagunen egoeraren jakinarazpena"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "Bertsioa ez da onartzen"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "Orientazioa"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "Erabiltzaile-moduak"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "Erabiltzaile-muga"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "Gaitasunak"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "Erabiltzaile-izena"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "IM gako-trukearekin"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "Helbide elektronikoa"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "MSN profila"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "Ping"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "Erabiltzaile-izena "
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "Zuzeneko bideoa"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "Mezua iritsi da"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "Gako publikoaren 'babble'-marka"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "Erabiltzailearen aukerak"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "Erabiltzaile-moduak"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "Erabiltzaile-izena "
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "Erabiltzaile-muga"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Trillian enkriptatzea"
+
+#~ msgid "Read Error"
+#~ msgstr "Irakurketa-errorea"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Huts egin du zerbitzariarekin konektatzean."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Ilara beteta dago"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "Ezin da mezua analizatu"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Ezin izan da ostalariarekin konektatu"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Huts egin du saioa hastean (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Ezin da zerbitzariarekin konektatu."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Deskonektatu egin zaituzte, beste lanpostu batetik hasi duzulako saioa."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Errorea. SSL euskarria ez dago instalatuta."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Okerreko pasahitza."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "Huts egin du zerbitzariarekin konektatzean."
+
+#, fuzzy
+#~ 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."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Ezin izan da konektatu"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "Erabiltzaile-izena ez da baliozkoa"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Ezin da zerbitzariaren informazioa hartu"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "Konexioa itxi da"
+
+# ,fuzzy
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Ezin izan da ostalaria"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Konexioa itxi da (idazten)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Konexioa berabierazten "
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Errorea socket-etik irakurtzean:%s."
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Ezin da ostalariarekin konektatu"
+
+#~ msgid "Could not write"
+#~ msgstr "Ezin izan da idatzi"
+
+#~ msgid "Could not connect"
+#~ msgstr "Ezin izan da konektatu"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Ezin izan da entzuteko socket-a sortu"
+
+# ,fuzzy
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Ezin izan da ostalaria"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Okerreko pasahitza."
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Japoniako yahoo"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "Japoniako bilagailuaren ostalaria"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japoniako fitxategi-transferentzien ostalaria "
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "Zerbitzaritik deskonektatuta zaude."
+
+# ,fuzzy
+#, fuzzy
+#~ msgid "Could not resolve host name"
+#~ msgstr "Ezin izan da ostalaria"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Zerbitzariak TLS/SSL behar du konektatzeko. Ez da TLS/SSL euskarririk "
+#~ "aurkitu"
+
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "IMko solasaldi-leihoak"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Erabili egoera _ezbedinak kontu batzuentzat"
+
 #, fuzzy
 #~ msgid "Activate which ID?"
 #~ msgstr "Zein ID aktibatu?"
@@ -15793,10 +15844,6 @@ msgstr ""
 #~ msgstr "Momentuko lekukoa"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Ezin da zerbitzariarekin konektatu."
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_Mezua:"
 
diff --git a/po/fa.po b/po/fa.po
index ce0db190d4..bc2ca9da55 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2007-04-10 20:37+0330\n"
 "Last-Translator: Elnaz Sarbar <elnaz@farsiweb.info>\n"
 "Language-Team: Persian\n"
@@ -2591,9 +2591,10 @@ msgstr ""
 "تاریخچه‌های کارگیرهای پیغام اینترنتی دیگر را در نمایش‌دهندهٔ تاریخچه قرار می‌دهد."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2650,7 +2651,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2900,11 +2901,12 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "گوش ایستادن برای اتصالات پیغام‌های اینترنتی دریافتی ممکن نیست\n"
 
 msgid ""
@@ -2959,14 +2961,21 @@ msgstr "‏%s گفتگو را بست."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "نمی‌توان پیغام را فرستاد. گفتگو شروع نمی‌شود."
 
-msgid "Cannot open socket"
-msgstr "باز کردن سوکت ممکن نیست"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"ایجاد سوکت ممکن نیست:\n"
+"‏%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "نمی‌توان سوکت را به درگاه مقید کرد"
 
-msgid "Could not listen on socket"
-msgstr "گوش ایستادن روی سوکت ممکن نیست"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"ایجاد سوکت ممکن نیست:\n"
+"‏%s"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3015,13 +3024,16 @@ msgstr "ذخیره کردن فهرست رفقا..."
 msgid "Load buddylist from file..."
 msgstr "بار کردن فهرست رفقا از پرونده..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "فیلدهای ثبت نام را پر کنید."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "گذرواژه‌ها مطابقت ندارند."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "نمی‌توان حساب جدید را ثبت کرد. خطایی رخ داد.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3033,14 +3045,15 @@ msgstr "ثبت نام موفقیت‌آمیز انجام شد!"
 msgid "Password"
 msgstr "گذرواژه"
 
-msgid "Password (retype)"
-msgstr "گذرواژه (تایپ مجدد)"
+msgid "Password (again)"
+msgstr "گذرواژه (دوباره)"
 
-msgid "Enter current token"
-msgstr "توکن فعلی را وارد کنید"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "توکن فعلی"
+#, fuzzy
+msgid "Captcha"
+msgstr "ذخیرهٔ تصویر"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "ثبت حساب Gadu-Gadu جدید"
@@ -3093,6 +3106,15 @@ msgstr "گذرواژه با موفقیت تغییر کرد!"
 msgid "Current password"
 msgstr "گذرواژهٔ فعلی"
 
+msgid "Password (retype)"
+msgstr "گذرواژه (تایپ مجدد)"
+
+msgid "Enter current token"
+msgstr "توکن فعلی را وارد کنید"
+
+msgid "Current token"
+msgstr "توکن فعلی"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "لطفاً گذرواژهٔ فعلی و گذرواژهٔ جدیدتان را وارد کنید."
 
@@ -3140,8 +3162,8 @@ msgstr "کاربری با این مشخصات پیدا نشد"
 msgid "There are no users matching your search criteria."
 msgstr "هیچ کاربری مطابق با معیارهای جستجوی شما پیدا نشد."
 
-msgid "Unable to read socket"
-msgstr "خواندن سوکت ممکن نیست"
+msgid "Unable to read from socket"
+msgstr "خواندن از سوکت ممکن نیست"
 
 msgid "Buddy list downloaded"
 msgstr "فهرست رفقا بارگیری شد:"
@@ -3155,8 +3177,14 @@ msgstr "فهرست رفقا بارگذاری شد"
 msgid "Your buddy list was stored on the server."
 msgstr "فهرست رفقای شما در کارگزار ذخیره نشده است."
 
-msgid "Connection failed."
-msgstr "اتصال شکست خورد."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "متصل شد"
+
+msgid "Connection failed"
+msgstr "اتصال شکست خورد"
 
 msgid "Add to chat"
 msgstr "اضافه کردن به گپ"
@@ -3164,18 +3192,23 @@ msgstr "اضافه کردن به گپ"
 msgid "Chat _name:"
 msgstr "_نام گپ:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "تحویل نام میزبان ممکن نیست."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "در حال اتصال"
+
 msgid "Chat error"
 msgstr "خطای گپ"
 
 msgid "This chat name is already in use"
 msgstr "این نام گپ از قبل وجود دارد"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "به کارگزار متصل نیست."
 
 msgid "Find buddies..."
@@ -3235,7 +3268,8 @@ msgstr "موضوعی تنظیم نشده است"
 msgid "File Transfer Failed"
 msgstr "انتقال پرونده شکست خورد"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "باز کردن درگاه حال پایش ممکن نیست."
 
 msgid "Error displaying MOTD"
@@ -3251,8 +3285,18 @@ msgstr "هیچ MOTD با این اتصال مربوط نشده است."
 msgid "MOTD for %s"
 msgstr "MOTD برای %s"
 
-msgid "Server has disconnected"
-msgstr "اتصال کارگزار قطع شده است"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"اتصال به کارگزار قطع شد:\n"
+"‏%s"
 
 msgid "View MOTD"
 msgstr "نمایش MOTD"
@@ -3267,22 +3311,20 @@ msgstr "_گذرواژه:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "لقب‌های IRC نمی‌توانند حاوی فاصله باشند"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "در حال اتصال"
-
 msgid "SSL support unavailable"
 msgstr "پشتیبانی SSL وجود ندارد"
 
-msgid "Couldn't create socket"
-msgstr "ایجاد سوکت ممکن نیست"
+msgid "Unable to connect"
+msgstr "اتصال ممکن نیست"
 
-msgid "Couldn't connect to host"
-msgstr "نمی‌توان به میزبان متصل شد"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "اتصال به %s ممکن نیست"
 
-msgid "Read error"
-msgstr "خطای خواندن"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "کارگزار اتصال را قطع کرد."
 
 msgid "Users"
 msgstr "کاربران"
@@ -3713,12 +3755,13 @@ msgstr "فرمان از کار انداخته شد"
 msgid "execute"
 msgstr "غیرمنتظره"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "کارگزار برای ورود به سیستم TLS/SSL لازم دارد. پشتیبانی TLS/SSL پیدا نشد."
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "کارگزار برای ورود به سیستم TLS/SSL لازم دارد. پشتیبانی TLS/SSL پیدا نشد."
 
@@ -3736,7 +3779,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "تأیید هویت متنی ساده"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "تأیید هویت شکست خورد"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "پاسخ نامعتبر از کارگزار."
 
 msgid "Server does not use any supported authentication method"
@@ -3748,7 +3796,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "تقاضای نامعتبر از سوی کارگزار"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "خطای SASL"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3768,10 +3817,8 @@ msgstr ""
 "برقراری اتصال با کارگزار ممکن نیست.\n"
 "‏%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "برقراری اتصال با کارگزار ممکن نیست.\n"
 "‏%s"
@@ -3780,12 +3827,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "نمی‌توان اتصال ایجاد کرد"
 
-msgid "Unable to create socket"
-msgstr "ایجاد سوکت ممکن نیست"
-
-msgid "Write error"
-msgstr "خطای نوشتن"
-
 msgid "Full Name"
 msgstr "نام و نام خانوادگی"
 
@@ -3855,188 +3896,6 @@ msgstr "سیستم عامل"
 msgid "Local Time"
 msgstr "پروندهٔ محلی:"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "تنظیم اطلاعات دفترچهٔ راهنمای کاربران"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "ادامهٔ نشانی"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "اسم مستعار گپ"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "کاربر اطلاعاتی در دفترچهٔ راهنمای کاربران ندارد."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "فرمان"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "خطای ثبت"
-
-#, fuzzy
-msgid "User Location"
-msgstr "مکان"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "جستجوی کاربر"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "اطلاع وضعیت رفیق"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "نسخهٔ پشتیبانی نشده"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "جهت"
-
-msgid "File Transfer"
-msgstr "انتقال پرونده"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "حالت‌های کاربر"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "محدودیت کاربران"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "قابلیت‌ها"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "نام کاربر"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "پیغام اینترنتی با تبادل کلید"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "نشانی پست الکترونیکی"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "تنظیم مجموعه تنظیمات"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "پیوستن"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "نام کاربر"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "ویدیوی زنده"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "پیغام دریافت می‌شود"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "پروندهٔ کلید عمومی"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "گزینه‌های کاربر"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "حالت‌های کاربر"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "نام کاربر"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "محدودیت کاربران"
-
-msgid "Ping"
-msgstr "‏Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "رمزنگاری Trillian"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "قابلیت‌ها"
-
 msgid "Priority"
 msgstr "اولویت"
 
@@ -4048,7 +3907,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "وارد سیستم شد"
 
 msgid "Middle Name"
@@ -4236,16 +4095,12 @@ msgid "Roles:"
 msgstr "نقش"
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "متن ساده"
 
-msgid "Read Error"
-msgstr "خطای خواندن"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 #, fuzzy
@@ -4436,9 +4291,6 @@ msgstr "گذرواژهٔ شما تغییر کرد."
 msgid "Error changing password"
 msgstr "خطا هنگام تغییر گذرواژه"
 
-msgid "Password (again)"
-msgstr "گذرواژه (دوباره)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "تغییر گذرواژه"
@@ -4832,6 +4684,14 @@ msgstr "خطای تجزیهٔ XML"
 msgid "Unknown Error in presence"
 msgstr "خطای نامعلوم در حضور"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "خطا هنگام پیوستن به گپ %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "خطا در گپ %s"
+
 msgid "Create New Room"
 msgstr "ایجاد اتاق جدید"
 
@@ -4848,16 +4708,20 @@ msgstr "_پیکربندی اتاق"
 msgid "_Accept Defaults"
 msgstr "_پذیرش پیش‌فرض‌ها"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "خطا هنگام پیوستن به گپ %s"
+#, fuzzy
+msgid "No reason"
+msgstr "دلیلی ارائه نشد."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "خطا در گپ %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "‏%s شما را از کانال بیرون انداخت: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "توسط %s (%s) بیرون انداخته شد"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "هنگام باز کردن پرونده خطایی رخ داد."
 
 #, fuzzy
@@ -5366,9 +5230,6 @@ msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "پشتیبانی SSL برای MSN لازم است. لطفاً یک کتابخانهٔ SSL پشتیبانی شده نصب کنید. "
 
-msgid "Failed to connect to server."
-msgstr "اتصال به کارگزار شکست خورد."
-
 msgid "Error retrieving profile"
 msgstr "خطا هنگام بازیابی شرح حال"
 
@@ -5623,9 +5484,6 @@ msgstr "ممکن است پیغام فرستاده نشده باشد چون خط�
 msgid "Message was not sent because an unknown error occurred."
 msgstr "ممکن است پیغام فرستاده نشده باشد چون خطایی نامعلوم رخ داد:"
 
-msgid "Unable to connect"
-msgstr "اتصال ممکن نیست"
-
 msgid "Writing error"
 msgstr "خطای نوشتن"
 
@@ -5640,13 +5498,16 @@ msgstr ""
 "خطای اتصال از کارگزار %s:\n"
 "‏%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "قرارداد ما توسط این کارگزار پشتیبانی نمی‌شود."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "خطا هنگام تجزیهٔ HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "شما از جای دیگری وارد سیستم شده‌اید."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5654,7 +5515,8 @@ msgstr ""
 "کارگزارهای MSN موقتاً قابل دسترسی نیستند. لطفاً پس از کمی صبر دوباره امتحان "
 "کنید."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "کارگزارهای MSN موقتاً خاموش خواهند شد."
 
 #, c-format
@@ -5667,9 +5529,6 @@ msgstr ""
 "فهرست رفقای MSN شما موقتاً قابل دسترسی نیست. لطفاً پس از کمی صبر دوباره امتحان "
 "کنید."
 
-msgid "Unknown error."
-msgstr "خطای نامعلوم."
-
 msgid "Handshaking"
 msgstr "در حال دست دادن"
 
@@ -5768,6 +5627,9 @@ msgstr "متصل شوندهٔ قرارداد AIM"
 msgid "%s is not a valid group."
 msgstr "‏%s گروه معتبری نیست."
 
+msgid "Unknown error."
+msgstr "خطای نامعلوم."
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "‏%s در %s (%s)"
@@ -5884,12 +5746,6 @@ msgstr[0] ""
 msgid "Add contacts from server"
 msgstr "پاسخ نامعتبر از کارگزار."
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "متصل شد"
-
 #, fuzzy, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "فراروند کُد خطای %d را بازگرداند"
@@ -5913,18 +5769,6 @@ msgid "Invalid input condition"
 msgstr "در حال تکمیل کردن اتصال"
 
 #, fuzzy
-msgid "Read buffer full (2)"
-msgstr "صف پر است"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "نمی‌توان پیغام را تجزیه کرد"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "نمی‌توان به میزبان متصل شد"
-
-#, fuzzy
 msgid "Failed to add buddy"
 msgstr "پیوستن به رفیق در گپ شکست خورد"
 
@@ -6018,6 +5862,12 @@ msgstr ""
 msgid "Client Version"
 msgstr "بستن گفتگو"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 #, fuzzy
 msgid "MySpaceIM - Username Available"
 msgstr "کارگزار در دسترس نیست"
@@ -6285,9 +6135,9 @@ msgstr "کاربر یا برون‌خط است یا با شما قطع رابط�
 msgid "Unknown error: 0x%X"
 msgstr "خطای نامعلوم: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "ورود به سیستم شکست خورد (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "نمی‌توان ورود کاربر %s را ممنوع کرد"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6389,9 +6239,6 @@ msgstr "کنفرانس GroupWise %Id"
 msgid "Authenticating..."
 msgstr "تأیید هویت..."
 
-msgid "Unable to connect to server."
-msgstr "اتصال به کارگزار ممکن نیست."
-
 msgid "Waiting for response..."
 msgstr "در حال انتظار برای پاسخ..."
 
@@ -6415,25 +6262,20 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "آیا مایلید به این گفتگو بپیوندید؟"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "شما از سیستم خارج شدید چون در ایستگاه کاری دیگری وارد سیستم شده‌اید."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 "به نظر می‌رسد %s برون‌خط است و پیغامی را که الان فرستادید دریافت نکرده است."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "نمی‌توان به کارگزار متصل شد. لطفاً نشانی کارگزاری را که مایلید به آن متصل شوید "
 "وارد کنید."
 
-msgid "Error. SSL support is not installed."
-msgstr "خطا. پشتیبانی SSL نصب نشده است."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "این کنفرانس بسته شده است. دیگر نمی‌توان پیغامی فرستاد."
 
@@ -6473,10 +6315,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "خطای هنگام ایجاد اتصال"
 
-msgid "Incorrect password."
-msgstr "گذرواژهٔ نادرست"
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, fuzzy
@@ -6487,18 +6326,8 @@ msgstr "متصل نشد"
 msgid "Invalid chat room name"
 msgstr "نام اتاق نامعتبر"
 
-msgid "Server closed the connection."
-msgstr "کارگزار اتصال را قطع کرد."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"اتصال به کارگزار قطع شد:\n"
-"‏%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "داده‌های نامعتبری از اتصال کارگزار دریافت شد.."
 
 #. *< type
@@ -6547,7 +6376,8 @@ msgstr "اتصال به کاربر دوردست قطع شد:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "داده‌های نامعتبری از اتصال با کاربر دوردست دریافت شد."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "برقراری اتصال با کاربر دوردست ممکن نیست."
 
 msgid "Direct IM established"
@@ -6746,21 +6576,15 @@ msgstr "سطح اخطار"
 msgid "Buddy Comment"
 msgstr "توضیح دربارهٔ رفیق"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "نمی‌توان به کارگزار تأیید هویت متصل شد:\n"
 "‏%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"نمی‌توان به کارگزار BOS متصل شد:\n"
-"‏%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "اتصال به کارگزار ممکن نیست."
 
 #, fuzzy
 msgid "Username sent"
@@ -6775,9 +6599,9 @@ msgstr "در حال تکمیل کردن اتصال"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "نمی‌توان وارد سیستم شد: نمی‌توان با %s وارد سیستم شد چون نام کاربری نامعتبر "
 "است. نام کاربری باید یا با حرف شروع شود و شامل حروف، ارقام، و فاصله باشد یا "
@@ -6792,29 +6616,23 @@ msgstr ""
 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
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "نام نامعتبر"
+msgid "Username does not exist"
+msgstr "کاربر وجود ندارد"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "حساب شما در حال حاضر به حالت تعلیق در آمده است."
 
 #. service temporarily unavailable
@@ -6835,7 +6653,8 @@ msgstr ""
 "کنید و بعد دوباره امتحان کنید. اگر الان به تلاشتان ادامه دهید شاید مجبور "
 "شوید بیشتر منتظر بمانید."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "کلید SecurID وارد شده نامعتبر است."
 
 msgid "Enter SecurID"
@@ -6996,6 +6815,9 @@ msgstr "برخط از"
 msgid "Member Since"
 msgstr "عضو از"
 
+msgid "Capabilities"
+msgstr "قابلیت‌ها"
+
 msgid "Profile"
 msgstr "مجموعه تنظیمات"
 
@@ -7168,7 +6990,7 @@ msgstr "پیغام رفتن خیلی طولانی است."
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7195,9 +7017,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "یتیمان"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "نمی‌توان رفیق %s را به فهرست رفقایتان اضافه کرد چون رفقای خیلی زیادی در فهرست "
@@ -7207,7 +7029,7 @@ msgid "(no name)"
 msgstr "(بدون نام)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "فرمان شما به دلیل نامعلومی شکست خورد."
 
 #, fuzzy, c-format
@@ -8057,7 +7879,7 @@ msgid "Update interval (seconds)"
 msgstr "خطای خواندن"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "نمی‌توان اطلاعات کارگزار را گرفت"
 
 #, c-format
@@ -8084,10 +7906,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "نمی‌توان اطلاعات کارگزار را گرفت"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "محاورهٔ درخواست"
 
@@ -8123,21 +7941,9 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "نمی‌توان متصل شد"
-
 msgid "Socket error"
 msgstr "خطای سوکت"
 
-msgid "Unable to read from socket"
-msgstr "خواندن از سوکت ممکن نیست"
-
-msgid "Write Error"
-msgstr "خطای نوشتن"
-
-msgid "Connection lost"
-msgstr "اتصال قطع شد"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "تنظیم اطلاعات کاربر..."
@@ -8146,8 +7952,9 @@ msgstr "تنظیم اطلاعات کاربر..."
 msgid "Requesting token"
 msgstr "درخواست رد شد"
 
-msgid "Couldn't resolve host"
-msgstr "تحویل نام میزبان ممکن نیست"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "تحویل نام میزبان ممکن نیست."
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8198,7 +8005,7 @@ msgid "QQ Qun Command"
 msgstr "فرمان"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "نمی‌توان اطلاعات کارگزار را گرفت"
 
 #, fuzzy
@@ -8220,9 +8027,6 @@ msgstr "فرستادن پرونده"
 msgid "%d canceled the transfer of %s"
 msgstr "‏%Id از انتقال %s صرف نظر کرد"
 
-msgid "Connection closed (writing)"
-msgstr "اتصال بسته شد (در حال نوشتن)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>عنوان گروه:</b> %s<br>"
@@ -8276,17 +8080,6 @@ msgstr "یک مدیر Sametime اعلان زیر را در کارگزار %s م�
 msgid "Sametime Administrator Announcement"
 msgstr "اعلان مدیر Sametime"
 
-msgid "Connection reset"
-msgstr "اتصال از نو آغاز شد"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "خطا هنگام خواندن از سوکت: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "اتصال به میزبان ممکن نیست"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "اعلان از %s"
@@ -8309,6 +8102,9 @@ msgstr "بلندگوها"
 msgid "Video Camera"
 msgstr "دوربین ویدیویی"
 
+msgid "File Transfer"
+msgstr "انتقال پرونده"
+
 #, fuzzy
 msgid "Supports"
 msgstr "پشتیبانی"
@@ -9130,6 +8926,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "آمار شبکه"
 
+msgid "Ping"
+msgstr "‏Ping"
+
 msgid "Ping failed"
 msgstr "‏Ping شکست خورد"
 
@@ -9190,7 +8989,8 @@ msgstr "نوع کلید عمومی پشتیبانی نشده"
 msgid "Disconnected by server"
 msgstr "قطع شده از طرف کارگزار"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "خطا هنگام اتصال به کارگزار SILC"
 
 msgid "Key Exchange failed"
@@ -9202,27 +9002,26 @@ msgstr ""
 "ازسرگیری نشست جدا شده شکست خورد. برای ایجاد اتصال جدید، اتصال مجدد را فشار "
 "دهید."
 
-msgid "Connection failed"
-msgstr "اتصال شکست خورد"
-
 msgid "Performing key exchange"
 msgstr "در حال اجرای تبادل کلید"
 
-msgid "Unable to create connection"
-msgstr "نمی‌توان اتصال ایجاد کرد"
-
 #, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "نمی‌توان زوج کلید SILC را بار کرد: %s"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "در حال اتصال به کارگزار SILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "نمی‌توان زوج کلید SILC را بار کرد: %s"
+
 msgid "Out of memory"
 msgstr "حافظه تمام شد"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "نمی‌توان قرارداد SILC را راه‌اندازی کرد"
 
 #, fuzzy
@@ -9513,7 +9312,7 @@ msgid "Creating SILC key pair..."
 msgstr "در حال ایجاد زوج کلید SILC..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "در حال ایجاد زوج کلید SILC..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9606,6 +9405,9 @@ msgstr "تخته‌سفید"
 msgid "No server statistics available"
 msgstr "آمار کارگزاری موجود نیست"
 
+msgid "Error during connecting to SILC Server"
+msgstr "خطا هنگام اتصال به کارگزار SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "شکست: عدم تطابق نسخه، کارگیرتان را ارتقا دهید"
@@ -9647,32 +9449,28 @@ msgstr "شکست: کوکی نامعتبر"
 msgid "Failure: Authentication failed"
 msgstr "شکست: تأیید هویت شکست خورد"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "نمی‌توان اتصال کارگیر SILC را راه‌اندازی کرد"
 
 #, fuzzy
 msgid "John Noname"
 msgstr "بدون نام"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "نمی‌توان زوج کلید SILC را بار کرد: %s"
 
-msgid "Could not write"
-msgstr "نمی‌توان نوشت"
-
-msgid "Could not connect"
-msgstr "متصل نشد"
+msgid "Unable to create connection"
+msgstr "نمی‌توان اتصال ایجاد کرد"
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "خطای کارگزار نامعلوم."
 
-msgid "Could not create listen socket"
-msgstr "ایجاد سوکت پایش ممکن نیست"
-
-msgid "Could not resolve hostname"
-msgstr "تحویل نام میزبان ممکن نیست"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "ایجاد سوکت ممکن نیست"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -9715,6 +9513,78 @@ msgstr "تأیید هویت کاربر"
 msgid "Auth Domain"
 msgstr "تأیید هویت دامنه"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "‏join &lt;room&gt;‎: پیوستن به اتاق گپ در شبکهٔ Yahoo"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: فهرست کردن اتاق‌های شبکهٔ یاهو"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "شناسهٔ Yahoo!‎"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "متصل شوندهٔ قرارداد یاهو"
+
+msgid "Pager server"
+msgstr "کارگزار پِی‌جو"
+
+msgid "Pager port"
+msgstr "درگاه پِی‌جو"
+
+msgid "File transfer server"
+msgstr "کارگزار انتقال پرونده"
+
+msgid "File transfer port"
+msgstr "درگاه انتقال پرونده"
+
+msgid "Chat room locale"
+msgstr "شرایط محلی اتاق گپ"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "نادیده گرفتن دعوت به کنفرانس‌ها و اتاق‌های گپ"
+
+msgid "Chat room list URL"
+msgstr "نشانی اینترنتی فهرست اتاق‌های گپ"
+
+msgid "Yahoo Chat server"
+msgstr "کارگزار گپ یاهو"
+
+msgid "Yahoo Chat port"
+msgstr "درگاه گَپ‏ یاهو"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "شناسهٔ Yahoo!‎"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "متصل شوندهٔ قرارداد یاهو"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9746,30 +9616,20 @@ msgstr "اضافه کردن رفیق رد شد"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 "خطای نامعلوم با شمارهٔ %d. ورود به وب‌گاه Yahoo!‎ ممکن است این مشکل را برطرف "
 "کند."
@@ -9812,35 +9672,30 @@ msgstr ""
 "خطای نامعلوم با شمارهٔ %d. ورود به وب‌گاه Yahoo!‎ ممکن است این مشکل را برطرف "
 "کند."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "اضافه کردن رفیق %s به گروه %s به فهرست کارگزار با حساب %s ممکن نیست."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "نمی‌توان رفیق را به فهرست کارگزار اضافه کرد"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "پاسخ‌های HTTP نامعتبر از کارگزار دریافت شد."
 
-msgid "Connection problem"
-msgstr "مشکل اتصال"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr ""
 "اتصال به کارگزار قطع شد:\n"
 "‏%s"
 
 #, fuzzy, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
 "برقراری اتصال با کارگزار ممکن نیست.\n"
 "‏%s"
@@ -9906,74 +9761,15 @@ msgstr "پیوستن به کاربر در گپ..."
 msgid "Open Inbox"
 msgstr "صندوق نامهٔ هات‌مِیل باز شود"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "‏join &lt;room&gt;‎: پیوستن به اتاق گپ در شبکهٔ Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: فهرست کردن اتاق‌های شبکهٔ یاهو"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "شناسهٔ Yahoo!‎"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "متصل شوندهٔ قرارداد یاهو"
-
-msgid "Yahoo Japan"
-msgstr "‏یاهوی ژاپن"
-
-msgid "Pager server"
-msgstr "کارگزار پِی‌جو"
-
-msgid "Japan Pager server"
-msgstr "کارگزار پِی‌جوی ژاپن"
-
-msgid "Pager port"
-msgstr "درگاه پِی‌جو"
-
-msgid "File transfer server"
-msgstr "کارگزار انتقال پرونده"
-
-msgid "Japan file transfer server"
-msgstr "کارگزار انتقال پروندهٔ ژاپن"
-
-msgid "File transfer port"
-msgstr "درگاه انتقال پرونده"
-
-msgid "Chat room locale"
-msgstr "شرایط محلی اتاق گپ"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "نادیده گرفتن دعوت به کنفرانس‌ها و اتاق‌های گپ"
-
-msgid "Chat room list URL"
-msgstr "نشانی اینترنتی فهرست اتاق‌های گپ"
-
-msgid "Yahoo Chat server"
-msgstr "کارگزار گپ یاهو"
-
-msgid "Yahoo Chat port"
-msgstr "درگاه گَپ‏ یاهو"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "نمی‌توان متصل شد"
+
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -9981,6 +9777,9 @@ msgstr ""
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "‏%s مایل است پروندهٔ %s را برای شما بفرستد"
 
+msgid "Write Error"
+msgstr "خطای نوشتن"
+
 msgid "Yahoo! Japan Profile"
 msgstr "مجموعه تنظیمات Yahoo!‎ ژاپن"
 
@@ -10099,23 +9898,19 @@ msgstr "صداها"
 msgid "Webcams"
 msgstr "دوربین‌های وبی"
 
+msgid "Connection problem"
+msgstr "مشکل اتصال"
+
 msgid "Unable to fetch room list."
 msgstr "نمی‌توان فهرست اتاق‌ها را گرفت."
 
 msgid "User Rooms"
 msgstr "اتاق‌های کاربر"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "مشکل اتصال با کارگزار YCHT"
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"اتصال به کارگزار قطع شد\n"
-"‏%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10234,24 +10029,16 @@ msgstr ""
 msgid "Exposure"
 msgstr ""
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"ایجاد سوکت ممکن نیست:\n"
-"‏%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "تجزیهٔ پاسخ پیشکار HTTP ممکن نیست: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "خطای اتصال پیشکار HTTP %Id"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "دسترسی مُجاز نیست: کارگزار پیشکار HTTP تونل زدن از درگاه %Id را ممنوع کرده "
 "است."
@@ -10260,9 +10047,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr "خطا هنگام تحویل %s"
 
-msgid "Could not resolve host name"
-msgstr "تحویل نام میزبان ممکن نیست"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10463,13 +10247,6 @@ msgstr "خطا هنگام نوشتن در %s: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "اتصال به %s ممکن نیست: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"کارگزار برای ورود به سیستم TLS/SSL لازم دارد. پشتیبانی TLS/SSL پیدا نشد."
-
 #, c-format
 msgid " - %s"
 msgstr ""
@@ -10715,7 +10492,11 @@ msgid "View _Log"
 msgstr "نمایش _تاریخچه"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "هنگام انفصال ممکن نیست"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "هنگام انفصال ممکن نیست"
 
 msgid "_Alias..."
@@ -11251,6 +11032,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "تغییر اطلاعات کاربر %s"
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11299,7 +11083,8 @@ msgstr "نادیده گرفتن"
 msgid "Get Away Message"
 msgstr ""
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "آخرین گفته"
 
 msgid "Unable to save icon file to disk."
@@ -12207,7 +11992,7 @@ msgid "Hyperlink visited color"
 msgstr "رنگ پیوند"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "رنگ پیوندهای اینترنتی وقتی موشی روی آنها قرار می‌گیرد."
 
 msgid "Hyperlink prelight color"
@@ -12245,15 +12030,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "حذف اطلاع"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "اطلاع‌های نامهٔ جدید"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12670,6 +12462,10 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "فرمان مرورگر «دستی» انتخاب شده است، ولی فرمانی تنظیم نشده است."
 
+#, fuzzy
+msgid "No message"
+msgstr "(۱ پیغام)"
+
 msgid "Open All Messages"
 msgstr "همهٔ پیغام‌ها باز شوند"
 
@@ -12687,10 +12483,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">نامه دارید!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "(۱ پیغام)"
-
 msgid "The following plugins will be unloaded."
 msgstr "متصل شونده‌های زیر از حافظه خارج خواهند شد."
 
@@ -12913,8 +12705,9 @@ msgstr "_نمایش شمایل محوطهٔ اعلانات:"
 msgid "On unread messages"
 msgstr "برای ‌پیغام‌های خوانده نشده"
 
-msgid "Conversation Window Hiding"
-msgstr "مخفی کردن پنجره‌های گفتگو"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "پنجره‌های گفتگوی پیغام اینترنتی"
 
 msgid "_Hide new IM conversations:"
 msgstr "_مخفی کردن گفتگوهای پیغام‌های اینترنتی جدید:"
@@ -12922,6 +12715,10 @@ msgstr "_مخفی کردن گفتگوهای پیغام‌های اینترنتی
 msgid "When away"
 msgstr "وقتی نیستید"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "پنجرهٔ گفتگو _بالا آورده شود"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -12982,10 +12779,6 @@ msgstr "استفاده از لغزش نرم"
 msgid "F_lash window when IMs are received"
 msgstr "_چشمک زدن پنجره وقتی پیغام‌های اینترنتی دریافت می‌شوند"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "پنجرهٔ گفتگو _بالا آورده شود"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -13024,7 +12817,8 @@ msgstr "نمی‌توان اطلاعات کاربر را گرفت"
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">مثال: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "تشخیص _خودکار نشانی IP"
 
 msgid "Public _IP:"
@@ -13403,34 +13197,18 @@ msgstr "_ذخیره و استفاده"
 msgid "Status for %s"
 msgstr "وضعیت %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "درج صورتک"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
 #, fuzzy
-msgid "Duplicate Shortcut"
-msgstr "تصحیح مقادیر تکراری"
+msgid "Custom Smiley"
+msgstr "درج صورتک"
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "لطفاً برای %s نام جدیدی وارد کنید"
+msgid "Duplicate Shortcut"
+msgstr "تصحیح مقادیر تکراری"
 
 #, fuzzy
 msgid "Edit Smiley"
@@ -13552,9 +13330,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "نمی‌توان راه‌انداز را فرستاد"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "شما یک راه‌انداز رومیزی را برداشته‌اید. به احتمال زیاد منظورتان ارسال چیزی است "
 "که این راه‌انداز به آن اشاره می‌کند."
@@ -14159,9 +13938,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "متصل شوندهٔ پیغام‌رسانی موسیقیایی برای آهنگ‌سازی چند نفری."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "با متصل شوندهٔ پیغام‌رسانی موسیقیایی چند کاربر می‌توانند هم‌زمان روی یک قطعهٔ "
 "موسیقی کار کنند."
@@ -14430,7 +14210,7 @@ msgstr "مخفی کردن پنجره‌های گفتگو"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14760,8 +14540,9 @@ msgstr "گزینه‌های پیجین"
 msgid "Options specific to Pidgin for Windows."
 msgstr "گزینه‌های خاص پیجین برای ویندوز."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "گزینه‌های خاص پیجین ویندوزی مانند جدا کردن فهرست را فراهم می‌کند."
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14802,6 +14583,287 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کارگیرها یا کارگزارهای XMPP مفید است."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "باز کردن سوکت ممکن نیست"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "گوش ایستادن روی سوکت ممکن نیست"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "خواندن سوکت ممکن نیست"
+
+#~ msgid "Connection failed."
+#~ msgstr "اتصال شکست خورد."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "اتصال کارگزار قطع شده است"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "ایجاد سوکت ممکن نیست"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "نمی‌توان به میزبان متصل شد"
+
+#~ msgid "Read error"
+#~ msgstr "خطای خواندن"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "برقراری اتصال با کارگزار ممکن نیست.\n"
+#~ "‏%s"
+
+#~ msgid "Write error"
+#~ msgstr "خطای نوشتن"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "تنظیم اطلاعات دفترچهٔ راهنمای کاربران"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "ادامهٔ نشانی"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "اسم مستعار گپ"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "کاربر اطلاعاتی در دفترچهٔ راهنمای کاربران ندارد."
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "فرمان"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "خطای ثبت"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "مکان"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "جستجوی کاربر"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "اطلاع وضعیت رفیق"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "نسخهٔ پشتیبانی نشده"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "جهت"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "حالت‌های کاربر"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "محدودیت کاربران"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "قابلیت‌ها"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "نام کاربر"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "پیغام اینترنتی با تبادل کلید"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "نشانی پست الکترونیکی"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "تنظیم مجموعه تنظیمات"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "پیوستن"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "نام کاربر"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "ویدیوی زنده"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "پیغام دریافت می‌شود"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "پروندهٔ کلید عمومی"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "گزینه‌های کاربر"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "حالت‌های کاربر"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "نام کاربر"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "محدودیت کاربران"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "رمزنگاری Trillian"
+
+#~ msgid "Read Error"
+#~ msgstr "خطای خواندن"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "اتصال به کارگزار شکست خورد."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "صف پر است"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "نمی‌توان پیغام را تجزیه کرد"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "نمی‌توان به میزبان متصل شد"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "ورود به سیستم شکست خورد (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "اتصال به کارگزار ممکن نیست."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "شما از سیستم خارج شدید چون در ایستگاه کاری دیگری وارد سیستم شده‌اید."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "خطا. پشتیبانی SSL نصب نشده است."
+
+#~ msgid "Incorrect password."
+#~ msgstr "گذرواژهٔ نادرست"
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "نمی‌توان به کارگزار BOS متصل شد:\n"
+#~ "‏%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "ممکن است به زودی ارتباط شما قطع شود. برای دیدن به‌هنگام‌سازی‌ها %s را ببینید."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "نمی‌توان متصل شد"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "نام نامعتبر"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "نمی‌توان اطلاعات کارگزار را گرفت"
+
+#~ msgid "Connection lost"
+#~ msgstr "اتصال قطع شد"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "تحویل نام میزبان ممکن نیست"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "اتصال بسته شد (در حال نوشتن)"
+
+#~ msgid "Connection reset"
+#~ msgstr "اتصال از نو آغاز شد"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "خطا هنگام خواندن از سوکت: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "اتصال به میزبان ممکن نیست"
+
+#~ msgid "Could not write"
+#~ msgstr "نمی‌توان نوشت"
+
+#~ msgid "Could not connect"
+#~ msgstr "متصل نشد"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "ایجاد سوکت پایش ممکن نیست"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "تحویل نام میزبان ممکن نیست"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "گذرواژهٔ نادرست"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "برقراری اتصال با کارگزار ممکن نیست.\n"
+#~ "‏%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "‏یاهوی ژاپن"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "کارگزار پِی‌جوی ژاپن"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "کارگزار انتقال پروندهٔ ژاپن"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "اتصال به کارگزار قطع شد\n"
+#~ "‏%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "تحویل نام میزبان ممکن نیست"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "کارگزار برای ورود به سیستم TLS/SSL لازم دارد. پشتیبانی TLS/SSL پیدا نشد."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "مخفی کردن پنجره‌های گفتگو"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "لطفاً برای %s نام جدیدی وارد کنید"
+
 #, fuzzy
 #~ msgid "Activate which ID?"
 #~ msgstr "فعال‌سازی کدام شناسه؟"
@@ -15482,10 +15544,6 @@ msgstr "این متصل‌شونده‌ برای اشکال‌زدایی کار�
 #~ msgstr "توکن فعلی"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "اتصال به کارگزار ممکن نیست."
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_پیغام:"
 
diff --git a/po/fi.po b/po/fi.po
index 9c3afff465..8c4fa33ac8 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-05 01:14+0300\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2009-07-05 01:14+0300\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: \n"
@@ -2893,15 +2893,17 @@ msgstr ""
 "ActiveTCL-asennusta ei havaittu. Jos haluat käyttää TCL-liitännäisiä, asenna "
 "ActiveTCL osoitteesta http://www.activestate.com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Apple Bonjour for Windows -työkalupakettia ei löytynyt, tarkista usein "
 "kysytyt kysymykset osoitteessa http://developer.pidgin.im/wiki/Using%"
 "20Pidgin#CanIusePidginforBonjourLink-LocalMessaging ."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Sisääntulevia pikaviestintäyhteyksiä ei voi kuunnella\n"
 
 msgid ""
@@ -2954,14 +2956,21 @@ msgstr "%s on sulkenut keskustelun."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Viestiä ei voi lähettää, keskustelua ei voi aloittaa."
 
-msgid "Cannot open socket"
-msgstr "Pistoketta ei voi avata"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Pistokkeen luonti epäonnistui:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Pistoketta ei voi liittää porttiin"
 
-msgid "Could not listen on socket"
-msgstr "Pistoketta ei voi kuunnella"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Pistokkeen luonti epäonnistui:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Virhe viestittäessä paikallisen mDNSResponderin kanssa."
@@ -3009,13 +3018,16 @@ msgstr "Tallenna tuttavat..."
 msgid "Load buddylist from file..."
 msgstr "Tuo tuttavat tiedostosta..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Täytä rekisteröitymiskentät."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Salasanat eivät täsmää."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Uuden käyttäjätilin rekisteröinti epäonnistui virheen takia.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3027,14 +3039,15 @@ msgstr "Rekisteröinti onnistui!"
 msgid "Password"
 msgstr "Salasana"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr "Salasana (uudelleen)"
 
-msgid "Enter current token"
-msgstr "Syötä nykyinen poletti"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Nykyinen poletti"
+#, fuzzy
+msgid "Captcha"
+msgstr "Captcha-kuva"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Rekisteröi uusi Gadu-Gadu-käyttäjätili"
@@ -3087,6 +3100,15 @@ msgstr "Salasanan vaihto onnistui!"
 msgid "Current password"
 msgstr "Nykyinen salasana"
 
+msgid "Password (retype)"
+msgstr "Salasana (uudelleen)"
+
+msgid "Enter current token"
+msgstr "Syötä nykyinen poletti"
+
+msgid "Current token"
+msgstr "Nykyinen poletti"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Syötä sekä nykyinen että uusi salasana tunnukselle: "
 
@@ -3134,7 +3156,7 @@ msgstr "Käyttäjistä ei löytynyt osumia"
 msgid "There are no users matching your search criteria."
 msgstr "Hakuvalintojasi vastaavia käyttäjiä ei ole."
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "Ei kyetty lukemaan pistoketta"
 
 msgid "Buddy list downloaded"
@@ -3149,8 +3171,14 @@ msgstr "Tuttavat lähetettiin"
 msgid "Your buddy list was stored on the server."
 msgstr "Tuttavasi tallennettiin palvelimelle."
 
-msgid "Connection failed."
-msgstr "Yhteys epäonnistui."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Yhdistetty"
+
+msgid "Connection failed"
+msgstr "Yhteys epäonnistui"
 
 msgid "Add to chat"
 msgstr "Lisää ryhmäkeskusteluun"
@@ -3158,17 +3186,23 @@ msgstr "Lisää ryhmäkeskusteluun"
 msgid "Chat _name:"
 msgstr "Keskustelunimi:"
 
-#. should this be a settings error?
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Ei kyetty selvittämään palvelimen nimeä."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Yhdistetään"
+
 msgid "Chat error"
 msgstr "Keskusteluvirhe"
 
 msgid "This chat name is already in use"
 msgstr "Tämä keskustelunimi on jo käytössä"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Ei yhdistettynä palvelimeen."
 
 msgid "Find buddies..."
@@ -3227,7 +3261,8 @@ msgstr "Aihetta ei ole asetettu"
 msgid "File Transfer Failed"
 msgstr "Tiedostonsiirto epäonnistui"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Kuuntelevaa porttia ei voi avata."
 
 msgid "Error displaying MOTD"
@@ -3243,8 +3278,18 @@ msgstr "MOTD:tä ei ole assosioitu tälle yhteydelle."
 msgid "MOTD for %s"
 msgstr "MOTD %s:lle"
 
-msgid "Server has disconnected"
-msgstr "Palvelin on katkaissut yhteyden"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Yhteys palvelimeen katkesi:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Näytä MOTD"
@@ -3258,22 +3303,20 @@ msgstr "_Salasana:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC-kutsumanimissä ja -palvelimissa ei saa olla välilyöntejä"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Yhdistetään"
-
 msgid "SSL support unavailable"
 msgstr "SSL-tuki ei saatavilla"
 
-msgid "Couldn't create socket"
-msgstr "Pistokkeen luominen epäonnistui"
+msgid "Unable to connect"
+msgstr "Yhteyden muodostaminen epäonnistui"
 
-msgid "Couldn't connect to host"
-msgstr "Yhteyttä isäntään ei voi muodostaa"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Kohteeseen %s ei kyetty muodostamaan yhteyttä"
 
-msgid "Read error"
-msgstr "Virhe luettaessa"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Palvelin on katkaissut yhteyden."
 
 msgid "Users"
 msgstr "Käyttäjät"
@@ -3700,10 +3743,12 @@ msgstr "Ad-Hoc-komento epäonnistui"
 msgid "execute"
 msgstr "suorita"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Palvelin vaatii TSL/SSL-tuen kirjautumiseen. TLS/SSL-tukea ei löydy."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Salausta vaadittu, mutta TLS/SSL-tukea ei löydy."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3721,7 +3766,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Tekstipohjainen tunnistus"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Todennus epäonnistui"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Kelvoton vastaus palvelimelta."
 
 msgid "Server does not use any supported authentication method"
@@ -3733,7 +3783,8 @@ msgstr "Salausta vaadittu, mutta sitä ei tueta tällä palvelimella."
 msgid "Invalid challenge from server"
 msgstr "Virheellinen tunnistushaaste palvelimelta"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL-virhe"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3748,23 +3799,13 @@ msgstr "Tukematon versio BOSH-yhteyskäytännöstä"
 msgid "Unable to establish a connection with the server"
 msgstr "Yhteyttä palvelimeen ei voi muodostaa"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"Yhteyttä palvelimeen ei voi muodostaa:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Yhteyttä palvelimeen ei voi muodostaa"
 
 msgid "Unable to establish SSL connection"
 msgstr "SSL-yhteyden muodostaminen ei onnistu"
 
-msgid "Unable to create socket"
-msgstr "Pistokkeen luonti epäonnistui"
-
-msgid "Write error"
-msgstr "Virhe kirjoituksessa"
-
 msgid "Full Name"
 msgstr "Koko nimi"
 
@@ -3834,159 +3875,6 @@ msgstr "Käyttöjärjestelmä"
 msgid "Local Time"
 msgstr "Paikallinen aika"
 
-msgid "Last Activity"
-msgstr "Viimeisin aktiivisena olo"
-
-msgid "Service Discovery Info"
-msgstr "Palvelulöytötiedot"
-
-msgid "Service Discovery Items"
-msgstr "Palvelulöytökohteet"
-
-msgid "Extended Stanza Addressing"
-msgstr "Laajennettu raakalohko-osoitus"
-
-msgid "Multi-User Chat"
-msgstr "Monen käyttäjän keskustelu"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Monen käyttäjän keskustelun laajennetut läsnäolotiedot"
-
-msgid "In-Band Bytestreams"
-msgstr "In-band-tavujonot"
-
-msgid "Ad-Hoc Commands"
-msgstr "Ad-Hoc-komennot"
-
-msgid "PubSub Service"
-msgstr "PubSub-palvelu"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5-tavujonot"
-
-msgid "Out of Band Data"
-msgstr "Out of band -tiedot"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "Rekisteröinti \"in-band\""
-
-msgid "User Location"
-msgstr "Käyttäjän sijainti"
-
-msgid "User Avatar"
-msgstr "Käyttäjän hahmo"
-
-msgid "Chat State Notifications"
-msgstr "Keskustelun tilan ilmoitukset"
-
-msgid "Software Version"
-msgstr "Ohjelmistoversio"
-
-msgid "Stream Initiation"
-msgstr "Virtauksen alustus"
-
-msgid "File Transfer"
-msgstr "Tiedostonsiirto"
-
-msgid "User Mood"
-msgstr "Käyttäjän mieliala"
-
-msgid "User Activity"
-msgstr "Käyttäjän aktiivisuus"
-
-msgid "Entity Capabilities"
-msgstr "Entiteetin ominaisuudet"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Salatut istuntojen neuvottelut"
-
-msgid "User Tune"
-msgstr "Käyttäjänimi"
-
-msgid "Roster Item Exchange"
-msgstr "Tuttavaluetteloiden vaihto"
-
-msgid "Reachability Address"
-msgstr "Tavoitettavuusosoite"
-
-msgid "User Profile"
-msgstr "Käyttäjän profiili"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle-ääni"
-
-msgid "User Nickname"
-msgstr "Käyttäjän kutsumanimi"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle raaka-UDP"
-
-msgid "Jingle Video"
-msgstr "Jingle-video"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Viestikuittaukset"
-
-msgid "Public Key Publishing"
-msgstr "Julkisen avaimen julkaiseminen"
-
-msgid "User Chatting"
-msgstr "Käyttäjä keskustelee"
-
-msgid "User Browsing"
-msgstr "Käyttäjä selaa"
-
-msgid "User Gaming"
-msgstr "Käyttäjä pelaa"
-
-msgid "User Viewing"
-msgstr "Käyttäjä katselee"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Raakalohkojen salaus"
-
-msgid "Entity Time"
-msgstr "Entiteetin aika"
-
-msgid "Delayed Delivery"
-msgstr "Viivästetty toimitus"
-
-msgid "Collaborative Data Objects"
-msgstr "Yhteistyötä tekevät dataobjektit"
-
-msgid "File Repository and Sharing"
-msgstr "Tiedostovarasto ja jakaminen"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "STUN-palvelun löytäminen Jinglelle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Yksinkertaistettu salatun istunnon neuvottelu"
-
-msgid "Hop Check"
-msgstr "Hyppytarkistus"
-
-msgid "Capabilities"
-msgstr "Kyvyt"
-
 msgid "Priority"
 msgstr "Tärkeys"
 
@@ -3997,7 +3885,8 @@ msgstr "Sijainti"
 msgid "%s ago"
 msgstr "%s sitten"
 
-msgid "Logged off"
+#, fuzzy
+msgid "Logged Off"
 msgstr "Kirjautunut ulos"
 
 msgid "Middle Name"
@@ -4175,16 +4064,14 @@ msgstr "Käyttäjiä ei löytynyt"
 msgid "Roles:"
 msgstr "Roolit:"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Pingin aikakatkaisu"
 
-msgid "Read Error"
-msgstr "Virhe luettaessa"
-
-#, c-format
+#, fuzzy
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 "Vaihtoehtoisia XMPP-yhteystapoja ei löytynyt suoran yhdistämisen "
 "epäonnistumisen jälkeen.\n"
@@ -4360,9 +4247,6 @@ msgstr "Salasana vaihdettu"
 msgid "Error changing password"
 msgstr "Virhe vaihdettaessa salasanaa"
 
-msgid "Password (again)"
-msgstr "Salasana (uudelleen)"
-
 msgid "Change XMPP Password"
 msgstr "Vaihda XMPP-salasana"
 
@@ -4746,6 +4630,14 @@ msgstr "Virhe XML-jäsennyksessä"
 msgid "Unknown Error in presence"
 msgstr "Tuntematon virhe tavoitettavuudessa"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Virhe liityttäessä ryhmäkeskusteluun %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Virhe ryhmäkeskustelussa: %s"
+
 msgid "Create New Room"
 msgstr "Luo uusi huone"
 
@@ -4762,13 +4654,17 @@ msgstr "_Aseta huoneen asetuksia"
 msgid "_Accept Defaults"
 msgstr "_Hyväksy oletusasetukset"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Virhe liityttäessä ryhmäkeskusteluun %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Syytä ei annettu"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Virhe ryhmäkeskustelussa: %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "%s on poistanut sinut kanavalta: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s potkaisi (%s)"
 
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Kaistansisäisessä tavuvirtasiirrossa tapahtui virhe\n"
@@ -5259,9 +5155,6 @@ msgstr "Aloita _ryhmäkeskustelu"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN vaatii SSL-tuen. Asenna tuettu SSL-kirjasto."
 
-msgid "Failed to connect to server."
-msgstr "Palvelimeen ei saatu yhteyttä."
-
 msgid "Error retrieving profile"
 msgstr "Virhe haettaessa profiilia"
 
@@ -5514,9 +5407,6 @@ msgstr "Viestiä ei voi lähettää tuntemattoman koodausvirheen vuoksi."
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Viestiä ei voi lähettää tuntemattoman virheen vuoksi."
 
-msgid "Unable to connect"
-msgstr "Yhteyden muodostaminen epäonnistui"
-
 msgid "Writing error"
 msgstr "Virhe kirjoitettaessa"
 
@@ -5531,13 +5421,16 @@ msgstr ""
 "Yhteysvirhe palvelimelta %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Palvelin ei tue yhteyskäytäntöä."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Virhe jäsennettäessä HTTP:tä."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Olet kirjautunut sisään toisesta paikasta."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5545,7 +5438,8 @@ msgstr ""
 "MSN-palvelimet ovat väliaikaisesti tavoittamattomissa. Odota ja yritä "
 "uudelleen."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN-palvelimet ajetaan alas väliaikaisesti."
 
 #, c-format
@@ -5556,9 +5450,6 @@ msgid ""
 "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"
 
@@ -5657,6 +5548,9 @@ msgstr "MSN-yhteyskäytäntöliitännäinen"
 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)"
@@ -5767,12 +5661,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Lisää tuttavia palvelimelta"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Yhdistetty"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Yhteyskäytäntövirhe, virhekoodi %d: %s"
@@ -5796,16 +5684,6 @@ msgstr "MySpaceIM-virhe"
 msgid "Invalid input condition"
 msgstr "Epäkelpo syötetila"
 
-msgid "Read buffer full (2)"
-msgstr "Lukupuskuri täynnä (2)"
-
-msgid "Unparseable message"
-msgstr "Viestin jäsennys epäonnistui"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Yhteyttä isäntään ei voi muodostaa: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Tuttavan lisääminen epäonnistui"
 
@@ -5889,6 +5767,16 @@ msgstr "Kavereita yhteensä"
 msgid "Client Version"
 msgstr "Asiakasohjelman versio"
 
+#, fuzzy
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"Mene osoitteeseen http://editprofile.myspace.com/index.cfm?"
+"fuseaction=profile.username ja valitse käyttäjänimesi. Kirjaudu sitten "
+"uudestaan."
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Käyttäjänimi saatavilla"
 
@@ -6147,9 +6035,9 @@ msgstr "Käyttäjä on joko poissa linjoilta tai sinut on estetty"
 msgid "Unknown error: 0x%X"
 msgstr "Tuntematon virhe: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Kirjautuminen epäonnistui (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Ei voi kirjautua"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6252,9 +6140,6 @@ msgstr "GroupWise-konferenssi %d"
 msgid "Authenticating..."
 msgstr "Todennetaan..."
 
-msgid "Unable to connect to server."
-msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä."
-
 msgid "Waiting for response..."
 msgstr "Odotetaan vastausta..."
 
@@ -6278,10 +6163,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Haluatko liittyä keskusteluun?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Sinut on kirjattu ulos koska olet kirjautunut sisään toiselta työasemalta."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6295,9 +6176,6 @@ msgstr ""
 "Palvelimeen ei voi yhdistää. Ole hyvä, syötä palvelimen osoite jolle haluat "
 "yhdistää."
 
-msgid "Error. SSL support is not installed."
-msgstr "Virhe. SSL-tuki ei ole asennettu."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Tämä konferenssi on suljettu. Uusia viestejä ei voi lähettää."
 
@@ -6336,10 +6214,8 @@ msgstr ""
 msgid "Error requesting "
 msgstr "Virhe pyydettäessä "
 
-msgid "Incorrect password."
-msgstr "Virheellinen salasana."
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+#, fuzzy
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL ei salli näyttönimen todentamista tämän sivuston kautta."
 
 msgid "Could not join chat room"
@@ -6348,18 +6224,8 @@ msgstr "Keskusteluhuoneeseen ei voi liittyä"
 msgid "Invalid chat room name"
 msgstr "Epäkelpo keskusteluhuoneen nimi"
 
-msgid "Server closed the connection."
-msgstr "Palvelin on katkaissut yhteyden."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Yhteys palvelimeen katkesi:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Palvelimeen yhdistettäessä vastaanotettiin virheellisiä tietoja."
 
 #. *< type
@@ -6407,7 +6273,8 @@ msgstr "Yhteys käyttäjään katkesi:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Vastaanotettiin virheellisiä tietoja luotaessa yhteyttä käyttäjään."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Yhteyttä käyttäjän kanssa ei voi muodostaa."
 
 msgid "Direct IM established"
@@ -6609,21 +6476,15 @@ msgstr "Varoitustaso"
 msgid "Buddy Comment"
 msgstr "Tuttavakommentti"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Ei saatu yhteyttä todentamispalvelimeen:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Ei saatu yhteyttä BOS-palvelimeen:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä."
 
 msgid "Username sent"
 msgstr "Käyttäjänimi lähetetty"
@@ -6635,11 +6496,11 @@ msgstr "Yhteys muodostettu, eväste lähetetty"
 msgid "Finalizing connection"
 msgstr "Viimeistellään yhteyttä"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Kirjautuminen epäonnistui: käyttäjänä %s ei voi kirjautua koska käyttäjänimi "
 "on virheellinen. Käyttäjänimen tulee olla oikea sähköpostiosoite, tai alkaa "
@@ -6654,26 +6515,21 @@ msgstr ""
 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
 #. the username does not exist
 msgid "Username does not exist"
 msgstr "Käyttäjänimeä ei ole"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Käyttäjätilisi palvelu on parhaillaan keskeytetty."
 
 #. service temporarily unavailable
@@ -6692,7 +6548,8 @@ msgstr ""
 "Olet ottanut ja katkaissut yhteyden liian tiheästi. Odota jonkin aikaa ja "
 "yritä uudelleen. Jos jatkat yrittämistä, joudut odottamaan vielä pidempään."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Syötetty SecurID-avain on virheellinen."
 
 msgid "Enter SecurID"
@@ -6859,6 +6716,9 @@ msgstr "Kirjautunut"
 msgid "Member Since"
 msgstr "Rekisteröitynyt"
 
+msgid "Capabilities"
+msgstr "Kyvyt"
+
 msgid "Profile"
 msgstr "Profiili"
 
@@ -7040,9 +6900,9 @@ msgstr[1] ""
 msgid "Away message too long."
 msgstr "Poissaoloviesti on liian pitkä."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7067,9 +6927,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Orvot"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Tuttavaa %s ei voi lisätä koska tuttaviasi on liian monta. Ole hyvä ja "
@@ -7078,8 +6938,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(nimetön)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Tuttavaa %s ei voi lisätä tuntemattomasta syystä."
 
 #, c-format
@@ -7850,7 +7710,8 @@ msgstr "Jatkuvan yhteydenpidon aikaväli (sekunneissa)"
 msgid "Update interval (seconds)"
 msgstr "Päivitysten aikaväli (sekunneissa)"
 
-msgid "Cannot decrypt server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "Palvelinvastauksen salausta ei voi purkaa"
 
 #, c-format
@@ -7875,9 +7736,6 @@ msgstr "Vaatii aktivoinnin"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Tuntematon vastauskoodi kirjauduttaessa (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Palvelinvastauksen salausta ei voi purkaa"
-
 msgid "Requesting captcha"
 msgstr "Pyydetään captchaa"
 
@@ -7899,10 +7757,6 @@ msgstr "QQ-Captcha-tarkistus"
 msgid "Enter the text from the image"
 msgstr "Syötä teksti kuvasta"
 
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Epäkelpo käyttäjänimi."
-
 #, c-format
 msgid "Unknown reply when checking password (0x%02X)"
 msgstr "Tuntematon vastaus tarkistettaessa salasanaa (0x%02X)"
@@ -7915,29 +7769,18 @@ msgstr ""
 "Tuntematon vastauskoosi kirjauduttaessa sisään (0x%02X):\n"
 "%s"
 
-msgid "Unable to connect."
-msgstr "Yhteyden muodostaminen epäonnistui."
-
 msgid "Socket error"
 msgstr "Pistokevirhe"
 
-msgid "Unable to read from socket"
-msgstr "Ei kyetty lukemaan pistoketta"
-
-msgid "Write Error"
-msgstr "Virhe kirjoituksessa"
-
-msgid "Connection lost"
-msgstr "Yhteys katkesi"
-
 msgid "Getting server"
 msgstr "Haetaan palvelinta"
 
 msgid "Requesting token"
 msgstr "Pyydetään polettia"
 
-msgid "Couldn't resolve host"
-msgstr "Yhteyttä isäntään ei voi löytää"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Ei kyetty selvittämään palvelimen nimeä."
 
 msgid "Invalid server or port"
 msgstr "Epäkelpo palvelin tai portti"
@@ -7990,7 +7833,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "QQ-Qun-komento"
 
-msgid "Could not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "Kirjautumisvastauksen salausta ei voi purkaa"
 
 msgid "Unknown LOGIN CMD"
@@ -8010,9 +7854,6 @@ msgstr "Tiedoston lähetys"
 msgid "%d canceled the transfer of %s"
 msgstr "%d peruutti tiedoston %s siirron"
 
-msgid "Connection closed (writing)"
-msgstr "Yhteys suljettu (kirjoitus)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Ryhmän nimi:</b> %s<br>"
@@ -8066,17 +7907,6 @@ msgstr "Sametime-ylläpitäjä on julkaissut seuraavan tiedotteen palvelimella %
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime-ylläpitäjän tiedote"
 
-msgid "Connection reset"
-msgstr "Yhteys suljettu"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Virhe luettaessa socketista: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Ilmoitus käyttäjältä %s"
@@ -8099,6 +7929,9 @@ msgstr "Kaiuttimet"
 msgid "Video Camera"
 msgstr "Videokamera"
 
+msgid "File Transfer"
+msgstr "Tiedostonsiirto"
+
 msgid "Supports"
 msgstr "Tukee"
 
@@ -8915,6 +8748,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Verkkotilastoja"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping epäonnistui"
 
@@ -8978,7 +8814,8 @@ msgstr "Julkisen avaimen tyyppiä ei tuettu"
 msgid "Disconnected by server"
 msgstr "Palvelin katkaisi yhteyden"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Virhe luotaessa yhteyttä SILC-palvelimelle"
 
 msgid "Key Exchange failed"
@@ -8990,26 +8827,26 @@ msgstr ""
 "Irrotetun yhteyden palauttaminen epäonnistui. Paina Uudelleenyhdistä "
 "luodaksesi uuden yhteyden."
 
-msgid "Connection failed"
-msgstr "Yhteys epäonnistui"
-
 msgid "Performing key exchange"
 msgstr "Suoritetaan avaintenvaihto"
 
-msgid "Unable to create connection"
-msgstr "Yhteyden luominen epäonnistui"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "SILC-avainparia ei voi ladata"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Yhdistetään SILC-palvelimelle"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "SILC-avainparia ei voi ladata"
+
 msgid "Out of memory"
 msgstr "Muisti loppu"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "SILC-yhteyskäytäntöä ei voi alustaa"
 
 msgid "Error loading SILC key pair"
@@ -9301,7 +9138,8 @@ msgstr "Allekirjoita ja tarkista kaikki viestit digitaalisesti"
 msgid "Creating SILC key pair..."
 msgstr "Luodaan SILC-avainpari..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "SILC-avainparia ei voi luoda\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9398,6 +9236,9 @@ msgstr "Kirjoitustaulu"
 msgid "No server statistics available"
 msgstr "Palvelimen tilastoja ei saatavilla."
 
+msgid "Error during connecting to SILC Server"
+msgstr "Virhe luotaessa yhteyttä SILC-palvelimelle"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Virhe: Versioepäyhteensopivuus, päivitä ohjelmasi"
@@ -9438,30 +9279,27 @@ msgstr "Virhe: Virheellinen eväste"
 msgid "Failure: Authentication failed"
 msgstr "Virhe: Todennus epäonnistui"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "SILC-asiakasyhteyttä ei voi alustaa"
 
 msgid "John Noname"
 msgstr "Pertti Perusnimi"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "SILC-avainparia ei voi ladata: %s"
 
-msgid "Could not write"
-msgstr "Kirjoittaminen ei onnistu"
-
-msgid "Could not connect"
-msgstr "Yhdistäminen ei onnistu"
+msgid "Unable to create connection"
+msgstr "Yhteyden luominen epäonnistui"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Tuntematon palvelinvastaus."
 
-msgid "Could not create listen socket"
-msgstr "Kuuntelupistokkeen luominen epäonnistui"
-
-msgid "Could not resolve hostname"
-msgstr "Isäntänimeä ei voi selvittää"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Pistokkeen luonti epäonnistui"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-käyttäjänimissä ei tule olla välilyöntejä tai @-merkkejä"
@@ -9502,6 +9340,77 @@ msgstr "Todennus/käyttäjä"
 msgid "Auth Domain"
 msgstr "Todennus/verkkoalue"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;huone&gt;: Liity keskusteluhuoneeseen Yahoo-verkossa"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Listaa kanavat Yahoo-verkossa"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Pyydä käyttäjää aloittamaan piirtelyistunto"
+
+msgid "Yahoo ID..."
+msgstr "Yahoo ID..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo-yhteyskäytäntöliitännäinen"
+
+msgid "Pager server"
+msgstr "Hakulaitepalvelin"
+
+msgid "Pager port"
+msgstr "Hakulaiteportti"
+
+msgid "File transfer server"
+msgstr "Tiedostonsiirtopalvelin"
+
+msgid "File transfer port"
+msgstr "Tiedostonsiirtoportti"
+
+msgid "Chat room locale"
+msgstr "Keskusteluhuoneen paikallisasetus"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Jätä konferenssi- ja keskusteluhuonekutsut huomiotta"
+
+msgid "Chat room list URL"
+msgstr "Keskusteluhuoneluettelon URL"
+
+msgid "Yahoo Chat server"
+msgstr "Yahoo-ryhmäkeskustelupalvelin"
+
+msgid "Yahoo Chat port"
+msgstr "Yahoo-ryhmäkeskustelupalvelimen portti"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo ID..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo-yhteyskäytäntöliitännäinen"
+
 msgid "Your SMS was not delivered"
 msgstr "Tekstiviestiä (SMS) ei välitetty"
 
@@ -9532,21 +9441,20 @@ msgstr "Tuttavan lisääminen estetty"
 msgid "Received invalid data"
 msgstr "Vastaanotettiin virheellisiä tietoja"
 
-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."
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
 msgstr ""
 "Käyttäjätili lukittu: liian monta epäonnistuttu kirjautumisyritystä.\n"
 "Yahoo!-WWW-sivustolle kirjautuminen saatta korjata tämän."
 
 #. indicates a lock of some description
+#, fuzzy
 msgid ""
-"Account locked: Unknown reason.\n"
-"Logging into the Yahoo! website may fix this."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 "Käyttäjätili lukittu: tuntematon syy.\n"
 "Yahoo!-WWW-sivustolle kirjautuminen saatta korjata tämän."
@@ -9589,39 +9497,32 @@ msgstr ""
 "Tuntematon viesti numero %d. Kirjautumalla Yahoo! verkkosivuille saattaa "
 "korjata tämän."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Tuttavaa %s ei voi lisätä ryhmään %s palvelimen tuttavissa, tilillä %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Tuttavaa ei voi lisätä palvelimen tuttaviin"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Ääniäinen %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Odottamaton HTTP-vastaus palvelimelta."
 
-msgid "Connection problem"
-msgstr "Yhteysvirhe"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Yhteys palvelimeen %s katkesi:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"Yhteyttä ei voi muodostaa palvelimeen %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Yhteyttä palvelimeen ei voi muodostaa"
 
 msgid "Not at Home"
 msgstr "Poissa kotoa"
@@ -9683,73 +9584,15 @@ msgstr "Liity käyttäjän seuraan ryhmäkeskustelussa..."
 msgid "Open Inbox"
 msgstr "Avaa saapuneet-kansio"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;huone&gt;: Liity keskusteluhuoneeseen Yahoo-verkossa"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Listaa kanavat Yahoo-verkossa"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Pyydä käyttäjää aloittamaan piirtelyistunto"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo ID..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo-yhteyskäytäntöliitännäinen"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japani"
-
-msgid "Pager server"
-msgstr "Hakulaitepalvelin"
-
-msgid "Japan Pager server"
-msgstr "Hakulaitepalvelin (Japani)"
-
-msgid "Pager port"
-msgstr "Hakulaiteportti"
-
-msgid "File transfer server"
-msgstr "Tiedostonsiirtopalvelin"
-
-msgid "Japan file transfer server"
-msgstr "Tiedostonsiirtopalvelin (Japani)"
-
-msgid "File transfer port"
-msgstr "Tiedostonsiirtoportti"
-
-msgid "Chat room locale"
-msgstr "Keskusteluhuoneen paikallisasetus"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Jätä konferenssi- ja keskusteluhuonekutsut huomiotta"
-
-msgid "Chat room list URL"
-msgstr "Keskusteluhuoneluettelon URL"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo-ryhmäkeskustelupalvelin"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo-ryhmäkeskustelupalvelimen portti"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Lähetä piirtelypyyntö (doodle)."
 
+msgid "Unable to connect."
+msgstr "Yhteyden muodostaminen epäonnistui."
+
 msgid "Unable to establish file descriptor."
 msgstr "Ei kyetty muodostamaan tiedostokahvaa."
 
@@ -9757,6 +9600,9 @@ msgstr "Ei kyetty muodostamaan tiedostokahvaa."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s tarjoaa %d tiedoston tiedostoryhmää.\n"
 
+msgid "Write Error"
+msgstr "Virhe kirjoituksessa"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan -profiili"
 
@@ -9875,23 +9721,19 @@ msgstr "Äänet"
 msgid "Webcams"
 msgstr "Web-kamerat"
 
+msgid "Connection problem"
+msgstr "Yhteysvirhe"
+
 msgid "Unable to fetch room list."
 msgstr "Huoneluetteloa ei voi hakea."
 
 msgid "User Rooms"
 msgstr "Käyttäjän huoneet"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Yhteysvirhe YCHT-palvelimen kanssa"
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Yhteys palvelimeen katkesi\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10018,33 +9860,22 @@ msgstr "Alue (realm)"
 msgid "Exposure"
 msgstr "Altistus"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Pistokkeen luonti epäonnistui:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Vastausta HTTP-välipalvelimelta ei voi jäsentää: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP-välipalvelimen yhteysvirhe %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Pääsy evätty: HTTP-välipalvelin estää portin %d tunneloinnin."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Virhe selvitettäessä %s"
 
-msgid "Could not resolve host name"
-msgstr "Isäntänimeä ei voi selvittää"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Pyydetään käyttäjän %s huomiota..."
@@ -10247,14 +10078,6 @@ msgid "Unable to connect to %s: %s"
 msgstr "Kohteeseen %s ei voi yhdistää: %s"
 
 #, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"Palvelimelle %s ei voi yhdistää: palvelin vaatii TSL/SSL-tuen, mutta TLS/SSL-"
-"tukea ei löydy."
-
-#, c-format
 msgid " - %s"
 msgstr " - %s"
 
@@ -10498,9 +10321,14 @@ msgstr "Lisää tuttava_ilmoitin..."
 msgid "View _Log"
 msgstr "Näytä _loki"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Piilota kun poissa linjoilta"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Näytä kun poissa linjoilta"
+
 msgid "_Alias..."
 msgstr "_Lempinimi..."
 
@@ -11044,7 +10872,8 @@ msgstr "Jätä huomiotta"
 msgid "Get Away Message"
 msgstr "Hae poissaoloviesti"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Viimeksi sanottu"
 
 msgid "Unable to save icon file to disk."
@@ -12597,8 +12426,9 @@ msgstr "_Näytä ilmoitusalueen kuvake:"
 msgid "On unread messages"
 msgstr "Kun lukemattomia viestejä"
 
-msgid "Conversation Window Hiding"
-msgstr "Keskusteluikkunan piilottaminen"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Pikaviesti-ikkunat"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Piilota uudet pikaviestikeskustelut:"
@@ -12606,6 +12436,9 @@ msgstr "_Piilota uudet pikaviestikeskustelut:"
 msgid "When away"
 msgstr "Poissaollessa"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Piene_nnä uudet keskusteluikkunat"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Välilehdet"
@@ -12664,9 +12497,6 @@ msgstr "Käytä portaatonta tekstinvieritystä"
 msgid "F_lash window when IMs are received"
 msgstr "_Vilkuta ikkunaa pikaviestien saapuessa"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Piene_nnä uudet keskusteluikkunat"
-
 msgid "Minimum input area height in lines:"
 msgstr "Kirjoitusalueen pienin korkeus riveissä:"
 
@@ -14394,6 +14224,304 @@ msgstr ""
 "Tätä liitännäistä voidaan käyttää XMPP-palvelimien tai -asiakasohjelmien "
 "virheenjäljitykseen."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Pistoketta ei voi avata"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Pistoketta ei voi kuunnella"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Ei kyetty lukemaan pistoketta"
+
+#~ msgid "Connection failed."
+#~ msgstr "Yhteys epäonnistui."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Palvelin on katkaissut yhteyden"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Pistokkeen luominen epäonnistui"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Yhteyttä isäntään ei voi muodostaa"
+
+#~ msgid "Read error"
+#~ msgstr "Virhe luettaessa"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Yhteyttä palvelimeen ei voi muodostaa:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Virhe kirjoituksessa"
+
+#~ msgid "Last Activity"
+#~ msgstr "Viimeisin aktiivisena olo"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Palvelulöytötiedot"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Palvelulöytökohteet"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Laajennettu raakalohko-osoitus"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Monen käyttäjän keskustelu"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Monen käyttäjän keskustelun laajennetut läsnäolotiedot"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "In-band-tavujonot"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ad-Hoc-komennot"
+
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub-palvelu"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5-tavujonot"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Out of band -tiedot"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "Rekisteröinti \"in-band\""
+
+#~ msgid "User Location"
+#~ msgstr "Käyttäjän sijainti"
+
+#~ msgid "User Avatar"
+#~ msgstr "Käyttäjän hahmo"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Keskustelun tilan ilmoitukset"
+
+#~ msgid "Software Version"
+#~ msgstr "Ohjelmistoversio"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Virtauksen alustus"
+
+#~ msgid "User Mood"
+#~ msgstr "Käyttäjän mieliala"
+
+#~ msgid "User Activity"
+#~ msgstr "Käyttäjän aktiivisuus"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Entiteetin ominaisuudet"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Salatut istuntojen neuvottelut"
+
+#~ msgid "User Tune"
+#~ msgstr "Käyttäjänimi"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Tuttavaluetteloiden vaihto"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Tavoitettavuusosoite"
+
+#~ msgid "User Profile"
+#~ msgstr "Käyttäjän profiili"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Jingle-ääni"
+
+#~ msgid "User Nickname"
+#~ msgstr "Käyttäjän kutsumanimi"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle raaka-UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Jingle-video"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Viestikuittaukset"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Julkisen avaimen julkaiseminen"
+
+#~ msgid "User Chatting"
+#~ msgstr "Käyttäjä keskustelee"
+
+#~ msgid "User Browsing"
+#~ msgstr "Käyttäjä selaa"
+
+#~ msgid "User Gaming"
+#~ msgstr "Käyttäjä pelaa"
+
+#~ msgid "User Viewing"
+#~ msgstr "Käyttäjä katselee"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Raakalohkojen salaus"
+
+#~ msgid "Entity Time"
+#~ msgstr "Entiteetin aika"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Viivästetty toimitus"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Yhteistyötä tekevät dataobjektit"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Tiedostovarasto ja jakaminen"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "STUN-palvelun löytäminen Jinglelle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Yksinkertaistettu salatun istunnon neuvottelu"
+
+#~ msgid "Hop Check"
+#~ msgstr "Hyppytarkistus"
+
+#~ msgid "Read Error"
+#~ msgstr "Virhe luettaessa"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Palvelimeen ei saatu yhteyttä."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Lukupuskuri täynnä (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Viestin jäsennys epäonnistui"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Yhteyttä isäntään ei voi muodostaa: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Kirjautuminen epäonnistui (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Sinut on kirjattu ulos koska olet kirjautunut sisään toiselta työasemalta."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Virhe. SSL-tuki ei ole asennettu."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Virheellinen salasana."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ei saatu yhteyttä BOS-palvelimeen:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Yhteytesi saattaa katketa kohta. Tarkista päivitykset: %s."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Yhteyttä ei voi muodostaa"
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Palvelinvastauksen salausta ei voi purkaa"
+
+#~ msgid "Invalid username."
+#~ msgstr "Epäkelpo käyttäjänimi."
+
+#~ msgid "Connection lost"
+#~ msgstr "Yhteys katkesi"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Yhteyttä isäntään ei voi löytää"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Yhteys suljettu (kirjoitus)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Yhteys suljettu"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Virhe luettaessa socketista: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä"
+
+#~ msgid "Could not write"
+#~ msgstr "Kirjoittaminen ei onnistu"
+
+#~ msgid "Could not connect"
+#~ msgstr "Yhdistäminen ei onnistu"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Kuuntelupistokkeen luominen epäonnistui"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Isäntänimeä ei voi selvittää"
+
+#~ msgid "Incorrect Password"
+#~ msgstr "Virheellinen salasana"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Yhteyttä ei voi muodostaa palvelimeen %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japani"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Hakulaitepalvelin (Japani)"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Tiedostonsiirtopalvelin (Japani)"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Yhteys palvelimeen katkesi\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Isäntänimeä ei voi selvittää"
+
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Palvelimelle %s ei voi yhdistää: palvelin vaatii TSL/SSL-tuen, mutta TLS/"
+#~ "SSL-tukea ei löydy."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Keskusteluikkunan piilottaminen"
+
 #~ msgid "More Data needed"
 #~ msgstr "Lisää tietoja tarvitaan"
 
@@ -14894,9 +15022,6 @@ msgstr ""
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "Ei voi kirjautua. Tarkista virheenjäljitysloki."
 
-#~ msgid "Unable to login"
-#~ msgstr "Ei voi kirjautua"
-
 #~ msgid "Failed room reply"
 #~ msgstr "Epäonnistunut huoneen vastaus"
 
@@ -15022,14 +15147,6 @@ msgstr ""
 #~ "Pahoittelut, MySpace ei tue salasanoja jotka ovat yli %d kirjainta pitkiä "
 #~ "(sinun on %d kirjainta)."
 
-#~ msgid ""
-#~ "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username and choose a username and try to login again."
-#~ msgstr ""
-#~ "Mene osoitteeseen http://editprofile.myspace.com/index.cfm?"
-#~ "fuseaction=profile.username ja valitse käyttäjänimesi. Kirjaudu sitten "
-#~ "uudestaan."
-
 #~ msgid "Invalid chat name specified."
 #~ msgstr "Virheellinen ryhmäkeskustelun nimi annettu."
 
@@ -15095,10 +15212,6 @@ msgstr ""
 #~ msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä."
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä."
-
-#, fuzzy
 #~ msgid "Show offline buddies"
 #~ msgstr "Näytä poissaolevat tuttavat"
 
diff --git a/po/fr.po b/po/fr.po
index eaff19da97..dacbc9c535 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2009-02-23 01:25+0100\n"
 "Last-Translator: Éric Boumaour <zongo_fr@users.sourceforge.net>\n"
 "Language-Team: fr <fr@li.org>\n"
@@ -2611,9 +2611,10 @@ msgstr ""
 "d'archives."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2670,8 +2671,9 @@ msgstr ""
 "Enregistre les messages envoyés à un utilisateur déconnecté en tant "
 "qu'alerte."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Les messages seront enregistrés en tant qu'alerte. Vous pouvez modifier ou "
@@ -2923,15 +2925,17 @@ msgstr ""
 "utiliser les plugins TCL, veuillez installer ActiveTCL depuis http://www."
 "activestate.com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Le kit Apple Bonjour pour Windows n'a pas été trouvé. Veuillez consulter la "
 "FAQ disponible sur : http://d.pidgin.im/wiki/BonjourWindows pour plus "
 "d'informations."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Impossible d'attendre des connexions rentrantes de messages.\n"
 
 msgid ""
@@ -2986,14 +2990,21 @@ msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 "Impossible d'envoyer le message, la conversation n'a pas pu être commencée."
 
-msgid "Cannot open socket"
-msgstr "Impossible d'ouvrir la connexion."
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Impossible de créer le socket :\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Impossible d'affecter un port à la connexion."
 
-msgid "Could not listen on socket"
-msgstr "Impossible de se mettre en écoute sur la connexion."
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Impossible de créer le socket :\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Erreur de communication avec le mDNSResponder local."
@@ -3040,13 +3051,16 @@ msgstr "Sauver la liste de contacts..."
 msgid "Load buddylist from file..."
 msgstr "Charger la liste de contacts depuis un fichier..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Renseignez les rubriques d'inscription."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Les mots de passe diffèrent."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Une erreur est survenue. Impossible d'inscrire un nouveau compte.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3058,14 +3072,15 @@ msgstr "Inscription effectuée."
 msgid "Password"
 msgstr "Mot de passe"
 
-msgid "Password (retype)"
-msgstr "Mot de passe (pour vérification)"
+msgid "Password (again)"
+msgstr "Mot de passe (confirmation)"
 
-msgid "Enter current token"
-msgstr "Saisissez le jeton actuel"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Jeton actuel"
+#, fuzzy
+msgid "Captcha"
+msgstr "Image captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Créer un nouveau compte Gadu-Gadu"
@@ -3118,6 +3133,15 @@ msgstr "Changement de mot de passe effectué."
 msgid "Current password"
 msgstr "Mot de passe actuel"
 
+msgid "Password (retype)"
+msgstr "Mot de passe (pour vérification)"
+
+msgid "Enter current token"
+msgstr "Saisissez le jeton actuel"
+
+msgid "Current token"
+msgstr "Jeton actuel"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 "Saisissez votre mot de passe et un nouveau mot de passe pour cet UIN : "
@@ -3166,8 +3190,8 @@ msgstr "Aucun utilisateur correspondant trouvé."
 msgid "There are no users matching your search criteria."
 msgstr "Il n'y a pas d'utilisateur qui vérifie votre critère de recherche."
 
-msgid "Unable to read socket"
-msgstr "Impossible de lire le socket"
+msgid "Unable to read from socket"
+msgstr "Impossible de lire le socket."
 
 msgid "Buddy list downloaded"
 msgstr "Liste de contacts téléchargée"
@@ -3181,7 +3205,13 @@ msgstr "Liste de contacts envoyée"
 msgid "Your buddy list was stored on the server."
 msgstr "Votre liste de contacts à été stockée sur le serveur."
 
-msgid "Connection failed."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Connecté"
+
+msgid "Connection failed"
 msgstr "Échec de la connexion"
 
 msgid "Add to chat"
@@ -3190,18 +3220,23 @@ msgstr "Ajouter à la discussion"
 msgid "Chat _name:"
 msgstr "_Nom de la discussion :"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Impossible de se connecter au serveur"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Connexion en cours"
+
 msgid "Chat error"
 msgstr "Erreur de discussion"
 
 msgid "This chat name is already in use"
 msgstr "Ce nom de discussion est déjà utilisé."
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Vous n'êtes pas connecté au serveur."
 
 msgid "Find buddies..."
@@ -3261,7 +3296,8 @@ msgstr "Pas de sujet"
 msgid "File Transfer Failed"
 msgstr "Échec du transfert de fichier."
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Impossible d'ouvrir un port en écoute."
 
 msgid "Error displaying MOTD"
@@ -3277,8 +3313,18 @@ msgstr "Il n'y a pas de message du jour associé à cette connexion."
 msgid "MOTD for %s"
 msgstr "Message du jour pour %s"
 
-msgid "Server has disconnected"
-msgstr "Déconnexion par le serveur"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Connexion perdue avec le serveur :\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Voir le message du jour"
@@ -3293,22 +3339,20 @@ msgstr "Mot de _passe :"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "Les pseudonymes IRC ne doivent pas avoir d'espace"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Connexion en cours"
-
 msgid "SSL support unavailable"
 msgstr "Support SSL non disponible"
 
-msgid "Couldn't create socket"
-msgstr "Impossible de créer le socket"
+msgid "Unable to connect"
+msgstr "Impossible de se connecter"
 
-msgid "Couldn't connect to host"
-msgstr "Impossible de se connecter à l'hôte"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Impossible de se connecter à %s."
 
-msgid "Read error"
-msgstr "Erreur de lecture"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Le serveur a fermé la connexion."
 
 msgid "Users"
 msgstr "Utilisateurs"
@@ -3742,12 +3786,14 @@ msgstr "Échec de la commande Ad-Hoc"
 msgid "execute"
 msgstr "execute"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "TLS/SSL est nécessaire pour la connexion au serveur. Aucun support de TLS/"
 "SSL n'a pu être trouvé."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "Vous demandez un chiffrement mais aucun support de TLS/SSL n'a pu être "
 "trouvé."
@@ -3768,7 +3814,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Authentification en texte non chiffré"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Échec de l'authentification"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Réponse non valide du serveur"
 
 msgid "Server does not use any supported authentication method"
@@ -3781,7 +3832,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "Demande d'accès non valide du serveur"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Erreur SASL"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3801,10 +3853,8 @@ msgstr ""
 "Impossible de se connecter au serveur :\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Impossible de se connecter au serveur :\n"
 "%s"
@@ -3813,12 +3863,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "Impossible de créer une connexion."
 
-msgid "Unable to create socket"
-msgstr "Impossible de créer le socket."
-
-msgid "Write error"
-msgstr "Erreur d'écriture"
-
 msgid "Full Name"
 msgstr "Nom complet"
 
@@ -3889,159 +3933,6 @@ msgstr "Système d'exploitation"
 msgid "Local Time"
 msgstr "Fichier local :"
 
-msgid "Last Activity"
-msgstr "Dernière activité"
-
-msgid "Service Discovery Info"
-msgstr "Informations du service de découverte"
-
-msgid "Service Discovery Items"
-msgstr "Items du service de découverte"
-
-msgid "Extended Stanza Addressing"
-msgstr "Adressage étendu de paragraphes"
-
-msgid "Multi-User Chat"
-msgstr "Discussion multi-utilisateurs"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Informations de présence des discussions multi-utilisateurs"
-
-msgid "In-Band Bytestreams"
-msgstr "Flux de données intrabandes"
-
-msgid "Ad-Hoc Commands"
-msgstr "Commandes ad-hoc"
-
-msgid "PubSub Service"
-msgstr "Service PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "Flux de données SOCKS5"
-
-msgid "Out of Band Data"
-msgstr "Données hors de la bande passante"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "Enregistrement intrabande"
-
-msgid "User Location"
-msgstr "Position de l'utilisateur"
-
-msgid "User Avatar"
-msgstr "Avatar de l'utilisateur"
-
-msgid "Chat State Notifications"
-msgstr "Notifications d'état de discussions"
-
-msgid "Software Version"
-msgstr "Version du logiciel"
-
-msgid "Stream Initiation"
-msgstr "Initialisation de flux"
-
-msgid "File Transfer"
-msgstr "Transfert de fichier"
-
-msgid "User Mood"
-msgstr "Humeur de l'utilisateur"
-
-msgid "User Activity"
-msgstr "Activité de l'utilisateur"
-
-msgid "Entity Capabilities"
-msgstr "Possibilités de l'entité"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Négociations de session chiffrée"
-
-msgid "User Tune"
-msgstr "Musique de l'utilisateur"
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-msgid "Reachability Address"
-msgstr ""
-
-msgid "User Profile"
-msgstr "Profil de l'utilisateur"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle audio"
-
-msgid "User Nickname"
-msgstr "Pseudo de l'utilisateur"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr "Jingle Video"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-msgid "Message Receipts"
-msgstr "Reçus des messages"
-
-msgid "Public Key Publishing"
-msgstr "Publication de clé publique"
-
-msgid "User Chatting"
-msgstr "L'utilisateur discute"
-
-msgid "User Browsing"
-msgstr "L'utilisateur navigue le web"
-
-msgid "User Gaming"
-msgstr "L'utilisateur joue"
-
-msgid "User Viewing"
-msgstr "L'utilisateur observe"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Chiffrement de paragraphe"
-
-msgid "Entity Time"
-msgstr "Temps de l'entité"
-
-msgid "Delayed Delivery"
-msgstr "Livraison retardée"
-
-msgid "Collaborative Data Objects"
-msgstr "Objets de données collaboratives"
-
-msgid "File Repository and Sharing"
-msgstr "Répertoire de fichier et partage"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "Service de découverte STUN pour Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Négociation de session chiffré simplifiée"
-
-msgid "Hop Check"
-msgstr "Vérifications des bonds"
-
-msgid "Capabilities"
-msgstr "Possibilités"
-
 msgid "Priority"
 msgstr "Priorité"
 
@@ -4053,7 +3944,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Connecté"
 
 msgid "Middle Name"
@@ -4237,16 +4128,13 @@ msgstr "Aucun utilisateur correspondant trouvé."
 msgid "Roles:"
 msgstr "Rôle"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Pas de réponse au ping"
 
-msgid "Read Error"
-msgstr "Erreur de lecture"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4426,9 +4314,6 @@ msgstr "Le mot de passe a été modifié"
 msgid "Error changing password"
 msgstr "Erreur lors du changement du mot de passe"
 
-msgid "Password (again)"
-msgstr "Mot de passe (confirmation)"
-
 msgid "Change XMPP Password"
 msgstr "Changer de mot de passe XMPP"
 
@@ -4816,6 +4701,14 @@ msgstr "Erreur de lecture du XML"
 msgid "Unknown Error in presence"
 msgstr "Erreur inconnue"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Erreur lors de l'arrivée dans la discussion %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Erreur dans la discussion %s"
+
 msgid "Create New Room"
 msgstr "Créer un nouveau salon"
 
@@ -4832,16 +4725,20 @@ msgstr "_Configurer le salon"
 msgid "_Accept Defaults"
 msgstr "_Accepter les paramètres par défaut"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Erreur lors de l'arrivée dans la discussion %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Pas de raison donnée"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Erreur dans la discussion %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Vous avez été expulsé par %s (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Expulsé par %s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Erreur lors de l'ouverture du fichier."
 
 #, fuzzy
@@ -5339,9 +5236,6 @@ msgstr ""
 "Le support de SSL est nécessaire pour MSN. Veuillez installer une "
 "bibliothèque SSL pour l'application."
 
-msgid "Failed to connect to server."
-msgstr "Impossible de se connecter au serveur."
-
 msgid "Error retrieving profile"
 msgstr "Erreur à la récupération du profil."
 
@@ -5596,9 +5490,6 @@ msgstr "Le message n'a pas été envoyé à cause d'une erreur de codage inconnu
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Le message n'a pas été envoyé à cause d'une erreur inconnue."
 
-msgid "Unable to connect"
-msgstr "Impossible de se connecter"
-
 msgid "Writing error"
 msgstr "Erreur d'écriture"
 
@@ -5613,13 +5504,16 @@ msgstr ""
 "Erreur de connexion du serveur %s :\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Notre protocole n'est pas supportés par le serveur."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Erreur à l'analyse du HTTP"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Vous venez de vous connecter depuis un autre endroit."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5627,7 +5521,8 @@ msgstr ""
 "Les serveurs MSN ne sont pas disponibles pour l'instant. Veuillez attendre "
 "un peu puis réessayer."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Les serveurs MSN sont coupés temporairement."
 
 #, c-format
@@ -5640,9 +5535,6 @@ 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"
 
@@ -5745,6 +5637,9 @@ msgstr "Plugin pour le protocole MSN"
 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)"
@@ -5857,12 +5752,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Ajouter les contacts du serveur"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Connecté"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Erreur de protocole, code %d : %s"
@@ -5887,16 +5776,6 @@ msgstr "Erreur MySpaceIM"
 msgid "Invalid input condition"
 msgstr "Condition de saisie non valide."
 
-msgid "Read buffer full (2)"
-msgstr "Buffer de lecture plein (2)"
-
-msgid "Unparseable message"
-msgstr "Impossible d'interpréter le message."
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Impossible de se connecter à l'hôte : %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Échec lors de l'ajout du contact."
 
@@ -5980,6 +5859,12 @@ msgstr "Total d'amis"
 msgid "Client Version"
 msgstr "Version du client"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Nom d'utilisateur disponible"
 
@@ -6238,9 +6123,9 @@ msgstr "L'utilisateur est déconnecté ou vous bloque"
 msgid "Unknown error: 0x%X"
 msgstr "Erreur inconnue :0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Échec à la connexion (%s)"
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Impossible d'envoyer un ping à l'utilisateur %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6346,9 +6231,6 @@ msgstr "Conférence GroupWise %d"
 msgid "Authenticating..."
 msgstr "Authentification en cours..."
 
-msgid "Unable to connect to server."
-msgstr "Impossible de se connecter au serveur"
-
 msgid "Waiting for response..."
 msgstr "En attente de réponse..."
 
@@ -6372,26 +6254,19 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Voulez-vous rejoindre la discussion ?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Vous venez d'être déconnecté à la suite d'une connexion depuis un autre "
-"endroit."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s est déconnecté et n'a pas reçu le message que vous venez d'envoyer."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Impossible de se connecter au serveur. Veuillez saisir l'adresse du serveur "
 "sur lequel vous voulez vous connecter."
 
-msgid "Error. SSL support is not installed."
-msgstr "Support SSL non installé"
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Cette conférence est fermée. Aucun message ne peut être envoyé."
 
@@ -6431,10 +6306,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6443,18 +6315,8 @@ msgstr "Impossible de rejoindre le salon de discussions"
 msgid "Invalid chat room name"
 msgstr "Nom de salon non valide"
 
-msgid "Server closed the connection."
-msgstr "Le serveur a fermé la connexion."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Connexion perdue avec le serveur :\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Données non valides reçues sur la connexion du serveur."
 
 #. *< type
@@ -6502,7 +6364,8 @@ msgstr "Connexion perdue avec l'interlocuteur :<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Données non valides reçues sur la connexion avec l'interlocuteur."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Impossible de se connecter à l'interlocuteur."
 
 msgid "Direct IM established"
@@ -6704,21 +6567,15 @@ msgstr "Niveau d'avertissement"
 msgid "Buddy Comment"
 msgstr "Commentaire"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Impossible de se connecter au serveur d'authentification :\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Impossible de se connecter au serveur BOS :\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Impossible de se connecter au serveur"
 
 msgid "Username sent"
 msgstr "Nom d'utilisateur envoyé"
@@ -6730,11 +6587,11 @@ msgstr "Connexion établie, cookie envoyé"
 msgid "Finalizing connection"
 msgstr "Finalisation de la connexion"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Impossible de se connecter : le nom d'utilisateur %s est non valide. Les "
 "noms doivent soit être une adresse électronique valide, soit commencer par "
@@ -6750,27 +6607,22 @@ msgstr ""
 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."
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Cet utilisateur n'existe pas"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Votre compte est actuellement suspendu."
 
 #. service temporarily unavailable
@@ -6793,7 +6645,8 @@ msgstr ""
 "réessayez. Si vous persistez maintenant, il vous faudra attendre encore plus "
 "longtemps."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "La clé SecurID saisie est non valide."
 
 msgid "Enter SecurID"
@@ -6972,6 +6825,9 @@ msgstr "En ligne depuis"
 msgid "Member Since"
 msgstr "Inscrit depuis"
 
+msgid "Capabilities"
+msgstr "Possibilités"
+
 msgid "Profile"
 msgstr "Informations"
 
@@ -7155,9 +7011,9 @@ msgstr[1] ""
 msgid "Away message too long."
 msgstr "Message d'absence trop long"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7183,9 +7039,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Orphelins"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Impossible d'ajouter le contact %s parce qu'il y a trop de contacts dans la "
@@ -7194,8 +7050,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(pas de nom)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Impossible d'ajouter le contact %s pour une raison inconnue."
 
 #, c-format
@@ -7974,7 +7830,8 @@ msgstr "Délai de Keep alive (en secondes)"
 msgid "Update interval (seconds)"
 msgstr "Délai de mise à jour (en secondes)"
 
-msgid "Cannot decrypt server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "Impossible de déchiffrer la réponse du serveur"
 
 #, c-format
@@ -7999,9 +7856,6 @@ msgstr "Activation nécessaire"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Réponse inconnue à la connexion (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Impossible de déchiffrer la réponse du serveur"
-
 msgid "Requesting captcha"
 msgstr "Demande de captcha"
 
@@ -8035,29 +7889,18 @@ msgstr ""
 "Réponse inconnue à la connexion (0x%02X) :\n"
 "%s"
 
-msgid "Unable to connect."
-msgstr "Impossible de se connecter"
-
 msgid "Socket error"
 msgstr "Erreur de socket."
 
-msgid "Unable to read from socket"
-msgstr "Impossible de lire le socket."
-
-msgid "Write Error"
-msgstr "Erreur d'écriture"
-
-msgid "Connection lost"
-msgstr "Connexion perdue."
-
 msgid "Getting server"
 msgstr "Récupération du serveur"
 
 msgid "Requesting token"
 msgstr "Requête d'un token"
 
-msgid "Couldn't resolve host"
-msgstr "Impossible de trouver l'adresse de l'hôte."
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Impossible de se connecter au serveur"
 
 msgid "Invalid server or port"
 msgstr "Serveur ou port non valide"
@@ -8110,7 +7953,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "Commande Qun QQ"
 
-msgid "Could not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "Impossible de déchiffrer la réponse de connexion"
 
 msgid "Unknown LOGIN CMD"
@@ -8130,9 +7974,6 @@ msgstr "Envoi de fichier"
 msgid "%d canceled the transfer of %s"
 msgstr "%d a annulé le transfert de %s"
 
-msgid "Connection closed (writing)"
-msgstr "Connexion terminée (en écriture)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Titre du groupe :</b> %s<br>"
@@ -8187,17 +8028,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Annonce d'un administrateur Sametime"
 
-msgid "Connection reset"
-msgstr "Connexion remise à zéro"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Erreur à la lecture du socket : %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Impossible de se connecter à l'hôte"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Annonce de %s"
@@ -8220,6 +8050,9 @@ msgstr "Haut-parleurs"
 msgid "Video Camera"
 msgstr "Caméra vidéo"
 
+msgid "File Transfer"
+msgstr "Transfert de fichier"
+
 msgid "Supports"
 msgstr "Fonctionnalités"
 
@@ -9036,6 +8869,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Statistiques du réseau"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Échec du ping"
 
@@ -9099,7 +8935,8 @@ msgstr "Type de clé publique non supporté"
 msgid "Disconnected by server"
 msgstr "Déconnexion par le serveur"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Erreur à la connexion au serveur SILC"
 
 msgid "Key Exchange failed"
@@ -9111,26 +8948,26 @@ msgstr ""
 "Échec de la reprise de session détachée. Choisissez « Reconnexion » pour "
 "créer une nouvelle connexion."
 
-msgid "Connection failed"
-msgstr "Échec de la connexion"
-
 msgid "Performing key exchange"
 msgstr "Échange de clé en cours"
 
-msgid "Unable to create connection"
-msgstr "Impossible de créer une connexion."
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Impossible de charger la paire de clés SILC"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Connexion au serveur SILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Impossible de charger la paire de clés SILC"
+
 msgid "Out of memory"
 msgstr "Pas assez de mémoire"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Impossible d'initialiser le protocole SILC."
 
 msgid "Error loading SILC key pair"
@@ -9430,7 +9267,8 @@ msgstr "Signer numériquement et vérifier tous les messages"
 msgid "Creating SILC key pair..."
 msgstr "Création de la paire de clés SILC..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Impossible de créer la paire de clés SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9526,6 +9364,9 @@ msgstr "Tableau"
 msgid "No server statistics available"
 msgstr "Aucune statistique du serveur disponible"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Erreur à la connexion au serveur SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Échec : version incompatible, veuillez mettre à jour votre client"
@@ -9570,30 +9411,27 @@ msgstr "Échec : cookie invalide"
 msgid "Failure: Authentication failed"
 msgstr "Échec de l'authentification"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Impossible d'initialiser la connexion client SILC"
 
 msgid "John Noname"
 msgstr "Anne Onyme"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Impossible de charger la paire de clés SILC : %s"
 
-msgid "Could not write"
-msgstr "Impossible d'envoyer."
-
-msgid "Could not connect"
-msgstr "Impossible de se connecter."
+msgid "Unable to create connection"
+msgstr "Impossible de créer une connexion."
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Réponse du serveur inconnue."
 
-msgid "Could not create listen socket"
-msgstr "Impossible de créer le socket d'écoute."
-
-msgid "Could not resolve hostname"
-msgstr "Impossible de résoudre le nom de l'hôte."
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Impossible de créer le socket."
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
@@ -9635,6 +9473,77 @@ msgstr "Utilisateur d'authentification"
 msgid "Auth Domain"
 msgstr "Domaine d'authentification"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;room&gt; : Rejoindre une discussion sur le réseau Yahoo"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list : Récupérer la liste des salons du réseau Yahoo."
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle : Envoie une demande pour un séance de griffonnage."
+
+msgid "Yahoo ID..."
+msgstr "ID Yahoo..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Plugin pour le protocole Yahoo"
+
+msgid "Pager server"
+msgstr "Serveur de texto"
+
+msgid "Pager port"
+msgstr "Port du pager"
+
+msgid "File transfer server"
+msgstr "Server de transfert de fichiers"
+
+msgid "File transfer port"
+msgstr "Port de transfert de fichiers"
+
+msgid "Chat room locale"
+msgstr "Langue du salon de discussions"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignorer les invitations aux conférences et salons de discussions"
+
+msgid "Chat room list URL"
+msgstr "URL de liste des salons de discussions"
+
+msgid "Yahoo Chat server"
+msgstr "Serveur Yahoo Chat"
+
+msgid "Yahoo Chat port"
+msgstr "Port Yahoo Chat"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "ID Yahoo..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Plugin pour le protocole Yahoo"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9667,30 +9576,20 @@ msgstr "Ajout du contact refusé"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  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."
@@ -9735,39 +9634,34 @@ msgstr ""
 "Erreur inconnue n°%d. Se connecter sur le site web Yahoo! peut corriger le "
 "problème."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Impossible d'ajouter le contact %s au groupe %s sur la liste du serveur pour "
 "le compte %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Impossible d'ajouter le contact sur la liste du serveur."
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Réception d'un message HTTP non attendu du serveur."
 
-msgid "Connection problem"
-msgstr "Problème de connexion"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Connexion perdue avec %s :\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Impossible de se connecter avec %s :\n"
+"Impossible de se connecter au serveur :\n"
 "%s"
 
 msgid "Not at Home"
@@ -9830,73 +9724,15 @@ msgstr "Joindre l'utilisateur dans une discussion..."
 msgid "Open Inbox"
 msgstr "Ouvrir la boîte à lettres"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;room&gt; : Rejoindre une discussion sur le réseau Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list : Récupérer la liste des salons du réseau Yahoo."
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle : Envoie une demande pour un séance de griffonnage."
-
-msgid "Yahoo ID..."
-msgstr "ID Yahoo..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Plugin pour le protocole Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japon"
-
-msgid "Pager server"
-msgstr "Serveur de texto"
-
-msgid "Japan Pager server"
-msgstr "Serveur japonais de texto"
-
-msgid "Pager port"
-msgstr "Port du pager"
-
-msgid "File transfer server"
-msgstr "Server de transfert de fichiers"
-
-msgid "Japan file transfer server"
-msgstr "Server japonais de transfert de fichiers"
-
-msgid "File transfer port"
-msgstr "Port de transfert de fichiers"
-
-msgid "Chat room locale"
-msgstr "Langue du salon de discussions"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignorer les invitations aux conférences et salons de discussions"
-
-msgid "Chat room list URL"
-msgstr "URL de liste des salons de discussions"
-
-msgid "Yahoo Chat server"
-msgstr "Serveur Yahoo Chat"
-
-msgid "Yahoo Chat port"
-msgstr "Port Yahoo Chat"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Envoyer une demande Doodle."
 
+msgid "Unable to connect."
+msgstr "Impossible de se connecter"
+
 msgid "Unable to establish file descriptor."
 msgstr "Impossible de créer un descripteur de fichier"
 
@@ -9904,6 +9740,9 @@ msgstr "Impossible de créer un descripteur de fichier"
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s essaie de vous envoyer un groupe de %d fichiers.\n"
 
+msgid "Write Error"
+msgstr "Erreur d'écriture"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Profil Yahoo! Japon"
 
@@ -10024,23 +9863,19 @@ msgstr "Voix"
 msgid "Webcams"
 msgstr "Webcams"
 
+msgid "Connection problem"
+msgstr "Problème de connexion"
+
 msgid "Unable to fetch room list."
 msgstr "Impossible de récupérer la liste des salons"
 
 msgid "User Rooms"
 msgstr "Salon de discussions utilisateur"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Problème de connexion avec le serveur YCHT"
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Connexion perdue avec le serveur :\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10171,24 +10006,16 @@ msgstr "Domaine"
 msgid "Exposure"
 msgstr "Exposition"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Impossible de créer le socket :\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Impossible de reconnaître la réponse du serveur mandataire HTTP : %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Erreur de connexion au serveur mandataire HTTP %d."
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "Accès interdit : le serveur mandataire n'autorise pas le passage par le port "
 "%d."
@@ -10197,9 +10024,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr "Erreur à la résolution du nom %s."
 
-msgid "Could not resolve host name"
-msgstr "Impossible de résoudre le nom de l'hôte."
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Attire l'attention de %s..."
@@ -10401,14 +10225,6 @@ msgstr "Erreur à l'écriture vers %s : %s"
 msgid "Unable to connect to %s: %s"
 msgstr "Impossible de se connecter à %s : %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"TLS/SSL est nécessaire pour la connexion au serveur. Aucun support de TLS/"
-"SSL n'a pu être trouvé."
-
 #, c-format
 msgid " - %s"
 msgstr " - %s"
@@ -10661,9 +10477,14 @@ msgstr "Ajouter une _alerte..."
 msgid "View _Log"
 msgstr "_Voir les archives"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Cacher si déconnecté"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Afficher si déconnecté"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
@@ -11169,6 +10990,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Changer les informations pour %s"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Saisissez le nom d'hôte correspondant à ce certificat."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Serveurs SSL"
@@ -11215,7 +11040,8 @@ msgstr "Ignorer"
 msgid "Get Away Message"
 msgstr "Récupérer le message d'absence"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Dernières paroles"
 
 msgid "Unable to save icon file to disk."
@@ -12111,7 +11937,8 @@ msgstr "Couleur pour afficher les liens hypertextes"
 msgid "Hyperlink visited color"
 msgstr "Couleur des liens visités"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+#, fuzzy
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 "Couleur pour afficher les liens hypertextes une fois visités (ou activés)."
 
@@ -12149,13 +11976,22 @@ msgstr "Couleur pour afficher le nom pour les messages d'action."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Nom de la couleur des messages chuchotés."
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Couleur pour afficher le nom pour les messages d'action."
+
 msgid "Whisper Message Name Color"
 msgstr "Nom de la couleur pour les messages envoyés"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Couleur pour afficher le nom pour les messages d'action."
+
 msgid "Typing notification color"
 msgstr "Couleur de la notification de saisie"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr ""
 "Couleur pour afficher que quelqu'un est en train de vous écrire un message"
 
@@ -12561,6 +12397,10 @@ msgstr ""
 "Un navigateur « Manuel » a été choisi choisi mais la ligne de commande est "
 "vide."
 
+#, fuzzy
+msgid "No message"
+msgstr "Message inconnu"
+
 msgid "Open All Messages"
 msgstr "Ouvrir tous les messages"
 
@@ -12578,10 +12418,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Vous avez du courrier !</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Message inconnu"
-
 msgid "The following plugins will be unloaded."
 msgstr "Les plugins suivants vont être déchargés."
 
@@ -12798,8 +12634,9 @@ msgstr "_Afficher l'icône de notification :"
 msgid "On unread messages"
 msgstr "Quand des messages sont non lus"
 
-msgid "Conversation Window Hiding"
-msgstr "Quand la fenêtre de conversation est cachée"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Fenêtres de conversation"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Cacher les nouvelles conversations :"
@@ -12807,6 +12644,9 @@ msgstr "_Cacher les nouvelles conversations :"
 msgid "When away"
 msgstr "Lorsque absent"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Rédu_ire la nouvelle fenêtre de conversation"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Onglets"
@@ -12865,9 +12705,6 @@ msgstr "Utiliser le défilement progressif"
 msgid "F_lash window when IMs are received"
 msgstr "_Faire clignoter la fenêtre sur la réception de messages"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Rédu_ire la nouvelle fenêtre de conversation"
-
 msgid "Minimum input area height in lines:"
 msgstr "Nombre minimum de lignes dans la zone de saisie :"
 
@@ -12902,7 +12739,8 @@ msgstr "Impossible de lancer le programme de configuration du navigateur."
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemple : stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Détection auto de l'adresse IP"
 
 msgid "Public _IP:"
@@ -13272,21 +13110,6 @@ msgstr "Enregistrer _et utiliser"
 msgid "Status for %s"
 msgstr "État pour %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "Frimousse personnalisée"
-
-msgid "More Data needed"
-msgstr "Données insuffisantes"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Veuillez fournir un raccourci correspondant à cette frimousse."
-
 #, fuzzy, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
@@ -13294,12 +13117,12 @@ msgstr ""
 "Une frimousse spécialisée pour ce raccourci existe déjà. Veuillez choisir un "
 "autre raccourci."
 
+msgid "Custom Smiley"
+msgstr "Frimousse personnalisée"
+
 msgid "Duplicate Shortcut"
 msgstr "Raccourci en double"
 
-msgid "Please select an image for the smiley."
-msgstr "Veuillez choisir une image pour cette frimousse."
-
 msgid "Edit Smiley"
 msgstr "Modifier la frimousse"
 
@@ -13413,9 +13236,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Impossible d'envoyer ce lien."
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Vous avez déposé un lien du bureau. Vous vouliez probablement envoyer le "
 "fichier vers lequel pointe ce lien au lieu du lien."
@@ -14030,9 +13854,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Plugin de messagerie musicale pour la composition collaborative."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Permet à plusieurs utilisateurs de travailler simultanément sur un morceau "
 "de musique en modifiant une partition commune en temps réel."
@@ -14287,9 +14112,10 @@ msgid "Conversation Window Send Button."
 msgstr "Bouton Envoyer dans la fenêtre de conversation."
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Ajoute un bouton Envoyer dans la fenêtre de conversation. Permet l'envoi de "
 "messages quand il n'y a pas de clavier physique."
@@ -14619,8 +14445,9 @@ msgstr "Options de Pidgin Windows"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Options spécifiques à Pidgin Windows"
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Fournit des options spécifiques à Pidgin Windows, tels que l'accrochage de "
 "la liste de contacts."
@@ -14662,6 +14489,297 @@ msgstr "Envoyer et recevoir des blocs XMPP."
 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 "Cannot open socket"
+#~ msgstr "Impossible d'ouvrir la connexion."
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Impossible de se mettre en écoute sur la connexion."
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Impossible de lire le socket"
+
+#~ msgid "Connection failed."
+#~ msgstr "Échec de la connexion"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Déconnexion par le serveur"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Impossible de créer le socket"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Impossible de se connecter à l'hôte"
+
+#~ msgid "Read error"
+#~ msgstr "Erreur de lecture"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Impossible de se connecter au serveur :\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Erreur d'écriture"
+
+#~ msgid "Last Activity"
+#~ msgstr "Dernière activité"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Informations du service de découverte"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Items du service de découverte"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Adressage étendu de paragraphes"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Discussion multi-utilisateurs"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Informations de présence des discussions multi-utilisateurs"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "Flux de données intrabandes"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Commandes ad-hoc"
+
+#~ msgid "PubSub Service"
+#~ msgstr "Service PubSub"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "Flux de données SOCKS5"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Données hors de la bande passante"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "Enregistrement intrabande"
+
+#~ msgid "User Location"
+#~ msgstr "Position de l'utilisateur"
+
+#~ msgid "User Avatar"
+#~ msgstr "Avatar de l'utilisateur"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Notifications d'état de discussions"
+
+#~ msgid "Software Version"
+#~ msgstr "Version du logiciel"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Initialisation de flux"
+
+#~ msgid "User Mood"
+#~ msgstr "Humeur de l'utilisateur"
+
+#~ msgid "User Activity"
+#~ msgstr "Activité de l'utilisateur"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Possibilités de l'entité"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Négociations de session chiffrée"
+
+#~ msgid "User Tune"
+#~ msgstr "Musique de l'utilisateur"
+
+#~ msgid "User Profile"
+#~ msgstr "Profil de l'utilisateur"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Jingle audio"
+
+#~ msgid "User Nickname"
+#~ msgstr "Pseudo de l'utilisateur"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Jingle Video"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Reçus des messages"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Publication de clé publique"
+
+#~ msgid "User Chatting"
+#~ msgstr "L'utilisateur discute"
+
+#~ msgid "User Browsing"
+#~ msgstr "L'utilisateur navigue le web"
+
+#~ msgid "User Gaming"
+#~ msgstr "L'utilisateur joue"
+
+#~ msgid "User Viewing"
+#~ msgstr "L'utilisateur observe"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Chiffrement de paragraphe"
+
+#~ msgid "Entity Time"
+#~ msgstr "Temps de l'entité"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Livraison retardée"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Objets de données collaboratives"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Répertoire de fichier et partage"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "Service de découverte STUN pour Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Négociation de session chiffré simplifiée"
+
+#~ msgid "Hop Check"
+#~ msgstr "Vérifications des bonds"
+
+#~ msgid "Read Error"
+#~ msgstr "Erreur de lecture"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Impossible de se connecter au serveur."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Buffer de lecture plein (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Impossible d'interpréter le message."
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Impossible de se connecter à l'hôte : %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Échec à la connexion (%s)"
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Vous venez d'être déconnecté à la suite d'une connexion depuis un autre "
+#~ "endroit."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Support SSL non installé"
+
+#~ msgid "Incorrect password."
+#~ msgstr "Mot de passe incorrect."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Impossible de se connecter au serveur BOS :\n"
+#~ "%s"
+
+#~ 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 "Could Not Connect"
+#~ msgstr "Impossible de se connecter."
+
+#~ msgid "Invalid username."
+#~ msgstr "Nom d'utilisateur non valide."
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Impossible de déchiffrer la réponse du serveur"
+
+#~ msgid "Connection lost"
+#~ msgstr "Connexion perdue."
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Impossible de trouver l'adresse de l'hôte."
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Connexion terminée (en écriture)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Connexion remise à zéro"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Erreur à la lecture du socket : %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Impossible de se connecter à l'hôte"
+
+#~ msgid "Could not write"
+#~ msgstr "Impossible d'envoyer."
+
+#~ msgid "Could not connect"
+#~ msgstr "Impossible de se connecter."
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Impossible de créer le socket d'écoute."
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Impossible de résoudre le nom de l'hôte."
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Mot de passe incorrect."
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Impossible de se connecter avec %s :\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japon"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Serveur japonais de texto"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Server japonais de transfert de fichiers"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Connexion perdue avec le serveur :\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Impossible de résoudre le nom de l'hôte."
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "TLS/SSL est nécessaire pour la connexion au serveur. Aucun support de TLS/"
+#~ "SSL n'a pu être trouvé."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Quand la fenêtre de conversation est cachée"
+
+#~ msgid "More Data needed"
+#~ msgstr "Données insuffisantes"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Veuillez fournir un raccourci correspondant à cette frimousse."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Veuillez choisir une image pour cette frimousse."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Activer quelle identité ?"
 
diff --git a/po/ga.po b/po/ga.po
index 19403772ba..8d20895cfd 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2008-08-27 16:26-0800\n"
 "Last-Translator: Aaron Kearns <ajkearns6@gmail.com>\n"
 "Language-Team: \n"
@@ -2459,7 +2459,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2507,7 +2507,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2748,11 +2748,11 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr ""
 
 msgid ""
@@ -2805,13 +2805,16 @@ msgstr ""
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-msgid "Cannot open socket"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Ní féidir an comhad a oscailt."
 
-msgid "Could not bind socket to port"
+#, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr ""
 
-msgid "Could not listen on socket"
+#, c-format
+msgid "Unable to listen on socket: %s"
 msgstr ""
 
 msgid "Error communicating with local mDNSResponder."
@@ -2859,13 +2862,13 @@ msgstr ""
 msgid "Load buddylist from file..."
 msgstr ""
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
-msgid "Passwords do not match."
+msgid "Passwords do not match"
 msgstr ""
 
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr ""
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2877,14 +2880,15 @@ msgstr ""
 msgid "Password"
 msgstr "Pasfhocal"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr ""
 
-msgid "Enter current token"
+msgid "Enter captcha text"
 msgstr ""
 
-msgid "Current token"
-msgstr ""
+#, fuzzy
+msgid "Captcha"
+msgstr "Sábháil an Íomha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr ""
@@ -2937,6 +2941,15 @@ msgstr ""
 msgid "Current password"
 msgstr ""
 
+msgid "Password (retype)"
+msgstr ""
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
@@ -2985,7 +2998,7 @@ msgstr ""
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr ""
 
 msgid "Buddy list downloaded"
@@ -3000,7 +3013,13 @@ msgstr ""
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
-msgid "Connection failed."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Ceangailte"
+
+msgid "Connection failed"
 msgstr ""
 
 msgid "Add to chat"
@@ -3009,19 +3028,24 @@ msgstr "Cuir le comhrá"
 msgid "Chat _name:"
 msgstr ""
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Ní féidir an comhad a oscailt."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Nasctha"
+
 msgid "Chat error"
 msgstr ""
 
 msgid "This chat name is already in use"
 msgstr ""
 
-msgid "Not connected to the server."
-msgstr ""
+#, fuzzy
+msgid "Not connected to the server"
+msgstr "Cailleadh an nasc le \"%s\"."
 
 msgid "Find buddies..."
 msgstr ""
@@ -3081,8 +3105,9 @@ msgstr ""
 msgid "File Transfer Failed"
 msgstr ""
 
-msgid "Could not open a listening port."
-msgstr ""
+#, fuzzy
+msgid "Unable to open a listening port."
+msgstr "Ní féidir an comhad a oscailt."
 
 msgid "Error displaying MOTD"
 msgstr ""
@@ -3097,8 +3122,16 @@ msgstr ""
 msgid "MOTD for %s"
 msgstr "MOTD le %s"
 
-msgid "Server has disconnected"
-msgstr ""
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "Cailleadh an nasc le \"%s\"."
 
 msgid "View MOTD"
 msgstr "Amharc MOTD"
@@ -3113,23 +3146,20 @@ msgstr "_Pasfhocal:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Nasctha"
-
 msgid "SSL support unavailable"
 msgstr ""
 
-msgid "Couldn't create socket"
+msgid "Unable to connect"
 msgstr ""
 
-msgid "Couldn't connect to host"
-msgstr ""
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Ní féidir an comhad a oscailt."
 
-#, fuzzy
-msgid "Read error"
-msgstr "Earráid sa léamh"
+#, c-format
+msgid "Server closed the connection"
+msgstr ""
 
 msgid "Users"
 msgstr "Úsáideoirí"
@@ -3517,10 +3547,10 @@ msgstr ""
 msgid "execute"
 msgstr "Deán"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3535,9 +3565,13 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
-msgid "Invalid response from server."
+msgid "SASL authentication failed"
 msgstr ""
 
+#, fuzzy
+msgid "Invalid response from server"
+msgstr "Ní féidir an comhad a oscailt."
+
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
@@ -3547,8 +3581,9 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr ""
 
-msgid "SASL error"
-msgstr ""
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "SSL Servers"
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -3562,22 +3597,13 @@ msgstr ""
 msgid "Unable to establish a connection with the server"
 msgstr ""
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Cailleadh an nasc le \"%s\"."
 
 msgid "Unable to establish SSL connection"
 msgstr ""
 
-msgid "Unable to create socket"
-msgstr ""
-
-#, fuzzy
-msgid "Write error"
-msgstr "Earráid sa scríobh"
-
 msgid "Full Name"
 msgstr "Ainm Iomlán"
 
@@ -3653,159 +3679,6 @@ msgstr "Córas Oibriúcháin"
 msgid "Local Time"
 msgstr "Ceantar"
 
-msgid "Last Activity"
-msgstr ""
-
-msgid "Service Discovery Info"
-msgstr ""
-
-msgid "Service Discovery Items"
-msgstr ""
-
-msgid "Extended Stanza Addressing"
-msgstr ""
-
-msgid "Multi-User Chat"
-msgstr ""
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr ""
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 Bytestreams"
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr ""
-
-msgid "User Location"
-msgstr ""
-
-msgid "User Avatar"
-msgstr ""
-
-msgid "Chat State Notifications"
-msgstr ""
-
-msgid "Software Version"
-msgstr ""
-
-msgid "Stream Initiation"
-msgstr ""
-
-msgid "File Transfer"
-msgstr ""
-
-msgid "User Mood"
-msgstr ""
-
-msgid "User Activity"
-msgstr ""
-
-msgid "Entity Capabilities"
-msgstr ""
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-msgid "User Tune"
-msgstr ""
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-msgid "Reachability Address"
-msgstr ""
-
-msgid "User Profile"
-msgstr ""
-
-msgid "Jingle"
-msgstr ""
-
-msgid "Jingle Audio"
-msgstr ""
-
-msgid "User Nickname"
-msgstr ""
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr ""
-
-msgid "Jingle DTMF"
-msgstr ""
-
-msgid "Message Receipts"
-msgstr ""
-
-msgid "Public Key Publishing"
-msgstr ""
-
-msgid "User Chatting"
-msgstr ""
-
-msgid "User Browsing"
-msgstr ""
-
-msgid "User Gaming"
-msgstr ""
-
-msgid "User Viewing"
-msgstr ""
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr ""
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr ""
-
 #, fuzzy
 msgid "Priority"
 msgstr "Tosaíocht"
@@ -3818,7 +3691,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Logáilte isteach!\n"
 
 msgid "Middle Name"
@@ -4002,17 +3875,13 @@ msgstr "Níl fuaim"
 msgid "Roles:"
 msgstr "Post"
 
-msgid "Ping timeout"
-msgstr ""
-
 #, fuzzy
-msgid "Read Error"
-msgstr "earráid ag léamh"
+msgid "Ping timed out"
+msgstr "Dínascadh de bharr moille rófhada"
 
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4192,9 +4061,6 @@ msgstr ""
 msgid "Error changing password"
 msgstr ""
 
-msgid "Password (again)"
-msgstr ""
-
 msgid "Change XMPP Password"
 msgstr ""
 
@@ -4569,6 +4435,14 @@ msgstr ""
 msgid "Unknown Error in presence"
 msgstr ""
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr ""
+
+#, c-format
+msgid "Error in chat %s"
+msgstr ""
+
 msgid "Create New Room"
 msgstr ""
 
@@ -4583,15 +4457,19 @@ msgstr ""
 msgid "_Accept Defaults"
 msgstr ""
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr ""
+#, fuzzy
+msgid "No reason"
+msgstr "Ní fios cén fáth"
 
 #, c-format
-msgid "Error in chat %s"
+msgid "You have been kicked: (%s)"
 msgstr ""
 
-msgid "An error occured on the in-band bytestream transfer\n"
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr " (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr ""
 
 msgid "Transfer was closed."
@@ -5076,9 +4954,6 @@ msgstr ""
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-msgid "Failed to connect to server."
-msgstr ""
-
 msgid "Error retrieving profile"
 msgstr ""
 
@@ -5320,9 +5195,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 
-msgid "Unable to connect"
-msgstr ""
-
 msgid "Writing error"
 msgstr "Earráid sa scríobh"
 
@@ -5336,19 +5208,20 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Our protocol is not supported by the server."
+msgid "Our protocol is not supported by the server"
 msgstr ""
 
-msgid "Error parsing HTTP."
-msgstr ""
+#, fuzzy
+msgid "Error parsing HTTP"
+msgstr "earráid agus ag léamh %s"
 
-msgid "You have signed on from another location."
+msgid "You have signed on from another location"
 msgstr ""
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr ""
 
 #, c-format
@@ -5359,10 +5232,6 @@ msgid ""
 "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 ""
 
@@ -5457,6 +5326,10 @@ msgstr "MSN Prótacal Breiseán"
 msgid "%s is not a valid group."
 msgstr ""
 
+#, fuzzy
+msgid "Unknown error."
+msgstr "Earráid anaithnid=(%d)\n"
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s ar %s (%s)"
@@ -5564,12 +5437,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Ceangailte"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr ""
@@ -5590,16 +5457,6 @@ msgstr ""
 msgid "Invalid input condition"
 msgstr ""
 
-msgid "Read buffer full (2)"
-msgstr ""
-
-msgid "Unparseable message"
-msgstr ""
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr ""
-
 msgid "Failed to add buddy"
 msgstr ""
 
@@ -5681,6 +5538,12 @@ msgstr ""
 msgid "Client Version"
 msgstr ""
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr ""
 
@@ -5936,9 +5799,9 @@ msgstr ""
 msgid "Unknown error: 0x%X"
 msgstr ""
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Ní féidir an comhad a oscailt."
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6036,9 +5899,6 @@ msgstr ""
 msgid "Authenticating..."
 msgstr ""
 
-msgid "Unable to connect to server."
-msgstr ""
-
 msgid "Waiting for response..."
 msgstr ""
 
@@ -6059,20 +5919,14 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr ""
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-
-msgid "Error. SSL support is not installed."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 
 msgid "This conference has been closed. No more messages can be sent."
@@ -6110,11 +5964,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6123,17 +5973,9 @@ msgstr ""
 msgid "Invalid chat room name"
 msgstr ""
 
-msgid "Server closed the connection."
-msgstr ""
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-
-msgid "Received invalid data on connection with server."
-msgstr ""
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "Cailleadh an nasc le \"%s\"."
 
 #. *< type
 #. *< ui_requirement
@@ -6180,7 +6022,7 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr ""
 
 msgid "Direct IM established"
@@ -6376,16 +6218,12 @@ msgid "Buddy Comment"
 msgstr ""
 
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Ní féidir an comhad a oscailt."
 
 msgid "Username sent"
 msgstr ""
@@ -6399,9 +6237,9 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 
 #, c-format
@@ -6411,26 +6249,21 @@ 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 ""
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Níl úsáideoir '%s' ar bith ann."
 
 #. Suspended account
-msgid "Your account is currently suspended."
+msgid "Your account is currently suspended"
 msgstr ""
 
 #. service temporarily unavailable
@@ -6447,7 +6280,7 @@ msgid ""
 "try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
-msgid "The SecurID key entered is invalid."
+msgid "The SecurID key entered is invalid"
 msgstr ""
 
 msgid "Enter SecurID"
@@ -6599,6 +6432,9 @@ msgstr ""
 msgid "Member Since"
 msgstr ""
 
+msgid "Capabilities"
+msgstr ""
+
 msgid "Profile"
 msgstr "Próifíl"
 
@@ -6757,7 +6593,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6779,7 +6615,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
@@ -6787,7 +6623,7 @@ msgid "(no name)"
 msgstr "(gan-ainm)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr ""
 
 #, c-format
@@ -7585,8 +7421,9 @@ msgstr ""
 msgid "Update interval (seconds)"
 msgstr "Eolas Úsáideoir"
 
-msgid "Cannot decrypt server reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt server reply"
+msgstr "Ní féidir an comhad a oscailt."
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
@@ -7610,9 +7447,6 @@ msgstr ""
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
-msgid "Could not decrypt server reply"
-msgstr ""
-
 msgid "Requesting captcha"
 msgstr ""
 
@@ -7646,21 +7480,9 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr ""
-
 msgid "Socket error"
 msgstr ""
 
-msgid "Unable to read from socket"
-msgstr ""
-
-msgid "Write Error"
-msgstr "Earráid scríobh"
-
-msgid "Connection lost"
-msgstr ""
-
 #, fuzzy
 msgid "Getting server"
 msgstr "Nasc diúltaithe"
@@ -7668,8 +7490,9 @@ msgstr "Nasc diúltaithe"
 msgid "Requesting token"
 msgstr ""
 
-msgid "Couldn't resolve host"
-msgstr ""
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Ní féidir an comhad a oscailt."
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -7719,7 +7542,7 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "Ordú"
 
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr ""
 
 #, fuzzy
@@ -7741,9 +7564,6 @@ msgstr ""
 msgid "%d canceled the transfer of %s"
 msgstr ""
 
-msgid "Connection closed (writing)"
-msgstr ""
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr ""
@@ -7797,17 +7617,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-msgid "Connection reset"
-msgstr ""
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr ""
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr ""
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -7830,6 +7639,9 @@ msgstr ""
 msgid "Video Camera"
 msgstr ""
 
+msgid "File Transfer"
+msgstr ""
+
 msgid "Supports"
 msgstr ""
 
@@ -8593,6 +8405,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr ""
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr ""
 
@@ -8651,8 +8466,9 @@ msgstr ""
 msgid "Disconnected by server"
 msgstr ""
 
-msgid "Error during connecting to SILC Server"
-msgstr ""
+#, fuzzy
+msgid "Error connecting to SILC Server"
+msgstr "Nasc diúltaithe"
 
 msgid "Key Exchange failed"
 msgstr ""
@@ -8661,27 +8477,24 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-msgid "Connection failed"
-msgstr ""
-
 msgid "Performing key exchange"
 msgstr ""
 
-msgid "Unable to create connection"
-msgstr ""
-
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr ""
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr ""
 
+msgid "Unable to not load SILC key pair"
+msgstr ""
+
 #, fuzzy
 msgid "Out of memory"
 msgstr "Cuimhne ídithe"
 
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr ""
 
 msgid "Error loading SILC key pair"
@@ -8960,7 +8773,7 @@ msgstr ""
 msgid "Creating SILC key pair..."
 msgstr ""
 
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr ""
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9050,6 +8863,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr ""
 
+msgid "Error during connecting to SILC Server"
+msgstr ""
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -9090,30 +8906,26 @@ msgstr ""
 msgid "Failure: Authentication failed"
 msgstr ""
 
-msgid "Cannot initialize SILC Client connection"
+msgid "Unable to initialize SILC Client connection"
 msgstr ""
 
 msgid "John Noname"
 msgstr ""
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr ""
 
-msgid "Could not write"
-msgstr ""
-
-msgid "Could not connect"
-msgstr ""
-
-msgid "Unknown server response."
+msgid "Unable to create connection"
 msgstr ""
 
-msgid "Could not create listen socket"
-msgstr ""
+#, fuzzy
+msgid "Unknown server response"
+msgstr "Ní fios cén fáth"
 
-msgid "Could not resolve hostname"
-msgstr ""
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Ní féidir an comhad a oscailt."
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
@@ -9154,6 +8966,78 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr ""
+
+msgid "list: List rooms on the Yahoo network"
+msgstr ""
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo Prótacal Breiseán"
+
+msgid "Pager server"
+msgstr ""
+
+msgid "Pager port"
+msgstr ""
+
+msgid "File transfer server"
+msgstr ""
+
+msgid "File transfer port"
+msgstr ""
+
+msgid "Chat room locale"
+msgstr ""
+
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
+
+msgid "Chat room list URL"
+msgstr ""
+
+msgid "Yahoo Chat server"
+msgstr ""
+
+msgid "Yahoo Chat port"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo Prótacal Breiseán"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9181,26 +9065,16 @@ msgstr ""
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 
 #. username or password missing
@@ -9235,33 +9109,27 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-msgid "Could not add buddy to server list"
-msgstr ""
+#, fuzzy
+msgid "Unable to add buddy to server list"
+msgstr "Ní féidir an comhad a oscailt."
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
-msgstr ""
-
-msgid "Connection problem"
+msgid "Received unexpected HTTP response from server"
 msgstr ""
 
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "Cailleadh an nasc le \"%s\"."
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Cailleadh an nasc le \"%s\"."
 
 msgid "Not at Home"
 msgstr ""
@@ -9323,74 +9191,15 @@ msgstr ""
 msgid "Open Inbox"
 msgstr ""
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-
-msgid "list: List rooms on the Yahoo network"
-msgstr ""
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo Prótacal Breiseán"
-
-msgid "Yahoo Japan"
-msgstr ""
-
-msgid "Pager server"
-msgstr ""
-
-msgid "Japan Pager server"
-msgstr ""
-
-msgid "Pager port"
-msgstr ""
-
-msgid "File transfer server"
-msgstr ""
-
-msgid "Japan file transfer server"
-msgstr ""
-
-msgid "File transfer port"
-msgstr ""
-
-msgid "Chat room locale"
-msgstr ""
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-msgid "Chat room list URL"
-msgstr ""
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-msgid "Yahoo Chat port"
-msgstr ""
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr ""
+
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -9398,6 +9207,9 @@ msgstr ""
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr ""
 
+msgid "Write Error"
+msgstr "Earráid scríobh"
+
 msgid "Yahoo! Japan Profile"
 msgstr ""
 
@@ -9503,20 +9315,18 @@ msgstr ""
 msgid "Webcams"
 msgstr ""
 
-msgid "Unable to fetch room list."
+msgid "Connection problem"
 msgstr ""
 
-msgid "User Rooms"
+msgid "Unable to fetch room list."
 msgstr ""
 
-msgid "Connection problem with the YCHT server."
+msgid "User Rooms"
 msgstr ""
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Connection problem with the YCHT server"
+msgstr "Cailleadh an nasc le \"%s\"."
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9635,13 +9445,7 @@ msgid "Exposure"
 msgstr "nochtadh"
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
 
 #, c-format
@@ -9649,16 +9453,13 @@ msgid "HTTP proxy connection error %d"
 msgstr ""
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
 #, c-format
 msgid "Error resolving %s"
 msgstr ""
 
-msgid "Could not resolve host name"
-msgstr ""
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -9858,12 +9659,6 @@ msgid "Unable to connect to %s: %s"
 msgstr ""
 
 #, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-
-#, c-format
 msgid " - %s"
 msgstr " - %s"
 
@@ -10101,7 +9896,10 @@ msgstr ""
 msgid "View _Log"
 msgstr "Amharc ar logchomhad"
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr ""
+
+msgid "Show When Offline"
 msgstr ""
 
 msgid "_Alias..."
@@ -10589,6 +10387,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr ""
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL Servers"
@@ -10639,8 +10440,9 @@ msgstr "Déan neamhshuim"
 msgid "Get Away Message"
 msgstr ""
 
-msgid "Last said"
-msgstr ""
+#, fuzzy
+msgid "Last Said"
+msgstr "Sloinne"
 
 msgid "Unable to save icon file to disk."
 msgstr ""
@@ -11517,7 +11319,7 @@ msgstr ""
 msgid "Hyperlink visited color"
 msgstr ""
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 
 msgid "Hyperlink prelight color"
@@ -11553,13 +11355,19 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 msgid "Typing notification color"
 msgstr ""
 
-msgid "The color to use for the typing notification font"
+msgid "The color to use for the typing notification"
 msgstr ""
 
 msgid "Typing notification font"
@@ -11916,6 +11724,10 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
+#, fuzzy
+msgid "No message"
+msgstr "Scéal"
+
 msgid "Open All Messages"
 msgstr ""
 
@@ -11932,10 +11744,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr ""
 
-#, fuzzy
-msgid "No message"
-msgstr "Scéal"
-
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -12145,8 +11953,9 @@ msgstr ""
 msgid "On unread messages"
 msgstr ""
 
-msgid "Conversation Window Hiding"
-msgstr ""
+#, fuzzy
+msgid "Conversation Window"
+msgstr "/Comhrá"
 
 msgid "_Hide new IM conversations:"
 msgstr ""
@@ -12154,6 +11963,9 @@ msgstr ""
 msgid "When away"
 msgstr ""
 
+msgid "Minimi_ze new conversation windows"
+msgstr ""
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -12212,9 +12024,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr ""
 
-msgid "Minimi_ze new conversation windows"
-msgstr ""
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12248,7 +12057,8 @@ msgstr ""
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-msgid "_Autodetect IP address"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr ""
 
 msgid "Public _IP:"
@@ -12619,30 +12429,15 @@ msgstr ""
 msgid "Status for %s"
 msgstr "Stádas le %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr ""
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
-msgid "Duplicate Shortcut"
+msgid "Custom Smiley"
 msgstr ""
 
-msgid "Please select an image for the smiley."
+msgid "Duplicate Shortcut"
 msgstr ""
 
 msgid "Edit Smiley"
@@ -12749,8 +12544,8 @@ msgid "Cannot send launcher"
 msgstr ""
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -13313,7 +13108,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -13561,7 +13356,7 @@ msgstr ""
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -13875,7 +13670,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr ""
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -13916,6 +13711,32 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Read error"
+#~ msgstr "Earráid sa léamh"
+
+#, fuzzy
+#~ msgid "Write error"
+#~ msgstr "Earráid sa scríobh"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5 Bytestreams"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#, fuzzy
+#~ msgid "Read Error"
+#~ msgstr "earráid ag léamh"
+
+#, fuzzy
+#~ msgid "Incorrect password."
+#~ msgstr "pasfhocal mícheart"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "pasfhocal mícheart"
+
+#, fuzzy
 #~ msgid "Add buddy Q&A"
 #~ msgstr "Cuir Cara"
 
diff --git a/po/gl.po b/po/gl.po
index b6800c3daf..afce766acf 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2008-12-15 13:44+0100\n"
 "Last-Translator: Frco. Javier Rial Rodríguez <fjrial@cesga.es>\n"
 "Language-Team: Galego <g11n@mancomun.org>\n"
@@ -2598,9 +2598,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Inclúe outros rexistros de clientes de MI no visualizador de rexistro."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2655,8 +2656,9 @@ msgstr "Emulación de mensaxe a contactos desconectados"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Gardar como avisos as mensaxes enviadas a un usuario desconectado."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "O resto das mensaxes gardaranse como avisos. Pode editar/eliminar os avisos "
@@ -2909,15 +2911,17 @@ msgstr ""
 "complementos de TCL, precisa instalar ActiveTCL desde o enderezo http://www."
 "activestate.com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Non se encontrou o toolkit Apple Bonjour for Windows, vexa a sección de "
 "preguntas máis frecuentes (FAQ) en: http://d.pidgin.im/BonjourWindows para "
 "máis información."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Non é posíbel escoitar as conexións entrantes de MI\n"
 
 msgid ""
@@ -2972,14 +2976,21 @@ msgstr "%s pechou a conversa."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Non é posíbel enviar a mensaxe; non se puido iniciar a conversa."
 
-msgid "Cannot open socket"
-msgstr "Non se pode abrir o conectador"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Non se puido crear un conectador:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Non se puido vincular o conectador ao porto"
 
-msgid "Could not listen on socket"
-msgstr "Non se puido escoitar o conectador"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Non se puido crear un conectador:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Erro ao comunicar co mDNSResponder local"
@@ -3029,13 +3040,16 @@ msgstr "Gardar lista de contactos..."
 msgid "Load buddylist from file..."
 msgstr "Cargar a lista de contactos desde un ficheiro..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Encher os campos de rexistro."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Os contrasinais non coinciden."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Non se puido rexistrar a nova conta. Produciuse un erro.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3047,14 +3061,15 @@ msgstr "O rexistro terminou satisfactoriamente!"
 msgid "Password"
 msgstr "Contrasinal"
 
-msgid "Password (retype)"
-msgstr "Contrasinal (escribir de novo)"
+msgid "Password (again)"
+msgstr "Contrasinal (de novo)"
 
-msgid "Enter current token"
-msgstr "Introduza o token actual"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Token actual"
+#, fuzzy
+msgid "Captcha"
+msgstr "Imaxe captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Rexistrar unha conta nova de Gadu-Gadu"
@@ -3107,6 +3122,15 @@ msgstr "O contrasinal modificouse con éxito!"
 msgid "Current password"
 msgstr "Contrasinal actual"
 
+msgid "Password (retype)"
+msgstr "Contrasinal (escribir de novo)"
+
+msgid "Enter current token"
+msgstr "Introduza o token actual"
+
+msgid "Current token"
+msgstr "Token actual"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Introduza o seu contrasinal actual e o novo para o UIN: "
 
@@ -3154,8 +3178,8 @@ msgstr "Non se encontrou usuarios coincidentes"
 msgid "There are no users matching your search criteria."
 msgstr "Non hai usuarios que coincidan cos seus criterios de busca."
 
-msgid "Unable to read socket"
-msgstr "Non é posíbel ler o conectador"
+msgid "Unable to read from socket"
+msgstr "Non é posíbel ler desde o conectador"
 
 msgid "Buddy list downloaded"
 msgstr "Descargouse a lista de contactos"
@@ -3169,8 +3193,14 @@ msgstr "Enviouse a lista de contactos"
 msgid "Your buddy list was stored on the server."
 msgstr "A súa lista de contactos almacenouse no servidor."
 
-msgid "Connection failed."
-msgstr "Fallou a conexión."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Conectado"
+
+msgid "Connection failed"
+msgstr "Fallo ao conectar"
 
 msgid "Add to chat"
 msgstr "Engadir á conversa"
@@ -3178,18 +3208,23 @@ msgstr "Engadir á conversa"
 msgid "Chat _name:"
 msgstr "_Nome da conversa:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Non se puido conectar ao servidor."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Conectando"
+
 msgid "Chat error"
 msgstr "Erro da conversa"
 
 msgid "This chat name is already in use"
 msgstr "O nome desta conversa xa está en uso"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Non está conectado ao servidor."
 
 msgid "Find buddies..."
@@ -3249,7 +3284,8 @@ msgstr "Non hai un asunto definido"
 msgid "File Transfer Failed"
 msgstr "Fallou a transferencia do ficheiro"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Non se puido abrir un porto de escoita."
 
 msgid "Error displaying MOTD"
@@ -3265,8 +3301,18 @@ msgstr "Non hai un MOTD asociado con esta conexión."
 msgid "MOTD for %s"
 msgstr "MOTD para %s"
 
-msgid "Server has disconnected"
-msgstr "O servidor desconectouse"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Perdeuse a conexión co servidor:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Ver MOTD"
@@ -3281,22 +3327,20 @@ msgstr "_Contrasinal:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "Os alias de IRC non poden conter espazos en branco"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Conectando"
-
 msgid "SSL support unavailable"
 msgstr "O soporte de SSL non está dispoñíbel"
 
-msgid "Couldn't create socket"
-msgstr "Non se puido crear o conectador "
+msgid "Unable to connect"
+msgstr "Non é posíbel conectar"
 
-msgid "Couldn't connect to host"
-msgstr "Non se puido conectar ao servidor"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Non se puido conectar a %s"
 
-msgid "Read error"
-msgstr "Erro de lectura"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "O servidor pechou a conexión."
 
 msgid "Users"
 msgstr "Usuarios"
@@ -3725,12 +3769,14 @@ msgstr "Fallou o comando Ad-Hoc"
 msgid "execute"
 msgstr "executar"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "O servidor require TLS/SSL para iniciar a sesión. Non se dispón de soporte "
 "TLS/SSL."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "O servidor require TLS/SSL para iniciar a sesión. Non se dispón de soporte "
 "TLS/SSL."
@@ -3750,7 +3796,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Autenticación con texto plano"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Fallou a autenticación"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Resposta non válida do servidor."
 
 msgid "Server does not use any supported authentication method"
@@ -3763,7 +3814,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "O desafío do servidor non é válido."
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Erro de SASL"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3783,10 +3835,8 @@ msgstr ""
 "Non se puido establecer unha conexión co servidor:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Non se puido establecer unha conexión co servidor:\n"
 "%s"
@@ -3795,12 +3845,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "Non é posíbel comezar a conexión"
 
-msgid "Unable to create socket"
-msgstr "Non é posíbel crear o conectador"
-
-msgid "Write error"
-msgstr "Erro de escritura"
-
 msgid "Full Name"
 msgstr "Nome completo:"
 
@@ -3871,159 +3915,6 @@ msgstr "Sistema operativo"
 msgid "Local Time"
 msgstr "Ficheiro local:"
 
-msgid "Last Activity"
-msgstr "Última actividade"
-
-msgid "Service Discovery Info"
-msgstr "Información de descubrimento de servizo"
-
-msgid "Service Discovery Items"
-msgstr "Elementos de descubrimento de servizo"
-
-msgid "Extended Stanza Addressing"
-msgstr "Envío de parágrafos ampliado"
-
-msgid "Multi-User Chat"
-msgstr "Conversa multiusuario"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Información de presencia ampliada de conversa multiusuario"
-
-msgid "In-Band Bytestreams"
-msgstr "Fluxos de bytes In-Band"
-
-msgid "Ad-Hoc Commands"
-msgstr "Comandos Ad-Hoc"
-
-msgid "PubSub Service"
-msgstr "Servizo PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "Fluxos de bytes SOCKS5"
-
-msgid "Out of Band Data"
-msgstr "Datos fóra de banda"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "Rexistro In-Band"
-
-msgid "User Location"
-msgstr "Localización do usuario"
-
-msgid "User Avatar"
-msgstr "Avatar de usuario"
-
-msgid "Chat State Notifications"
-msgstr "Notificacións de estado da conversa"
-
-msgid "Software Version"
-msgstr "Versión de software"
-
-msgid "Stream Initiation"
-msgstr "Inicio de fluxo"
-
-msgid "File Transfer"
-msgstr "Transferencia de ficheiros"
-
-msgid "User Mood"
-msgstr "Estado de ánimo do usuario"
-
-msgid "User Activity"
-msgstr "Actividade do usuario"
-
-msgid "Entity Capabilities"
-msgstr "Capacidades da entidade"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Negociacións de sesión codificada"
-
-msgid "User Tune"
-msgstr "Música do usuario"
-
-msgid "Roster Item Exchange"
-msgstr "Intercambio de elementos da lista"
-
-msgid "Reachability Address"
-msgstr "Enderezo de contacto"
-
-msgid "User Profile"
-msgstr "Perfil de usuario"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle Audio"
-
-msgid "User Nickname"
-msgstr "Alias do usuario"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle UDP en bruto"
-
-msgid "Jingle Video"
-msgstr "Jingle Video"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Recibos de mensaxe"
-
-msgid "Public Key Publishing"
-msgstr "Publicación da chave pública"
-
-msgid "User Chatting"
-msgstr "O usuario está conversando"
-
-msgid "User Browsing"
-msgstr "O usuario está navegando"
-
-msgid "User Gaming"
-msgstr "O usuario está xogando"
-
-msgid "User Viewing"
-msgstr "O usuario está observando"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Cifrado de parágrafo"
-
-msgid "Entity Time"
-msgstr "Hora da entidade"
-
-msgid "Delayed Delivery"
-msgstr "Envío atrasado"
-
-msgid "Collaborative Data Objects"
-msgstr "Collaborative Data Objects"
-
-msgid "File Repository and Sharing"
-msgstr "Repositorio de ficheiros e compartidos"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "Descubrimento de servizo STUN para o Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Negociación simplificada de sesión cifrada"
-
-msgid "Hop Check"
-msgstr "Verificación de saltos"
-
-msgid "Capabilities"
-msgstr "Capacidades"
-
 msgid "Priority"
 msgstr "Prioridade"
 
@@ -4035,7 +3926,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Con sesión iniciada"
 
 msgid "Middle Name"
@@ -4217,16 +4108,13 @@ msgstr "Non se encontrou usuarios coincidentes"
 msgid "Roles:"
 msgstr "Papel"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Excedeuse o tempo de espera do ping"
 
-msgid "Read Error"
-msgstr "Erro de lectura"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4405,9 +4293,6 @@ msgstr "Modificouse o seu contrasinal."
 msgid "Error changing password"
 msgstr "Erro ao modificar o contrasinal"
 
-msgid "Password (again)"
-msgstr "Contrasinal (de novo)"
-
 msgid "Change XMPP Password"
 msgstr "Cambiar o contrasinal de XMPP"
 
@@ -4796,6 +4681,14 @@ msgstr "Erro de análise de XML"
 msgid "Unknown Error in presence"
 msgstr "Erro descoñecido na presenza"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Erro ao unirse á conversa %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Erro na conversa %s"
+
 msgid "Create New Room"
 msgstr "Crear unha sala nova"
 
@@ -4812,16 +4705,20 @@ msgstr "_Configurar a sala"
 msgid "_Accept Defaults"
 msgstr "_Aceptar os valores predeterminados"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Erro ao unirse á conversa %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Non se deu ningunha razón"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Erro na conversa %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Foi expulsado por %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Expulsado por %s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Produciuse un erro ao abrir o ficheiro."
 
 #, fuzzy
@@ -5316,9 +5213,6 @@ msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "Necesítase o soporte SSL para o MSN. Instale unha biblioteca SSL soportada."
 
-msgid "Failed to connect to server."
-msgstr "Fallou ao conectar ao servidor."
-
 msgid "Error retrieving profile"
 msgstr "Erro ao obter o perfil"
 
@@ -5576,9 +5470,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Non se enviou a mensaxe porque se produciu un erro descoñecido."
 
-msgid "Unable to connect"
-msgstr "Non é posíbel conectar"
-
 msgid "Writing error"
 msgstr "Erro de escritura"
 
@@ -5593,13 +5484,16 @@ msgstr ""
 "Erro de conexión do servidor %s :\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "O servidor non soporta o noso protocolo."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Erro na análise HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Conectouse desde outra localización."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5607,7 +5501,8 @@ msgstr ""
 "Os servidores MSN non están dispoñíbeis temporalmente. Agarde e volva "
 "tentalo máis tarde."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Os servidores MSN van sufrir un apagado temporal."
 
 #, c-format
@@ -5620,9 +5515,6 @@ 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"
 
@@ -5725,6 +5617,9 @@ msgstr "Complemento de protocolo MSN"
 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)"
@@ -5835,12 +5730,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Engadir contactos desde o servidor"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Conectado"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Erro de protocolo, código %d: %s"
@@ -5865,16 +5754,6 @@ msgstr "Erro do MySpaceIM"
 msgid "Invalid input condition"
 msgstr "Condición de entrada non válida"
 
-msgid "Read buffer full (2)"
-msgstr "O búfer de lectura está cheo (2)"
-
-msgid "Unparseable message"
-msgstr "A mensaxe non é analizábel"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Non se puido conectar ao servidor: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Fallou ao engadir un contacto"
 
@@ -5959,6 +5838,12 @@ msgstr "Total de amigos"
 msgid "Client Version"
 msgstr "Versión do cliente"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - O nome de usuario está dispoñíbel"
 
@@ -6217,9 +6102,9 @@ msgstr "O usuario non está conectado ou vostede está sendo bloqueado"
 msgid "Unknown error: 0x%X"
 msgstr "Erro descoñecido: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Fallou o inicio de sesión (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Non é posíbel facer ping ao usuario %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6326,9 +6211,6 @@ msgstr "Conferencia GroupWise %d"
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-msgid "Unable to connect to server."
-msgstr "Non se puido conectar ao servidor."
-
 msgid "Waiting for response..."
 msgstr "Agardando unha resposta..."
 
@@ -6352,9 +6234,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Desexa unirse á conversa?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Foi desconectado porque se conectou desde outra estación de traballo."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6362,16 +6241,14 @@ msgstr ""
 "Non parece que %s estea conectado e non recibiu a mensaxe que lle acaba de "
 "enviar."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Non se puido contactar co servidor. Indique o enderezo do servidor co que "
 "desexa conectar."
 
-msgid "Error. SSL support is not installed."
-msgstr "Erro. O soporte SSL non está instalado."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Pechouse esta conferencia. Non se poden enviar máis mensaxes."
 
@@ -6410,10 +6287,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6422,18 +6296,8 @@ msgstr "Non se puido unir á sala de conversa"
 msgid "Invalid chat room name"
 msgstr "Nome de sala de conversa non válido"
 
-msgid "Server closed the connection."
-msgstr "O servidor pechou a conexión."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Perdeuse a conexión co servidor:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Recibíronse datos non válidos na conexión co servidor."
 
 #. *< type
@@ -6481,7 +6345,8 @@ msgstr "Perdeuse a conexión co usuario remoto:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Recibíronse datos non válidos na conexión co usuario remoto."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Non se puido establecer unha conexión co usuario remoto."
 
 msgid "Direct IM established"
@@ -6682,21 +6547,15 @@ msgstr "Nivel de aviso"
 msgid "Buddy Comment"
 msgstr "Comentario de contacto"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Non se puido conectar ao servidor de autenticación:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Non se puido conectar ao servidor BOS:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Non se puido conectar ao servidor."
 
 msgid "Username sent"
 msgstr "Enviouse o nome de usuario"
@@ -6708,11 +6567,11 @@ msgstr "Estableceuse a conexión e enviouse a cookie"
 msgid "Finalizing connection"
 msgstr "Rematando a conexión"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Non se puido iniciar a sesión: Non se iniciou a sesión como %s porque o nome "
 "de usuario non é válido.  Os nomes de usuario teñen que ser unha dirección "
@@ -6726,26 +6585,22 @@ 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."
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "O usuario non existe"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "A conta está actualmente deshabilitada."
 
 #. service temporarily unavailable
@@ -6766,7 +6621,8 @@ 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."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "A chave SecurID que se introduciu non é válida."
 
 msgid "Enter SecurID"
@@ -6938,6 +6794,9 @@ msgstr "Conectado desde"
 msgid "Member Since"
 msgstr "Membro desde"
 
+msgid "Capabilities"
+msgstr "Capacidades"
+
 msgid "Profile"
 msgstr "Perfil"
 
@@ -7121,9 +6980,9 @@ msgstr[1] ""
 msgid "Away message too long."
 msgstr "A mensaxe de ausencia é demasiado longa."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7149,9 +7008,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Orfos"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Non se puido engadir o contacto %s porque hai demasiados contactos na lista "
@@ -7160,8 +7019,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(sen nome)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Non se puido engadir o contacto %s por unha razón descoñecida."
 
 #, c-format
@@ -7946,7 +7805,8 @@ msgstr "Intervalo de keep alive (segundos)"
 msgid "Update interval (seconds)"
 msgstr "Intervalo de actualización (segundos)"
 
-msgid "Cannot decrypt server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "Non se pode descifrar a resposta do servidor"
 
 #, c-format
@@ -7971,9 +7831,6 @@ msgstr "Requírese activación"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Código de resposta descoñecido ao iniciar sesión en (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Non se puido descrifrar a resposta do servidor"
-
 msgid "Requesting captcha"
 msgstr "Solicitando captcha"
 
@@ -8008,29 +7865,18 @@ msgstr ""
 "Código de resposta descoñecido ao iniciar sesión en (0x%02X):\n"
 "%s"
 
-msgid "Unable to connect."
-msgstr "Non é posíbel conectar."
-
 msgid "Socket error"
 msgstr "Erro do conectador"
 
-msgid "Unable to read from socket"
-msgstr "Non é posíbel ler desde o conectador"
-
-msgid "Write Error"
-msgstr "Erro de escritura"
-
-msgid "Connection lost"
-msgstr "Conexión perdida"
-
 msgid "Getting server"
 msgstr "A obter o servidor"
 
 msgid "Requesting token"
 msgstr "Solicitando token"
 
-msgid "Couldn't resolve host"
-msgstr "Non se puido resolver o host"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Non se puido conectar ao servidor."
 
 msgid "Invalid server or port"
 msgstr "O servidor ou o porto non son válidos"
@@ -8084,7 +7930,7 @@ msgid "QQ Qun Command"
 msgstr "Comando QQ Qun"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Non puido descifrar a resposta do inicio de sesión"
 
 #, fuzzy
@@ -8106,9 +7952,6 @@ msgstr "Ficheiro enviado"
 msgid "%d canceled the transfer of %s"
 msgstr "%d cancelou a transferencia de %s"
 
-msgid "Connection closed (writing)"
-msgstr "Conexión pechada (escribindo)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Título do grupo:</b> %s<br>"
@@ -8163,17 +8006,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Anuncio do administrador Sametime"
 
-msgid "Connection reset"
-msgstr "Conexión reiniciada"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Erro ao ler do conectador: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Non é posíbel conectarse ao host"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Anuncio de %s"
@@ -8196,6 +8028,9 @@ msgstr "Altofalantes"
 msgid "Video Camera"
 msgstr "Videocámara"
 
+msgid "File Transfer"
+msgstr "Transferencia de ficheiros"
+
 msgid "Supports"
 msgstr "Admitidos"
 
@@ -9016,6 +8851,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Estatísticas de rede"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Fallou o ping"
 
@@ -9079,7 +8917,8 @@ msgstr "Tipo de chave pública non soportada"
 msgid "Disconnected by server"
 msgstr "Desconectado polo servidor"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Produciuse un erro durante a conexión ao servidor SILC"
 
 msgid "Key Exchange failed"
@@ -9091,26 +8930,26 @@ msgstr ""
 "Produciuse un erro ao retomar a sesión desconectada. Prema Reconectar para "
 "crear unha nova conexión."
 
-msgid "Connection failed"
-msgstr "Fallo ao conectar"
-
 msgid "Performing key exchange"
 msgstr "Efectuando o intercambio de chaves"
 
-msgid "Unable to create connection"
-msgstr "Non é posíbel crear a conexión"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Non se puido cargar o par de chaves SILC"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Conectando co servidor SILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Non se puido cargar o par de chaves SILC"
+
 msgid "Out of memory"
 msgstr "Sen memoria"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Non se puido inicializar o protocolo SILC"
 
 msgid "Error loading SILC key pair"
@@ -9409,7 +9248,8 @@ msgstr "Asinar dixitalmente e verificar todas as mensaxes"
 msgid "Creating SILC key pair..."
 msgstr "Creando o par de chaves SILC..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Non se pode crear o par de chaves SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9504,6 +9344,9 @@ msgstr "Encerado"
 msgid "No server statistics available"
 msgstr "Non hai estatísticas do servidor dispoñíbeis"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Produciuse un erro durante a conexión ao servidor SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Fallo: Existe unha diferenza nas versións, actualice o seu cliente"
@@ -9544,30 +9387,27 @@ msgstr "Fallo: Cookie non válida"
 msgid "Failure: Authentication failed"
 msgstr "Fallo: Fallou a autenticación"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Non se puido inicializar a conexión do cliente SILC"
 
 msgid "John Noname"
 msgstr "Nome Apelidos"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Non se puido cargar o par de chaves SILC: %s"
 
-msgid "Could not write"
-msgstr "Non se puido escribir"
-
-msgid "Could not connect"
-msgstr "Non se puido conectar"
+msgid "Unable to create connection"
+msgstr "Non é posíbel crear a conexión"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Resposta do servidor descoñecida."
 
-msgid "Could not create listen socket"
-msgstr "Non se puido crear o conectador para escoitar"
-
-msgid "Could not resolve hostname"
-msgstr "Non se puido resolver o nome do host"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Non é posíbel crear o conectador"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
@@ -9610,6 +9450,77 @@ msgstr "Usuario de autenticación"
 msgid "Auth Domain"
 msgstr "Dominio de autenticación"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;sala&gt;:  Unirse a unha sala na rede Yahoo"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Mostrar as salas da rede Yahoo"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Solicitar ao usuario o comezo dunha sesión Doodle"
+
+msgid "Yahoo ID..."
+msgstr "ID de Yahoo..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Complemento de protocolo Yahoo"
+
+msgid "Pager server"
+msgstr "Servidor do buscapersoas"
+
+msgid "Pager port"
+msgstr "Porto do buscapersoas"
+
+msgid "File transfer server"
+msgstr "Servidor de transferencia de ficheiros"
+
+msgid "File transfer port"
+msgstr "Porto de transferencia de ficheiros"
+
+msgid "Chat room locale"
+msgstr "Localización da sala de conversa"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignorar os convites a salas de conferencias ou de conversa"
+
+msgid "Chat room list URL"
+msgstr "URL de lista de salas da conversa"
+
+msgid "Yahoo Chat server"
+msgstr "Servidor de conversa de Yahoo"
+
+msgid "Yahoo Chat port"
+msgstr "Porto de conversa de Yahoo"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "ID de Yahoo..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Complemento de protocolo Yahoo"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9642,30 +9553,20 @@ msgstr "Rexeitouse engadir o contacto"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  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."
@@ -9708,39 +9609,34 @@ msgstr ""
 "Erro descoñecido número %d. Se inicia sesión no sitio web de Yahoo! é "
 "posíbel que isto se arranxe."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Non se puido engadir o contacto %s ao grupo %s á lista no servidor para a "
 "conta %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Non se puido engadir o contacto á lista do servidor"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audíbel %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Recibiuse unha resposta HTTP inesperada do servidor."
 
-msgid "Connection problem"
-msgstr "Problema de conexión"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Perdeuse a conexión con %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Non se puido establecer unha conexión con %s:\n"
+"Non se puido establecer unha conexión co servidor:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9803,73 +9699,15 @@ msgstr "Unir un usuario á conversa..."
 msgid "Open Inbox"
 msgstr "Abrir a caixa de entrada"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;sala&gt;:  Unirse a unha sala na rede Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Mostrar as salas da rede Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Solicitar ao usuario o comezo dunha sesión Doodle"
-
-msgid "Yahoo ID..."
-msgstr "ID de Yahoo..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Complemento de protocolo Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Xapón"
-
-msgid "Pager server"
-msgstr "Servidor do buscapersoas"
-
-msgid "Japan Pager server"
-msgstr "Servidor de buscapersoas xaponés"
-
-msgid "Pager port"
-msgstr "Porto do buscapersoas"
-
-msgid "File transfer server"
-msgstr "Servidor de transferencia de ficheiros"
-
-msgid "Japan file transfer server"
-msgstr "Servidor de transferencia de ficheiros xaponés"
-
-msgid "File transfer port"
-msgstr "Porto de transferencia de ficheiros"
-
-msgid "Chat room locale"
-msgstr "Localización da sala de conversa"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignorar os convites a salas de conferencias ou de conversa"
-
-msgid "Chat room list URL"
-msgstr "URL de lista de salas da conversa"
-
-msgid "Yahoo Chat server"
-msgstr "Servidor de conversa de Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "Porto de conversa de Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Enviar unha petición Doodle."
 
+msgid "Unable to connect."
+msgstr "Non é posíbel conectar."
+
 msgid "Unable to establish file descriptor."
 msgstr "Non se puido establecer o descritor de ficheiro."
 
@@ -9877,6 +9715,9 @@ msgstr "Non se puido establecer o descritor de ficheiro."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s está tentándolle enviar un grupo de %d ficheiros.\n"
 
+msgid "Write Error"
+msgstr "Erro de escritura"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Perfil de Yahoo! xaponés"
 
@@ -9992,23 +9833,19 @@ msgstr "Voces"
 msgid "Webcams"
 msgstr "Cámaras web"
 
+msgid "Connection problem"
+msgstr "Problema de conexión"
+
 msgid "Unable to fetch room list."
 msgstr "Non se puido obter a lista de salas."
 
 msgid "User Rooms"
 msgstr "Salas de usuarios"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Produciuse un problema ao conectarse co servidor YCHT."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Perdeuse a conexión co servidor\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10142,24 +9979,16 @@ msgstr "Dominio"
 msgid "Exposure"
 msgstr "Exposición"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Non se puido crear un conectador:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Non é posíbel analizar a resposta desde o proxy HTTP: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Erro de conexión no proxy HTTP %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "Acceso denegado: o servidor de proxy HTTP prohibe o túnel polo porto %d."
 
@@ -10167,9 +9996,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr "Erro ao resolver %s"
 
-msgid "Could not resolve host name"
-msgstr "Non se puido resolver o nome do host"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Solicitando a atención de %s..."
@@ -10371,14 +10197,6 @@ msgstr "Error ao escribir en %s: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "Non se pode conectar a %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"O servidor require TLS/SSL para iniciar a sesión. Non se dispón de soporte "
-"TLS/SSL."
-
 #, c-format
 msgid " - %s"
 msgstr " - %s"
@@ -10629,9 +10447,14 @@ msgstr "Engadir _aviso de contacto..."
 msgid "View _Log"
 msgstr "Ver _rexistro"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Ocultar cando se está desconectado"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Mostrar cando se está desconectado"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
@@ -11138,6 +10961,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Modificar a información de usuario para %s"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Escriba o nome do host para o que é este certificado."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Servidores SSL"
@@ -11184,7 +11011,8 @@ msgstr "Ignorar"
 msgid "Get Away Message"
 msgstr "Mensaxe de ausencia"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Dito a última vez"
 
 msgid "Unable to save icon file to disk."
@@ -12076,7 +11904,8 @@ msgstr "Cor para debuxar as ligazóns."
 msgid "Hyperlink visited color"
 msgstr "Cor da ligazón visitada"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+#, fuzzy
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 "A cor para debuxar as ligazóns despois de que se visiten (ou se activen)"
 
@@ -12114,13 +11943,22 @@ msgstr "A cor para debuxar o nome dunha mensaxe de acción."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Cor do nome para a mensaxe de acción dunha mensaxe privada"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "A cor para debuxar o nome dunha mensaxe de acción."
+
 msgid "Whisper Message Name Color"
 msgstr "Cor do nome para as mensaxes privadas"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "A cor para debuxar o nome dunha mensaxe de acción."
+
 msgid "Typing notification color"
 msgstr "Eliminación da notificación de escritura"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "A cor que se usará para o tipo de letra da notificación de escritura"
 
 msgid "Typing notification font"
@@ -12519,6 +12357,10 @@ msgstr ""
 "Elixiuse o navegador 'Manual', mais non se definiu ningún comando para "
 "executalo."
 
+#, fuzzy
+msgid "No message"
+msgstr "Mensaxe descoñecida"
+
 msgid "Open All Messages"
 msgstr "Abrir todas as mensaxes"
 
@@ -12536,10 +12378,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Ten correo!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Mensaxe descoñecida"
-
 msgid "The following plugins will be unloaded."
 msgstr "Desactivaranse os seguintes complementos."
 
@@ -12755,8 +12593,9 @@ msgstr "Mo_strar a icona da área de notificación do sistema:"
 msgid "On unread messages"
 msgstr "Se hai mensaxes sen ler"
 
-msgid "Conversation Window Hiding"
-msgstr "Ocultar a xanela de conversa"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Ventás de conversa de MI"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Ocultar as novas conversas de MI:"
@@ -12764,6 +12603,9 @@ msgstr "_Ocultar as novas conversas de MI:"
 msgid "When away"
 msgstr "Cando estea ausente"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Minimi_zar as novas xanelas de conversa"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Separadores"
@@ -12822,9 +12664,6 @@ msgstr "Usar o desprazamento suave"
 msgid "F_lash window when IMs are received"
 msgstr "Facer escinti_lar a xanela ao recibir mensaxes de MI"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Minimi_zar as novas xanelas de conversa"
-
 msgid "Minimum input area height in lines:"
 msgstr "Altura mínima da área de entrada en liñas:"
 
@@ -12859,7 +12698,8 @@ msgstr "Non se pode iniciar o programa de configuración do navegador."
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemplo: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "Detectar _automaticamente o enderezo IP"
 
 msgid "Public _IP:"
@@ -13230,21 +13070,6 @@ msgstr "Ga_rdar e usar"
 msgid "Status for %s"
 msgstr "Estado para %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "Emoticona personalizada"
-
-msgid "More Data needed"
-msgstr "Precísanse máis datos"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Proporcione un atallo para asociar á emoticona."
-
 #, fuzzy, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
@@ -13252,12 +13077,12 @@ msgstr ""
 "Xa existe unha emoticona personalizada para o atallo seleccionado. "
 "Especifique un atallo diferente."
 
+msgid "Custom Smiley"
+msgstr "Emoticona personalizada"
+
 msgid "Duplicate Shortcut"
 msgstr "Atallo duplicado"
 
-msgid "Please select an image for the smiley."
-msgstr "Escolla unha imaxe para a emoticona."
-
 msgid "Edit Smiley"
 msgstr "Editar emoticona"
 
@@ -13371,9 +13196,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Non se pode enviar o iniciador"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Arrastrou un iniciador do escritorio. O máis probábel é que queira enviar o "
 "contido ao que apunta o propio iniciador."
@@ -13974,9 +13800,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Complemento de mensaxería musical para a composición colaborativa."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "O complemento de mensaxería musical permíte que distintos usuarios traballen "
 "de forma simultánea nunha peza de música editando unha partitura común en "
@@ -14232,9 +14059,10 @@ msgid "Conversation Window Send Button."
 msgstr "O botón para enviar a xanela de conversa."
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Engade un botón Enviar á área de entrada da xanela de conversa. Está "
 "previsto para cando non existe un teclado físico."
@@ -14567,8 +14395,9 @@ msgstr "Opcións do Pidgin no Windows"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opcións específicas do Pidgin no Windows."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Proporciona opcións específicas para o Pidgin no Windows, como a ancoraxe da "
 "xanela de contactos."
@@ -14610,6 +14439,312 @@ msgstr "Enviar e recibir entradas XMPP en bruto."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este complemento é útil para depurar servidores XMPP ou clientes."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Non se pode abrir o conectador"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Non se puido escoitar o conectador"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Non é posíbel ler o conectador"
+
+#~ msgid "Connection failed."
+#~ msgstr "Fallou a conexión."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "O servidor desconectouse"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Non se puido crear o conectador "
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Non se puido conectar ao servidor"
+
+#~ msgid "Read error"
+#~ msgstr "Erro de lectura"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non se puido establecer unha conexión co servidor:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Erro de escritura"
+
+#~ msgid "Last Activity"
+#~ msgstr "Última actividade"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Información de descubrimento de servizo"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Elementos de descubrimento de servizo"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Envío de parágrafos ampliado"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Conversa multiusuario"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Información de presencia ampliada de conversa multiusuario"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "Fluxos de bytes In-Band"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Comandos Ad-Hoc"
+
+#~ msgid "PubSub Service"
+#~ msgstr "Servizo PubSub"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "Fluxos de bytes SOCKS5"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Datos fóra de banda"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "Rexistro In-Band"
+
+#~ msgid "User Location"
+#~ msgstr "Localización do usuario"
+
+#~ msgid "User Avatar"
+#~ msgstr "Avatar de usuario"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Notificacións de estado da conversa"
+
+#~ msgid "Software Version"
+#~ msgstr "Versión de software"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Inicio de fluxo"
+
+#~ msgid "User Mood"
+#~ msgstr "Estado de ánimo do usuario"
+
+#~ msgid "User Activity"
+#~ msgstr "Actividade do usuario"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Capacidades da entidade"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Negociacións de sesión codificada"
+
+#~ msgid "User Tune"
+#~ msgstr "Música do usuario"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Intercambio de elementos da lista"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Enderezo de contacto"
+
+#~ msgid "User Profile"
+#~ msgstr "Perfil de usuario"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Jingle Audio"
+
+#~ msgid "User Nickname"
+#~ msgstr "Alias do usuario"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle UDP en bruto"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Jingle Video"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Recibos de mensaxe"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Publicación da chave pública"
+
+#~ msgid "User Chatting"
+#~ msgstr "O usuario está conversando"
+
+#~ msgid "User Browsing"
+#~ msgstr "O usuario está navegando"
+
+#~ msgid "User Gaming"
+#~ msgstr "O usuario está xogando"
+
+#~ msgid "User Viewing"
+#~ msgstr "O usuario está observando"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Cifrado de parágrafo"
+
+#~ msgid "Entity Time"
+#~ msgstr "Hora da entidade"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Envío atrasado"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Collaborative Data Objects"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Repositorio de ficheiros e compartidos"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "Descubrimento de servizo STUN para o Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Negociación simplificada de sesión cifrada"
+
+#~ msgid "Hop Check"
+#~ msgstr "Verificación de saltos"
+
+#~ msgid "Read Error"
+#~ msgstr "Erro de lectura"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Fallou ao conectar ao servidor."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "O búfer de lectura está cheo (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "A mensaxe non é analizábel"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Non se puido conectar ao servidor: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Fallou o inicio de sesión (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Foi desconectado porque se conectou desde outra estación de traballo."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Erro. O soporte SSL non está instalado."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Contrasinal incorrecto."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non se puido conectar ao servidor BOS:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Talvez sexa desconectado en breve. Comprobe %s para actualizacións."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Non se puido conectar"
+
+#~ msgid "Invalid username."
+#~ msgstr "Nome de usuario non válido."
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Non se puido descrifrar a resposta do servidor"
+
+#~ msgid "Connection lost"
+#~ msgstr "Conexión perdida"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Non se puido resolver o host"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Conexión pechada (escribindo)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Conexión reiniciada"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Erro ao ler do conectador: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Non é posíbel conectarse ao host"
+
+#~ msgid "Could not write"
+#~ msgstr "Non se puido escribir"
+
+#~ msgid "Could not connect"
+#~ msgstr "Non se puido conectar"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Non se puido crear o conectador para escoitar"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Non se puido resolver o nome do host"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Contrasinal incorrecto"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Non se puido establecer unha conexión con %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Xapón"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Servidor de buscapersoas xaponés"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Servidor de transferencia de ficheiros xaponés"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Perdeuse a conexión co servidor\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Non se puido resolver o nome do host"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "O servidor require TLS/SSL para iniciar a sesión. Non se dispón de "
+#~ "soporte TLS/SSL."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Ocultar a xanela de conversa"
+
+#~ msgid "More Data needed"
+#~ msgstr "Precísanse máis datos"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Proporcione un atallo para asociar á emoticona."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Escolla unha imaxe para a emoticona."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Que ID quere activar?"
 
diff --git a/po/gu.po b/po/gu.po
index 04a5bd4768..b3e19c54af 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin_gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2006-07-03 11:31+0530\n"
 "Last-Translator: Ankit Patel <ankit644@yahoo.com>\n"
 "Language-Team: Gujarati <indianoss-gujarati@lists.sourceforge.net>\n"
@@ -2682,7 +2682,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2734,7 +2734,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2980,12 +2980,12 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
 #, fuzzy
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr "નવું જોડાણ બનાવવામાં અસમર્થ."
 
 msgid ""
@@ -3042,17 +3042,17 @@ msgstr "%s એ આ વાર્તાલાપમાં આમંત્રિત
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "સંદેશો મોકલવામાં અસમર્થઃ સંદેશો ખૂબ લાંબો છે."
 
-#, fuzzy
-msgid "Cannot open socket"
-msgstr "સોકેટ ખોલવામાં અસમર્થ"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "સોકેટ બનાવવામાં અસમર્થ"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "લિસન સોકેટ બનાવી શક્યા નહિં"
 
-#, fuzzy
-msgid "Could not listen on socket"
-msgstr "લિસન સોકેટ બનાવી શક્યા નહિં"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "સોકેટ બનાવવામાં અસમર્થ"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3104,13 +3104,16 @@ msgstr "વ્યક્તિયાદી સંગ્રહો..."
 msgid "Load buddylist from file..."
 msgstr "સર્વરમાંથી વ્યક્તિ યાદી આયાત કરો"
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "નોંધણી ક્ષેત્રોમાં ભરો."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "પાસવર્ડો બંધબેસતા નથી."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "નવું જોડાણ બનાવવામાં અસમર્થ. ક્ષતિ ઉદભવી.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3122,14 +3125,15 @@ msgstr "રજીસ્ટ્રેશન સફળતાપૂર્વક પ�
 msgid "Password"
 msgstr "પાસવર્ડ"
 
-msgid "Password (retype)"
-msgstr "પાસવર્ડ (ફરી લખો)"
+msgid "Password (again)"
+msgstr "પાસવર્ડ (ફરી)"
 
-msgid "Enter current token"
-msgstr "હાલનું ટોકન દાખલ કરો"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "હાલનું ટોકન"
+#, fuzzy
+msgid "Captcha"
+msgstr "ચિત્ર સંગ્રહો"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "નવું ગડુ-ગડુ ખાતું રજીસ્ટર કરો"
@@ -3183,6 +3187,15 @@ msgstr "પાસવર્ડ સફળતાપૂર્વક બદલાઈ
 msgid "Current password"
 msgstr "હાલનો પાસવર્ડ"
 
+msgid "Password (retype)"
+msgstr "પાસવર્ડ (ફરી લખો)"
+
+msgid "Enter current token"
+msgstr "હાલનું ટોકન દાખલ કરો"
+
+msgid "Current token"
+msgstr "હાલનું ટોકન"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "મહેરબાની કરી, UIN માટે તમારો વર્તમાન પાસવર્ડ અને નવો પાસવર્ડ દાખલ કરો: "
 
@@ -3233,7 +3246,8 @@ msgstr "કોઇ લૉગ મળ્યા નહિ"
 msgid "There are no users matching your search criteria."
 msgstr "મહેરબાની કરીને તમારી શોધ પરિણામ દાખલ કરો"
 
-msgid "Unable to read socket"
+#, fuzzy
+msgid "Unable to read from socket"
 msgstr "સોકેટ વાંચવામાં અસમર્થ"
 
 #, fuzzy
@@ -3252,8 +3266,15 @@ msgstr "વ્યક્તિ દર્શાવો"
 msgid "Your buddy list was stored on the server."
 msgstr "Gadu-Gadu સર્વર પર કોઈ વ્યક્તિ યાદી સંગ્રહાયેલ નથી."
 
-msgid "Connection failed."
-msgstr "જોડાણ નિષ્ફળ."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+#, fuzzy
+msgid "Connected"
+msgstr "સાંકળો"
+
+msgid "Connection failed"
+msgstr "જોડાણ નિષ્ફળ"
 
 msgid "Add to chat"
 msgstr "સંવાદમાં ઉમેરો"
@@ -3261,18 +3282,23 @@ msgstr "સંવાદમાં ઉમેરો"
 msgid "Chat _name:"
 msgstr "સંવાદ નામ (_n):"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "સર્વરને પીંગ કરવામાં અસમર્થ"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "જોડાઈ રહ્યા છીએ"
+
 msgid "Chat error"
 msgstr "સંવાદ ક્ષતિ"
 
 msgid "This chat name is already in use"
 msgstr "આ સંવાદ નામ પહેલાથી જ ઉપયોગમાં છે"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "સર્વર સાથે જોડાણથયેલ નથી."
 
 #, fuzzy
@@ -3336,7 +3362,7 @@ msgid "File Transfer Failed"
 msgstr "ફાઈલ પરિવહન રદ થઈ ગયું"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Pidgin સાંભળનાર પોર્ટ ખોલી શક્યું નહિં."
 
 msgid "Error displaying MOTD"
@@ -3352,8 +3378,16 @@ msgstr "આ જોડાણ સાથે સંકળાયેલ કોઈ MOTD
 msgid "MOTD for %s"
 msgstr "%s માટે MOTD"
 
-msgid "Server has disconnected"
-msgstr "સર્વરે જોડાણ તોડી નાંખ્યું"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "સર્વર સાથે જોડાણથયેલ નથી."
 
 msgid "View MOTD"
 msgstr "MOTD જુઓ"
@@ -3368,22 +3402,20 @@ msgstr "પાસવર્ડ (_P):"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC ખોટા નામો ખાલી જગ્યાઓ સમાવી શકે નહિં"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "જોડાઈ રહ્યા છીએ"
-
 msgid "SSL support unavailable"
 msgstr "SSL આધાર ઉપલબ્ધ નથી"
 
-msgid "Couldn't create socket"
-msgstr "સોકેટ બનાવી શક્યા નહિં"
+msgid "Unable to connect"
+msgstr "જોડાવામાં અસમર્થ"
 
-msgid "Couldn't connect to host"
-msgstr "યજમાન સાથે જોડાઈ શક્યા નહિં"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "સર્વર સાથે જોડાવામાં અસમર્થ."
 
-msgid "Read error"
-msgstr "વાંચન ક્ષતિ"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "જોડાણ બનાવવામાં ક્ષતિ"
 
 msgid "Users"
 msgstr "વપરાશકર્તાઓ"
@@ -3819,11 +3851,12 @@ msgstr "આદેશ નિષ્ક્રિય કરેલ"
 msgid "execute"
 msgstr "ઈચ્છિત નથી"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "પ્રવેશ માટે સર્વરને TLS/SSL જરૂરી છે.  કોઈ TLS/SSL આધાર મળ્યો નહિં."
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "પ્રવેશ માટે સર્વરને TLS/SSL જરૂરી છે.  કોઈ TLS/SSL આધાર મળ્યો નહિં."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3840,7 +3873,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "સાદુંલખાણ સત્તાધિકરણ"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "સત્તાધિકરણ નિષ્ફળ"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "સર્વરમાંથી અયોગ્ય પ્રત્યુત્તર."
 
 msgid "Server does not use any supported authentication method"
@@ -3852,8 +3890,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "સર્વરમાંથી અયોગ્ય શરત"
 
-#, fuzzy
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "સંવાદ ક્ષતિ"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3871,22 +3909,14 @@ msgstr "બિનઆધારભૂત આવૃત્તિ"
 msgid "Unable to establish a connection with the server"
 msgstr "સર્વર સાથે SSL જોડાણ બનાવવામાં અસમર્થ."
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "સર્વર સાથે SSL જોડાણ બનાવવામાં અસમર્થ."
 
 #, fuzzy
 msgid "Unable to establish SSL connection"
 msgstr "નવું જોડાણ બનાવવામાં અસમર્થ."
 
-msgid "Unable to create socket"
-msgstr "સોકેટ બનાવવામાં અસમર્થ"
-
-msgid "Write error"
-msgstr "લખવામાં ક્ષતિ"
-
 msgid "Full Name"
 msgstr "પૂરું નામ"
 
@@ -3960,188 +3990,6 @@ msgstr "ઓપરેટિંગ સિસ્ટમ છુપાવો"
 msgid "Local Time"
 msgstr "સ્થાનિક ફાઈલ:"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "ડિરેક્ટરી જાણકારી સુયોજિત કરો"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "વિસ્તૃત સરનામું"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "ઉપનામ સંવાદ"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "વપરાશકર્તા પાસે કોઈ ડિરેક્ટરી જાણકારી નથી."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "આદેશ"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "રજીસ્ટ્રેશન ક્ષતિ"
-
-#, fuzzy
-msgid "User Location"
-msgstr "સ્થળ"
-
-msgid "User Avatar"
-msgstr ""
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "વ્યક્તિ સ્થિતિ સૂચન"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "બિનઆધારભૂત આવૃત્તિ"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "દિશા"
-
-#, fuzzy
-msgid "File Transfer"
-msgstr "ફાઈલ પરિવહનો"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "વપરાશકર્તા સ્થિતિઓ"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "વપરાશકર્તા મર્યાદા"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "ક્ષમતાઓ"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "વપરાશકર્તા નામ"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "કી ફેરબદલી સાથે IM"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "ઈમેઈલ સરનામું"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "રૂપરેખા સુયોજિત કરો"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "Ping"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "લાડકું નામ"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "જીવંત વીડિયો"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "સંદેશો મળ્યો"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "જાહેર કી બેબલપ્રિન્ટ"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "વપરાશકર્તા વિકલ્પો"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "વપરાશકર્તા સ્થિતિઓ"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "વપરાશકર્તા મર્યાદા"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "વપરાશકર્તા મર્યાદા"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "ટ્રીલીયન એનક્રિપ્શન"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "ક્ષમતાઓ"
-
 msgid "Priority"
 msgstr "ઉચ્ચતા"
 
@@ -4153,7 +4001,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "પ્રવેશ બહાર નીકળો"
 
 msgid "Middle Name"
@@ -4339,16 +4187,12 @@ msgid "Roles:"
 msgstr "ભૂમિકા"
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "સાદું લખાણ"
 
-msgid "Read Error"
-msgstr "વાંચવામાં ક્ષતિ"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 #, fuzzy
@@ -4539,9 +4383,6 @@ msgstr "તમારો પાસવર્ડ બદલાઈ ગયો છે."
 msgid "Error changing password"
 msgstr "પાસવર્ડ બદલવામાં ક્ષતિ"
 
-msgid "Password (again)"
-msgstr "પાસવર્ડ (ફરી)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "પાસવર્ડ બદલો"
@@ -4938,6 +4779,14 @@ msgstr "XML પદચ્છેદન ક્ષતિ"
 msgid "Unknown Error in presence"
 msgstr "હાજરીમાં અજ્ઞાત ક્ષતિ"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "સંવાદ %s માં જોડાવામાં ક્ષતિ"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "સંવાદ %s માં ક્ષતિ"
+
 msgid "Create New Room"
 msgstr "નવો કક્ષ બનાવો"
 
@@ -4956,16 +4805,20 @@ msgstr "કક્ષ રૂપરેખાંકિત કરો"
 msgid "_Accept Defaults"
 msgstr "મૂળભુતો સ્વીકારો"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "સંવાદ %s માં જોડાવામાં ક્ષતિ"
+#, fuzzy
+msgid "No reason"
+msgstr "કોઈ કારણ આપેલ નથી."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "સંવાદ %s માં ક્ષતિ"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "તમે %s દ્વારા હકાલી કાઢાયા છો: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s દ્વારા હકાલી કઢાયા (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "ફાઈલ ખોલતી વખતે ક્ષતિ ઉદ્દભવી."
 
 #, fuzzy
@@ -5484,9 +5337,6 @@ msgstr ""
 "SSL આધાર એ MSN માટે જરૂરી છે. મહેરબાની કરીને આધારભૂત SSL લાઈબ્રેરી સ્થાપિત કરો. વધુ "
 "જાણકારી માટે http://Pidgin.sf.net/faq-ssl.php જુઓ."
 
-msgid "Failed to connect to server."
-msgstr "સર્વર સાથે જોડાવામાં નિષ્ફળ."
-
 msgid "Error retrieving profile"
 msgstr "રૂપરેખા મેળવવામાં ક્ષતિ"
 
@@ -5768,9 +5618,6 @@ msgstr "સંદેશો મોકલાઈ શકાશે નહિં ક�
 msgid "Message was not sent because an unknown error occurred."
 msgstr "સંદેશો મોકલાઈ શકાશે નહિં કારણ કે એક અજ્ઞાત ક્ષતિ ઉદ્દભવી:"
 
-msgid "Unable to connect"
-msgstr "જોડાવામાં અસમર્થ"
-
 msgid "Writing error"
 msgstr "લખવામાં ક્ષતિ"
 
@@ -5785,20 +5632,24 @@ msgstr ""
 "%s માંથી સર્વર (%s) માં જોડાણ ક્ષતિ:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "સર્વર દ્વારા અમારો પ્રોટોકોલ આધારભૂત નથી."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "HTTP નું પદચ્છેદન કરવામાં ક્ષતિ."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "તમે અન્ય સ્થાનમાંથી પ્રવેશ કર્યો છે."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN સર્વરો ક્ષણવાર માટે ઉપલબ્ધ નથી. મહેરબાની કરીને રાહ જુઓ અને ફરીથી પ્રયત્ન કરો."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN સર્વરો ક્ષણવાર માટે નીચા જઈ રહ્યા છે."
 
 #, c-format
@@ -5811,9 +5662,6 @@ msgstr ""
 "તમારી MSN વ્યક્તિ યાદી ક્ષણવાર માટે ઉપલબ્ધ નથી. મહેરબાની કરીને રાહ જુઓ અને ફરીથી "
 "પ્રયત્ન કરો."
 
-msgid "Unknown error."
-msgstr "અજ્ઞાત ક્ષતિ."
-
 msgid "Handshaking"
 msgstr "Handshaking"
 
@@ -5913,6 +5761,9 @@ msgstr "AIM/ICQ પ્રોટોકોલ પ્લગઈન"
 msgid "%s is not a valid group."
 msgstr "%s એ માન્ય જૂથ નથી."
 
+msgid "Unknown error."
+msgstr "અજ્ઞાત ક્ષતિ."
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s એ %s (%s) પર"
@@ -6029,13 +5880,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "સર્વરમાંથી અયોગ્ય પ્રત્યુત્તર."
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-#, fuzzy
-msgid "Connected"
-msgstr "સાંકળો"
-
 #, fuzzy, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "પ્રક્રિયાએ ક્ષતિ કોડ %d આપ્યો"
@@ -6059,18 +5903,6 @@ msgid "Invalid input condition"
 msgstr "જોડાણ પરિપૂર્ણ કરી રહ્યા છીએ"
 
 #, fuzzy
-msgid "Read buffer full (2)"
-msgstr "કતાર ભરેલી છે"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "સંદેશાનું પદચ્છેદન કરવામાં અસમર્થ"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "યજમાન સાથે જોડાઈ શક્યા નહિં"
-
-#, fuzzy
 msgid "Failed to add buddy"
 msgstr "વ્યક્તિને સંવાદમાં જોડવામાં નિષ્ફળ"
 
@@ -6165,6 +5997,12 @@ msgstr ""
 msgid "Client Version"
 msgstr "વાર્તાલાપ બંધ કરો"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 #, fuzzy
 msgid "MySpaceIM - Username Available"
 msgstr "સેવા ઉપલબ્ધ નથી"
@@ -6432,9 +6270,9 @@ msgstr "વપરાશકર્તા ક્યાં તો ઓફલાઈન
 msgid "Unknown error: 0x%X"
 msgstr "અજ્ઞાત ક્ષતિ: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "પ્રવેશ નિષ્ફળ (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "વપરાશકર્તા %s ને બેન કરવામાં અસમર્થ"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6536,9 +6374,6 @@ msgstr "GroupWise કોન્ફરન્સ %d"
 msgid "Authenticating..."
 msgstr "સત્તાધિકરણ કરી રહ્યા છીએ..."
 
-msgid "Unable to connect to server."
-msgstr "સર્વર સાથે જોડાવામાં અસમર્થ."
-
 msgid "Waiting for response..."
 msgstr "પ્રત્યુત્તર માટે રાહ જોઈ રહ્યા છીએ..."
 
@@ -6562,24 +6397,19 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "શું તમે વાર્તાલાપમાં જોડાવા માંગો છો?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "તમે પ્રવેશ બહાર નીકળી ગયા છો કારણ કે તમે બીજા વર્કસ્ટેશનમાં પ્રવેશ કરેલ છે."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s એ ઓફલાઈન થયેલ હોય એમ દેખાય છે અને તમે મોકલેલ સંદેશો મેળવેલ નથી."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "સર્વર સાથે જોડાવામાં અસમર્થ. તમે જે સર્વર સાથે જોડાવા ઈચ્છો છો તે સર્વરનું મહેરબાની કીરને "
 "સરનામું દાખલ કરો."
 
-msgid "Error. SSL support is not installed."
-msgstr "ક્ષતિ. SSL આધાર સ્થાપિત થયેલ નથી."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "કોન્ફરન્સ બંધ થઈ ગયેલ છે. કોઈ વધુ સંદેશાઓ મોકલી શકાશે નહિં."
 
@@ -6618,10 +6448,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "જોડાણ બનાવવામાં ક્ષતિ"
 
-msgid "Incorrect password."
-msgstr "અયોગ્ય પાસવર્ડ."
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, fuzzy
@@ -6633,17 +6460,7 @@ msgid "Invalid chat room name"
 msgstr "અયોગ્ય કક્ષ નામ"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "જોડાણ બનાવવામાં ક્ષતિ"
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "સર્વર સાથે જોડાણથયેલ નથી."
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "સર્વર સાથે SSL જોડાણ બનાવવામાં અસમર્થ."
 
 #. *< type
@@ -6696,8 +6513,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "સર્વર સાથે SSL જોડાણ બનાવવામાં અસમર્થ."
 
 #, fuzzy
 msgid "Direct IM established"
@@ -6893,16 +6711,12 @@ msgid "Buddy Comment"
 msgstr "વ્યક્તિ ટિપ્પણી"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "પરિવહન માટે જોડાઈ શક્યા નહિં."
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr "સર્વર સાથે જોડાવામાં નિષ્ફળ."
+msgid "Unable to connect to BOS server: %s"
+msgstr "સર્વર સાથે જોડાવામાં અસમર્થ."
 
 #, fuzzy
 msgid "Username sent"
@@ -6917,9 +6731,9 @@ msgstr "જોડાણ પરિપૂર્ણ કરી રહ્યા છ�
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "પ્રવેશ કરવામાં અસમર્થ: %s તરીકે પ્રવેશ કરી શક્યા નહિં કારણ કે સ્ક્રીન નામ એ અયોગ્ય છે.  "
 "સ્ક્રીન નામો ક્યાં તો અક્ષરથી જ શરૂ થવા જોઈએ અને માત્ર અક્ષરો, નંબરો અને જગ્યાઓ, અથવા "
@@ -6935,30 +6749,23 @@ msgstr ""
 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
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "અયોગ્ય વપરાશકર્તા નામ"
+msgid "Username does not exist"
+msgstr "વપરાશકર્તા અસ્તિત્વમાં નથી"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "તમારું ખાતું વર્તમાનમાં અટકાવી દેવાયેલ છે."
 
 #. service temporarily unavailable
@@ -6978,7 +6785,8 @@ msgstr ""
 "તમે ખૂબ ઝડપથી જોડાણ બનાવી રહ્યા છો અને તોડી રહ્યા છો. દસ મિનિટ રાહ જુઓ અને ફરીથી "
 "પ્રયત્ન કરો. જો તમે પ્રયત્ન કરવાનું ચાલુ રાખો, તો તમારે વધુ સમય માટે રાહ જોવી પડશે."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "દાખલ થયેલ SecurID કી અયોગ્ય છે."
 
 msgid "Enter SecurID"
@@ -7149,6 +6957,9 @@ msgstr "ત્યારથી ઓનલાઈન"
 msgid "Member Since"
 msgstr "ત્યારથી સભ્ય"
 
+msgid "Capabilities"
+msgstr "ક્ષમતાઓ"
+
 msgid "Profile"
 msgstr "રુપરેખા"
 
@@ -7327,7 +7138,7 @@ msgstr "દૂર સંદેશ ખૂબ લાંબો છે."
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7354,9 +7165,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "ઓરફાન"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "વ્યક્તિ %s ને ઉમેરી શક્યા નહિં કારણ કે તમારી પાસે ઘણી વ્યક્તિઓ તમારી વ્યક્તિ યાદીમાં ઉમેરેલ "
@@ -7366,7 +7177,7 @@ msgid "(no name)"
 msgstr "(નામ વિનાનું)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "તમારો આદેશ અજ્ઞાત કારણોસર નિષ્ફળ ગયો."
 
 #, fuzzy, c-format
@@ -8241,7 +8052,7 @@ msgid "Update interval (seconds)"
 msgstr "વાંચવામાં ક્ષતિ"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "સર્વર જાણકારી મેળવી શકતા નથી"
 
 #, c-format
@@ -8268,10 +8079,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "સર્વર જાણકારી મેળવી શકતા નથી"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "વિનંતી સંવાદ"
 
@@ -8307,26 +8114,11 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "જોડાવામાં અસમર્થ."
-
 #, fuzzy
 msgid "Socket error"
 msgstr "ટોકન ક્ષતિ"
 
 #, fuzzy
-msgid "Unable to read from socket"
-msgstr "સોકેટ વાંચવામાં અસમર્થ"
-
-#, fuzzy
-msgid "Write Error"
-msgstr "લખવામાં ક્ષતિ"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "જોડાણ બંધ થઈ ગયું"
-
-#, fuzzy
 msgid "Getting server"
 msgstr "વપરાશકર્તા જાણ સુયોજિત કરો..."
 
@@ -8335,8 +8127,8 @@ msgid "Requesting token"
 msgstr "માંગણી રદ થઈ ગયેલ"
 
 #, fuzzy
-msgid "Couldn't resolve host"
-msgstr "યજમાન સાથે જોડાઈ શક્યા નહિં"
+msgid "Unable to resolve hostname"
+msgstr "સર્વરને પીંગ કરવામાં અસમર્થ"
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8387,7 +8179,7 @@ msgid "QQ Qun Command"
 msgstr "આદેશ"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "સર્વર જાણકારી મેળવી શકતા નથી"
 
 #, fuzzy
@@ -8410,10 +8202,6 @@ msgstr "ફાઈલ મોકલવામાં નિષ્ફળ"
 msgid "%d canceled the transfer of %s"
 msgstr "%s એ %s નું પરિવહન રદ કર્યું"
 
-#, fuzzy
-msgid "Connection closed (writing)"
-msgstr "જોડાણ બંધ થઈ ગયું"
-
 #, fuzzy, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>વપરાશકર્તા:</b> %s<br>"
@@ -8471,19 +8259,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#, fuzzy
-msgid "Connection reset"
-msgstr "જોડાણ બંધ થઈ ગયું"
-
-#, fuzzy, c-format
-msgid "Error reading from socket: %s"
-msgstr "સોકેટમાંથી વાંચતી વખતે ક્ષતિ."
-
-#. this is a regular connect, error out
-#, fuzzy
-msgid "Unable to connect to host"
-msgstr "સર્વર સાથે જોડાવામાં અસમર્થ."
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -8511,6 +8286,10 @@ msgid "Video Camera"
 msgstr "વીડિયો સંવાદ"
 
 #, fuzzy
+msgid "File Transfer"
+msgstr "ફાઈલ પરિવહનો"
+
+#, fuzzy
 msgid "Supports"
 msgstr "આધાર"
 
@@ -9342,6 +9121,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "નેટવર્ક પરિસ્થિતિઓ"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping નિષ્ફળ"
 
@@ -9407,7 +9189,8 @@ msgstr "બિનઆધારભૂત જાહેર કી પ્રકાર
 msgid "Disconnected by server"
 msgstr "સર્વર દ્વારા જોડાણ તૂટી ગયેલ"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "SILC સર્વર સાથે જોડાણ કરવામાં ક્ષતિ"
 
 msgid "Key Exchange failed"
@@ -9417,29 +9200,26 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "નહિં જોડાયેલ સત્ર છોડવામાં નિષ્ફળ. નવું જોડાણ બનાવવા માટે પુનઃજોડાવ દબાવો."
 
-msgid "Connection failed"
-msgstr "જોડાણ નિષ્ફળ"
-
 msgid "Performing key exchange"
 msgstr "કી ફેરબદલી કરી રહ્યા છીએ"
 
 #, fuzzy
-msgid "Unable to create connection"
-msgstr "નવું જોડાણ બનાવવામાં અસમર્થ."
-
-#, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "જાહેર કી લાવી શક્યા નહિં"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "SILC સર્વર સાથે જોડાઈ રહ્યા છીએ"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "જાહેર કી લાવી શક્યા નહિં"
+
 msgid "Out of memory"
 msgstr "મેમરી ઓછી છે"
 
 #, fuzzy
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "SILC ક્લાઈન્ટ જોડાણનો પ્રારંભ કરી શકતા નથી"
 
 #, fuzzy
@@ -9745,7 +9525,7 @@ msgid "Creating SILC key pair..."
 msgstr "SILC કી જોડ બનાવી રહ્યા છીએ..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "SILC કી જોડ બનાવી રહ્યા છીએ..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9839,6 +9619,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr "કોઈ સર્વર પરિસ્થિતિઓ ઉપલબ્ધ નથી"
 
+msgid "Error during connecting to SILC Server"
+msgstr "SILC સર્વર સાથે જોડાણ કરવામાં ક્ષતિ"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "નિષ્ફળતા: આવૃત્તિ બિનજોડણી, તમારો ક્લાઈન્ટ સુધારો"
@@ -9879,7 +9662,8 @@ msgstr "નિષ્ફળતા: અયોગ્ય કુકી"
 msgid "Failure: Authentication failed"
 msgstr "નિષ્ફળતા: સત્તાધિકરણ નિષ્ફળ"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "SILC ક્લાઈન્ટ જોડાણનો પ્રારંભ કરી શકતા નથી"
 
 #, fuzzy
@@ -9887,26 +9671,20 @@ msgid "John Noname"
 msgstr "યજમાન નામ"
 
 #, fuzzy, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "જાહેર કી લાવી શક્યા નહિં"
 
 #, fuzzy
-msgid "Could not write"
-msgstr "મોકલી શક્યા નહિં"
-
-msgid "Could not connect"
-msgstr "જોડાઈ શક્યા નહિં"
+msgid "Unable to create connection"
+msgstr "નવું જોડાણ બનાવવામાં અસમર્થ."
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "અજ્ઞાત સર્વર ક્ષતિ."
 
-msgid "Could not create listen socket"
-msgstr "લિસન સોકેટ બનાવી શક્યા નહિં"
-
 #, fuzzy
-msgid "Could not resolve hostname"
-msgstr "યજમાનનામો ઉકેલવામાં અસમર્થ."
+msgid "Unable to create listen socket"
+msgstr "સોકેટ બનાવવામાં અસમર્થ"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -9953,6 +9731,84 @@ msgstr "AP વપરાશકર્તા"
 msgid "Auth Domain"
 msgstr "આપમેળે"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;room&gt;:  Yahoo નેટવર્ક પર સંવાદ કક્ષમાં જોડાવ"
+
+#, fuzzy
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  આ નેટવર્ક પરની ચેનલોની યાદી આપો"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: વપરાશકર્તાને ડુડલ સત્ર શરૂ કરવા માટે વિનંતિ કરો"
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo પ્રોટોકોલ પ્લગઈન"
+
+#, fuzzy
+msgid "Pager server"
+msgstr "પ્રોક્સી સર્વર"
+
+msgid "Pager port"
+msgstr "પેજર પોર્ટ"
+
+#, fuzzy
+msgid "File transfer server"
+msgstr "ફાઈલ પરિવહન યજમાન"
+
+msgid "File transfer port"
+msgstr "ફાઈલ પરિવહન પોર્ટ"
+
+#, fuzzy
+msgid "Chat room locale"
+msgstr "સંવાદ કક્ષ લોકેલ"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
+
+#, fuzzy
+msgid "Chat room list URL"
+msgstr "સંવાદ કક્ષ યાદી Url"
+
+msgid "Yahoo Chat server"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo Chat port"
+msgstr "Yahoo જાપાન"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo પ્રોટોકોલ પ્લગઈન"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9982,28 +9838,18 @@ msgstr "વ્યક્તિ ઉમેરવાનું નામંજૂર
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr "અજ્ઞાત ક્ષતિ નંબર %d. Yahoo! વેબસાઈટમાં પ્રવેશ કરવાનું ક્ષતિ ચોક્કસ કરશે."
 
 #. username or password missing
@@ -10041,11 +9887,12 @@ msgstr "તમારું ખાતું તાળું મરાયેલ �
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "અજ્ઞાત ક્ષતિ નંબર %d. Yahoo! વેબસાઈટમાં પ્રવેશ કરવાનું ક્ષતિ ચોક્કસ કરશે."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "વ્યક્તિ %s ને જૂથ %s માં સર્વર સાથે ઉમેરી શક્યા નહિં જે યાદી ખાતા %s પર છે."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "વ્યક્તિને સર્વર યાદીમાં ઉમેરી શક્યા નહિં"
 
 #, c-format
@@ -10053,23 +9900,16 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
 #, fuzzy
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "સર્વરમાંથી અયોગ્ય પ્રત્યુત્તર."
 
-msgid "Connection problem"
-msgstr "જોડાણ સમસ્યા"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "%s પર %s સાથે વાર્તાલાપ"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "સર્વર સાથે SSL જોડાણ બનાવવામાં અસમર્થ."
 
 #, fuzzy
 msgid "Not at Home"
@@ -10138,82 +9978,15 @@ msgstr "વપરાશકર્તાને સંવાદમાં જોડ�
 msgid "Open Inbox"
 msgstr "હોટમેલ ઇનબોક્સ ખોલો"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;room&gt;:  Yahoo નેટવર્ક પર સંવાદ કક્ષમાં જોડાવ"
-
-#, fuzzy
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  આ નેટવર્ક પરની ચેનલોની યાદી આપો"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: વપરાશકર્તાને ડુડલ સત્ર શરૂ કરવા માટે વિનંતિ કરો"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo પ્રોટોકોલ પ્લગઈન"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo જાપાન"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "પ્રોક્સી સર્વર"
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "જાપાન Pager યજમાન"
-
-msgid "Pager port"
-msgstr "પેજર પોર્ટ"
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "ફાઈલ પરિવહન યજમાન"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "જાપાન ફાઈલ પરિવહન યજમાન"
-
-msgid "File transfer port"
-msgstr "ફાઈલ પરિવહન પોર્ટ"
-
-#, fuzzy
-msgid "Chat room locale"
-msgstr "સંવાદ કક્ષ લોકેલ"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-#, fuzzy
-msgid "Chat room list URL"
-msgstr "સંવાદ કક્ષ યાદી Url"
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "Yahoo જાપાન"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "જોડાવામાં અસમર્થ."
+
 msgid "Unable to establish file descriptor."
 msgstr "ફાઈલ વર્ણનાત્મક અધિષ્ઠાપિત કરવામાં અસમર્થ."
 
@@ -10221,6 +9994,10 @@ msgstr "ફાઈલ વર્ણનાત્મક અધિષ્ઠાપિ�
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s એ ફાઈલ %s મોકલવાની તક આપી રહ્યું છે"
 
+#, fuzzy
+msgid "Write Error"
+msgstr "લખવામાં ક્ષતિ"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! જાપાન રૂપરેખા"
 
@@ -10339,21 +10116,19 @@ msgstr "અવાજો"
 msgid "Webcams"
 msgstr "વેબકેમ"
 
+msgid "Connection problem"
+msgstr "જોડાણ સમસ્યા"
+
 msgid "Unable to fetch room list."
 msgstr "કક્ષ યાદી મેળવવામાં અસમર્થ."
 
 msgid "User Rooms"
 msgstr "વપરાશકર્તા કક્ષો"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "YCHT સર્વર સાથે જોડાણ સમસ્યા છે."
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "સર્વર સાથે જોડાણથયેલ નથી."
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10479,31 +10254,21 @@ msgid "Exposure"
 msgstr "પ્રસ્તાવ"
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "સોકેટ બનાવવામાં અસમર્થ"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "સંદેશો મોકલવામાં અસમર્થ: %s"
 
 #, fuzzy, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "પ્રોક્સી જોડાણ ક્ષતિ %d"
 
 #, fuzzy, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "પરવાનગી નામંજૂર: પ્રોક્સી સર્વર પોર્ટ %d ટનલીંગ બગાડે છે."
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr "%s ચલાવવામાં ક્ષતિ"
 
-#, fuzzy
-msgid "Could not resolve host name"
-msgstr "યજમાનનામો ઉકેલવામાં અસમર્થ."
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10721,12 +10486,6 @@ msgstr ""
 msgid "Unable to connect to %s: %s"
 msgstr "સર્વર સાથે જોડાવામાં અસમર્થ."
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "પ્રવેશ માટે સર્વરને TLS/SSL જરૂરી છે.  કોઈ TLS/SSL આધાર મળ્યો નહિં."
-
 #, c-format
 msgid " - %s"
 msgstr ""
@@ -10979,7 +10738,11 @@ msgid "View _Log"
 msgstr "લૉગ જુઓ (_L)"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "જ્યારે ઓફલાઈન હોય ત્યારે માન્ય નથી"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "જ્યારે ઓફલાઈન હોય ત્યારે માન્ય નથી"
 
 msgid "_Alias..."
@@ -11529,6 +11292,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "%s માટે વપરાશકર્તા જાણકારી બદલો"
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11577,7 +11343,7 @@ msgid "Get Away Message"
 msgstr "દૂર જવાનો સંદેશ મેળવો"
 
 #, fuzzy
-msgid "Last said"
+msgid "Last Said"
 msgstr "છેલ્લું નામ"
 
 msgid "Unable to save icon file to disk."
@@ -12514,7 +12280,7 @@ msgid "Hyperlink visited color"
 msgstr "હાયપરલીંક રંગ"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "જ્યારે માઉસ તેના પર લઇ જવાય ત્યારનો હાયપરલીંકો દોરવા માટેનો રંગ."
 
 msgid "Hyperlink prelight color"
@@ -12552,15 +12318,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "સૂચન દૂર કરવાનું"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "નવા મેઈલ સૂચનો"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12961,6 +12734,10 @@ msgid ""
 msgstr "'Manual' બ્રાઉઝર આદેશ પસંદ થયેલ છે, પરંતુ કોઈ આદેશ સુયોજિત થયેલ નથી."
 
 #, fuzzy
+msgid "No message"
+msgstr "(૧ સંદેશો)"
+
+#, fuzzy
 msgid "Open All Messages"
 msgstr "સંદેશો મોકલો"
 
@@ -12985,10 +12762,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, fuzzy
-msgid "No message"
-msgstr "(૧ સંદેશો)"
-
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -13227,7 +13000,7 @@ msgid "On unread messages"
 msgstr "સંદેશો મોકલો (_m)"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "IM વાર્તાલાપ વિન્ડો"
 
 #, fuzzy
@@ -13237,6 +13010,10 @@ msgstr "નવાં વાર્તાલાપો (_e):"
 msgid "When away"
 msgstr "જ્યારે દૂર જાવ"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "વાર્તાલાપ વિન્ડો ઉપર લાવો (_a)"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -13298,10 +13075,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr "જ્યારે સંદેશાઓ મેળવાય ત્યારે વિન્ડો ફ્લેશ કરો (_F)"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "વાર્તાલાપ વિન્ડો ઉપર લાવો (_a)"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -13339,8 +13112,8 @@ msgstr "વપરાશકર્તા જાણકારી મેળવી શ
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-#, fuzzy
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "આપોઆપ શોધાયેલ IP સરનામું (_A)"
 
 msgid "Public _IP:"
@@ -13728,34 +13501,18 @@ msgstr "સંગ્રહો & વાપરો (_v)"
 msgid "Status for %s"
 msgstr "સ્થિતિ: %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "સ્મિત ઉમેરો"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
 #, fuzzy
-msgid "Duplicate Shortcut"
-msgstr "નકલી ખરૂ"
+msgid "Custom Smiley"
+msgstr "સ્મિત ઉમેરો"
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "મહેરબાની કરીને પસંદિત જૂથ માટે નવું નામ દાખલ કરો."
+msgid "Duplicate Shortcut"
+msgstr "નકલી ખરૂ"
 
 #, fuzzy
 msgid "Edit Smiley"
@@ -13876,9 +13633,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "ચલાવનાર મોકલી શકતા નથી"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -14501,7 +14259,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -14768,7 +14526,7 @@ msgstr "IM વાર્તાલાપ વિન્ડો"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -15103,7 +14861,7 @@ msgstr "વિન્ડોઝ Pidgin માટે વિશિષ્ટ વિ�
 
 #, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Provides options specific to Windows Pidgin, such as buddy list docking and "
 "conversation flashing."
@@ -15148,6 +14906,281 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Cannot open socket"
+#~ msgstr "સોકેટ ખોલવામાં અસમર્થ"
+
+#, fuzzy
+#~ msgid "Could not listen on socket"
+#~ msgstr "લિસન સોકેટ બનાવી શક્યા નહિં"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "સોકેટ વાંચવામાં અસમર્થ"
+
+#~ msgid "Connection failed."
+#~ msgstr "જોડાણ નિષ્ફળ."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "સર્વરે જોડાણ તોડી નાંખ્યું"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "સોકેટ બનાવી શક્યા નહિં"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "યજમાન સાથે જોડાઈ શક્યા નહિં"
+
+#~ msgid "Read error"
+#~ msgstr "વાંચન ક્ષતિ"
+
+#~ msgid "Write error"
+#~ msgstr "લખવામાં ક્ષતિ"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "ડિરેક્ટરી જાણકારી સુયોજિત કરો"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "વિસ્તૃત સરનામું"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "ઉપનામ સંવાદ"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "વપરાશકર્તા પાસે કોઈ ડિરેક્ટરી જાણકારી નથી."
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "આદેશ"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "રજીસ્ટ્રેશન ક્ષતિ"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "સ્થળ"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "વ્યક્તિ સ્થિતિ સૂચન"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "બિનઆધારભૂત આવૃત્તિ"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "દિશા"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "વપરાશકર્તા સ્થિતિઓ"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "વપરાશકર્તા મર્યાદા"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "ક્ષમતાઓ"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "વપરાશકર્તા નામ"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "કી ફેરબદલી સાથે IM"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "ઈમેઈલ સરનામું"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "રૂપરેખા સુયોજિત કરો"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "Ping"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "લાડકું નામ"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "જીવંત વીડિયો"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "સંદેશો મળ્યો"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "જાહેર કી બેબલપ્રિન્ટ"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "વપરાશકર્તા વિકલ્પો"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "વપરાશકર્તા સ્થિતિઓ"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "વપરાશકર્તા મર્યાદા"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "વપરાશકર્તા મર્યાદા"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "ટ્રીલીયન એનક્રિપ્શન"
+
+#~ msgid "Read Error"
+#~ msgstr "વાંચવામાં ક્ષતિ"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "સર્વર સાથે જોડાવામાં નિષ્ફળ."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "કતાર ભરેલી છે"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "સંદેશાનું પદચ્છેદન કરવામાં અસમર્થ"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "યજમાન સાથે જોડાઈ શક્યા નહિં"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "પ્રવેશ નિષ્ફળ (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "સર્વર સાથે જોડાવામાં અસમર્થ."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "તમે પ્રવેશ બહાર નીકળી ગયા છો કારણ કે તમે બીજા વર્કસ્ટેશનમાં પ્રવેશ કરેલ છે."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "ક્ષતિ. SSL આધાર સ્થાપિત થયેલ નથી."
+
+#~ msgid "Incorrect password."
+#~ msgstr "અયોગ્ય પાસવર્ડ."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "સર્વર સાથે જોડાવામાં નિષ્ફળ."
+
+#, fuzzy
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "તમે ટુંકમાં જ જોડાણ છોજી દેશો.  તમે TOC વાપરવાની ઈચ્છા રાખશો જ્યાં સુધી આ ચોક્કસ નહિં "
+#~ "થઈ જાય.  સુધારાઓ માટે %s ને ચકાસો."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "જોડાઈ શક્યા નહિં"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "અયોગ્ય વપરાશકર્તા નામ"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "સર્વર જાણકારી મેળવી શકતા નથી"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "જોડાણ બંધ થઈ ગયું"
+
+#, fuzzy
+#~ msgid "Couldn't resolve host"
+#~ msgstr "યજમાન સાથે જોડાઈ શક્યા નહિં"
+
+#, fuzzy
+#~ msgid "Connection closed (writing)"
+#~ msgstr "જોડાણ બંધ થઈ ગયું"
+
+#, fuzzy
+#~ msgid "Connection reset"
+#~ msgstr "જોડાણ બંધ થઈ ગયું"
+
+#, fuzzy
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "સોકેટમાંથી વાંચતી વખતે ક્ષતિ."
+
+#, fuzzy
+#~ msgid "Unable to connect to host"
+#~ msgstr "સર્વર સાથે જોડાવામાં અસમર્થ."
+
+#, fuzzy
+#~ msgid "Could not write"
+#~ msgstr "મોકલી શક્યા નહિં"
+
+#~ msgid "Could not connect"
+#~ msgstr "જોડાઈ શક્યા નહિં"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "લિસન સોકેટ બનાવી શક્યા નહિં"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "યજમાનનામો ઉકેલવામાં અસમર્થ."
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "અયોગ્ય પાસવર્ડ."
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo જાપાન"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "જાપાન Pager યજમાન"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "જાપાન ફાઈલ પરિવહન યજમાન"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "સર્વર સાથે જોડાણથયેલ નથી."
+
+#, fuzzy
+#~ msgid "Could not resolve host name"
+#~ msgstr "યજમાનનામો ઉકેલવામાં અસમર્થ."
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "પ્રવેશ માટે સર્વરને TLS/SSL જરૂરી છે.  કોઈ TLS/SSL આધાર મળ્યો નહિં."
+
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "IM વાર્તાલાપ વિન્ડો"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "મહેરબાની કરીને પસંદિત જૂથ માટે નવું નામ દાખલ કરો."
+
+#, fuzzy
 #~ msgid "Activate which ID?"
 #~ msgstr "કયું ID સક્રિય કરવું છે?"
 
@@ -15785,10 +15818,6 @@ msgstr ""
 #~ msgstr "હાલનું ટોકન"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "સર્વર સાથે જોડાવામાં અસમર્થ."
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "સંદેશો (_M):"
 
diff --git a/po/he.po b/po/he.po
index ff5d47999b..348ac00e96 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-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@li.org>\n"
@@ -2517,9 +2517,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "כלול יומנים של תוכנות צ'אט אחרות בצופה-היומנים."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2573,8 +2574,9 @@ msgstr "אמולציה של הודעות לא-מקוונות"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "שמור הודעות שנשלחו למשתמש לא-מחובר בתור תגובת-פעילות."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "שאר ההודעת יישמרו בתור תגובת-פעילות. ניתן לערוך/למחוק את התגובה מתוך חלון "
@@ -2824,14 +2826,16 @@ msgstr ""
 "לא היה ניתן לזהות ActiveTCL מתוקן. אם ברצונך להשתמש בתוספי TCL, יש להתקין "
 "ActiveTCL מתוך http://www.activestate.com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "חבילת בונג'ור של אפל עבור חלונות לא נמצאה, ראה את השו\"ת באתר: http://d."
 "pidgin.im/BonjourWindows למידע נוסף."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "לא ניתן להקשיב לתקשורת-הודעות נכנסת.\n"
 
 msgid ""
@@ -2884,14 +2888,21 @@ msgstr "%s סגר את חלון השיחה."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "לא ניתן לשלוח את ההודעה, לא היה אפשר להתחיל את השיחה."
 
-msgid "Cannot open socket"
-msgstr "אין אפשרות לפתוח שקע"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"אין אפשרות ליצור שקע:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "לא ניתן לקבע את השקע ליציאה"
 
-msgid "Could not listen on socket"
-msgstr "אין אפשרות להקשיב בשקע זה"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"אין אפשרות ליצור שקע:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "שגיאה בתקשורת עם mDNSResponder מקומי."
@@ -2938,13 +2949,16 @@ msgstr "שמור את רשימת אנשי הקשר..."
 msgid "Load buddylist from file..."
 msgstr "טען את רשימת אנשי הקשר מקובץ..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "יש למלא את שדות ההרשמה."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "הסיסמאות אינן תואמות."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "לא ניתן לבצע הרשמה לחשבון חדש. אירעה שגיאה.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2956,14 +2970,15 @@ msgstr "הרישום בוצע בהצלחה"
 msgid "Password"
 msgstr "סיסמה"
 
-msgid "Password (retype)"
-msgstr "סיסמא )שוב("
+msgid "Password (again)"
+msgstr "סיסמא (שנית)"
 
-msgid "Enter current token"
-msgstr "הזן ערך נוכחי"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "ערך נוכחי"
+#, fuzzy
+msgid "Captcha"
+msgstr "שמור תמונה"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "בצע רישום לחשבון חדש של Gadu-Gadu"
@@ -3016,6 +3031,15 @@ msgstr "הסיסמא שונתה בהצלחה!"
 msgid "Current password"
 msgstr "סיסמא נוכחית"
 
+msgid "Password (retype)"
+msgstr "סיסמא )שוב("
+
+msgid "Enter current token"
+msgstr "הזן ערך נוכחי"
+
+msgid "Current token"
+msgstr "ערך נוכחי"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "יש להזין את סיסמתך הנוכחית וסיסמתך החדשה עבור משתמש מספר: "
 
@@ -3063,8 +3087,8 @@ msgstr "לא נמצאו משתמשים תואמים"
 msgid "There are no users matching your search criteria."
 msgstr "לא נמצאו משתמשים התואמים לקריטריוני החיפוש שלך."
 
-msgid "Unable to read socket"
-msgstr "אין אפשרות לקרוא את השקע"
+msgid "Unable to read from socket"
+msgstr "אין אפשרות לקרוא מן השקע"
 
 msgid "Buddy list downloaded"
 msgstr "רשימת אנשי הקשר הועתקה"
@@ -3078,8 +3102,14 @@ msgstr "רשימת אנשי הקשר נשלחה"
 msgid "Your buddy list was stored on the server."
 msgstr "רשימת אנשי הקשר שלך אוכסנה על השרת"
 
-msgid "Connection failed."
-msgstr "ההתחברות נכשלה."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "מחובר"
+
+msgid "Connection failed"
+msgstr "ההתחברות נכשלה"
 
 msgid "Add to chat"
 msgstr "הוסף לשיחה"
@@ -3087,18 +3117,23 @@ msgstr "הוסף לשיחה"
 msgid "Chat _name:"
 msgstr "שם _צ'אט:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "לא ניתן להתחבר לשרת"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "מתחבר"
+
 msgid "Chat error"
 msgstr "שגיאה בצ'אט"
 
 msgid "This chat name is already in use"
 msgstr "שם הצ'אט הזה כבר בשימוש"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "לא מחובר לשרת."
 
 msgid "Find buddies..."
@@ -3158,7 +3193,8 @@ msgstr "אין כותרת"
 msgid "File Transfer Failed"
 msgstr "העברת הקובץ נכשלה"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "לא ניתן לפתוח שקע-קשב."
 
 msgid "Error displaying MOTD"
@@ -3174,8 +3210,18 @@ msgstr "אין הודעה יומית המיוחסת לחיבור זה."
 msgid "MOTD for %s"
 msgstr "הודעת היום עבור %s"
 
-msgid "Server has disconnected"
-msgstr "השרת התנתק"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"אבדה התקשורת עם השרת:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "הצג את הודעת היום"
@@ -3190,22 +3236,20 @@ msgstr "_סיסמא:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "אסור לשמות ב-IRC להכיל רווחים"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "מתחבר"
-
 msgid "SSL support unavailable"
 msgstr "אין תמיכה ב-SSL."
 
-msgid "Couldn't create socket"
-msgstr "אין אפשרות ליצור שקע"
+msgid "Unable to connect"
+msgstr "לא ניתן להתחבר"
 
-msgid "Couldn't connect to host"
-msgstr "לא ניתן להתחבר לשרת"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "לא ניתן להתחבר אל %s"
 
-msgid "Read error"
-msgstr "שגיאה בקריאה"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "השרת סגר את החיבור."
 
 msgid "Users"
 msgstr "משתמשים"
@@ -3623,10 +3667,12 @@ msgstr "פקודה זמנית נכשלה"
 msgid "execute"
 msgstr "הפעל"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "השרת דורש TLS/SSL להתחברות. לא נמצאה תמיכה ל-TLS/SSL."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "הגדרת דרישה להצפנה, אך לא נמצאה תמיכה ב-TLS/SSL."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3641,7 +3687,12 @@ msgstr "%s דורש אימות לא מוצפן מעל תקשורת לא מוצפ
 msgid "Plaintext Authentication"
 msgstr "אימות לא מוצפן"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "האימות נכשל"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "שגיעה בתגובה מהשרת"
 
 msgid "Server does not use any supported authentication method"
@@ -3653,7 +3704,8 @@ msgstr "נתת דרישה להצפנה, אבל השרת לא מספק זאת."
 msgid "Invalid challenge from server"
 msgstr "תשובת אימות לא תקפה מהשרת"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "שגיאת SASL"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3673,10 +3725,8 @@ msgstr ""
 "לא ניתן ליצור חיבור עם השרת:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "לא ניתן ליצור חיבור עם השרת:\n"
 "%s"
@@ -3685,12 +3735,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "לא ניתן לאתחל חיבור"
 
-msgid "Unable to create socket"
-msgstr "אין אפשרות ליצור שקע"
-
-msgid "Write error"
-msgstr "שגיאה בכתיבה"
-
 msgid "Full Name"
 msgstr "שם מלא"
 
@@ -3759,159 +3803,6 @@ msgstr "מערכת הפעלה"
 msgid "Local Time"
 msgstr "קובץ מקומי:"
 
-msgid "Last Activity"
-msgstr "פעילות אחרונה"
-
-msgid "Service Discovery Info"
-msgstr "מידע של שירות תגלית"
-
-msgid "Service Discovery Items"
-msgstr "פריטי שירות תגלית"
-
-msgid "Extended Stanza Addressing"
-msgstr "כתובות מורחבות לסטאנזות"
-
-msgid "Multi-User Chat"
-msgstr "צ'אט מרובה משתמשים"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "מידע נוכחותי בצ'אט מרובה משתמשים"
-
-msgid "In-Band Bytestreams"
-msgstr "זרמי-נתונים לפי הסדר"
-
-msgid "Ad-Hoc Commands"
-msgstr "פקודות זמניות"
-
-msgid "PubSub Service"
-msgstr "שירות PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "זרמי-נתונים של SOCKS5"
-
-msgid "Out of Band Data"
-msgstr "מידע שלא לפי סדר"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "רישום דרך התור"
-
-msgid "User Location"
-msgstr "מיקום משתמש"
-
-msgid "User Avatar"
-msgstr "תמונת משתמש"
-
-msgid "Chat State Notifications"
-msgstr "התרעות על מצבי צ'אט"
-
-msgid "Software Version"
-msgstr "גירסת תוכנה"
-
-msgid "Stream Initiation"
-msgstr "איתחול זרם"
-
-msgid "File Transfer"
-msgstr "משלוח קבצים"
-
-msgid "User Mood"
-msgstr "מצב-רוח המשתמש"
-
-msgid "User Activity"
-msgstr "פעילות משתמש"
-
-msgid "Entity Capabilities"
-msgstr "יכולות ישות"
-
-msgid "Encrypted Session Negotiations"
-msgstr "מיקוחים לחיבור מוצפן"
-
-msgid "User Tune"
-msgstr "שיר משתמש"
-
-msgid "Roster Item Exchange"
-msgstr "החלפת פריטי רשימה"
-
-msgid "Reachability Address"
-msgstr "כתובת זמינות"
-
-msgid "User Profile"
-msgstr "פרופיל משתמש"
-
-msgid "Jingle"
-msgstr "ג'ינגל"
-
-msgid "Jingle Audio"
-msgstr "צליל ג'ינגל"
-
-msgid "User Nickname"
-msgstr "כינוי משתמש"
-
-msgid "Jingle ICE UDP"
-msgstr "ג'ינגל ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "ג'ינגל ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "ג'ינגל UDP לא-מעובד"
-
-msgid "Jingle Video"
-msgstr "ג'ינגל וידאו"
-
-msgid "Jingle DTMF"
-msgstr "ג'ינגל DTMF"
-
-msgid "Message Receipts"
-msgstr "קבלות הודעות"
-
-msgid "Public Key Publishing"
-msgstr "פירסום מפתח ציבורי"
-
-msgid "User Chatting"
-msgstr "משתמש מצ'וטט"
-
-msgid "User Browsing"
-msgstr "משתמש גולש"
-
-msgid "User Gaming"
-msgstr "משתמש משחק"
-
-msgid "User Viewing"
-msgstr "משתמש צופה"
-
-msgid "Ping"
-msgstr "פינג"
-
-msgid "Stanza Encryption"
-msgstr "הצפנת סטנזה"
-
-msgid "Entity Time"
-msgstr "זמן ישות"
-
-msgid "Delayed Delivery"
-msgstr "משלוח מעוכב"
-
-msgid "Collaborative Data Objects"
-msgstr "אובייקטי מידע שיתופיים"
-
-msgid "File Repository and Sharing"
-msgstr "ספריית קבצים ושיתוף"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "שירות תגלית STUN עבור ג'ינגל"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "מיקוח פשוט לחיבור המוצפן"
-
-msgid "Hop Check"
-msgstr "בדיקת קפיצות"
-
-msgid "Capabilities"
-msgstr "יכולות"
-
 msgid "Priority"
 msgstr "עדיפות"
 
@@ -3923,7 +3814,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "מחובר"
 
 msgid "Middle Name"
@@ -4104,16 +3995,13 @@ msgstr "לא נמצאו משתמשים תואמים"
 msgid "Roles:"
 msgstr "תפקיד"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "פינג לא חזר בזמן"
 
-msgid "Read Error"
-msgstr "שגיאה בקריאה"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4289,9 +4177,6 @@ msgstr "הסיסמה שלך שונתה."
 msgid "Error changing password"
 msgstr "שגיאה במהלך שינוי הסיסמה"
 
-msgid "Password (again)"
-msgstr "סיסמא (שנית)"
-
 msgid "Change XMPP Password"
 msgstr "שנה סיסמת XMPP"
 
@@ -4673,6 +4558,14 @@ msgstr "שגיאת פיענוח XML"
 msgid "Unknown Error in presence"
 msgstr "שגיאה לא מוכרת בנוכחות"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "שגיאה בהצטרפות לצ'אט %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "שגיאה בשיחה %s"
+
 msgid "Create New Room"
 msgstr "צור חדר חדש"
 
@@ -4688,16 +4581,20 @@ msgstr "הגדרות החדר"
 msgid "_Accept Defaults"
 msgstr "קבל את ברירות המחדל"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "שגיאה בהצטרפות לצ'אט %s"
+#, fuzzy
+msgid "No reason"
+msgstr "לא ניתנה סיבה."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "שגיאה בשיחה %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "נבעטת ע\"י: %s (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "נבעט ע\"י %s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "ארעה שגיאה בעת פתיחת הקובץ."
 
 #, fuzzy
@@ -5188,9 +5085,6 @@ msgstr "יז_ום שיחה"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "נדרשת תמיכה ב-SSL עבור MSN. נא להתקין ספריית SSL נתמכת."
 
-msgid "Failed to connect to server."
-msgstr "כשל בהתחברות לשרת"
-
 msgid "Error retrieving profile"
 msgstr "שגיאה בשליפת הפרופיל"
 
@@ -5441,9 +5335,6 @@ msgstr "ההודעה לא נשלחה מכיוון שקרתה הודעת-קידו
 msgid "Message was not sent because an unknown error occurred."
 msgstr "ההודעה לא נשלחה מכיוון שקרתה שגיאה לא מוכרת."
 
-msgid "Unable to connect"
-msgstr "לא ניתן להתחבר"
-
 msgid "Writing error"
 msgstr "שגיאה בכתיבה"
 
@@ -5458,19 +5349,23 @@ msgstr ""
 "שגיאת תקשורת משרת %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "הפרוטוקול שלנו לא נתמך ע\"י השרת."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "שגיאה בפיענוח HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "אתה התחברת ממיקום נוסף."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "שרתי ה-MSN לא זמינים כרגע. אנא נסו מאוחר יותר."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "שרתי ב-MSN זמנית מפסיקים לפעול."
 
 #, c-format
@@ -5481,9 +5376,6 @@ msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "רשימת אנשי הקשר שלך ב-MSN אינה זמינה כרגע. יש לנסות שנית מאוחר יותר."
 
-msgid "Unknown error."
-msgstr "שגיאה לא מוכרת."
-
 msgid "Handshaking"
 msgstr "יוזם תקשורת"
 
@@ -5582,6 +5474,9 @@ msgstr "תוסף פרוטוקול MSN"
 msgid "%s is not a valid group."
 msgstr "%s אינה קבוצה תקפה."
 
+msgid "Unknown error."
+msgstr "שגיאה לא מוכרת."
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s על %s (%s)"
@@ -5693,12 +5588,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "הוסף אנשי-קשר מהשרת"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "מחובר"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "שגיאת פרוטוקול, קוד %d: %s"
@@ -5722,16 +5611,6 @@ msgstr "שגיאת MySpaceIM"
 msgid "Invalid input condition"
 msgstr "תנאי קליטה שגוי"
 
-msgid "Read buffer full (2)"
-msgstr "תור-הקריאה מלא (2)"
-
-msgid "Unparseable message"
-msgstr "הודעת שלא ניתנת לפיענוח"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "לא ניתן להתחבר לשרת: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "כשל בהוספת איש-קשר"
 
@@ -5814,6 +5693,12 @@ msgstr "סה\"כ חברים"
 msgid "Client Version"
 msgstr "גירסת לקוח"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - שם המשתמש זמין"
 
@@ -6068,9 +5953,9 @@ msgstr "משתמש זה לא מחובר או שאתה חסום"
 msgid "Unknown error: 0x%X"
 msgstr "שגיאה לא מוכרת: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "לא ניתן להתחבר (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "לא ניתן להתחבר"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6172,9 +6057,6 @@ msgstr "ועידת GroupWise %d"
 msgid "Authenticating..."
 msgstr "מאמת..."
 
-msgid "Unable to connect to server."
-msgstr "לא ניתן להתחבר לשרת"
-
 msgid "Waiting for response..."
 msgstr "ממתין לתשובה..."
 
@@ -6198,22 +6080,17 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "האם ברצונך להצטרף לשיחה?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "נותקת כיוון שהתחברת ממחשב אחר."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "ככל הנראה, %s אינו מחובר ולא קיבל את ההודעה ששלחת הרגע."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr "לא ניתן להתחבר לשרת. יש להזין את כתובת השרת שברצונך להתחבר אליו."
 
-msgid "Error. SSL support is not installed."
-msgstr "שגיאה. לא מותקנת תמיכה ב-SSL."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "ועידה זו נסגרה. לא ניתן לשלוח עוד הודעות."
 
@@ -6252,10 +6129,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "שגיאה בבקשת אסימון כניסה"
 
-msgid "Incorrect password."
-msgstr "סיסמה לא נכונה."
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6264,18 +6138,8 @@ msgstr "לא ניתן להתחבר אל חדר הצ'אט"
 msgid "Invalid chat room name"
 msgstr "שם החדר אינו תקף"
 
-msgid "Server closed the connection."
-msgstr "השרת סגר את החיבור."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"אבדה התקשורת עם השרת:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "התקבל מידע שגוי בחיבור עם השרת."
 
 #. *< type
@@ -6323,7 +6187,8 @@ msgstr "אבד החיבור עם המשתמש המרוחק:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "התקבל מידע שגוי בחיבור עם המשתמש המרוחק."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "לא ניתן ליצור חיבור עם המשתמש המרוחק."
 
 msgid "Direct IM established"
@@ -6522,21 +6387,15 @@ msgstr "רמת אזהרה"
 msgid "Buddy Comment"
 msgstr "הערת איש קשר"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "לא ניתן להתחבר לשרת האימות:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"לא ניתן להתחבר לשרת ה-BOS:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "לא ניתן להתחבר לשרת"
 
 msgid "Username sent"
 msgstr "שם משתמש נשלח"
@@ -6548,11 +6407,11 @@ msgstr "חיבור הושלם, נשלח cookie."
 msgid "Finalizing connection"
 msgstr "מבצע גימור לחיבור"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "לא ניתן להתחבר: לא היה ניתן להתחבר בתור %s כיוון ששם-תצוגה זה אינו תקף. שמות-"
 "תצוגה חייבים להיות כתובות אימייל חוקיות, או להתחיל באות ולהכיל רק אותיות "
@@ -6565,26 +6424,22 @@ 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 "שם משתמש לא תקף."
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "המשתמש לא קיים"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "חשבונך מושעה כרגע."
 
 #. service temporarily unavailable
@@ -6604,7 +6459,8 @@ msgstr ""
 "התחברת והתנתקת התדירות גבוהה מדיי. המתן 10 דקות ונסה שנית. אם תמשיך לנסות, "
 "תיאלץ להמתין אפילו יותר."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "המפתח עבור SecurID אינו תקף."
 
 msgid "Enter SecurID"
@@ -6769,6 +6625,9 @@ msgstr "מחובר מאז"
 msgid "Member Since"
 msgstr "חבר מאז"
 
+msgid "Capabilities"
+msgstr "יכולות"
+
 msgid "Profile"
 msgstr "פרופיל"
 
@@ -6933,9 +6792,9 @@ msgstr[1] "עברת את אורך הודעת הריחוק המקסימלי של
 msgid "Away message too long."
 msgstr "הודעת הריחוק מהמחשב ארוכה מדי."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6960,9 +6819,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "יתומים"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "לא ניתן להוסיף את %s לרשימת אנשי הקשר שלך, כיוון שיש יותר מדי אנשי קשר "
@@ -6971,8 +6830,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(ללא שם)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "לא היה ניתן להוסיף את איש הקשר %s מסיבה לא ידועה."
 
 #, c-format
@@ -7806,7 +7665,7 @@ msgid "Update interval (seconds)"
 msgstr "פרק זמן בין עידכונים"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "אין אפשרות לפיענוח המשוב בעת אימות משתמש"
 
 #, c-format
@@ -7833,10 +7692,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "קוד-תגובה שגוי, 0x%02X"
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "אין אפשרות לפיענוח המשוב בעת אימות משתמש"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "מבקש/ת את תשומת-הלב של %s..."
 
@@ -7874,21 +7729,9 @@ msgid ""
 "%s"
 msgstr "קוד-תגובה שגוי, 0x%02X"
 
-msgid "Unable to connect."
-msgstr "לא ניתן להתחבר"
-
 msgid "Socket error"
 msgstr "שגיאת שקע"
 
-msgid "Unable to read from socket"
-msgstr "אין אפשרות לקרוא מן השקע"
-
-msgid "Write Error"
-msgstr "שגיאה בכתיבה"
-
-msgid "Connection lost"
-msgstr "החיבור אבד"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "קבע את המידע על המשתמש..."
@@ -7897,8 +7740,9 @@ msgstr "קבע את המידע על המשתמש..."
 msgid "Requesting token"
 msgstr "הבקשה נדחית"
 
-msgid "Couldn't resolve host"
-msgstr "לא ניתן למצוא כתובת שרת"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "לא ניתן להתחבר לשרת"
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -7953,7 +7797,7 @@ msgid "QQ Qun Command"
 msgstr "פקודה"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "אין אפשרות לפיענוח המשוב בעת אימות משתמש"
 
 #, fuzzy
@@ -7975,9 +7819,6 @@ msgstr "שליחת קובץ"
 msgid "%d canceled the transfer of %s"
 msgstr "%d ביטל את העברת %s"
 
-msgid "Connection closed (writing)"
-msgstr "החיבור נסגר (כתיבה)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>שם קבוצה:</b> %s<br>"
@@ -8031,17 +7872,6 @@ msgstr "אדמיניסטרטור Sametime שם את ההודעה להלן על �
 msgid "Sametime Administrator Announcement"
 msgstr "הודעה מאת אדמיניסטרטור Sametime"
 
-msgid "Connection reset"
-msgstr "החיבור אותחל"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "שגיאה בקריאת נתונים מהשקע: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "לא ניתן להתחבר לשרת"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "הודעה מאת %s"
@@ -8064,6 +7894,9 @@ msgstr "רמקולים"
 msgid "Video Camera"
 msgstr "מצלמת וידאו"
 
+msgid "File Transfer"
+msgstr "משלוח קבצים"
+
 msgid "Supports"
 msgstr "תומכים"
 
@@ -8868,6 +8701,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "סטטיסטיקות של הרשת"
 
+msgid "Ping"
+msgstr "פינג"
+
 msgid "Ping failed"
 msgstr "פינג נכשל"
 
@@ -8931,7 +8767,8 @@ msgstr "סוג מפתח ציבורי שאינו נתמך"
 msgid "Disconnected by server"
 msgstr "נותק ע\"י השרת"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "שגיאה בעת התחברות לשרת ה-SILC"
 
 msgid "Key Exchange failed"
@@ -8941,26 +8778,26 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "המשך תהליך פעולה שנותק, נכשל. לחצ/י על חיבור מחדש ליצור חיבור חדש."
 
-msgid "Connection failed"
-msgstr "ההתחברות נכשלה"
-
 msgid "Performing key exchange"
 msgstr "מבצע החלפת מפתחות"
 
-msgid "Unable to create connection"
-msgstr "לא ניתן ליצור חיבור"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "לא ניתן לטעון את זוג מפתחות ה-SILC"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "מתחבר לשרת ה-SILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "לא ניתן לטעון את זוג מפתחות ה-SILC"
+
 msgid "Out of memory"
 msgstr "אזל הזיכרון"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "לא ניתן לאתחל את פרוטוקול SILC"
 
 msgid "Error loading SILC key pair"
@@ -9247,7 +9084,8 @@ msgstr "חתום דיגיטלית וודא את כל ההודעות המיידי
 msgid "Creating SILC key pair..."
 msgstr "יוצר זוג מפתחות SILC..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "לא יכול ליצור זוג מפתחות SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9341,6 +9179,9 @@ msgstr "לוח-לבן"
 msgid "No server statistics available"
 msgstr "אין סטטיסטיקות זמינות לשרת"
 
+msgid "Error during connecting to SILC Server"
+msgstr "שגיאה בעת התחברות לשרת ה-SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "שגיאה: אי-תאימות גירסאות, יש לשדרג את תוכנה הלקוח שלך"
@@ -9381,30 +9222,27 @@ msgstr "שגיאה: cookie שגוי"
 msgid "Failure: Authentication failed"
 msgstr "שגיאה: האימות נכשל"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "לא ניתן לאתחל חיבור לקוח של SILC"
 
 msgid "John Noname"
 msgstr "פלוני אלמוני"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "לא ניתן לטעון את זוג מפתחות ה-SILC: %s"
 
-msgid "Could not write"
-msgstr "לא ניתן לכתוב"
-
-msgid "Could not connect"
-msgstr "לא ניתן להתחבר"
+msgid "Unable to create connection"
+msgstr "לא ניתן ליצור חיבור"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "תגובת שרת לא ידועה."
 
-msgid "Could not create listen socket"
-msgstr "אין אפשרות ליצור שקע-קשב"
-
-msgid "Could not resolve hostname"
-msgstr "לא ניתן למצוא כתובת שרת"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "אין אפשרות ליצור שקע"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "אסור לשמות משתמשים של SIP להכיל רווחים או סמלי @"
@@ -9446,6 +9284,78 @@ msgstr "משתמש לאימות"
 msgid "Auth Domain"
 msgstr "דומיין לאימות"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;חדר&gt;:  הצטרף לחדר צ'אט ברשת Yahoo"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: הצג את רשימת החדרים ברשת Yahoo"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: לבקש מהמשתמש להתחיל ב- Doodle"
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "תוסף פרוטוקול Yahoo"
+
+msgid "Pager server"
+msgstr "שרת ה-Pager"
+
+msgid "Pager port"
+msgstr "יציאת Pager"
+
+msgid "File transfer server"
+msgstr "שרת העברת קבצים"
+
+msgid "File transfer port"
+msgstr "יציאה להעברת קבצים"
+
+msgid "Chat room locale"
+msgstr "הגדרה איזורית לחדר צ'אט"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "התעלם מהזמנות לשיחות-ועידה ולחדרי-צ'אט"
+
+msgid "Chat room list URL"
+msgstr "מיקום של רשימת חדרי הצ'אט"
+
+msgid "Yahoo Chat server"
+msgstr "שרת צ'אט של Yahoo"
+
+msgid "Yahoo Chat port"
+msgstr "כניסת שרת Yahoo"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "תוסף פרוטוקול Yahoo"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9476,28 +9386,18 @@ msgstr "הוספת איש קשר נדחתה"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr "שגיאה לא מוכרת מספר %d. התחברות באתר Yahoo! אולי יתקן את זה."
 
 #. username or password missing
@@ -9535,37 +9435,32 @@ msgstr "חשבונך נעול, יש לגשת לאתר של Yahoo."
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "שגיאה לא מוכרת מספר %d. התחברות באתר Yahoo! אולי יתקן את זה."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "לא ניתן להוסיף את איש הקשר %s לקבוצה %s ברשימה על השרת בחשבון %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "לא ניתן להוסיף את איש הקשר לרשימה בשרת"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ בר-שמיעה %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "התקבלה תגובת HTTP לא-צפויה מן השרת."
 
-msgid "Connection problem"
-msgstr "תקלת תקשורת"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "אבד החיבור עם %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"לא היה ניתן ליצור חיבור עם %s:\n"
+"לא ניתן ליצור חיבור עם השרת:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9628,74 +9523,15 @@ msgstr "הצטרף למשתמש בצ'אט..."
 msgid "Open Inbox"
 msgstr "פתח את תיבת הדואר שלי"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;חדר&gt;:  הצטרף לחדר צ'אט ברשת Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: הצג את רשימת החדרים ברשת Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: לבקש מהמשתמש להתחיל ב- Doodle"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "תוסף פרוטוקול Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo יפן"
-
-msgid "Pager server"
-msgstr "שרת ה-Pager"
-
-msgid "Japan Pager server"
-msgstr "שרת ה-Pager ביפן"
-
-msgid "Pager port"
-msgstr "יציאת Pager"
-
-msgid "File transfer server"
-msgstr "שרת העברת קבצים"
-
-msgid "Japan file transfer server"
-msgstr "שרת יפני להעברת קבצים"
-
-msgid "File transfer port"
-msgstr "יציאה להעברת קבצים"
-
-msgid "Chat room locale"
-msgstr "הגדרה איזורית לחדר צ'אט"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "התעלם מהזמנות לשיחות-ועידה ולחדרי-צ'אט"
-
-msgid "Chat room list URL"
-msgstr "מיקום של רשימת חדרי הצ'אט"
-
-msgid "Yahoo Chat server"
-msgstr "שרת צ'אט של Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "כניסת שרת Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "נשלחה בקשר לקשקש."
 
+msgid "Unable to connect."
+msgstr "לא ניתן להתחבר"
+
 msgid "Unable to establish file descriptor."
 msgstr "לא ניתן לברר את מספר החיבור לקובץ."
 
@@ -9703,6 +9539,9 @@ msgstr "לא ניתן לברר את מספר החיבור לקובץ."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s מציע/ה לשלוח אליך אוסף של %d קבצים.\n"
 
+msgid "Write Error"
+msgstr "שגיאה בכתיבה"
+
 msgid "Yahoo! Japan Profile"
 msgstr "פרופיל Yahoo! יפן"
 
@@ -9815,23 +9654,19 @@ msgstr "קולות"
 msgid "Webcams"
 msgstr "מצלמות אינטרנט"
 
+msgid "Connection problem"
+msgstr "תקלת תקשורת"
+
 msgid "Unable to fetch room list."
 msgstr "לא ניתן לקבל רשימת החדרים."
 
 msgid "User Rooms"
 msgstr "חדרים של משתמשים"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "שגיאה בתקשורת עם שרת ה-YCHT."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"אבד החיבור עם השרת\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -9952,33 +9787,22 @@ msgstr "איזור"
 msgid "Exposure"
 msgstr "חשיפה"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"אין אפשרות ליצור שקע:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "לא ניתן לעכל את תשובת שרת התיווך של HTTP: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "שגיאה בשרת התיווך של HTTP %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "אין הרשאה: שרת התיווך אוסר על תיעול ליציאה %d."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "שגיאה במציאת הכתובת של %s"
 
-msgid "Could not resolve host name"
-msgstr "לא ניתן למצוא כתובת שרת"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "מבקש/ת את תשומת-הלב של %s..."
@@ -10180,12 +10004,6 @@ msgstr "שגיאה בכתיבה לתוך %s: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "לא ניתן להתחבר אל %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "השרת דורש TLS/SSL להתחברות. לא נמצאה תמיכה ל-TLS/SSL."
-
 #, c-format
 msgid " - %s"
 msgstr " - %s"
@@ -10432,9 +10250,14 @@ msgstr "הוסף תגובה לפעולת איש קשר..."
 msgid "View _Log"
 msgstr "הצ_ג רישום"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "החבא כאשר לא-מקוון"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "הצג כאשר לא-מקוון"
+
 msgid "_Alias..."
 msgstr "_שם נוסף..."
 
@@ -10934,6 +10757,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "שנה פרטי משתמש עבור %s"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "יש להקליד את שם השרת שעבורו נועדה התעודה"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "שרתי SSL"
@@ -10979,7 +10806,8 @@ msgstr "התעלם"
 msgid "Get Away Message"
 msgstr "השג את הודעת ההתרחקות"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "נאמר לאחרונה"
 
 msgid "Unable to save icon file to disk."
@@ -11864,7 +11692,7 @@ msgid "Hyperlink visited color"
 msgstr "צבע קישורים"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "הצבע לצבוע בו קישורים כאשר העכבר מעליהם."
 
 msgid "Hyperlink prelight color"
@@ -11900,13 +11728,22 @@ msgstr "הצבע עבור שם של הודעות-פעולה."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "צבע עבור שמות הודעות-פעולה להודעות שנלחשות"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "הצבע עבור שם של הודעות-פעולה."
+
 msgid "Whisper Message Name Color"
 msgstr "צבע עבור שם הודעה שנלחשה"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "הצבע עבור שם של הודעות-פעולה."
+
 msgid "Typing notification color"
 msgstr "צבע התרעת-הקלדה"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "הצבע בו תוצג התרעת ההקלדה"
 
 msgid "Typing notification font"
@@ -12294,6 +12131,10 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "נבחרה לביצוע הפקודה 'הידנית' של הדפדפן, אבל לא נקבעה הוראה לביצוע."
 
+#, fuzzy
+msgid "No message"
+msgstr "הודעת לא מוכרת"
+
 msgid "Open All Messages"
 msgstr "פתח את כל ההודעות"
 
@@ -12311,10 +12152,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">דואר חדש נכנס!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "הודעת לא מוכרת"
-
 msgid "The following plugins will be unloaded."
 msgstr "התוספים שלהלן ייפרקו מן הזיכרון."
 
@@ -12528,8 +12365,9 @@ msgstr "הצג את סמל מגש המערכת:"
 msgid "On unread messages"
 msgstr "בהגעת הודעות שלא נקראו"
 
-msgid "Conversation Window Hiding"
-msgstr "הסתרת חלונות שיחה"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "חלונות שיחה להודעות"
 
 msgid "_Hide new IM conversations:"
 msgstr "ה_סתר שיחות חדשות"
@@ -12537,6 +12375,9 @@ msgstr "ה_סתר שיחות חדשות"
 msgid "When away"
 msgstr "כאשר מרוחק"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "מזער חלונות שיחה חדשים"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "כרטיסיות"
@@ -12595,9 +12436,6 @@ msgstr "התשתמש בגלילה-חלקה"
 msgid "F_lash window when IMs are received"
 msgstr "_הבהב את חלון השיחה בעת קבלת הודעות"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "מזער חלונות שיחה חדשים"
-
 msgid "Minimum input area height in lines:"
 msgstr "גובה מינימלי בשורות של איזור הקלט:"
 
@@ -12632,7 +12470,8 @@ msgstr "לא יכול להפעיל את תוכנת הגדרות הדפדפן."
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">לדוגמא: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "מצ_א כתובת IP אוטומטית"
 
 msgid "Public _IP:"
@@ -13003,32 +12842,17 @@ msgstr "שמור והשתמש"
 msgid "Status for %s"
 msgstr "מצב עבור %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "חייכן שלך"
-
-msgid "More Data needed"
-msgstr "נחוץ מידע נוסף"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "נא להזין קיצור-דרך לקשר עם החייכן."
-
 #, fuzzy, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr "חייכן שלך כבר קיים לקיצור-הדרך שנבחר. יש לבחור קיצור-דרך אחר."
 
+msgid "Custom Smiley"
+msgstr "חייכן שלך"
+
 msgid "Duplicate Shortcut"
 msgstr "כפילות בקיצורי-הדרך"
 
-msgid "Please select an image for the smiley."
-msgstr "יש לבחור תמונה עבור החייכן."
-
 msgid "Edit Smiley"
 msgstr "_ערוך חייכן"
 
@@ -13138,9 +12962,10 @@ msgstr "ניתן להכניס תמונה זו לתוך ההודעה, או להש
 msgid "Cannot send launcher"
 msgstr "לא ניתן לשלוח את קובץ המפעיל"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "גררת קובץ מפעיל של שולחן העבודה. קרוב לודאי שרצית לשלוח את מה שהמפעיל "
 "מצביעעליו, ולא את המפעיל עצמו."
@@ -13728,9 +13553,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "תוסף להודעות מוזיקה להלחנה משותפת."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "התוסף להודעות מוזיקה מאפשר למספר משתמשים לעבוד יחד על הלחנת יצירה בזמן אמת."
 
@@ -13986,9 +13812,10 @@ msgid "Conversation Window Send Button."
 msgstr "כפתור שליחה בחלון שיחה."
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "מוסיף כפתור שליחה לאיזור הקלט של חלון השיחה. נועד לשימוש כאשר אין מקלדת "
 "פיזית."
@@ -14313,8 +14140,9 @@ msgstr "הגדרות פידג'ין לחלונות"
 msgid "Options specific to Pidgin for Windows."
 msgstr "אפשרויות לפידג'ין היחודיות לחלונות."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "מאפשר גישה לאפשרויות הייחודיות לפידג'ין בחלונות, כגון עגינה של רשימת אנשי "
 "הקשר."
@@ -14356,6 +14184,310 @@ msgstr "שלח וקבל סטנזות XMPP גולמיות."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "תוסף זה שימושי לניפוי באגים בשרתים ולקוחות של XMPP."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "אין אפשרות לפתוח שקע"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "אין אפשרות להקשיב בשקע זה"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "אין אפשרות לקרוא את השקע"
+
+#~ msgid "Connection failed."
+#~ msgstr "ההתחברות נכשלה."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "השרת התנתק"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "אין אפשרות ליצור שקע"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "לא ניתן להתחבר לשרת"
+
+#~ msgid "Read error"
+#~ msgstr "שגיאה בקריאה"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "לא ניתן ליצור חיבור עם השרת:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "שגיאה בכתיבה"
+
+#~ msgid "Last Activity"
+#~ msgstr "פעילות אחרונה"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "מידע של שירות תגלית"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "פריטי שירות תגלית"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "כתובות מורחבות לסטאנזות"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "צ'אט מרובה משתמשים"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "מידע נוכחותי בצ'אט מרובה משתמשים"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "זרמי-נתונים לפי הסדר"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "פקודות זמניות"
+
+#~ msgid "PubSub Service"
+#~ msgstr "שירות PubSub"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "זרמי-נתונים של SOCKS5"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "מידע שלא לפי סדר"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "רישום דרך התור"
+
+#~ msgid "User Location"
+#~ msgstr "מיקום משתמש"
+
+#~ msgid "User Avatar"
+#~ msgstr "תמונת משתמש"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "התרעות על מצבי צ'אט"
+
+#~ msgid "Software Version"
+#~ msgstr "גירסת תוכנה"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "איתחול זרם"
+
+#~ msgid "User Mood"
+#~ msgstr "מצב-רוח המשתמש"
+
+#~ msgid "User Activity"
+#~ msgstr "פעילות משתמש"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "יכולות ישות"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "מיקוחים לחיבור מוצפן"
+
+#~ msgid "User Tune"
+#~ msgstr "שיר משתמש"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "החלפת פריטי רשימה"
+
+#~ msgid "Reachability Address"
+#~ msgstr "כתובת זמינות"
+
+#~ msgid "User Profile"
+#~ msgstr "פרופיל משתמש"
+
+#~ msgid "Jingle"
+#~ msgstr "ג'ינגל"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "צליל ג'ינגל"
+
+#~ msgid "User Nickname"
+#~ msgstr "כינוי משתמש"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "ג'ינגל ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "ג'ינגל ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "ג'ינגל UDP לא-מעובד"
+
+#~ msgid "Jingle Video"
+#~ msgstr "ג'ינגל וידאו"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "ג'ינגל DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "קבלות הודעות"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "פירסום מפתח ציבורי"
+
+#~ msgid "User Chatting"
+#~ msgstr "משתמש מצ'וטט"
+
+#~ msgid "User Browsing"
+#~ msgstr "משתמש גולש"
+
+#~ msgid "User Gaming"
+#~ msgstr "משתמש משחק"
+
+#~ msgid "User Viewing"
+#~ msgstr "משתמש צופה"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "הצפנת סטנזה"
+
+#~ msgid "Entity Time"
+#~ msgstr "זמן ישות"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "משלוח מעוכב"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "אובייקטי מידע שיתופיים"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "ספריית קבצים ושיתוף"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "שירות תגלית STUN עבור ג'ינגל"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "מיקוח פשוט לחיבור המוצפן"
+
+#~ msgid "Hop Check"
+#~ msgstr "בדיקת קפיצות"
+
+#~ msgid "Read Error"
+#~ msgstr "שגיאה בקריאה"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "כשל בהתחברות לשרת"
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "תור-הקריאה מלא (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "הודעת שלא ניתנת לפיענוח"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "לא ניתן להתחבר לשרת: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "לא ניתן להתחבר (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "נותקת כיוון שהתחברת ממחשב אחר."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "שגיאה. לא מותקנת תמיכה ב-SSL."
+
+#~ msgid "Incorrect password."
+#~ msgstr "סיסמה לא נכונה."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "לא ניתן להתחבר לשרת ה-BOS:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "ייתכן ותנותק/י בקרוב. יש לבדוק את %s לעידכונים."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "לא ניתן להתחבר"
+
+#~ msgid "Invalid username."
+#~ msgstr "שם משתמש לא תקף."
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "אין אפשרות לפיענוח המשוב בעת אימות משתמש"
+
+#~ msgid "Connection lost"
+#~ msgstr "החיבור אבד"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "לא ניתן למצוא כתובת שרת"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "החיבור נסגר (כתיבה)"
+
+#~ msgid "Connection reset"
+#~ msgstr "החיבור אותחל"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "שגיאה בקריאת נתונים מהשקע: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "לא ניתן להתחבר לשרת"
+
+#~ msgid "Could not write"
+#~ msgstr "לא ניתן לכתוב"
+
+#~ msgid "Could not connect"
+#~ msgstr "לא ניתן להתחבר"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "אין אפשרות ליצור שקע-קשב"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "לא ניתן למצוא כתובת שרת"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "סיסמה לא נכונה"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "לא היה ניתן ליצור חיבור עם %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo יפן"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "שרת ה-Pager ביפן"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "שרת יפני להעברת קבצים"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "אבד החיבור עם השרת\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "לא ניתן למצוא כתובת שרת"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "השרת דורש TLS/SSL להתחברות. לא נמצאה תמיכה ל-TLS/SSL."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "הסתרת חלונות שיחה"
+
+#~ msgid "More Data needed"
+#~ msgstr "נחוץ מידע נוסף"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "נא להזין קיצור-דרך לקשר עם החייכן."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "יש לבחור תמונה עבור החייכן."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "איזה ID להפעיל?"
 
@@ -14843,9 +14975,6 @@ msgstr "תוסף זה שימושי לניפוי באגים בשרתים ולקו
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "לא ניתן להיכנס. יש לבדוק ביומן רישום הבאגים"
 
-#~ msgid "Unable to login"
-#~ msgstr "לא ניתן להתחבר"
-
 #~ msgid "Failed room reply"
 #~ msgstr "כשל במשוב מהחדר"
 
diff --git a/po/hi.po b/po/hi.po
index f3c9a82cee..1f6f3d0141 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2005-05-29 20:43+0530\n"
 "Last-Translator: Akash <akash@ncb.ernet.in>\n"
 "Language-Team: Akash <matrubhasha@ncb.ernet.in>\n"
@@ -2784,7 +2784,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2836,7 +2836,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -3113,12 +3113,12 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
 #, fuzzy
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr "नया कनेक्शन बनाने में असमर्थ।"
 
 msgid ""
@@ -3181,17 +3181,17 @@ msgstr "%s इस वार्तालाप के लिए आमंत्�
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "संदेश भेजने में असफल: संदेश बहुत बढ़ा है।"
 
-#, fuzzy
-msgid "Cannot open socket"
-msgstr "सोकेट खोलने में असमर्थ"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "सोकेट बनाने में असमर्थ"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "सॉकट नहीं बना सका"
 
-#, fuzzy
-msgid "Could not listen on socket"
-msgstr "सॉकट नहीं बना सका"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "सोकेट बनाने में असमर्थ"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3254,15 +3254,15 @@ msgstr "बड्डी सूची भेजें"
 msgid "Load buddylist from file..."
 msgstr "सर्वर से बड्डी सूची का आयात करें"
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
 #, fuzzy
-msgid "Passwords do not match."
+msgid "Passwords do not match"
 msgstr "नया पासवर्ड मेल नहीं खाता."
 
 #, fuzzy
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "नया कनेक्शन बनाने में असमर्थ।"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3275,17 +3275,15 @@ msgstr "रजिस्ट्रेशन सफल रहा"
 msgid "Password"
 msgstr "पासवर्ड "
 
-#, fuzzy
-msgid "Password (retype)"
-msgstr "पासवर्ड भेजा दिया"
+msgid "Password (again)"
+msgstr "पासवर्ड (फिर से)"
 
-#, fuzzy
-msgid "Enter current token"
-msgstr "%s ने अभी लॉग-इन किया है"
+msgid "Enter captcha text"
+msgstr ""
 
 #, fuzzy
-msgid "Current token"
-msgstr "अभी है"
+msgid "Captcha"
+msgstr "चित्र संचित करें"
 
 #, fuzzy
 msgid "Register New Gadu-Gadu Account"
@@ -3347,6 +3345,18 @@ msgid "Current password"
 msgstr "गलत पासवर्ड "
 
 #, fuzzy
+msgid "Password (retype)"
+msgstr "पासवर्ड भेजा दिया"
+
+#, fuzzy
+msgid "Enter current token"
+msgstr "%s ने अभी लॉग-इन किया है"
+
+#, fuzzy
+msgid "Current token"
+msgstr "अभी है"
+
+#, fuzzy
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "कृपया अपना वर्तमान पासवर्ड भरें तथा आपका नया  पासवर्ड भरें."
 
@@ -3400,7 +3410,8 @@ msgstr "कोइ मिलता हुआ होस्ट नहीं"
 msgid "There are no users matching your search criteria."
 msgstr "कृपया आपका नया पासवर्ड डालें।"
 
-msgid "Unable to read socket"
+#, fuzzy
+msgid "Unable to read from socket"
 msgstr "सोकेट पढ़ने में असमर्थ"
 
 #, fuzzy
@@ -3419,8 +3430,14 @@ msgstr "बड्डी द्रश्य"
 msgid "Your buddy list was stored on the server."
 msgstr "गाडू-गाडू सवर्र पर कोइ भी बड्डी सूची नहीं है।"
 
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
 #, fuzzy
-msgid "Connection failed."
+msgid "Connected"
+msgstr "कनेक्ट"
+
+msgid "Connection failed"
 msgstr "कनेक्शन असफल हुआ"
 
 #, fuzzy
@@ -3431,11 +3448,15 @@ msgstr "चैट जोड़ें"
 msgid "Chat _name:"
 msgstr "अंतिम नाम"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "सर्वर को पींग नहीं कर पाया"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "कनेक्ट कर रहा है"
+
 #, fuzzy
 msgid "Chat error"
 msgstr "पढ़ने में त्रुटि"
@@ -3445,7 +3466,7 @@ msgid "This chat name is already in use"
 msgstr "फ़ाइल पहले से है"
 
 #, fuzzy
-msgid "Not connected to the server."
+msgid "Not connected to the server"
 msgstr "आपको सवर्र से डिसकनेक्ट्ड कर दिया गया।"
 
 #, fuzzy
@@ -3515,7 +3536,7 @@ msgid "File Transfer Failed"
 msgstr "फ़ाइल हस्तांतरण रद्द"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "गेम सुनने के लिए पोर्ट नहीं खोल सका।"
 
 msgid "Error displaying MOTD"
@@ -3531,8 +3552,16 @@ msgstr "इस कनेक्शन के साथ कोइ ऐम औ ट�
 msgid "MOTD for %s"
 msgstr "%s के लिए ऐम औ टी डी"
 
-msgid "Server has disconnected"
-msgstr "सर्वर ने कनेक्शन तोड़ा"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "आपको सवर्र से डिसकनेक्ट्ड कर दिया गया।"
 
 msgid "View MOTD"
 msgstr "ऐमऔटीडी(MOTD) देखें"
@@ -3551,22 +3580,20 @@ msgstr "पासवर्ड:(_P)"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "आइ आर सी उपनामों में वाइटस्पेस नहीं हो सकती"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "कनेक्ट कर रहा है"
-
 msgid "SSL support unavailable"
 msgstr "एस एस एल समर्थन उपलब्ध नहीं है"
 
-msgid "Couldn't create socket"
-msgstr "सॉकट नहीं बना सका"
+msgid "Unable to connect"
+msgstr "कनेक्ट करने में असमर्थ"
 
-msgid "Couldn't connect to host"
-msgstr "होस्ट से कनेक्टेड नहीं कर पाया"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "सर्वर से कनेक्ट नहीं कर पाया।"
 
-msgid "Read error"
-msgstr "पढ़ने में त्रुटि"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "कनेक्शन बनाने में त्रुटि"
 
 msgid "Users"
 msgstr "उपयोगकर्ता"
@@ -4009,13 +4036,14 @@ msgstr "कमांड असमर्थ"
 msgid "execute"
 msgstr "अपेक्षित नहीं"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "सवर्र पर लॉग इन करने के लिए टी एल एस / एस एस एल चाहिए. टी एल एस / एस एस एल "
 "समर्थन नहीं मिला।"
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "सवर्र पर लॉग इन करने के लिए टी एल एस / एस एस एल चाहिए. टी एल एस / एस एस एल "
 "समर्थन नहीं मिला।"
@@ -4034,7 +4062,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "साधारण टेक्सट प्रमाणीकरण"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "प्रमाणीकरण असफल"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "सवर्र ने अवैध उत्तर दिया।"
 
 msgid "Server does not use any supported authentication method"
@@ -4046,8 +4079,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "सवर्र द्वारा अवैध चुनौती"
 
-#, fuzzy
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "पढ़ने में त्रुटि"
 
 msgid "The BOSH connection manager terminated your session."
@@ -4065,22 +4098,14 @@ msgstr "असमर्थित आवर्तन"
 msgid "Unable to establish a connection with the server"
 msgstr "सवर्र से एस एस एल कनेक्शन बनाने में त्रुटी।"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "सवर्र से एस एस एल कनेक्शन बनाने में त्रुटी।"
 
 #, fuzzy
 msgid "Unable to establish SSL connection"
 msgstr "नया कनेक्शन बनाने में असमर्थ।"
 
-msgid "Unable to create socket"
-msgstr "सोकेट बनाने में असमर्थ"
-
-msgid "Write error"
-msgstr "लिखने में त्रुटी"
-
 msgid "Full Name"
 msgstr "पूरा नाम"
 
@@ -4152,188 +4177,6 @@ msgstr "ऑपरेटिंग सिस्टम छिपायें"
 msgid "Local Time"
 msgstr "स्थानिय फा़इल"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "डिर जानकारी दृढ़ करें..."
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "विस्तृत पता"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "चैट का उपनाम"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "उपयोगकर्ता के पास कोइ डायरक्ट्री की जानकारी नहीं है।"
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "कमांड"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "ऐचटीऐमऐल(HTML)"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "रजिस्ट्रेशन त्रुटि"
-
-#, fuzzy
-msgid "User Location"
-msgstr "स्थान निरूप"
-
-msgid "User Avatar"
-msgstr ""
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "बड्डी स्थिति सूचना"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "असमर्थित आवर्तन"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "दिशा"
-
-#, fuzzy
-msgid "File Transfer"
-msgstr "फ़ाइल हस्तांतरण"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "उपयोगकर्ता ढंग"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "उपयोगकर्ता सीमा"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "योग्यताऐं"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "उपयोगकर्ता-नाम"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "आई एम कुंजी विनिमय"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "इमेल पता"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "प्रोफ़ाइल द्रद्द करें"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "पिंग"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "उपनाम"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "प्रत्यक्ष विडीयो"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "प्राप्त सन्देश"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "सार्वजनिक कुंजी बैबलप्रिंट"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "उपयोगकर्ता विकल्प"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "उपयोगकर्ता ढंग"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "उपयोगकर्ता सीमा"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "उपयोगकर्ता सीमा"
-
-msgid "Ping"
-msgstr "पिंग"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "ट्रिलियन एनक्रिपशन"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "योग्यताऐं"
-
 #, fuzzy
 msgid "Priority"
 msgstr "पोर्ट"
@@ -4346,7 +4189,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "लौग आउट हो चुका है"
 
 msgid "Middle Name"
@@ -4543,16 +4386,12 @@ msgid "Roles:"
 msgstr "कार्य भाग"
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "सादा टेक्स्ट्"
 
-msgid "Read Error"
-msgstr "पढ़ने में त्रुटि"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 #, fuzzy
@@ -4743,9 +4582,6 @@ msgstr "आपका पासवर्ड बदल दिया गया ह�
 msgid "Error changing password"
 msgstr "पासवर्ड बदलते समय त्रुटि"
 
-msgid "Password (again)"
-msgstr "पासवर्ड (फिर से)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "पासवर्ड बदलें"
@@ -5157,6 +4993,14 @@ msgstr "एक्सएमएल पदभंजन त्रुटी"
 msgid "Unknown Error in presence"
 msgstr "उपस्थिति में अज्ञात त्रुटी"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "चैट में शामिल होने में त्रुटि %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "चैट में त्रुटि %s"
+
 msgid "Create New Room"
 msgstr "नया कक्ष बनायें"
 
@@ -5174,16 +5018,20 @@ msgstr "कमरे की संरचना"
 msgid "_Accept Defaults"
 msgstr "डिफाल्ट स्वीकारें"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "चैट में शामिल होने में त्रुटि %s"
+#, fuzzy
+msgid "No reason"
+msgstr "कोई कारण नहीं दिया"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "चैट में त्रुटि %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "आपको %s: (%s) ने लात मारी"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s (%s) से लात पड़ी"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "फ़ाइल को खोलने में त्रुटि '"
 
 #, fuzzy
@@ -5719,9 +5567,6 @@ msgstr ""
 "वाचनालय की स्थापना करें। अधिक जानकारी के लिए पर http://Pidgin.sf.net/faq-ssl.php "
 "जाएँ।"
 
-msgid "Failed to connect to server."
-msgstr "सर्वर से कनेक्ट करने में असफल।"
-
 msgid "Error retrieving profile"
 msgstr "प्रोफ़ाइल लाने में त्रुटी"
 
@@ -6013,9 +5858,6 @@ msgstr "संदेश भेजा नहीं जा सका क्यो�
 msgid "Message was not sent because an unknown error occurred."
 msgstr "संदेश भेजा नहीं जा सका क्योंकि अज्ञात त्रुटी हुई"
 
-msgid "Unable to connect"
-msgstr "कनेक्ट करने में असमर्थ"
-
 msgid "Writing error"
 msgstr "लिखने में त्रुटी"
 
@@ -6034,20 +5876,24 @@ msgstr ""
 "%s सवर्र से कनेक्शन त्रुटी (%s):\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "हमारे प्रोटॅकॉल का इस सवर्र में समर्थन नहीं है।"
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "ऐच टी टी पी पढ़ने में त्रुटी"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "आपने किसी दूसरी जगह से साइन-इन किया है।"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "एम एस एन सवर्र अस्थाई रुप से उपलब्ध नहीं है। कृपया कुछ देर प्रतीक्षा कर फिर प्रयास करें।"
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "एम एस एन के सवर्र कुछ देर के लिए बंद हो रहे हैं।"
 
 #, c-format
@@ -6060,13 +5906,6 @@ 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 "हेन्डशेकिंग"
 
@@ -6166,6 +6005,13 @@ msgstr "ऐ आई एम/आई सी क्यू प्रोटॅकोल
 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)"
@@ -6282,13 +6128,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "सवर्र ने अवैध उत्तर दिया।"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-#, fuzzy
-msgid "Connected"
-msgstr "कनेक्ट"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr ""
@@ -6312,18 +6151,6 @@ msgid "Invalid input condition"
 msgstr "कनेक्शन को निर्णायक कर रहा है"
 
 #, fuzzy
-msgid "Read buffer full (2)"
-msgstr "कतार पूरी"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "संदेश पदभंजन में असमर्थ"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "होस्ट से कनेक्टेड नहीं कर पाया"
-
-#, fuzzy
 msgid "Failed to add buddy"
 msgstr "बड्डी के साथ चैट में जुड़ने में असफल"
 
@@ -6419,6 +6246,12 @@ msgstr ""
 msgid "Client Version"
 msgstr "वार्तालाप बंद करें"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 #, fuzzy
 msgid "MySpaceIM - Username Available"
 msgstr "सेवा उपलब्ध नहीं है "
@@ -6689,9 +6522,9 @@ msgstr "उपयोगकर्ता या तो औफ-लाइन है
 msgid "Unknown error: 0x%X"
 msgstr "अज्ञात त्रुटि: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "लॉग-इन असफल (%s)। "
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "%s उपयोगकर्ता को निषेध करने में असमर्थ"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6791,9 +6624,6 @@ msgstr "ग्रुपवाइज़ सम्मेलन %d"
 msgid "Authenticating..."
 msgstr "प्रमाणित कर रहा है"
 
-msgid "Unable to connect to server."
-msgstr "सर्वर से कनेक्ट नहीं कर पाया।"
-
 msgid "Waiting for response..."
 msgstr "उत्तर कि प्रतीक्षा कर रहें हैं"
 
@@ -6819,23 +6649,18 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "क्या आप संवाद में शामिल होना चाहेंगे?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "आपको लॉग-आउट कर दिया गया है क्योंकि आपने दूसरे कार्य स्थल से लॉग-इन किया।"
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s अनुपस्थित लग रहा है और उसको आपका अभी भेजा गया संदेश नहीं मिला।"
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "सवर्र से कनेक्ट करने में असमर्थ। कृपया सवर्र का पता डालें जिससे आप कनेक्ट करना चाहतें हैं।"
 
-msgid "Error. SSL support is not installed."
-msgstr "त्रुटी । एस एस एल समर्थन स्थापित नहीं है।"
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "यह सम्मेलन बंद कर दिया गया है। और संदेश नहीं भेजे जा सकते।"
 
@@ -6874,10 +6699,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "कनेक्शन बनाने में त्रुटि"
 
-msgid "Incorrect password."
-msgstr "गलत पासवर्ड "
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, fuzzy
@@ -6889,17 +6711,7 @@ msgid "Invalid chat room name"
 msgstr "गलत कक्ष नाम"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "कनेक्शन बनाने में त्रुटि"
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "आपको सवर्र से डिसकनेक्ट्ड कर दिया गया।"
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "सवर्र से एस एस एल कनेक्शन बनाने में त्रुटी।"
 
 #. *< type
@@ -6952,8 +6764,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "सवर्र से एस एस एल कनेक्शन बनाने में त्रुटी।"
 
 #, fuzzy
 msgid "Direct IM established"
@@ -7151,16 +6964,12 @@ msgid "Buddy Comment"
 msgstr "बड्डी टिप्पणी"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "हसतांतरण करने के लिए कनेक्ट नहीं कर पाया।"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr "सर्वर से कनेक्ट करने में असफल।"
+msgid "Unable to connect to BOS server: %s"
+msgstr "सर्वर से कनेक्ट नहीं कर पाया।"
 
 #, fuzzy
 msgid "Username sent"
@@ -7175,9 +6984,9 @@ msgstr "कनेक्शन को निर्णायक कर रहा �
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "लॉगिन करने में असमर्थ: %s को साइन औन न कर सका क्योंकि स्क्रीन-नाम अवैध है। स्क्रीन-नाम "
 "किसी अक्षर से शुरु होना चाहीए और उसमें केवल अक्षर, अंक और खाली जगह होने चाहीए, नहीं तो "
@@ -7193,30 +7002,23 @@ 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 ""
-"आप जल्दी डिसकनेक्ट हो जाएंगे। जब तक यह ठीक होगा आप टी औ सी का प्रयोग करना चाहेंगे। "
-"अपडेट्स के लिए %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
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "अवैध उपयोगकर्ता-नाम"
+msgid "Username does not exist"
+msgstr "उपयोगकर्ता नहीं है"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "आपका खाता अभी निलंबित है।"
 
 #. service temporarily unavailable
@@ -7236,7 +7038,8 @@ msgstr ""
 "आप बार-बार कनेक्ट और डिसकनेक्ट हों रहें हैं। दस मिनट प्रतीक्षा करें फिर प्रयास करें। अगर आप "
 "बिना रुके प्रयास करते रहे तब आपको ज़्यादा प्रतीक्षा करनी पड़ेगी।"
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "डाली गयी सेक्योर आई डी कुंजी अवैध है।"
 
 msgid "Enter SecurID"
@@ -7412,6 +7215,9 @@ msgstr "से औनलाइन"
 msgid "Member Since"
 msgstr "से सदस्य"
 
+msgid "Capabilities"
+msgstr "योग्यताऐं"
+
 msgid "Profile"
 msgstr "प्रोफ़ाइल"
 
@@ -7585,7 +7391,7 @@ msgstr "अनुपस्थिति संदेश बहुत लम्ब
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7611,9 +7417,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "लावारिस"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "बड्डी %s को जोड़ नहीं पाया क्योंकि आपकी सूची में बहुत ज्यादा बड्डी हैं। किसी एक को हटा कर "
@@ -7623,7 +7429,7 @@ msgid "(no name)"
 msgstr "(कोई नाम नहीं)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "आपका निर्देष अज्ञात कारण से असफल हो गया।"
 
 #, fuzzy, c-format
@@ -8506,7 +8312,7 @@ msgid "Update interval (seconds)"
 msgstr "पढ़ने में त्रुटि"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "सर्वर की जानकारी नहीं मिली"
 
 #, c-format
@@ -8533,10 +8339,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "सर्वर की जानकारी नहीं मिली"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "अस्पष्ट अनुरोध"
 
@@ -8572,9 +8374,6 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-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)  #-#-#-#-#
@@ -8584,18 +8383,6 @@ msgid "Socket error"
 msgstr "अज्ञात त्रुटि"
 
 #, fuzzy
-msgid "Unable to read from socket"
-msgstr "सोकेट पढ़ने में असमर्थ"
-
-#, fuzzy
-msgid "Write Error"
-msgstr "लिखने में त्रुटी"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "कनेक्शन बंद हो गया"
-
-#, fuzzy
 msgid "Getting server"
 msgstr "उपयोगकर्ता की जानकारी दृढ़ करें..."
 
@@ -8604,8 +8391,8 @@ msgid "Requesting token"
 msgstr "अनुरोध निषेध"
 
 #, fuzzy
-msgid "Couldn't resolve host"
-msgstr "होस्ट से कनेक्टेड नहीं कर पाया"
+msgid "Unable to resolve hostname"
+msgstr "सर्वर को पींग नहीं कर पाया"
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8660,7 +8447,7 @@ msgid "QQ Qun Command"
 msgstr "कमांड"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "सर्वर की जानकारी नहीं मिली"
 
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
@@ -8691,10 +8478,6 @@ msgstr "फ़ाइल भेजना असफल"
 msgid "%d canceled the transfer of %s"
 msgstr "%s ने %s के स्थानांतर को रद्द किया"
 
-#, fuzzy
-msgid "Connection closed (writing)"
-msgstr "कनेक्शन बंद हो गया"
-
 #, fuzzy, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>उपभोक्ता:</b> %s<br>"
@@ -8756,19 +8539,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#, fuzzy
-msgid "Connection reset"
-msgstr "कनेक्शन बंद हो गया"
-
-#, fuzzy, c-format
-msgid "Error reading from socket: %s"
-msgstr "सॉकेट से पढ़ने में त्रुटि।"
-
-#. this is a regular connect, error out
-#, fuzzy
-msgid "Unable to connect to host"
-msgstr "सर्वर से कनेक्ट नहीं कर पाया।"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -8800,6 +8570,10 @@ msgid "Video Camera"
 msgstr "विडीयो चैट"
 
 #, fuzzy
+msgid "File Transfer"
+msgstr "फ़ाइल हस्तांतरण"
+
+#, fuzzy
 msgid "Supports"
 msgstr "समर्थन"
 
@@ -9655,6 +9429,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "नेटवर्क के आंकड़े"
 
+msgid "Ping"
+msgstr "पिंग"
+
 msgid "Ping failed"
 msgstr "पिंग असफल"
 
@@ -9720,7 +9497,8 @@ msgstr "असमर्थित सार्वजनिक कुंजी प
 msgid "Disconnected by server"
 msgstr "सर्वर ने कनेक्शन तोड़ा"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "एस आई एल सी कनेक्शन के दोरान त्रुटी"
 
 msgid "Key Exchange failed"
@@ -9730,29 +9508,26 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "प्रथक काल का पुनः आरम्भ विफल"
 
-msgid "Connection failed"
-msgstr "कनेक्शन असफल हुआ"
-
 msgid "Performing key exchange"
 msgstr "कुंजी विनियम निभा रहा है"
 
 #, fuzzy
-msgid "Unable to create connection"
-msgstr "नया कनेक्शन बनाने में असमर्थ।"
-
-#, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "सार्वजनिक कुंजी नहीं लोड कर पा रहा"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "एस एल आइ सी  सर्वर से कनेक्शन कर रहा है"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "सार्वजनिक कुंजी नहीं लोड कर पा रहा"
+
 msgid "Out of memory"
 msgstr "अपर्याप्त मेमरी"
 
 #, fuzzy
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "एस आई एल सी कनेक्शन नहीं शुरु कर पाया"
 
 #, fuzzy
@@ -10054,7 +9829,7 @@ msgid "Creating SILC key pair..."
 msgstr "एस आइ एल सी कुंजी जोड़ा बना रहा है..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "एस आइ एल सी कुंजी जोड़ा बना रहा है..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -10148,6 +9923,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr "सवर्र के आंकड़े उपलब्ध नहीं हैं"
 
+msgid "Error during connecting to SILC Server"
+msgstr "एस आई एल सी कनेक्शन के दोरान त्रुटी"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "असफलता: अनुवाद असमानता, क्लायंट को अपग्रेड करें"
@@ -10188,7 +9966,8 @@ msgstr "असफलता: अवैध कुकी"
 msgid "Failure: Authentication failed"
 msgstr "असफलता: प्रमाणीकरण असफल"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "एस आई एल सी कनेक्शन नहीं शुरु कर पाया"
 
 #, fuzzy
@@ -10196,31 +9975,24 @@ msgid "John Noname"
 msgstr "अंतिम नाम"
 
 #, fuzzy, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "सार्वजनिक कुंजी नहीं लोड कर पा रहा"
 
 #, fuzzy
-msgid "Could not write"
-msgstr "भेज नहीं सका"
-
-msgid "Could not connect"
-msgstr "कनेक्ट नहीं कर पाया"
+msgid "Unable to create connection"
+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
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "अज्ञात त्रुटि।"
 
 #, fuzzy
-msgid "Could not create listen socket"
-msgstr "सॉकट नहीं बना सका"
-
-#, fuzzy
-msgid "Could not resolve hostname"
-msgstr "होस्ट का नाम ढूंड नहीं पाया।"
+msgid "Unable to create listen socket"
+msgstr "सोकेट बनाने में असमर्थ"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -10270,6 +10042,84 @@ msgstr "ऐ पी उपयोगकर्ता"
 msgid "Auth Domain"
 msgstr "स्वचालित"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;कक्ष&gt;:  याहू नेटवर्क पर किसी चैट कक्ष में जाएं"
+
+#, fuzzy
+msgid "list: List rooms on the Yahoo network"
+msgstr "सूची: इस नेटवर्क पर चैनलों कि सूची दिखायें"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "याहू! आइ डी"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "याहू प्रोटोकाल प्लगइन"
+
+#, fuzzy
+msgid "Pager server"
+msgstr "प्रोक्सी सर्वर"
+
+msgid "Pager port"
+msgstr "पैजर पोर्ट"
+
+#, fuzzy
+msgid "File transfer server"
+msgstr "फ़ाइल हस्तांतरण होस्ट"
+
+msgid "File transfer port"
+msgstr "फ़ाइल हस्तांतरण पोर्ट"
+
+#, fuzzy
+msgid "Chat room locale"
+msgstr "चैट कक्ष सूची की कड़ी"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
+
+#, fuzzy
+msgid "Chat room list URL"
+msgstr "चैट कक्ष सूची की कड़ी"
+
+msgid "Yahoo Chat server"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo Chat port"
+msgstr "याहू जापान"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "याहू! आइ डी"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "याहू प्रोटोकाल प्लगइन"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -10298,28 +10148,18 @@ msgstr "बड्डी को जोड़ना मना हो गया "
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr "अज्ञात त्रुटी संखया %d। याहू में लॉग-इन करने से शायद ठीक हो जाय।"
 
 #. username or password missing
@@ -10357,11 +10197,12 @@ msgstr "आपके खाते पर ताला लगा है, कृ�
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "अज्ञात त्रुटी संखया %d। याहू में लॉग-इन करने से शायद ठीक हो जाय।"
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "इस खाते %s पर बड्डी %s को %s समुह में जोड़ नहीं पाया।"
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "बड्डी को सवर्र सूची में नहीं डाल सका।"
 
 #, c-format
@@ -10369,24 +10210,17 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
 #, fuzzy
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "सवर्र ने अवैध उत्तर दिया।"
 
-msgid "Connection problem"
-msgstr "कनेक्शन में कठिनाई"
-
 #  Conversations
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "%s के साथ वार्तालाप"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "सवर्र से एस एस एल कनेक्शन बनाने में त्रुटी।"
 
 #, fuzzy
 msgid "Not at Home"
@@ -10457,82 +10291,15 @@ msgstr "उपयोगकर्ता से संवाद में जु�
 msgid "Open Inbox"
 msgstr ""
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;कक्ष&gt;:  याहू नेटवर्क पर किसी चैट कक्ष में जाएं"
-
-#, fuzzy
-msgid "list: List rooms on the Yahoo network"
-msgstr "सूची: इस नेटवर्क पर चैनलों कि सूची दिखायें"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "याहू! आइ डी"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "याहू प्रोटोकाल प्लगइन"
-
-msgid "Yahoo Japan"
-msgstr "याहू जापान"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "प्रोक्सी सर्वर"
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "जापान पैजर होस्ट"
-
-msgid "Pager port"
-msgstr "पैजर पोर्ट"
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "फ़ाइल हस्तांतरण होस्ट"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "जापान फ़ाइल हस्तांतरण होस्ट"
-
-msgid "File transfer port"
-msgstr "फ़ाइल हस्तांतरण पोर्ट"
-
-#, fuzzy
-msgid "Chat room locale"
-msgstr "चैट कक्ष सूची की कड़ी"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-#, fuzzy
-msgid "Chat room list URL"
-msgstr "चैट कक्ष सूची की कड़ी"
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "याहू जापान"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "कनेक्ट करने में असमर्थ"
+
 msgid "Unable to establish file descriptor."
 msgstr "फाइल डिसक्रिपट्र स्थापित करनें में असमर्थ।"
 
@@ -10540,6 +10307,10 @@ msgstr "फाइल डिसक्रिपट्र स्थापित क
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s को %s भेजने का प्रस्ताव"
 
+#, fuzzy
+msgid "Write Error"
+msgstr "लिखने में त्रुटी"
+
 msgid "Yahoo! Japan Profile"
 msgstr "याहू जापान प्रोफ़ाइल"
 
@@ -10660,21 +10431,19 @@ msgstr "आवाज़ें"
 msgid "Webcams"
 msgstr "वेब केमरे"
 
+msgid "Connection problem"
+msgstr "कनेक्शन में कठिनाई"
+
 msgid "Unable to fetch room list."
 msgstr "कक्ष सूची नहीं ला पाया"
 
 msgid "User Rooms"
 msgstr "उपभोक्ता कक्ष"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "वाय सी एच टी YCHT सर्वर से कनेक्शन में कठिनाई"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "आपको सवर्र से डिसकनेक्ट्ड कर दिया गया।"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10804,13 +10573,7 @@ msgid "Exposure"
 msgstr "दिखावा"
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "सोकेट बनाने में असमर्थ"
-
-#, fuzzy, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "%s को संदेश भेजने में असमर्थ"
 
 #, fuzzy, c-format
@@ -10818,17 +10581,13 @@ msgid "HTTP proxy connection error %d"
 msgstr "प्रोक्सी कनेक्शन में त्रुटि %d"
 
 #, fuzzy, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "प्रवेश निषेध: प्रोक्सी सर्वर पोर्ट %d टनलिंग वर्जित करता है।"
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr "चैट में शामिल होने में त्रुटि %s"
 
-#, fuzzy
-msgid "Could not resolve host name"
-msgstr "होस्ट का नाम ढूंड नहीं पाया।"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -11054,14 +10813,6 @@ msgstr ""
 msgid "Unable to connect to %s: %s"
 msgstr "सर्वर से कनेक्ट नहीं कर पाया।"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"सवर्र पर लॉग इन करने के लिए टी एल एस / एस एस एल चाहिए. टी एल एस / एस एस एल "
-"समर्थन नहीं मिला।"
-
 #, c-format
 msgid " - %s"
 msgstr ""
@@ -11323,7 +11074,11 @@ msgid "View _Log"
 msgstr "लॉग देखें(_L)"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "जब आप ऑफलाइन हैं तब आज्ञा नहीं"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "जब आप ऑफलाइन हैं तब आज्ञा नहीं"
 
 msgid "_Alias..."
@@ -11903,6 +11658,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "उपयोगकर्ता %s हेतु जानकारी बदलें"
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11959,7 +11717,7 @@ msgid "Get Away Message"
 msgstr "नया अनुपस्थिति संदेश"
 
 #, fuzzy
-msgid "Last said"
+msgid "Last Said"
 msgstr "अंतिम नाम"
 
 msgid "Unable to save icon file to disk."
@@ -13007,7 +12765,7 @@ msgid "Hyperlink visited color"
 msgstr "हाइपरलिंक रंग"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "हाइपरलिंक खींचना का रंग।"
 
 #, fuzzy
@@ -13047,16 +12805,23 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #  ---------- "Notification Removals" ----------
 #, fuzzy
 msgid "Typing notification color"
 msgstr "सूचक हटाना"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "नयी डाक की सूचनाऐँ"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -13427,6 +13192,10 @@ msgid ""
 msgstr "'स्वयं' ब्राउज़र कमांड चुनी गयी है, परंतु कोइ कमांड को दृढ़ नहीं किया गया है।"
 
 #, fuzzy
+msgid "No message"
+msgstr "(1 सन्देश)"
+
+#, fuzzy
 msgid "Open All Messages"
 msgstr "संदेश भेजें"
 
@@ -13451,10 +13220,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, fuzzy
-msgid "No message"
-msgstr "(1 सन्देश)"
-
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -13712,7 +13477,7 @@ msgstr "सन्देश भेजो(_m)"
 
 #  IM Convo trans options
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "आईएम वार्तालाप विंडो"
 
 #  Conversations
@@ -13723,6 +13488,11 @@ msgstr "वार्तालाप बंद करें"
 msgid "When away"
 msgstr "जब अनुपस्थित"
 
+#  IM Convo trans options
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "आईएम वार्तालाप विंडो"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -13788,11 +13558,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr "जब संदेश मिलें तो विंडो चमकाएँ (_F)"
 
-#  IM Convo trans options
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "आईएम वार्तालाप विंडो"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -13832,8 +13597,8 @@ msgstr "उपयोगकर्ता की जानकारी नहीं
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-#, fuzzy
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "स्वतः जाने आइ पी पता(_A)"
 
 msgid "Public _IP:"
@@ -14237,34 +14002,18 @@ msgstr "संचय करें और प्रयोग करें(_v)"
 msgid "Status for %s"
 msgstr "वस्तुस्थिति: %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "स्माइली डालें"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
 #, fuzzy
-msgid "Duplicate Shortcut"
-msgstr "सार्वजनिक कुंजी फा़इल"
+msgid "Custom Smiley"
+msgstr "स्माइली डालें"
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "कृपया चुने हुए समूह के लिए नया नाम भरें।"
+msgid "Duplicate Shortcut"
+msgstr "सार्वजनिक कुंजी फा़इल"
 
 #, fuzzy
 msgid "Edit Smiley"
@@ -14388,8 +14137,8 @@ msgid "Cannot send launcher"
 msgstr "फ़ाइल नहीं भेज पाया"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -15067,7 +14816,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #  ---------- "Notify For" ----------
@@ -15396,7 +15145,7 @@ msgstr "आईएम वार्तालाप विंडो"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -15772,9 +15521,10 @@ msgstr "लॉगइन विकल्प"
 msgid "Options specific to Pidgin for Windows."
 msgstr "विंडोस गेम हेतु विशेष विकल्प"
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "विंडोस गेम हेतु विशेष विकल्प"
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr ""
@@ -15817,6 +15567,286 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Cannot open socket"
+#~ msgstr "सोकेट खोलने में असमर्थ"
+
+#, fuzzy
+#~ msgid "Could not listen on socket"
+#~ msgstr "सॉकट नहीं बना सका"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "सोकेट पढ़ने में असमर्थ"
+
+#, fuzzy
+#~ msgid "Connection failed."
+#~ msgstr "कनेक्शन असफल हुआ"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "सर्वर ने कनेक्शन तोड़ा"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "सॉकट नहीं बना सका"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "होस्ट से कनेक्टेड नहीं कर पाया"
+
+#~ msgid "Read error"
+#~ msgstr "पढ़ने में त्रुटि"
+
+#~ msgid "Write error"
+#~ msgstr "लिखने में त्रुटी"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "डिर जानकारी दृढ़ करें..."
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "विस्तृत पता"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "चैट का उपनाम"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "उपयोगकर्ता के पास कोइ डायरक्ट्री की जानकारी नहीं है।"
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "कमांड"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "ऐचटीऐमऐल(HTML)"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "रजिस्ट्रेशन त्रुटि"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "स्थान निरूप"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "बड्डी स्थिति सूचना"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "असमर्थित आवर्तन"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "दिशा"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "उपयोगकर्ता ढंग"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "उपयोगकर्ता सीमा"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "योग्यताऐं"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "उपयोगकर्ता-नाम"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "आई एम कुंजी विनिमय"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "इमेल पता"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "प्रोफ़ाइल द्रद्द करें"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "पिंग"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "उपनाम"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "प्रत्यक्ष विडीयो"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "प्राप्त सन्देश"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "सार्वजनिक कुंजी बैबलप्रिंट"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "उपयोगकर्ता विकल्प"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "उपयोगकर्ता ढंग"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "उपयोगकर्ता सीमा"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "उपयोगकर्ता सीमा"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "ट्रिलियन एनक्रिपशन"
+
+#~ msgid "Read Error"
+#~ msgstr "पढ़ने में त्रुटि"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "सर्वर से कनेक्ट करने में असफल।"
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "कतार पूरी"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "संदेश पदभंजन में असमर्थ"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "होस्ट से कनेक्टेड नहीं कर पाया"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "लॉग-इन असफल (%s)। "
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "सर्वर से कनेक्ट नहीं कर पाया।"
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "आपको लॉग-आउट कर दिया गया है क्योंकि आपने दूसरे कार्य स्थल से लॉग-इन किया।"
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "त्रुटी । एस एस एल समर्थन स्थापित नहीं है।"
+
+#~ msgid "Incorrect password."
+#~ msgstr "गलत पासवर्ड "
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "सर्वर से कनेक्ट करने में असफल।"
+
+#, fuzzy
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "आप जल्दी डिसकनेक्ट हो जाएंगे। जब तक यह ठीक होगा आप टी औ सी का प्रयोग करना चाहेंगे। "
+#~ "अपडेट्स के लिए %s देखें।"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "कनेक्ट नहीं कर पाया"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "अवैध उपयोगकर्ता-नाम"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "सर्वर की जानकारी नहीं मिली"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "कनेक्शन बंद हो गया"
+
+#, fuzzy
+#~ msgid "Couldn't resolve host"
+#~ msgstr "होस्ट से कनेक्टेड नहीं कर पाया"
+
+#, fuzzy
+#~ msgid "Connection closed (writing)"
+#~ msgstr "कनेक्शन बंद हो गया"
+
+#, fuzzy
+#~ msgid "Connection reset"
+#~ msgstr "कनेक्शन बंद हो गया"
+
+#, fuzzy
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "सॉकेट से पढ़ने में त्रुटि।"
+
+#, fuzzy
+#~ msgid "Unable to connect to host"
+#~ msgstr "सर्वर से कनेक्ट नहीं कर पाया।"
+
+#, fuzzy
+#~ msgid "Could not write"
+#~ msgstr "भेज नहीं सका"
+
+#~ msgid "Could not connect"
+#~ msgstr "कनेक्ट नहीं कर पाया"
+
+#, fuzzy
+#~ msgid "Could not create listen socket"
+#~ msgstr "सॉकट नहीं बना सका"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "होस्ट का नाम ढूंड नहीं पाया।"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "गलत पासवर्ड "
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "याहू जापान"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "जापान पैजर होस्ट"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "जापान फ़ाइल हस्तांतरण होस्ट"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "आपको सवर्र से डिसकनेक्ट्ड कर दिया गया।"
+
+#, fuzzy
+#~ msgid "Could not resolve host name"
+#~ msgstr "होस्ट का नाम ढूंड नहीं पाया।"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "सवर्र पर लॉग इन करने के लिए टी एल एस / एस एस एल चाहिए. टी एल एस / एस एस एल "
+#~ "समर्थन नहीं मिला।"
+
+#  IM Convo trans options
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "आईएम वार्तालाप विंडो"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "कृपया चुने हुए समूह के लिए नया नाम भरें।"
+
+#, fuzzy
 #~ msgid "Activate which ID?"
 #~ msgstr "कोनसा आइ डी क्रियांवित करें?"
 
@@ -16456,10 +16486,6 @@ msgstr ""
 #~ msgstr "अभी है"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "सर्वर से कनेक्ट नहीं कर पाया।"
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "संदेश(_M)"
 
diff --git a/po/hu.po b/po/hu.po
index d45acc601c..bd9c88d02e 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2009-02-25 03:21+0100\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <gnome@fsf.hu>\n"
@@ -2586,9 +2586,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Felveszi más azonnaliüzenő-kliensek naplóit a naplómegjelenítőbe."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2642,8 +2643,9 @@ msgstr "Offline üzenetek emulációja"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "A kilépett felhasználónak küldött üzenetek mentése figyelmeztetésként."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "A további üzenetek figyelmeztetésként kerülnek mentésre. A figyelmeztetést a "
@@ -2896,14 +2898,16 @@ msgstr ""
 "Az ActiveTCL telepítés nem észlelhető. Ha TCL bővítményeket kíván használni, "
 "akkor telepítse az ActiveTCL-t a http://www.activestate.com címről\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Az Apple Bonjour For Windows eszközkészlet nem található, további "
 "információkat a http://d.pidgin.im/BonjourWindows oldalon találhat."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Nem lehetséges a bejövő azonnali üzenő kapcsolatokat figyelni\n"
 
 msgid ""
@@ -2956,14 +2960,21 @@ msgstr "%s bezárta a társalgást."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Nem küldhető el az üzenet, a társalgás nem kezdhető el."
 
-msgid "Cannot open socket"
-msgstr "Nem nyitható meg a foglalat"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Nem lehet létrehozni a foglalatot:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Nem köthető a foglalat a porthoz"
 
-msgid "Could not listen on socket"
-msgstr "Nem lehet figyelni a foglalatot"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Nem lehet létrehozni a foglalatot:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Hiba a helyi mDNSResponderrel végzett kommunikációban."
@@ -3012,13 +3023,16 @@ msgstr "Partnerlista mentése…"
 msgid "Load buddylist from file..."
 msgstr "Partnerlista betöltése fájlból…"
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Töltse ki a regisztrációs mezőket."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "A jelszavak nem egyeznek."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Nem regisztrálható új fiók. Hiba történt.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3030,14 +3044,15 @@ msgstr "A regisztráció sikeresen befejeződött!"
 msgid "Password"
 msgstr "Jelszó"
 
-msgid "Password (retype)"
-msgstr "Jelszó (megerősítés)"
+msgid "Password (again)"
+msgstr "Jelszó (még egyszer)"
 
-msgid "Enter current token"
-msgstr "Adja meg az aktuális jelsort"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Aktuális jelsor"
+#, fuzzy
+msgid "Captcha"
+msgstr "Captcha kép"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Új Gadu-Gadu fiók regisztrálása"
@@ -3090,6 +3105,15 @@ msgstr "A jelszó sikeresen megváltoztatva!"
 msgid "Current password"
 msgstr "Jelenlegi jelszó"
 
+msgid "Password (retype)"
+msgstr "Jelszó (megerősítés)"
+
+msgid "Enter current token"
+msgstr "Adja meg az aktuális jelsort"
+
+msgid "Current token"
+msgstr "Aktuális jelsor"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Adja meg a jelenlegi jelszavát és az új jelszót az UIM-hez: "
 
@@ -3137,8 +3161,8 @@ msgstr "Nem találhatók megfelelő felhasználók"
 msgid "There are no users matching your search criteria."
 msgstr "Nincsenek a keresési feltételnek megfelelő felhasználók."
 
-msgid "Unable to read socket"
-msgstr "A foglalatot nem lehet olvasni"
+msgid "Unable to read from socket"
+msgstr "A foglalatból nem lehet olvasni"
 
 msgid "Buddy list downloaded"
 msgstr "A partnerlista letöltve"
@@ -3152,8 +3176,14 @@ msgstr "A partnerlista feltöltve"
 msgid "Your buddy list was stored on the server."
 msgstr "A partnerlista tárolva a kiszolgálón."
 
-msgid "Connection failed."
-msgstr "A kapcsolódás meghiúsult."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Kapcsolódva"
+
+msgid "Connection failed"
+msgstr "Kapcsolódás sikertelen"
 
 msgid "Add to chat"
 msgstr "Felvétel csevegéshez"
@@ -3161,18 +3191,23 @@ msgstr "Felvétel csevegéshez"
 msgid "Chat _name:"
 msgstr "Csevegés _neve:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Nem lehet a kiszolgálóhoz kapcsolódni."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Kapcsolódás"
+
 msgid "Chat error"
 msgstr "Csevegéshiba"
 
 msgid "This chat name is already in use"
 msgstr "Ez a csevegésnév már használatban van"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Nincs kapcsolat a kiszolgálóval."
 
 msgid "Find buddies..."
@@ -3232,7 +3267,8 @@ msgstr "Nincs beállítva téma"
 msgid "File Transfer Failed"
 msgstr "A fájlátvitel meghiúsult"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Nem nyitható meg figyelőport."
 
 msgid "Error displaying MOTD"
@@ -3248,8 +3284,18 @@ msgstr "Nincs MOTD társítva ehhez a kapcsolathoz."
 msgid "MOTD for %s"
 msgstr "MOTD a következőhöz: %s"
 
-msgid "Server has disconnected"
-msgstr "A kiszolgáló bontotta a kapcsolatot"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Elveszett a kapcsolat a kiszolgálóhoz:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "MOTD megjelenítése"
@@ -3264,22 +3310,20 @@ msgstr "_Jelszó:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "Az IRC becenevek nem tartalmazhatnak szóközt"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Kapcsolódás"
-
 msgid "SSL support unavailable"
 msgstr "Az SSL támogatás nem érhető el"
 
-msgid "Couldn't create socket"
-msgstr "Nem sikerült létrehozni a foglalatot"
+msgid "Unable to connect"
+msgstr "Nem lehet kapcsolódni"
 
-msgid "Couldn't connect to host"
-msgstr "Nem sikerült kapcsolódni a kiszolgálóhoz"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Nem lehet csatlakozni a következőhöz: %s"
 
-msgid "Read error"
-msgstr "Olvasási hiba"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "A kiszolgáló lezárta a kapcsolatot."
 
 msgid "Users"
 msgstr "Felhasználók"
@@ -3715,12 +3759,14 @@ msgstr "Az eseti parancs meghiúsult"
 msgid "execute"
 msgstr "végrehajtás"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "A kiszolgáló megköveteli a TLS/SSL használatát a bejelentkezéshez, de ezek "
 "támogatása nem található."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Titkosítást kér, de a TLS/SSL támogatása nem található."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3738,7 +3784,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Egyszerű szöveges hitelesítés"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Hitelesítés sikertelen"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Érvénytelen válasz a kiszolgálótól."
 
 msgid "Server does not use any supported authentication method"
@@ -3750,7 +3801,8 @@ msgstr "Titkosítást igényel, de az nem áll rendelkezésre ezen a kiszolgál�
 msgid "Invalid challenge from server"
 msgstr "Érvénytelen hívás a kiszolgálótól"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL hiba"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3770,10 +3822,8 @@ msgstr ""
 "Nem hozható létre kapcsolat a következő kiszolgálóval:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Nem hozható létre kapcsolat a következő kiszolgálóval:\n"
 "%s"
@@ -3782,12 +3832,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "A kapcsolat nem inicializálható"
 
-msgid "Unable to create socket"
-msgstr "Nem lehet létrehozni foglalatot"
-
-msgid "Write error"
-msgstr "Írási hiba"
-
 msgid "Full Name"
 msgstr "Teljes név"
 
@@ -3858,162 +3902,6 @@ msgstr "Operációs rendszer"
 msgid "Local Time"
 msgstr "Helyi fájl:"
 
-# fixme: innentől egy jó darabon xmpp protokollkiegészítések nevei vannak, lásd: http://www.xmpp.org/extensions/
-msgid "Last Activity"
-msgstr "Utolsó művelet"
-
-msgid "Service Discovery Info"
-msgstr "Szolgáltatásfeltérképezési információk"
-
-msgid "Service Discovery Items"
-msgstr "Szolgáltatásfeltérképezési elemek"
-
-msgid "Extended Stanza Addressing"
-msgstr "Kibővített kifejezéscímzés"
-
-msgid "Multi-User Chat"
-msgstr "Többfelhasználós csevegés"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Többfelhasználós csevegés kibővített jelenlét-információi"
-
-msgid "In-Band Bytestreams"
-msgstr "Beágyazott bájtsorozat"
-
-msgid "Ad-Hoc Commands"
-msgstr "Eseti parancsok"
-
-msgid "PubSub Service"
-msgstr "PubSub szolgáltatás"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 bájtsorozat"
-
-msgid "Out of Band Data"
-msgstr "Külső adatok"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-# fixme: mi a rák ez?
-msgid "In-Band Registration"
-msgstr "Beágyazott regisztráció"
-
-msgid "User Location"
-msgstr "Felhasználó helye"
-
-msgid "User Avatar"
-msgstr "Felhasználói avatar"
-
-msgid "Chat State Notifications"
-msgstr "Csevegésállapot-értesítések"
-
-msgid "Software Version"
-msgstr "Szoftververzió"
-
-msgid "Stream Initiation"
-msgstr "Adatátvitel kezdeményezése"
-
-msgid "File Transfer"
-msgstr "Fájlátvitel"
-
-msgid "User Mood"
-msgstr "Felhasználó hangulata"
-
-msgid "User Activity"
-msgstr "Felhasználói tevékenység"
-
-msgid "Entity Capabilities"
-msgstr "Egyed képességei"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Titkosított munkamenet-egyeztetések"
-
-msgid "User Tune"
-msgstr "Hallgatott zene"
-
-msgid "Roster Item Exchange"
-msgstr "Partnerlista-elemek cseréje"
-
-msgid "Reachability Address"
-msgstr "Elérhetőségi cím"
-
-msgid "User Profile"
-msgstr "Felhasználói profil"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle hang"
-
-msgid "User Nickname"
-msgstr "Felhasználó beceneve"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle Raw UDP"
-
-msgid "Jingle Video"
-msgstr "Jingle videó"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Tértivevények"
-
-msgid "Public Key Publishing"
-msgstr "Nyilvános kulcs közzététele"
-
-msgid "User Chatting"
-msgstr "Csevegőszobák"
-
-msgid "User Browsing"
-msgstr "Böngészett oldalak"
-
-msgid "User Gaming"
-msgstr "Játékok"
-
-msgid "User Viewing"
-msgstr "Videók"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Kifejezéstitkosítás"
-
-msgid "Entity Time"
-msgstr "Helyi idő"
-
-msgid "Delayed Delivery"
-msgstr "Késleltetett kézbesítés"
-
-msgid "Collaborative Data Objects"
-msgstr "Együttműködési adatobjektumok"
-
-msgid "File Repository and Sharing"
-msgstr "Fájllerakat és -megosztás"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "STUN szolgáltatásfeltérképezés a Jingle-höz"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Egyszerűsített titkosított munkamenet-egyeztetés"
-
-# fixme: idáig egy jó darabon xmpp protokollkiegészítések nevei voltak, lásd: http://www.xmpp.org/extensions/
-msgid "Hop Check"
-msgstr "Ugrásellenőrzés"
-
-msgid "Capabilities"
-msgstr "Képességek"
-
 msgid "Priority"
 msgstr "Prioritás"
 
@@ -4025,7 +3913,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Bejelentkezve"
 
 msgid "Middle Name"
@@ -4207,16 +4095,13 @@ msgstr "Nem találhatók megfelelő felhasználók"
 msgid "Roles:"
 msgstr "Funkció"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Ping időtúllépése"
 
-msgid "Read Error"
-msgstr "Olvasási hiba"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4392,9 +4277,6 @@ msgstr "A jelszava meg lett változtatva."
 msgid "Error changing password"
 msgstr "Hiba a jelszó módosításakor"
 
-msgid "Password (again)"
-msgstr "Jelszó (még egyszer)"
-
 msgid "Change XMPP Password"
 msgstr "XMPP jelszó módosítása"
 
@@ -4779,6 +4661,14 @@ msgstr "XML elemzési hiba"
 msgid "Unknown Error in presence"
 msgstr "Ismeretlen hiba a jelenlétben"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Hiba a(z) %s csevegéshez csatlakozás közben"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Hiba a(z) %s csevegésben"
+
 msgid "Create New Room"
 msgstr "Új szoba létrehozása"
 
@@ -4795,16 +4685,20 @@ msgstr "Sz_oba beállítása"
 msgid "_Accept Defaults"
 msgstr "Alapértel_mezések elfogadása"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Hiba a(z) %s csevegéshez csatlakozás közben"
+#, fuzzy
+msgid "No reason"
+msgstr "Nincs ok megadva"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Hiba a(z) %s csevegésben"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "%s kirúgta Önt: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s kizárta (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Hiba történt a fájl megnyitása közben."
 
 #, fuzzy
@@ -5300,9 +5194,6 @@ msgstr ""
 "Az MSN használatához SSL támogatás szükséges. Telepítsen egy támogatott SSL "
 "könyvtárat."
 
-msgid "Failed to connect to server."
-msgstr "Nem sikerült a kiszolgálóhoz kapcsolódni."
-
 msgid "Error retrieving profile"
 msgstr "Hiba a profil letöltése közben"
 
@@ -5556,9 +5447,6 @@ msgstr "Az üzenet nem küldhető el, mivel ismeretlen kódolási hiba történt
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Az üzenet nem küldhető el, mivel ismeretlen hiba történt."
 
-msgid "Unable to connect"
-msgstr "Nem lehet kapcsolódni"
-
 msgid "Writing error"
 msgstr "Írási hiba"
 
@@ -5573,13 +5461,16 @@ msgstr ""
 "Kapcsolódási hiba a(z) %s kiszolgálótól:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "A protokollt nem támogatja a kiszolgáló."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Hiba a HTTP feldolgozása közben."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Bejelentkezett egy másik helyről."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5587,7 +5478,8 @@ msgstr ""
 "Az MSN kiszolgálók átmenetileg nem érhetők el. Kérem várjon és próbálja újra "
 "később."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Az MSN kiszolgálók átmenetileg leállnak."
 
 #, c-format
@@ -5600,9 +5492,6 @@ 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"
 
@@ -5701,6 +5590,9 @@ msgstr "MSN protokollbővítmény"
 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)"
@@ -5811,12 +5703,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Kapcsolatok felvétele a kiszolgálóról"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Kapcsolódva"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protokollhiba, %d. kód: %s"
@@ -5840,16 +5726,6 @@ msgstr "MySpaceIM hiba"
 msgid "Invalid input condition"
 msgstr "Érvénytelen bemeneti feltétel"
 
-msgid "Read buffer full (2)"
-msgstr "Az olvasási puffer megtelt (2)"
-
-msgid "Unparseable message"
-msgstr "Értelmezhetetlen üzenet"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Nem sikerült kapcsolódni a kiszolgálóhoz: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "A partner felvétele sikertelen"
 
@@ -5934,6 +5810,12 @@ msgstr "Barátok összesen"
 msgid "Client Version"
 msgstr "Kliensverzió"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM – A felhasználónév elérhető"
 
@@ -6193,9 +6075,9 @@ msgstr "A felhasználó kilépett, vagy Ön le van tiltva"
 msgid "Unknown error: 0x%X"
 msgstr "Ismeretlen hiba: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "A bejelentkezés sikertelen (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "%s felhasználó nem pingelhető"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6303,9 +6185,6 @@ msgstr "GroupWise konferencia %d"
 msgid "Authenticating..."
 msgstr "Hitelesítés…"
 
-msgid "Unable to connect to server."
-msgstr "Nem lehet a kiszolgálóhoz kapcsolódni."
-
 msgid "Waiting for response..."
 msgstr "Várakozás válaszra…"
 
@@ -6329,25 +6208,19 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Szeretne csatlakozni a társalgáshoz?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Ki lett jelentkeztetve, mivel bejelentkezett egy másik munkaállomásról."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "Úgy tűnik, %s kilépett, és nem kapta meg az utoljára küldött üzenetet."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Nem lehet kapcsolódni a kiszolgálóhoz. Kérem adja meg a kiszolgáló címét, "
 "amelyikhez kapcsolódni szeretne."
 
-msgid "Error. SSL support is not installed."
-msgstr "Hiba: az SSL támogatás nincs telepítve."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Ez a konferencia le lett zárva. További üzenetek már nem küldhetőek."
 
@@ -6386,10 +6259,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6398,18 +6268,8 @@ msgstr "Nem sikerült kapcsolódni a csevegőszobához"
 msgid "Invalid chat room name"
 msgstr "Érvénytelen csevegőszobanév"
 
-msgid "Server closed the connection."
-msgstr "A kiszolgáló lezárta a kapcsolatot."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Elveszett a kapcsolat a kiszolgálóhoz:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Érvénytelen adatok érkeztek a kapcsolaton a kiszolgálótól."
 
 #. *< type
@@ -6457,7 +6317,8 @@ msgstr "A távoli felhasználóhoz elveszett a kapcsolat:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Érvénytelen adatok érkeztek a kapcsolaton a távoli felhasználótól."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Nem hozható létre kapcsolat a távoli felhasználóval."
 
 msgid "Direct IM established"
@@ -6657,21 +6518,15 @@ msgstr "Figyelmeztetési szint"
 msgid "Buddy Comment"
 msgstr "Partnermegjegyzés"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Nem sikerült kapcsolódni a hitelesítési kiszolgálóhoz:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Nem sikerült kapcsolódni a BOS kiszolgálóhoz:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Nem lehet a kiszolgálóhoz kapcsolódni."
 
 msgid "Username sent"
 msgstr "Felhasználónév elküldve"
@@ -6683,11 +6538,11 @@ msgstr "Kapcsolat létrejött, süti elküldve"
 msgid "Finalizing connection"
 msgstr "Kapcsolódás befejezése"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Nem lehet belépni: Sikertelen a belépés %s néven, mert a felhasználónév "
 "érvénytelen. A felhasználóneveknek érvényes e-mail címnek kell lennie, vagy "
@@ -6703,28 +6558,22 @@ msgstr ""
 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."
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "A felhasználó nem létezik"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "A fiókja jelenleg fel van függesztve."
 
 #. service temporarily unavailable
@@ -6746,7 +6595,8 @@ 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 "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "A megadott SecurID kulcs érvénytelen."
 
 msgid "Enter SecurID"
@@ -6932,6 +6782,9 @@ msgstr "Kapcsolódva ezóta"
 msgid "Member Since"
 msgstr "Tagság kezdete"
 
+msgid "Capabilities"
+msgstr "Képességek"
+
 msgid "Profile"
 msgstr "Profil"
 
@@ -7113,9 +6966,9 @@ msgstr[1] ""
 msgid "Away message too long."
 msgstr "A távollét-üzenet túl hosszú."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7141,9 +6994,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Árvák"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "%s partnert nem lehet felvenni, mert túl sok partner van a partnerlistáján. "
@@ -7152,8 +7005,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(nincs név)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "A(z) %s partner ismeretlen ok miatt nem adható hozzá."
 
 #, c-format
@@ -7928,7 +7781,8 @@ msgstr "Kapcsolat-fenntartási időköz (mp)"
 msgid "Update interval (seconds)"
 msgstr "Frissítési időköz (mp)"
 
-msgid "Cannot decrypt server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "Nem fejthető vissza a kiszolgáló válasza"
 
 #, c-format
@@ -7953,9 +7807,6 @@ msgstr "Aktiválás szükséges"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Ismeretlen válaszkód bejelentkezéskor (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Nem fejthető vissza a kiszolgáló válasza"
-
 msgid "Requesting captcha"
 msgstr "Captcha kérése"
 
@@ -7989,29 +7840,18 @@ msgstr ""
 "Ismeretlen válaszkód bejelentkezéskor (0x%02X):\n"
 "%s"
 
-msgid "Unable to connect."
-msgstr "Nem lehet kapcsolódni."
-
 msgid "Socket error"
 msgstr "Foglalathiba"
 
-msgid "Unable to read from socket"
-msgstr "A foglalatból nem lehet olvasni"
-
-msgid "Write Error"
-msgstr "Írási hiba"
-
-msgid "Connection lost"
-msgstr "A kapcsolat elveszett"
-
 msgid "Getting server"
 msgstr "Kiszolgáló lekérdezése"
 
 msgid "Requesting token"
 msgstr "Jelsor kérése"
 
-msgid "Couldn't resolve host"
-msgstr "Nem sikerült a kiszolgáló feloldása"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Nem lehet a kiszolgálóhoz kapcsolódni."
 
 msgid "Invalid server or port"
 msgstr "Érvénytelen kiszolgáló vagy port"
@@ -8064,7 +7904,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "QQ Qun parancs"
 
-msgid "Could not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "Nem fejthető vissza a bejelentkezési válas"
 
 msgid "Unknown LOGIN CMD"
@@ -8084,9 +7925,6 @@ msgstr "Fájlküldés"
 msgid "%d canceled the transfer of %s"
 msgstr "%d megszakította a(z) %s átvitelét"
 
-msgid "Connection closed (writing)"
-msgstr "Kapcsolat lezárva (írás)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Csoport címe:</b> %s<br>"
@@ -8142,17 +7980,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime adminisztrátori bejelentés"
 
-msgid "Connection reset"
-msgstr "Kapcsolat visszaállítva"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Hiba a foglalatból olvasás közben: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Nem lehet a kiszolgálóhoz kapcsolódni"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Bejelentés a következőtől: %s"
@@ -8175,6 +8002,9 @@ msgstr "Hangszórók"
 msgid "Video Camera"
 msgstr "Videokamera"
 
+msgid "File Transfer"
+msgstr "Fájlátvitel"
+
 msgid "Supports"
 msgstr "Támogatja"
 
@@ -8998,6 +8828,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Hálózati statisztika"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping sikertelen"
 
@@ -9062,7 +8895,8 @@ msgstr "Nem támogatott típusú nyilvános kulcs"
 msgid "Disconnected by server"
 msgstr "A kiszolgáló bontotta a kapcsolatot"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Hiba a SILC kiszolgálóhoz kapcsolódás közben"
 
 msgid "Key Exchange failed"
@@ -9074,26 +8908,26 @@ msgstr ""
 "A leválasztott folyamat folytatása sikertelen. Kattintson az Újrakapcsolódás "
 "gombra egy új kapcsolat létrehozásához."
 
-msgid "Connection failed"
-msgstr "Kapcsolódás sikertelen"
-
 msgid "Performing key exchange"
 msgstr "Kulcscsere elvégzése"
 
-msgid "Unable to create connection"
-msgstr "Nem hozható létre kapcsolat"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Nem sikerült a SILC kulcspárt betölteni"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Kapcsolódás a SILC kiszolgálóhoz"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Nem sikerült a SILC kulcspárt betölteni"
+
 msgid "Out of memory"
 msgstr "Elfogyott a memória"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Nem lehet inicializálni a SILC protokollt"
 
 msgid "Error loading SILC key pair"
@@ -9402,7 +9236,8 @@ msgstr "Minden üzenet digitális aláírása és ellenőrzése"
 msgid "Creating SILC key pair..."
 msgstr "SILC kulcspár létrehozása…"
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Nem hozható létre SILC kulcspár\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9498,6 +9333,9 @@ msgstr "Rajzlap"
 msgid "No server statistics available"
 msgstr "Nincsenek elérhető kiszolgálóstatisztikák"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Hiba a SILC kiszolgálóhoz kapcsolódás közben"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Hiba: A verziók különböznek, kérem frissítse a kliensét"
@@ -9539,30 +9377,27 @@ msgstr "Hiba: Érvénytelen süti"
 msgid "Failure: Authentication failed"
 msgstr "Hiba: Hitelesítés sikertelen"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Nem lehet inicializálni a SILC kliens kapcsolatot"
 
 msgid "John Noname"
 msgstr "Névtelen"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Nem sikerült a SILC kulcspárt betölteni: %s"
 
-msgid "Could not write"
-msgstr "Nem sikerült az írás"
-
-msgid "Could not connect"
-msgstr "Nem sikerült kapcsolódni"
+msgid "Unable to create connection"
+msgstr "Nem hozható létre kapcsolat"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Ismeretlen kiszolgálóválasz."
 
-msgid "Could not create listen socket"
-msgstr "Nem sikerült létrehozni a figyelő foglalatot"
-
-msgid "Could not resolve hostname"
-msgstr "A gépnév nem oldható fel"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Nem lehet létrehozni foglalatot"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
@@ -9605,6 +9440,77 @@ msgstr "Felhasználó hitelesítése"
 msgid "Auth Domain"
 msgstr "Tartomány hitelesítése"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;szoba&gt;:  Csatlakozás csevegőszobához a Yahoo hálózatán"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Csatornák listázása a Yahoo hálózatán"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Kérés a felhasználóhoz egy firkálási folyamat indítására"
+
+msgid "Yahoo ID..."
+msgstr "Yahoo azonosító…"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo protokollbővítmény"
+
+msgid "Pager server"
+msgstr "Személyhívó kiszolgáló"
+
+msgid "Pager port"
+msgstr "Személyhívó Port"
+
+msgid "File transfer server"
+msgstr "Fájlátviteli kiszolgáló"
+
+msgid "File transfer port"
+msgstr "Fájlátviteli port"
+
+msgid "Chat room locale"
+msgstr "Csevegőszoba nyelve"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Konferencia- és csevegőszoba-meghívások figyelmen kívül hagyása"
+
+msgid "Chat room list URL"
+msgstr "Csevegőszobák listájának URL címe"
+
+msgid "Yahoo Chat server"
+msgstr "Yahoo csevegőkiszolgáló"
+
+msgid "Yahoo Chat port"
+msgstr "Yahoo csevegőport"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo azonosító…"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo protokollbővítmény"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9637,30 +9543,20 @@ msgstr "Partner felvétele megtagadva"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  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."
@@ -9704,39 +9600,34 @@ msgstr ""
 "Ismeretlen hibaszám: %d. A Yahoo! weboldalára bejelentkezve talán "
 "megoldhatja ezt a problémát."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Nem sikerült a(z) %s partner hozzáadása a(z) %s csoporthoz, a(z) %s fiókhoz "
 "tartozó kiszolgálóoldali listán."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Nem sikerült a partnert hozzáadni a kiszolgálóoldali listához"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hallható %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Váratlan HTTP válasz érkezett a kiszolgálótól."
 
-msgid "Connection problem"
-msgstr "Kapcsolathiba"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Elveszett a kapcsolat a következővel: %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Nem hozható létre kapcsolat a következővel: %s:\n"
+"Nem hozható létre kapcsolat a következő kiszolgálóval:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9799,73 +9690,15 @@ msgstr "Felhasználó csatlakoztatása csevegéshez…"
 msgid "Open Inbox"
 msgstr "Bejövő levelek megnyitása"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;szoba&gt;:  Csatlakozás csevegőszobához a Yahoo hálózatán"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Csatornák listázása a Yahoo hálózatán"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Kérés a felhasználóhoz egy firkálási folyamat indítására"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo azonosító…"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo protokollbővítmény"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japán"
-
-msgid "Pager server"
-msgstr "Személyhívó kiszolgáló"
-
-msgid "Japan Pager server"
-msgstr "Japán személyhívó kiszolgáló"
-
-msgid "Pager port"
-msgstr "Személyhívó Port"
-
-msgid "File transfer server"
-msgstr "Fájlátviteli kiszolgáló"
-
-msgid "Japan file transfer server"
-msgstr "Japán fájlátviteli kiszolgáló"
-
-msgid "File transfer port"
-msgstr "Fájlátviteli port"
-
-msgid "Chat room locale"
-msgstr "Csevegőszoba nyelve"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Konferencia- és csevegőszoba-meghívások figyelmen kívül hagyása"
-
-msgid "Chat room list URL"
-msgstr "Csevegőszobák listájának URL címe"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo csevegőkiszolgáló"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo csevegőport"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Firkálási kérés elküldve."
 
+msgid "Unable to connect."
+msgstr "Nem lehet kapcsolódni."
+
 msgid "Unable to establish file descriptor."
 msgstr "Nem lehet a fájlleírót létrehozni."
 
@@ -9873,6 +9706,9 @@ msgstr "Nem lehet a fájlleírót létrehozni."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s felajánlja egy %d fájlból álló csoport elküldését.\n"
 
+msgid "Write Error"
+msgstr "Írási hiba"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japán profil"
 
@@ -9990,23 +9826,19 @@ msgstr "Hangok"
 msgid "Webcams"
 msgstr "Webkamerák"
 
+msgid "Connection problem"
+msgstr "Kapcsolathiba"
+
 msgid "Unable to fetch room list."
 msgstr "Nem lehet letölteni a szobalistát."
 
 msgid "User Rooms"
 msgstr "Felhasználói szobák"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Kapcsolathiba a YCHT kiszolgálóval."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"A kapcsolat elveszett a kiszolgálóval\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10136,24 +9968,16 @@ msgstr "Tartomány"
 msgid "Exposure"
 msgstr "Exportálás"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Nem lehet létrehozni a foglalatot:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "A válasz nem dolgozható fel a HTTP proxytól: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "%d HTTP proxy kapcsolathiba"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "Hozzáférés megtagadva: a HTTP proxy kiszolgáló tiltja az alagutazást a(z) %"
 "d. porton."
@@ -10162,9 +9986,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr "Hiba %s feloldásakor"
 
-msgid "Could not resolve host name"
-msgstr "A gépnév nem oldható fel"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "%s figyelmének kérése…"
@@ -10366,14 +10187,6 @@ msgstr "Hiba %s írása közben: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "Nem lehet a következőhöz kapcsolódni: %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"A kiszolgáló megköveteli a TLS/SSL használatát a bejelentkezéshez, de ezek "
-"támogatása nem található."
-
 #, c-format
 msgid " - %s"
 msgstr " – %s"
@@ -10626,9 +10439,14 @@ msgstr "_Partnerfigyelmeztetés felvétele…"
 msgid "View _Log"
 msgstr "Nap_ló megtekintése"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Elrejtés, ha nem érhető el"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Megjelenítés, ha elérhető"
+
 msgid "_Alias..."
 msgstr "Ál_név…"
 
@@ -11132,6 +10950,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "%s felhasználóinformációinak módosítása"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Írja be a tanúsítványt birtokló gép nevét."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL kiszolgálók"
@@ -11179,7 +11001,8 @@ msgstr "Mellőzés"
 msgid "Get Away Message"
 msgstr "Távollét üzenet lekérdezése"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Utoljára ezt mondta"
 
 msgid "Unable to save icon file to disk."
@@ -12073,7 +11896,8 @@ msgstr "Hiperhivatkozások rajzolásához használt szín."
 msgid "Hyperlink visited color"
 msgstr "Meglátogatott hiperhivatkozás színe"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+#, fuzzy
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Meglátogatott (aktivált) hiperhivatkozások rajzolásához használt szín."
 
 msgid "Hyperlink prelight color"
@@ -12110,13 +11934,22 @@ msgstr "Műveletüzenet nevének rajzszíne."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Műveletüzenet névszíne suttogott üzenethez"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Műveletüzenet nevének rajzszíne."
+
 msgid "Whisper Message Name Color"
 msgstr "Suttogott üzenet névszíne"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Műveletüzenet nevének rajzszíne."
+
 msgid "Typing notification color"
 msgstr "Gépelésértesítés színe"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "A gépelésértesítés betűkészletének színe"
 
 msgid "Typing notification font"
@@ -12509,6 +12342,10 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "A „Kézi” böngészőparancsot választotta, de nem adott meg parancsot."
 
+#, fuzzy
+msgid "No message"
+msgstr "Ismeretlen üzenet"
+
 msgid "Open All Messages"
 msgstr "Összes üzenet megnyitása"
 
@@ -12526,10 +12363,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Levele érkezett!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Ismeretlen üzenet"
-
 msgid "The following plugins will be unloaded."
 msgstr "A következő bővítmények lesznek eltávolítva."
 
@@ -12745,8 +12578,9 @@ msgstr "_Rendszertálca-ikon megjelenítése:"
 msgid "On unread messages"
 msgstr "Olvasatlan üzenetek esetén"
 
-msgid "Conversation Window Hiding"
-msgstr "Társalgási ablak elrejtése"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "IM társalgási ablakok"
 
 msgid "_Hide new IM conversations:"
 msgstr "Új társal_gások elrejtése:"
@@ -12754,6 +12588,9 @@ msgstr "Új társal_gások elrejtése:"
 msgid "When away"
 msgstr "Ha távol vagyok"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Új társalgási ablakok _minimalizálása"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Lapok"
@@ -12812,9 +12649,6 @@ msgstr "Finom görgetés használata"
 msgid "F_lash window when IMs are received"
 msgstr "_Villanjon az ablak új üzenetek fogadásakor"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Új társalgási ablakok _minimalizálása"
-
 msgid "Minimum input area height in lines:"
 msgstr "Beviteli terület minimális magassága sorokban:"
 
@@ -12849,7 +12683,8 @@ msgstr "Nem indítható a böngészőkonfigurációs program."
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Például: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_IP cím automatikus felismerése"
 
 msgid "Public _IP:"
@@ -13219,21 +13054,6 @@ msgstr "Menté_s és használat"
 msgid "Status for %s"
 msgstr "%s állapota"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "Egyéni hangulatjel"
-
-msgid "More Data needed"
-msgstr "További adatok szükségesek"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Adja meg a hangulatjelhez társítandó billentyűparancsot."
-
 #, fuzzy, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
@@ -13241,12 +13061,12 @@ msgstr ""
 "Már létezik egyéni hangulatjel a kiválasztott billentyűparancshoz. Adjon meg "
 "másik billentyűparancsot."
 
+msgid "Custom Smiley"
+msgstr "Egyéni hangulatjel"
+
 msgid "Duplicate Shortcut"
 msgstr "Kettőzött billentyűparancs"
 
-msgid "Please select an image for the smiley."
-msgstr "Válassza ki a képet a hangulatjelhez."
-
 msgid "Edit Smiley"
 msgstr "Hangulatjel szerkesztése"
 
@@ -13360,9 +13180,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Az indítóikon nem küldhető el"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Egy asztali indítóikont húzott be. Valószínűleg az indítóikon által mutatott "
 "objektumot akarta elküldeni az indítóikon helyett."
@@ -13968,9 +13789,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Zenei üzenetküldő bővítmény együttműködő zeneszerzéshez."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "A zenei üzenetküldő bővítmény lehetővé teszi a párhuzamos munkát több "
 "felhasználó számára ugyanazon kotta valós idejű szerkesztésével."
@@ -14226,9 +14048,10 @@ msgid "Conversation Window Send Button."
 msgstr "Társalgási ablak küldés gombja."
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Egy Küldés gombot ad a társalgási ablak beviteli területéhez. Hasznos, ha "
 "nincs jelen fizikai billentyűzet."
@@ -14560,8 +14383,9 @@ msgstr "A windowsos Pidin beállításai"
 msgid "Options specific to Pidgin for Windows."
 msgstr "A windowsos Pidginre jellemző beállítások."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "A windowsos Pidginre jellemző beállításokat biztosít, mint például a "
 "partnerlista dokkolása."
@@ -14605,6 +14429,317 @@ msgstr ""
 "Ez a bővítmény XMPP kiszolgálókban vagy kliensekben végzett hibakereséshez "
 "hasznos."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Nem nyitható meg a foglalat"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Nem lehet figyelni a foglalatot"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "A foglalatot nem lehet olvasni"
+
+#~ msgid "Connection failed."
+#~ msgstr "A kapcsolódás meghiúsult."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "A kiszolgáló bontotta a kapcsolatot"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Nem sikerült létrehozni a foglalatot"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Nem sikerült kapcsolódni a kiszolgálóhoz"
+
+#~ msgid "Read error"
+#~ msgstr "Olvasási hiba"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nem hozható létre kapcsolat a következő kiszolgálóval:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Írási hiba"
+
+# fixme: innentől egy jó darabon xmpp protokollkiegészítések nevei vannak, lásd: http://www.xmpp.org/extensions/
+#~ msgid "Last Activity"
+#~ msgstr "Utolsó művelet"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Szolgáltatásfeltérképezési információk"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Szolgáltatásfeltérképezési elemek"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Kibővített kifejezéscímzés"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Többfelhasználós csevegés"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Többfelhasználós csevegés kibővített jelenlét-információi"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "Beágyazott bájtsorozat"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Eseti parancsok"
+
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub szolgáltatás"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5 bájtsorozat"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Külső adatok"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+# fixme: mi a rák ez?
+#~ msgid "In-Band Registration"
+#~ msgstr "Beágyazott regisztráció"
+
+#~ msgid "User Location"
+#~ msgstr "Felhasználó helye"
+
+#~ msgid "User Avatar"
+#~ msgstr "Felhasználói avatar"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Csevegésállapot-értesítések"
+
+#~ msgid "Software Version"
+#~ msgstr "Szoftververzió"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Adatátvitel kezdeményezése"
+
+#~ msgid "User Mood"
+#~ msgstr "Felhasználó hangulata"
+
+#~ msgid "User Activity"
+#~ msgstr "Felhasználói tevékenység"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Egyed képességei"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Titkosított munkamenet-egyeztetések"
+
+#~ msgid "User Tune"
+#~ msgstr "Hallgatott zene"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Partnerlista-elemek cseréje"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Elérhetőségi cím"
+
+#~ msgid "User Profile"
+#~ msgstr "Felhasználói profil"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Jingle hang"
+
+#~ msgid "User Nickname"
+#~ msgstr "Felhasználó beceneve"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle Raw UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Jingle videó"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Tértivevények"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Nyilvános kulcs közzététele"
+
+#~ msgid "User Chatting"
+#~ msgstr "Csevegőszobák"
+
+#~ msgid "User Browsing"
+#~ msgstr "Böngészett oldalak"
+
+#~ msgid "User Gaming"
+#~ msgstr "Játékok"
+
+#~ msgid "User Viewing"
+#~ msgstr "Videók"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Kifejezéstitkosítás"
+
+#~ msgid "Entity Time"
+#~ msgstr "Helyi idő"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Késleltetett kézbesítés"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Együttműködési adatobjektumok"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Fájllerakat és -megosztás"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "STUN szolgáltatásfeltérképezés a Jingle-höz"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Egyszerűsített titkosított munkamenet-egyeztetés"
+
+# fixme: idáig egy jó darabon xmpp protokollkiegészítések nevei voltak, lásd: http://www.xmpp.org/extensions/
+#~ msgid "Hop Check"
+#~ msgstr "Ugrásellenőrzés"
+
+#~ msgid "Read Error"
+#~ msgstr "Olvasási hiba"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Nem sikerült a kiszolgálóhoz kapcsolódni."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Az olvasási puffer megtelt (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Értelmezhetetlen üzenet"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Nem sikerült kapcsolódni a kiszolgálóhoz: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "A bejelentkezés sikertelen (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Ki lett jelentkeztetve, mivel bejelentkezett egy másik munkaállomásról."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Hiba: az SSL támogatás nincs telepítve."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Helytelen jelszó."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nem sikerült kapcsolódni a BOS kiszolgálóhoz:\n"
+#~ "%s"
+
+#~ 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 "Could Not Connect"
+#~ msgstr "Nem sikerült kapcsolódni"
+
+#~ msgid "Invalid username."
+#~ msgstr "Érvénytelen felhasználónév."
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Nem fejthető vissza a kiszolgáló válasza"
+
+#~ msgid "Connection lost"
+#~ msgstr "A kapcsolat elveszett"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Nem sikerült a kiszolgáló feloldása"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Kapcsolat lezárva (írás)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Kapcsolat visszaállítva"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Hiba a foglalatból olvasás közben: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Nem lehet a kiszolgálóhoz kapcsolódni"
+
+#~ msgid "Could not write"
+#~ msgstr "Nem sikerült az írás"
+
+#~ msgid "Could not connect"
+#~ msgstr "Nem sikerült kapcsolódni"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Nem sikerült létrehozni a figyelő foglalatot"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "A gépnév nem oldható fel"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Hibás jelszó"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nem hozható létre kapcsolat a következővel: %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japán"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Japán személyhívó kiszolgáló"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japán fájlátviteli kiszolgáló"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "A kapcsolat elveszett a kiszolgálóval\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "A gépnév nem oldható fel"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "A kiszolgáló megköveteli a TLS/SSL használatát a bejelentkezéshez, de "
+#~ "ezek támogatása nem található."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Társalgási ablak elrejtése"
+
+#~ msgid "More Data needed"
+#~ msgstr "További adatok szükségesek"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Adja meg a hangulatjelhez társítandó billentyűparancsot."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Válassza ki a képet a hangulatjelhez."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Melyik azonosítót aktiválja?"
 
diff --git a/po/hy.po b/po/hy.po
index 1d476d38b0..0920dd847e 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: am\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2009-05-20 17:37+0400\n"
 "Last-Translator: David Avsharyan <avsharyan@gmail.com>\n"
 "Language-Team: \n"
@@ -2436,7 +2436,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2484,7 +2484,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2724,11 +2724,11 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr ""
 
 msgid ""
@@ -2780,13 +2780,16 @@ msgstr ""
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-msgid "Cannot open socket"
+#, c-format
+msgid "Unable to create socket: %s"
 msgstr ""
 
-msgid "Could not bind socket to port"
+#, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr ""
 
-msgid "Could not listen on socket"
+#, c-format
+msgid "Unable to listen on socket: %s"
 msgstr ""
 
 msgid "Error communicating with local mDNSResponder."
@@ -2834,13 +2837,13 @@ msgstr ""
 msgid "Load buddylist from file..."
 msgstr ""
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
-msgid "Passwords do not match."
+msgid "Passwords do not match"
 msgstr ""
 
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr ""
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2852,13 +2855,13 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr ""
 
-msgid "Enter current token"
+msgid "Enter captcha text"
 msgstr ""
 
-msgid "Current token"
+msgid "Captcha"
 msgstr ""
 
 msgid "Register New Gadu-Gadu Account"
@@ -2912,6 +2915,15 @@ msgstr ""
 msgid "Current password"
 msgstr ""
 
+msgid "Password (retype)"
+msgstr ""
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
@@ -2959,7 +2971,7 @@ msgstr ""
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr ""
 
 msgid "Buddy list downloaded"
@@ -2974,7 +2986,13 @@ msgstr ""
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
-msgid "Connection failed."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr ""
+
+msgid "Connection failed"
 msgstr ""
 
 msgid "Add to chat"
@@ -2983,8 +3001,13 @@ msgstr ""
 msgid "Chat _name:"
 msgstr ""
 
-#. should this be a settings error?
-msgid "Unable to resolve server"
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr ""
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
 msgstr ""
 
 msgid "Chat error"
@@ -2993,8 +3016,9 @@ msgstr ""
 msgid "This chat name is already in use"
 msgstr ""
 
-msgid "Not connected to the server."
-msgstr ""
+#, fuzzy
+msgid "Not connected to the server"
+msgstr "Ստեղծել այս հաշիվը սերվերի վրա"
 
 msgid "Find buddies..."
 msgstr ""
@@ -3052,7 +3076,7 @@ msgstr ""
 msgid "File Transfer Failed"
 msgstr ""
 
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr ""
 
 msgid "Error displaying MOTD"
@@ -3068,7 +3092,15 @@ msgstr ""
 msgid "MOTD for %s"
 msgstr ""
 
-msgid "Server has disconnected"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
 msgstr ""
 
 msgid "View MOTD"
@@ -3083,21 +3115,19 @@ msgstr ""
 msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr ""
-
 msgid "SSL support unavailable"
 msgstr ""
 
-msgid "Couldn't create socket"
+msgid "Unable to connect"
 msgstr ""
 
-msgid "Couldn't connect to host"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
 msgstr ""
 
-msgid "Read error"
+#, c-format
+msgid "Server closed the connection"
 msgstr ""
 
 msgid "Users"
@@ -3483,10 +3513,10 @@ msgstr ""
 msgid "execute"
 msgstr ""
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3501,7 +3531,10 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
-msgid "Invalid response from server."
+msgid "SASL authentication failed"
+msgstr ""
+
+msgid "Invalid response from server"
 msgstr ""
 
 msgid "Server does not use any supported authentication method"
@@ -3513,7 +3546,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr ""
 
-msgid "SASL error"
+#, c-format
+msgid "SASL error: %s"
 msgstr ""
 
 msgid "The BOSH connection manager terminated your session."
@@ -3529,20 +3563,12 @@ msgid "Unable to establish a connection with the server"
 msgstr ""
 
 #, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 
 msgid "Unable to establish SSL connection"
 msgstr ""
 
-msgid "Unable to create socket"
-msgstr ""
-
-msgid "Write error"
-msgstr ""
-
 msgid "Full Name"
 msgstr ""
 
@@ -3610,159 +3636,6 @@ msgstr ""
 msgid "Local Time"
 msgstr ""
 
-msgid "Last Activity"
-msgstr ""
-
-msgid "Service Discovery Info"
-msgstr ""
-
-msgid "Service Discovery Items"
-msgstr ""
-
-msgid "Extended Stanza Addressing"
-msgstr ""
-
-msgid "Multi-User Chat"
-msgstr ""
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr ""
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr ""
-
-msgid "In-Band Registration"
-msgstr ""
-
-msgid "User Location"
-msgstr ""
-
-msgid "User Avatar"
-msgstr ""
-
-msgid "Chat State Notifications"
-msgstr ""
-
-msgid "Software Version"
-msgstr ""
-
-msgid "Stream Initiation"
-msgstr ""
-
-msgid "File Transfer"
-msgstr ""
-
-msgid "User Mood"
-msgstr ""
-
-msgid "User Activity"
-msgstr ""
-
-msgid "Entity Capabilities"
-msgstr ""
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-msgid "User Tune"
-msgstr ""
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-msgid "Reachability Address"
-msgstr ""
-
-msgid "User Profile"
-msgstr ""
-
-msgid "Jingle"
-msgstr ""
-
-msgid "Jingle Audio"
-msgstr ""
-
-msgid "User Nickname"
-msgstr ""
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr ""
-
-msgid "Jingle DTMF"
-msgstr ""
-
-msgid "Message Receipts"
-msgstr ""
-
-msgid "Public Key Publishing"
-msgstr ""
-
-msgid "User Chatting"
-msgstr ""
-
-msgid "User Browsing"
-msgstr ""
-
-msgid "User Gaming"
-msgstr ""
-
-msgid "User Viewing"
-msgstr ""
-
-msgid "Ping"
-msgstr ""
-
-msgid "Stanza Encryption"
-msgstr ""
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr ""
-
 msgid "Priority"
 msgstr ""
 
@@ -3773,7 +3646,7 @@ msgstr ""
 msgid "%s ago"
 msgstr ""
 
-msgid "Logged off"
+msgid "Logged Off"
 msgstr ""
 
 msgid "Middle Name"
@@ -3949,16 +3822,12 @@ msgstr ""
 msgid "Roles:"
 msgstr ""
 
-msgid "Ping timeout"
-msgstr ""
-
-msgid "Read Error"
+msgid "Ping timed out"
 msgstr ""
 
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4132,9 +4001,6 @@ msgstr ""
 msgid "Error changing password"
 msgstr ""
 
-msgid "Password (again)"
-msgstr ""
-
 msgid "Change XMPP Password"
 msgstr ""
 
@@ -4507,6 +4373,14 @@ msgstr ""
 msgid "Unknown Error in presence"
 msgstr ""
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr ""
+
+#, c-format
+msgid "Error in chat %s"
+msgstr ""
+
 msgid "Create New Room"
 msgstr ""
 
@@ -4521,15 +4395,18 @@ msgstr ""
 msgid "_Accept Defaults"
 msgstr ""
 
+msgid "No reason"
+msgstr ""
+
 #, c-format
-msgid "Error joining chat %s"
+msgid "You have been kicked: (%s)"
 msgstr ""
 
 #, c-format
-msgid "Error in chat %s"
+msgid "Kicked (%s)"
 msgstr ""
 
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr ""
 
 msgid "Transfer was closed."
@@ -5006,9 +4883,6 @@ msgstr ""
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-msgid "Failed to connect to server."
-msgstr ""
-
 msgid "Error retrieving profile"
 msgstr ""
 
@@ -5245,9 +5119,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 
-msgid "Unable to connect"
-msgstr ""
-
 msgid "Writing error"
 msgstr ""
 
@@ -5260,19 +5131,19 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Our protocol is not supported by the server."
+msgid "Our protocol is not supported by the server"
 msgstr ""
 
-msgid "Error parsing HTTP."
+msgid "Error parsing HTTP"
 msgstr ""
 
-msgid "You have signed on from another location."
+msgid "You have signed on from another location"
 msgstr ""
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr ""
 
 #, c-format
@@ -5283,9 +5154,6 @@ msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "Unknown error."
-msgstr ""
-
 msgid "Handshaking"
 msgstr ""
 
@@ -5380,6 +5248,9 @@ msgstr ""
 msgid "%s is not a valid group."
 msgstr ""
 
+msgid "Unknown error."
+msgstr ""
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr ""
@@ -5486,12 +5357,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr ""
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr ""
@@ -5512,16 +5377,6 @@ msgstr ""
 msgid "Invalid input condition"
 msgstr ""
 
-msgid "Read buffer full (2)"
-msgstr ""
-
-msgid "Unparseable message"
-msgstr ""
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr ""
-
 msgid "Failed to add buddy"
 msgstr ""
 
@@ -5603,6 +5458,12 @@ msgstr ""
 msgid "Client Version"
 msgstr ""
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr ""
 
@@ -5858,7 +5719,7 @@ msgid "Unknown error: 0x%X"
 msgstr ""
 
 #, c-format
-msgid "Login failed (%s)."
+msgid "Unable to login: %s"
 msgstr ""
 
 #, c-format
@@ -5957,9 +5818,6 @@ msgstr ""
 msgid "Authenticating..."
 msgstr ""
 
-msgid "Unable to connect to server."
-msgstr ""
-
 msgid "Waiting for response..."
 msgstr ""
 
@@ -5980,20 +5838,14 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr ""
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-
-msgid "Error. SSL support is not installed."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 
 msgid "This conference has been closed. No more messages can be sent."
@@ -6031,10 +5883,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr ""
 
-msgid "Incorrect password."
-msgstr ""
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6043,16 +5892,7 @@ msgstr ""
 msgid "Invalid chat room name"
 msgstr ""
 
-msgid "Server closed the connection."
-msgstr ""
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr ""
 
 #. *< type
@@ -6100,7 +5940,7 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr ""
 
 msgid "Direct IM established"
@@ -6293,15 +6133,11 @@ msgid "Buddy Comment"
 msgstr ""
 
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 
 #, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
 msgstr ""
 
 msgid "Username sent"
@@ -6316,9 +6152,9 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 
 #, c-format
@@ -6328,26 +6164,20 @@ 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."
+#. the username does not exist
+msgid "Username does not exist"
 msgstr ""
 
 #. Suspended account
-msgid "Your account is currently suspended."
+msgid "Your account is currently suspended"
 msgstr ""
 
 #. service temporarily unavailable
@@ -6364,7 +6194,7 @@ msgid ""
 "try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
-msgid "The SecurID key entered is invalid."
+msgid "The SecurID key entered is invalid"
 msgstr ""
 
 msgid "Enter SecurID"
@@ -6515,6 +6345,9 @@ msgstr ""
 msgid "Member Since"
 msgstr ""
 
+msgid "Capabilities"
+msgstr ""
+
 msgid "Profile"
 msgstr ""
 
@@ -6671,7 +6504,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6692,7 +6525,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
@@ -6700,7 +6533,7 @@ msgid "(no name)"
 msgstr ""
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr ""
 
 #, c-format
@@ -7449,7 +7282,7 @@ msgstr ""
 msgid "Update interval (seconds)"
 msgstr ""
 
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr ""
 
 #, c-format
@@ -7474,9 +7307,6 @@ msgstr ""
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
-msgid "Could not decrypt server reply"
-msgstr ""
-
 msgid "Requesting captcha"
 msgstr ""
 
@@ -7508,28 +7338,16 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr ""
-
 msgid "Socket error"
 msgstr ""
 
-msgid "Unable to read from socket"
-msgstr ""
-
-msgid "Write Error"
-msgstr ""
-
-msgid "Connection lost"
-msgstr ""
-
 msgid "Getting server"
 msgstr ""
 
 msgid "Requesting token"
 msgstr ""
 
-msgid "Couldn't resolve host"
+msgid "Unable to resolve hostname"
 msgstr ""
 
 msgid "Invalid server or port"
@@ -7575,7 +7393,7 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr ""
 
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr ""
 
 msgid "Unknown LOGIN CMD"
@@ -7595,9 +7413,6 @@ msgstr ""
 msgid "%d canceled the transfer of %s"
 msgstr ""
 
-msgid "Connection closed (writing)"
-msgstr ""
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr ""
@@ -7651,17 +7466,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-msgid "Connection reset"
-msgstr ""
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr ""
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr ""
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -7684,6 +7488,9 @@ msgstr ""
 msgid "Video Camera"
 msgstr ""
 
+msgid "File Transfer"
+msgstr ""
+
 msgid "Supports"
 msgstr ""
 
@@ -8439,6 +8246,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr ""
 
+msgid "Ping"
+msgstr ""
+
 msgid "Ping failed"
 msgstr ""
 
@@ -8496,7 +8306,7 @@ msgstr ""
 msgid "Disconnected by server"
 msgstr ""
 
-msgid "Error during connecting to SILC Server"
+msgid "Error connecting to SILC Server"
 msgstr ""
 
 msgid "Key Exchange failed"
@@ -8506,26 +8316,23 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-msgid "Connection failed"
-msgstr ""
-
 msgid "Performing key exchange"
 msgstr ""
 
-msgid "Unable to create connection"
-msgstr ""
-
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr ""
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr ""
 
+msgid "Unable to not load SILC key pair"
+msgstr ""
+
 msgid "Out of memory"
 msgstr ""
 
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr ""
 
 msgid "Error loading SILC key pair"
@@ -8802,7 +8609,7 @@ msgstr ""
 msgid "Creating SILC key pair..."
 msgstr ""
 
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr ""
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -8891,6 +8698,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr ""
 
+msgid "Error during connecting to SILC Server"
+msgstr ""
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -8931,29 +8741,23 @@ msgstr ""
 msgid "Failure: Authentication failed"
 msgstr ""
 
-msgid "Cannot initialize SILC Client connection"
+msgid "Unable to initialize SILC Client connection"
 msgstr ""
 
 msgid "John Noname"
 msgstr ""
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr ""
 
-msgid "Could not write"
-msgstr ""
-
-msgid "Could not connect"
-msgstr ""
-
-msgid "Unknown server response."
+msgid "Unable to create connection"
 msgstr ""
 
-msgid "Could not create listen socket"
+msgid "Unknown server response"
 msgstr ""
 
-msgid "Could not resolve hostname"
+msgid "Unable to create listen socket"
 msgstr ""
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -8995,6 +8799,74 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr ""
+
+msgid "list: List rooms on the Yahoo network"
+msgstr ""
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+msgid "Yahoo ID..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr ""
+
+msgid "Pager server"
+msgstr ""
+
+msgid "Pager port"
+msgstr ""
+
+msgid "File transfer server"
+msgstr ""
+
+msgid "File transfer port"
+msgstr ""
+
+msgid "Chat room locale"
+msgstr ""
+
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
+
+msgid "Chat room list URL"
+msgstr ""
+
+msgid "Yahoo Chat server"
+msgstr ""
+
+msgid "Yahoo Chat port"
+msgstr ""
+
+msgid "Yahoo JAPAN ID..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr ""
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9022,24 +8894,16 @@ msgstr ""
 msgid "Received invalid data"
 msgstr ""
 
-#. Password incorrect
-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
-msgid "Username does not exist"
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
 msgstr ""
 
 #. indicates a lock of some description
 msgid ""
-"Account locked: Unknown reason.\n"
-"Logging into the Yahoo! website may fix this."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 
 #. username or password missing
@@ -9073,32 +8937,25 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-msgid "Could not add buddy to server list"
+msgid "Unable to add buddy to server list"
 msgstr ""
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-msgid "Received unexpected HTTP response from server."
-msgstr ""
-
-msgid "Connection problem"
+msgid "Received unexpected HTTP response from server"
 msgstr ""
 
 #, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr ""
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
 
 msgid "Not at Home"
@@ -9161,73 +9018,15 @@ msgstr ""
 msgid "Open Inbox"
 msgstr ""
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-
-msgid "list: List rooms on the Yahoo network"
-msgstr ""
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-msgid "Yahoo ID..."
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr ""
-
-msgid "Yahoo Japan"
-msgstr ""
-
-msgid "Pager server"
-msgstr ""
-
-msgid "Japan Pager server"
-msgstr ""
-
-msgid "Pager port"
-msgstr ""
-
-msgid "File transfer server"
-msgstr ""
-
-msgid "Japan file transfer server"
-msgstr ""
-
-msgid "File transfer port"
-msgstr ""
-
-msgid "Chat room locale"
-msgstr ""
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-msgid "Chat room list URL"
-msgstr ""
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-msgid "Yahoo Chat port"
-msgstr ""
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr ""
+
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -9235,6 +9034,9 @@ msgstr ""
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr ""
 
+msgid "Write Error"
+msgstr ""
+
 msgid "Yahoo! Japan Profile"
 msgstr ""
 
@@ -9339,19 +9141,16 @@ msgstr ""
 msgid "Webcams"
 msgstr ""
 
-msgid "Unable to fetch room list."
+msgid "Connection problem"
 msgstr ""
 
-msgid "User Rooms"
+msgid "Unable to fetch room list."
 msgstr ""
 
-msgid "Connection problem with the YCHT server."
+msgid "User Rooms"
 msgstr ""
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
+msgid "Connection problem with the YCHT server"
 msgstr ""
 
 msgid ""
@@ -9470,13 +9269,7 @@ msgid "Exposure"
 msgstr ""
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
 
 #, c-format
@@ -9484,16 +9277,13 @@ msgid "HTTP proxy connection error %d"
 msgstr ""
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
 #, c-format
 msgid "Error resolving %s"
 msgstr ""
 
-msgid "Could not resolve host name"
-msgstr ""
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -9692,12 +9482,6 @@ msgid "Unable to connect to %s: %s"
 msgstr ""
 
 #, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-
-#, c-format
 msgid " - %s"
 msgstr ""
 
@@ -9927,7 +9711,10 @@ msgstr ""
 msgid "View _Log"
 msgstr ""
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr ""
+
+msgid "Show When Offline"
 msgstr ""
 
 msgid "_Alias..."
@@ -10403,6 +10190,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr ""
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr ""
@@ -10448,7 +10238,7 @@ msgstr ""
 msgid "Get Away Message"
 msgstr ""
 
-msgid "Last said"
+msgid "Last Said"
 msgstr ""
 
 msgid "Unable to save icon file to disk."
@@ -11304,7 +11094,7 @@ msgstr ""
 msgid "Hyperlink visited color"
 msgstr ""
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 
 msgid "Hyperlink prelight color"
@@ -11340,13 +11130,19 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 msgid "Typing notification color"
 msgstr ""
 
-msgid "The color to use for the typing notification font"
+msgid "The color to use for the typing notification"
 msgstr ""
 
 msgid "Typing notification font"
@@ -11681,6 +11477,9 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
+msgid "No message"
+msgstr ""
+
 msgid "Open All Messages"
 msgstr ""
 
@@ -11696,9 +11495,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr ""
 
-msgid "No message"
-msgstr ""
-
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -11903,7 +11699,7 @@ msgstr ""
 msgid "On unread messages"
 msgstr ""
 
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr ""
 
 msgid "_Hide new IM conversations:"
@@ -11912,6 +11708,9 @@ msgstr ""
 msgid "When away"
 msgstr ""
 
+msgid "Minimi_ze new conversation windows"
+msgstr ""
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -11970,9 +11769,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr ""
 
-msgid "Minimi_ze new conversation windows"
-msgstr ""
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12005,7 +11801,8 @@ msgstr ""
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-msgid "_Autodetect IP address"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr ""
 
 msgid "Public _IP:"
@@ -12367,30 +12164,15 @@ msgstr ""
 msgid "Status for %s"
 msgstr ""
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr ""
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
-msgid "Duplicate Shortcut"
+msgid "Custom Smiley"
 msgstr ""
 
-msgid "Please select an image for the smiley."
+msgid "Duplicate Shortcut"
 msgstr ""
 
 msgid "Edit Smiley"
@@ -12495,8 +12277,8 @@ msgid "Cannot send launcher"
 msgstr ""
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -13048,7 +12830,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -13290,7 +13072,7 @@ msgstr ""
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -13592,7 +13374,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr ""
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 
 msgid "<font color='#777777'>Logged out.</font>"
diff --git a/po/id.po b/po/id.po
index ef4416b94f..bb3f65f048 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.2.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2007-10-28 02:39+0800\n"
 "Last-Translator: Rai S. Regawa <raireg@yahoo.com>\n"
 "Language-Team: Rai S. Regawa <raireg@yahoo.com>\n"
@@ -2616,9 +2616,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Menyertakan log klien PI lainnya dalam penglihat log."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2674,8 +2675,9 @@ msgstr "Pesan Emulasi Offline"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Simpan pesan-pesan yang dikrim ke pengguan offline sebagai tos."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Pesan-pesan selebihnya akan disimpan sebagai tos. Anda dapat merubah/"
@@ -2926,11 +2928,12 @@ msgstr ""
 "plugin TCL, instal ActiveTCL dari http://www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Tidak dapat mendengarkan sambungan masuk PI\n"
 
 msgid ""
@@ -2983,14 +2986,21 @@ msgstr "%s telah menutup percakapan."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Tidak dapat mengirim pesan: percakapan tidak dapat dimulai."
 
-msgid "Cannot open socket"
-msgstr "Tidak dapat membuka soket"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Tidak dapat membuat soket:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Tidak dapat mengikat soket ke port"
 
-msgid "Could not listen on socket"
-msgstr "Tidak dapat mendengar pada soket"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Tidak dapat membuat soket:\n"
+"%s"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3040,13 +3050,16 @@ msgstr "Simpan daftar teman..."
 msgid "Load buddylist from file..."
 msgstr "Muat daftar teman dari file..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Isi bagian-dalam dalam pendaftaran."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Kata sandi tidak sama."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Tidak dapat mendaftarkan akun baru. Kesalahan terjadi.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3058,14 +3071,15 @@ msgstr "Pendaftaran selesai dengan sukses!"
 msgid "Password"
 msgstr "Kata sandi"
 
-msgid "Password (retype)"
-msgstr "Kata sandi (ketik ulang)"
+msgid "Password (again)"
+msgstr "Kata Sandi (lagi)"
 
-msgid "Enter current token"
-msgstr "Masukkan token sekarang"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Token sekarang"
+#, fuzzy
+msgid "Captcha"
+msgstr "Simpan Gambar"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Daftarkan Akun Gadu-Gadu Baru"
@@ -3118,6 +3132,15 @@ msgstr "Kata sandi diganti dengan sukses!"
 msgid "Current password"
 msgstr "Kata sandi sekarang"
 
+msgid "Password (retype)"
+msgstr "Kata sandi (ketik ulang)"
+
+msgid "Enter current token"
+msgstr "Masukkan token sekarang"
+
+msgid "Current token"
+msgstr "Token sekarang"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 "Mohon masukkan kata sandi anda sekarang dan kata sandi baru untuk UIN: "
@@ -3166,8 +3189,8 @@ msgstr "Pengguna yang sesuai tidak ditemukan"
 msgid "There are no users matching your search criteria."
 msgstr "Tidak terdapat pengguna yang sesuai dengan kriteria pencarian anda."
 
-msgid "Unable to read socket"
-msgstr "Tidak dapat membaca soket"
+msgid "Unable to read from socket"
+msgstr "Tidak dapat membaca dari soket"
 
 msgid "Buddy list downloaded"
 msgstr "Daftar teman terdownload"
@@ -3181,8 +3204,14 @@ msgstr "Daftar teman diupload"
 msgid "Your buddy list was stored on the server."
 msgstr "Daftar teman anda telah disimpan pada server."
 
-msgid "Connection failed."
-msgstr "Sambungan gagal."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Tersambung"
+
+msgid "Connection failed"
+msgstr "Sambungan gagal"
 
 msgid "Add to chat"
 msgstr "Tambahkan ke percakapan"
@@ -3190,18 +3219,23 @@ msgstr "Tambahkan ke percakapan"
 msgid "Chat _name:"
 msgstr "_Nama percakapan:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Tidak dapat menyambung ke server."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Menyambungkan"
+
 msgid "Chat error"
 msgstr "Kesalahan percakapan"
 
 msgid "This chat name is already in use"
 msgstr "Nama percakapan ini telah digunakan"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Tidak tersambung ke server."
 
 msgid "Find buddies..."
@@ -3261,7 +3295,8 @@ msgstr "Tidak ada topik terpasang"
 msgid "File Transfer Failed"
 msgstr "Transfer File Gagal"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Tidak dapat membuka port pendengar."
 
 msgid "Error displaying MOTD"
@@ -3277,8 +3312,18 @@ msgstr "Tidak terdapat MOTD yang berasosiasi dengan sambungan ini."
 msgid "MOTD for %s"
 msgstr "MOTD untuk %s"
 
-msgid "Server has disconnected"
-msgstr "Server telah memutuskan sambungan"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Kehilangan sambungan dengan server:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Lihat MOTD"
@@ -3293,22 +3338,20 @@ msgstr "_Kata sandi:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "Nama panggilan IRC tidak dapat mengandung sepasi"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Menyambungkan"
-
 msgid "SSL support unavailable"
 msgstr "Dukungan SSL tidak tersedia"
 
-msgid "Couldn't create socket"
-msgstr "Tidak dapat menciptakan soket"
+msgid "Unable to connect"
+msgstr "Tidak dapat tersambung"
 
-msgid "Couldn't connect to host"
-msgstr "Tidak dapat tersambung ke host"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Tidak dapat menyambung ke %s"
 
-msgid "Read error"
-msgstr "Kesalahan baca"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Server menutup sambungan."
 
 msgid "Users"
 msgstr "Pengguna"
@@ -3744,12 +3787,13 @@ msgstr "Perintah Ad-Hoc Gagal"
 msgid "execute"
 msgstr "laksanakan"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "Server memerlukan TLS/SSL untuk login.  Dukungan TLS/SSL tidak ditemukan."
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "Server memerlukan TLS/SSL untuk login.  Dukungan TLS/SSL tidak ditemukan."
 
@@ -3769,7 +3813,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Otentifikasi Teks biasa"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Otentikasi gagal"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Respon tidak valid dari server"
 
 msgid "Server does not use any supported authentication method"
@@ -3781,7 +3830,8 @@ msgstr "Anda memerlukan enkripsi, tetapi tidak tersedia pada server ini."
 msgid "Invalid challenge from server"
 msgstr "Tantangan tidak valid dari server"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "kesalahan SASL"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3801,10 +3851,8 @@ msgstr ""
 "Tidak dapat membuat sambungan dengan server:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Tidak dapat membuat sambungan dengan server:\n"
 "%s"
@@ -3813,12 +3861,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "Tidak dapat menginisialisasi sambungan"
 
-msgid "Unable to create socket"
-msgstr "Tidak dapat menciptakan soket"
-
-msgid "Write error"
-msgstr "Kesalahan penulisan"
-
 msgid "Full Name"
 msgstr "Nama Lengkap"
 
@@ -3889,159 +3931,6 @@ msgstr "Sistem Operasi"
 msgid "Local Time"
 msgstr "File Lokal:"
 
-msgid "Last Activity"
-msgstr "Aktifitas Terakhir"
-
-msgid "Service Discovery Info"
-msgstr "Layani Info Temuan"
-
-msgid "Service Discovery Items"
-msgstr "Layani Item Temuan"
-
-msgid "Extended Stanza Addressing"
-msgstr "Alamat Stanza Lengkap"
-
-msgid "Multi-User Chat"
-msgstr "Percakapan Banyak-Pengguna"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Informasi Lengkap Kehadiran Percakpan Banyak-Pengguna"
-
-msgid "In-Band Bytestreams"
-msgstr "Arus byte Dalam-Pita"
-
-msgid "Ad-Hoc Commands"
-msgstr "Perintah Ad-Hoc"
-
-msgid "PubSub Service"
-msgstr "Layanan PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "Arus byte SOCKS5"
-
-msgid "Out of Band Data"
-msgstr "Kehabisan Pita Data"
-
-msgid "XHTML-IM"
-msgstr "PI-XHTML"
-
-msgid "In-Band Registration"
-msgstr "Pendaftaran Dalam-Pita"
-
-msgid "User Location"
-msgstr "Lokasi Pengguna"
-
-msgid "User Avatar"
-msgstr "Avatar Pengguna"
-
-msgid "Chat State Notifications"
-msgstr "Pemberitahuan Keadaan Percakapan"
-
-msgid "Software Version"
-msgstr "Versi Piranti Lunak"
-
-msgid "Stream Initiation"
-msgstr "Inisasi Arus"
-
-msgid "File Transfer"
-msgstr "Transfer File"
-
-msgid "User Mood"
-msgstr "Mood Pengguna"
-
-msgid "User Activity"
-msgstr "Aktifitas Pengguna"
-
-msgid "Entity Capabilities"
-msgstr "Kemampuan Entitas"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Sesi Negosiasi Terenkripsi"
-
-msgid "User Tune"
-msgstr "Musik Pengguna"
-
-msgid "Roster Item Exchange"
-msgstr "Daftar Item Pertukaran"
-
-msgid "Reachability Address"
-msgstr "Alamat Tetap"
-
-msgid "User Profile"
-msgstr "Profil Pengguna"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Audio Jingle"
-
-msgid "User Nickname"
-msgstr "Nama Panggilan Pengguna"
-
-msgid "Jingle ICE UDP"
-msgstr "ICE UDP Jingle"
-
-msgid "Jingle ICE TCP"
-msgstr "ICE TCP Jingle"
-
-msgid "Jingle Raw UDP"
-msgstr "Raw UDP Jingle"
-
-msgid "Jingle Video"
-msgstr "Video Jingle"
-
-msgid "Jingle DTMF"
-msgstr "DTMF Jingle"
-
-msgid "Message Receipts"
-msgstr "Tanda Terima Pesan"
-
-msgid "Public Key Publishing"
-msgstr "Penerbitan Kunci Publik"
-
-msgid "User Chatting"
-msgstr "Percakapan Pengguna"
-
-msgid "User Browsing"
-msgstr "Browsing Pengguna"
-
-msgid "User Gaming"
-msgstr "Permainan Pengguna"
-
-msgid "User Viewing"
-msgstr "Pandangan Pengguna"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Enkripsi Stanza"
-
-msgid "Entity Time"
-msgstr "Waktu Entitas"
-
-msgid "Delayed Delivery"
-msgstr "Pengiriman Tertunda"
-
-msgid "Collaborative Data Objects"
-msgstr "Obyek Data Kolaboratif"
-
-msgid "File Repository and Sharing"
-msgstr "Repoistory dan Sharing File"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "Temuan Layanan STUN untuk Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Negosiasi Sesi Enkripsi yang Disederhanakan"
-
-msgid "Hop Check"
-msgstr "Pemeriksaan Hop"
-
-msgid "Capabilities"
-msgstr "Kemampuan"
-
 msgid "Priority"
 msgstr "Prioritas"
 
@@ -4053,7 +3942,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Terlogin"
 
 msgid "Middle Name"
@@ -4237,16 +4126,12 @@ msgid "Roles:"
 msgstr "Peranan"
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "Teks biasa"
 
-msgid "Read Error"
-msgstr "Kesalahan Baca"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4424,9 +4309,6 @@ msgstr "Kata sandi anda telah diganti."
 msgid "Error changing password"
 msgstr "Kesalahan penggantian kata sandi"
 
-msgid "Password (again)"
-msgstr "Kata Sandi (lagi)"
-
 msgid "Change XMPP Password"
 msgstr "Rubah Kata Sandi XMPP"
 
@@ -4814,6 +4696,14 @@ msgstr "Kesalahan Parse XML"
 msgid "Unknown Error in presence"
 msgstr "Kesalahan tidak dikenal hadir"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Kesalahan bergabung percakapan %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Kesalahan dalam percakapan %s"
+
 msgid "Create New Room"
 msgstr "Buat Kamar Baru"
 
@@ -4830,16 +4720,20 @@ msgstr "_Konfigurasi Kamar"
 msgid "_Accept Defaults"
 msgstr "_Terima Standar"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Kesalahan bergabung percakapan %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Tidak diberikan alasan."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Kesalahan dalam percakapan %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Anda telah ditendang oleh %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Ditendang oleh %s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Kesalahan terjadi ketika membuka file."
 
 #, fuzzy
@@ -5345,9 +5239,6 @@ msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "Dukungan SSL diperlukan untuk MSN. Mohon instal pustaka SSL yang didukung. "
 
-msgid "Failed to connect to server."
-msgstr "Gagal tersambung ke server."
-
 msgid "Error retrieving profile"
 msgstr "Kesalahan pemanggilan profil"
 
@@ -5605,9 +5496,6 @@ msgstr "Pesan mungkin tidak terkirim karena kesalahan tidak dikenal terjadi:"
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Pesan mungkin tidak terkirim karena kesalahan tidak dikenal terjadi:"
 
-msgid "Unable to connect"
-msgstr "Tidak dapat tersambung"
-
 msgid "Writing error"
 msgstr "Kesalahan penulisan"
 
@@ -5622,20 +5510,24 @@ msgstr ""
 "Kesalahan sambungan dari server %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Protokol kami tidak didukung oleh server."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Kesalahan parsing HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Anda telah bergabung dari lokasi yang berbeda."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Server-server MSN sementara tidak tersedia. Mohon tunggu dan coba lagi."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Server-server MSN akan sementara mati."
 
 #, c-format
@@ -5647,9 +5539,6 @@ msgid ""
 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"
 
@@ -5750,6 +5639,9 @@ msgstr "Plugin Protokol AIM"
 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)"
@@ -5864,12 +5756,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Tambahkan kontak dari server"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Tersambung"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Kesalahan protokol, kode %d: %s"
@@ -5891,17 +5777,6 @@ msgstr "Kesalahan MySpaceIM"
 msgid "Invalid input condition"
 msgstr "Kondisi input tidak valid"
 
-#, fuzzy
-msgid "Read buffer full (2)"
-msgstr "Buffer baca penuh"
-
-msgid "Unparseable message"
-msgstr "Pesan yang tidak dapat dipecah"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Tidak dapat tersambung ke host: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Gagal menambahkan teman"
 
@@ -5986,6 +5861,15 @@ msgid "Client Version"
 msgstr "Versi Klien"
 
 #, fuzzy
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"Mohon kunjungi http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"nama pengguna dan pilih nama pengguna dan coba login kembali."
+
+#, fuzzy
 msgid "MySpaceIM - Username Available"
 msgstr "Layanan Tidak Tersedia"
 
@@ -6249,9 +6133,9 @@ msgstr "Pengguna sedang offline atau anda diblokir"
 msgid "Unknown error: 0x%X"
 msgstr "Kesalahan tidak dikenal: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Login gagal (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Tidak dapat mem-ping pengguna %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6356,9 +6240,6 @@ msgstr "Konferensi GroupWise %d"
 msgid "Authenticating..."
 msgstr "Mengotentikasi..."
 
-msgid "Unable to connect to server."
-msgstr "Tidak dapat menyambung ke server."
-
 msgid "Waiting for response..."
 msgstr "Menunggu tanggapan..."
 
@@ -6382,25 +6263,20 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Apakah anda ingin bergabung ke percakapan?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Anda telah terlogout karena anda login pada komputer yang lain."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 "%s tampaknya offline dan tidak menerima pesan yang baru saja anda kirim."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Tidak dapat menyambung ke server. Mohon masukkan alamat server ke mana anda "
 "ingin menyambung."
 
-msgid "Error. SSL support is not installed."
-msgstr "Kesalahan: dukungan SSL tidak terinstal."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Konferensi ini ditutup. Tidak ada pesan yang dapat dikirim."
 
@@ -6440,10 +6316,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, fuzzy
@@ -6454,18 +6327,8 @@ msgstr "Tidak dapat menyambung"
 msgid "Invalid chat room name"
 msgstr "Nama Kamar Tidak Valid"
 
-msgid "Server closed the connection."
-msgstr "Server menutup sambungan."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Kehilangan sambungan dengan server:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Menerima data tidak valid pada sambungan dengan server."
 
 #. *< type
@@ -6513,7 +6376,8 @@ msgstr "Kehilangan sambungan dengan pengguna terpisah:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Menerima data tidak valid pada sambungan dengan pengguna terpisah."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Tidak dapat melakukan sambungan dengan pengguna terpisah."
 
 msgid "Direct IM established"
@@ -6712,21 +6576,15 @@ msgstr "Tingkat Peringatan"
 msgid "Buddy Comment"
 msgstr "Komentar Teman"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Tidak dapat tersambung ke server otentikasi:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Tidak dapat tersambung ke server BOS:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Tidak dapat menyambung ke server OIM"
 
 #, fuzzy
 msgid "Username sent"
@@ -6741,9 +6599,9 @@ msgstr "Memfinalkan sambungan"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Tidak dapat login: Tidak dapat gabung sebagai %s karena nama layar tidak "
 "valid.  Nama layar harus merupakan email yang valid, atau dimulai dengan "
@@ -6757,27 +6615,22 @@ 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
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "Nama tidak valid"
+msgid "Username does not exist"
+msgstr "Pengguna tidak pernah ada"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Akun anda sementara ditahan."
 
 #. service temporarily unavailable
@@ -6799,7 +6652,8 @@ msgstr ""
 "dan coba lagi. Apabila anda meneruskan mencoba, anda akan harus menuggu "
 "lebih lama"
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Kunci SecurID yang dimasukkan tidak valid."
 
 msgid "Enter SecurID"
@@ -6971,6 +6825,9 @@ msgstr "Online Sejak"
 msgid "Member Since"
 msgstr "Anggota Sejak"
 
+msgid "Capabilities"
+msgstr "Kemampuan"
+
 msgid "Profile"
 msgstr "Profil"
 
@@ -7154,7 +7011,7 @@ msgstr "Pesan menjauh terlalu panjang."
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7181,9 +7038,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Yatim Piatu"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Tidak dapat menambahkan teman %s karena anda memiliki terlalu banyak teman "
@@ -7192,8 +7049,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(tanpa nama)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Tidak dapat menambahkan teman %s karena alasan yang tidak jelas."
 
 #, fuzzy, c-format
@@ -8041,7 +7898,7 @@ msgid "Update interval (seconds)"
 msgstr "Pertahankan kesalahan"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Tidak bisa mendapatkan informasi server"
 
 #, c-format
@@ -8068,10 +7925,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Tidak bisa mendapatkan informasi server"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "Memohon perhatian %s ..."
 
@@ -8109,21 +7962,9 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "Tidak dapat menyambung."
-
 msgid "Socket error"
 msgstr "Kesalahan Soket"
 
-msgid "Unable to read from socket"
-msgstr "Tidak dapat membaca dari soket"
-
-msgid "Write Error"
-msgstr "Kesalahan Penulisan"
-
-msgid "Connection lost"
-msgstr "Sambungan putus"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "Atur Info Pengguna..."
@@ -8132,8 +7973,9 @@ msgstr "Atur Info Pengguna..."
 msgid "Requesting token"
 msgstr "Permintaan ditolak"
 
-msgid "Couldn't resolve host"
-msgstr "Tidak dapat me-resolve host"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Tidak dapat menyambung ke server."
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8184,7 +8026,7 @@ msgid "QQ Qun Command"
 msgstr "Perintah"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Tidak bisa mendapatkan informasi server"
 
 #, fuzzy
@@ -8206,9 +8048,6 @@ msgstr "File Terkirim"
 msgid "%d canceled the transfer of %s"
 msgstr "%d membatalkan trasnfer dari %s"
 
-msgid "Connection closed (writing)"
-msgstr "Sambugan tertutup (menulis)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Judul Kelompok:</b> %s<br>"
@@ -8263,17 +8102,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Pemberitahuan Administrator Sametime"
 
-msgid "Connection reset"
-msgstr "Sambungan di-reset"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Kesalahan membaca dari soket: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Tidak dapat menyambung ke host"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Pengumuman dari %s"
@@ -8296,6 +8124,9 @@ msgstr "Pengeras Suara"
 msgid "Video Camera"
 msgstr "Kamera Video"
 
+msgid "File Transfer"
+msgstr "Transfer File"
+
 msgid "Supports"
 msgstr "Dukungan-dukungan"
 
@@ -9115,6 +8946,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Statistik Jaringan"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping gagal"
 
@@ -9178,7 +9012,8 @@ msgstr "Jenis kunci publik tidak didukung"
 msgid "Disconnected by server"
 msgstr "Diputuskan oleh server"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Kesalahan selama menyambung ke Server SILC"
 
 msgid "Key Exchange failed"
@@ -9190,26 +9025,26 @@ msgstr ""
 "Meneruskan melepas sesi gagal. Tekan Sambung Kembali untuk membuat sambugan "
 "baru"
 
-msgid "Connection failed"
-msgstr "Sambungan gagal"
-
 msgid "Performing key exchange"
 msgstr "Melakukan pertukaran kunci"
 
-msgid "Unable to create connection"
-msgstr "Tidak dapat membuat sambungan"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Tidak dapat memuat pasangan kunci SILC"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Menyambung ke Server SILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Tidak dapat memuat pasangan kunci SILC"
+
 msgid "Out of memory"
 msgstr "Kehabisan memori"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Tidak dapat menginisialisasi protokol SILC"
 
 msgid "Error loading SILC key pair"
@@ -9502,7 +9337,8 @@ msgstr "Verifikasi dan tanda tangani semua pesan secara digital"
 msgid "Creating SILC key pair..."
 msgstr "Membuat pasangan kunci SILC..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Tidak dapat membuat pasangan kunci SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9598,6 +9434,9 @@ msgstr "Papan tulis"
 msgid "No server statistics available"
 msgstr "Statistik server tidak tersedia"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Kesalahan selama menyambung ke Server SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Kegagalan: Versi tidak cocok, perbaharui klien anda"
@@ -9639,30 +9478,27 @@ msgstr "Kegagalan: Cookie tidak valid"
 msgid "Failure: Authentication failed"
 msgstr "Kegagalan: Otentikasi gagal"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Tidak dapat menginisialisasi sambungan Klien SILC"
 
 msgid "John Noname"
 msgstr "John Tanpa nama"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Tidak dapat memuat pasangan kunci SILC: %s"
 
-msgid "Could not write"
-msgstr "Tidak dapat menulis"
-
-msgid "Could not connect"
-msgstr "Tidak dapat menyambung"
+msgid "Unable to create connection"
+msgstr "Tidak dapat membuat sambungan"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Respon server tidak dikenal."
 
-msgid "Could not create listen socket"
-msgstr "Tidak dapat membuat soket pendengar"
-
-msgid "Could not resolve hostname"
-msgstr "Tidak dapat me-resolve nama host"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Tidak dapat menciptakan soket"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -9705,6 +9541,78 @@ msgstr "Otorisasi Pengguna"
 msgid "Auth Domain"
 msgstr "Otorisasi Domain"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;room&gt;:  Gabung kamar percakapan pada jaringan Yahoo"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "daftar:  Daftar kamar pada jaringan Yahoo"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Minta pengguna untuk memulasi sesi Doodle"
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "ID Yahoo!"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Protokol Plugin Yahoo"
+
+msgid "Pager server"
+msgstr "Server Penyeranta"
+
+msgid "Pager port"
+msgstr "Port Penyeranta"
+
+msgid "File transfer server"
+msgstr "Server transfer file"
+
+msgid "File transfer port"
+msgstr "Port Transfer File"
+
+msgid "Chat room locale"
+msgstr "Kamar Pengguna Lokal"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Abaikan undangan konferensi dan kamar percakapan"
+
+msgid "Chat room list URL"
+msgstr "Daftar URL kamar percakapan"
+
+msgid "Yahoo Chat server"
+msgstr "Server Percakapan Yahoo"
+
+msgid "Yahoo Chat port"
+msgstr "Port Percakapan Yahoo"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "ID Yahoo!"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Protokol Plugin Yahoo"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9737,30 +9645,20 @@ msgstr "Penambahan teman ditolak"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 "Kesalahan nomor tidak dikenal %d. Login ke situs Yahoo! dapat memperbaiki "
 "ini."
@@ -9803,39 +9701,34 @@ msgstr ""
 "Kesalahan nomor tidak dikenal %d. Login ke situs Yahoo! dapat memperbaiki "
 "ini."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Tidak dapat menambahkan teman %s ke kelompok %s pada daftar server atas akun "
 "%s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Tidak dapat menambahkan teman ke daftar server"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ %s/%s/%s.swf dengan suara ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Menerima respon HTTP tidak terduga dari server."
 
-msgid "Connection problem"
-msgstr "Masalah sambungan"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Kehilangan sambungan dengan %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Tidak dapat membuat sambungan dengan %s:\n"
+"Tidak dapat membuat sambungan dengan server:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9898,74 +9791,15 @@ msgstr "Gabung Pengguna dalam Percakapan..."
 msgid "Open Inbox"
 msgstr "Buka Inbox"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;room&gt;:  Gabung kamar percakapan pada jaringan Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "daftar:  Daftar kamar pada jaringan Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Minta pengguna untuk memulasi sesi Doodle"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "ID Yahoo!"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Protokol Plugin Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Jepang"
-
-msgid "Pager server"
-msgstr "Server Penyeranta"
-
-msgid "Japan Pager server"
-msgstr "Server Penyeranta Jepang"
-
-msgid "Pager port"
-msgstr "Port Penyeranta"
-
-msgid "File transfer server"
-msgstr "Server transfer file"
-
-msgid "Japan file transfer server"
-msgstr "Server Transfer File Jepang"
-
-msgid "File transfer port"
-msgstr "Port Transfer File"
-
-msgid "Chat room locale"
-msgstr "Kamar Pengguna Lokal"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Abaikan undangan konferensi dan kamar percakapan"
-
-msgid "Chat room list URL"
-msgstr "Daftar URL kamar percakapan"
-
-msgid "Yahoo Chat server"
-msgstr "Server Percakapan Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "Port Percakapan Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Mengirim permohonan Doodle."
 
+msgid "Unable to connect."
+msgstr "Tidak dapat menyambung."
+
 msgid "Unable to establish file descriptor."
 msgstr "Gagal menetapkan deskriptor file."
 
@@ -9973,6 +9807,9 @@ msgstr "Gagal menetapkan deskriptor file."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s menawarkan untuk mengirim file %s"
 
+msgid "Write Error"
+msgstr "Kesalahan Penulisan"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Profil Yahoo! Jepang"
 
@@ -10091,23 +9928,19 @@ msgstr "Suara-suara"
 msgid "Webcams"
 msgstr "Webcam"
 
+msgid "Connection problem"
+msgstr "Masalah sambungan"
+
 msgid "Unable to fetch room list."
 msgstr "Tidak dapat memanggil daftar kamar."
 
 msgid "User Rooms"
 msgstr "Kamar Pengguna"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Masalah sambungan dengan sever YCNT."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Kehilangan sambungan dengan sever\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10232,33 +10065,22 @@ msgstr "Area"
 msgid "Exposure"
 msgstr "Tingkat Ekspos"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Tidak dapat membuat soket:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Tidak dapat mem-parse tanggapan dari proxy HTTP: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Kesalahan sambungan HTTP proxy %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Akses ditolak: Sever procy HTTP melarang penerowongan port %d."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Kesalahan dalam me-resolve %s"
 
-msgid "Could not resolve host name"
-msgstr "Tidak dapat resolve nama host"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Memohon perhatian %s ..."
@@ -10463,13 +10285,6 @@ msgstr "Kesalahan menulis ke %s: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "Tidak dapat menyambung ke %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"Server memerlukan TLS/SSL untuk login.  Dukungan TLS/SSL tidak ditemukan."
-
 #, c-format
 msgid " - %s"
 msgstr ""
@@ -10727,9 +10542,14 @@ msgstr "Tambahkan _Tos Teman..."
 msgid "View _Log"
 msgstr "Lihat _Log"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Sembunyikan saat tidak tersambung"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Tampilkan saat tidak tersambung"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
@@ -11250,6 +11070,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Rubah informasi pengguna untuk %s"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Ketik nama host sesuai sertifikat ini"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Server SSL"
@@ -11297,7 +11121,8 @@ msgstr "Acuhkan"
 msgid "Get Away Message"
 msgstr "Pesan Sedang Tidak di Tempat"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Terakhir dikatakan"
 
 msgid "Unable to save icon file to disk."
@@ -12205,7 +12030,7 @@ msgid "Hyperlink visited color"
 msgstr "Warna Hyperlink"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Warna untuk menggambar hyperlink saat mouse berada di atasnya."
 
 msgid "Hyperlink prelight color"
@@ -12243,15 +12068,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "Penghilangan Pemberitahuan"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "Pemberitahuan email baru"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12653,6 +12485,10 @@ msgstr ""
 "Perintah 'Manual' browser telah dipilih, tapi tidak ada perintah yang "
 "dipasang."
 
+#, fuzzy
+msgid "No message"
+msgstr "Pesan tidak dikenal"
+
 msgid "Open All Messages"
 msgstr "Buka Semua Pesan"
 
@@ -12670,10 +12506,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Anda memiliki email!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Pesan tidak dikenal"
-
 msgid "The following plugins will be unloaded."
 msgstr "Plugin-plugin ini akan dilepaskan."
 
@@ -12894,8 +12726,9 @@ msgstr "_Tampikan ikon baki sistem:"
 msgid "On unread messages"
 msgstr "Pada pesan-pesan yang tidak dibaca"
 
-msgid "Conversation Window Hiding"
-msgstr "Persembunyian Jendela Percakapan"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Jendela Percakapan PI"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Sembunyikan pecakapan PI baru:"
@@ -12903,6 +12736,9 @@ msgstr "_Sembunyikan pecakapan PI baru:"
 msgid "When away"
 msgstr "Ketika menjauh"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Kecil_kan jendela-jendela percakapan baru"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Tab-tab"
@@ -12961,9 +12797,6 @@ msgstr "Gunakan scrolling-halus"
 msgid "F_lash window when IMs are received"
 msgstr "K_edipkan jendela saat PI diterima"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Kecil_kan jendela-jendela percakapan baru"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12999,7 +12832,8 @@ msgstr "Tidak dapat memperoleh informasi pengguna"
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Contoh: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Deteksi otomatis alamat IP"
 
 msgid "Public _IP:"
@@ -13375,34 +13209,18 @@ msgstr "Si_mpan & Gunakan"
 msgid "Status for %s"
 msgstr "Status untuk %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "Masukkan Senyuman"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
 #, fuzzy
-msgid "Duplicate Shortcut"
-msgstr "Gandakan Perbaikan"
+msgid "Custom Smiley"
+msgstr "Masukkan Senyuman"
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Mohon pilih mood anda dari daftar."
+msgid "Duplicate Shortcut"
+msgstr "Gandakan Perbaikan"
 
 #, fuzzy
 msgid "Edit Smiley"
@@ -13526,9 +13344,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Tidak dapat mengirim peluncur"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Anda menarik peluncur desktop. Besar kemungkinan anda ingin mengirim apapun "
 "yang ditunjuk peluncur ini daripada peluncurnya itu sendiri."
@@ -14136,9 +13955,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Plugin Pesan Musik untuk komposisi kolaboratif."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Plugin Pesan Musik memungkinkan sejumlah pengguna untuk bekerja secara "
 "simultan pada sebuah musik dengan mengedit gubahan (musik) umum secara real-"
@@ -14407,7 +14227,7 @@ msgstr "Persembunyian Jendela Percakapan"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14735,8 +14555,9 @@ msgstr "Pilihan-pilihan Pidgin Windows"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Pilihan khusus untuk Pidgin Windows."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Menyediakan pilihan khusus untuk Pidgin Windows , seperti labuhan daftar "
 "teman."
@@ -14778,6 +14599,311 @@ msgstr "Kirim dan terima bait-bait XMPP mentah."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Plugin ini berguna untuk debug server atau klien XMPP."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Tidak dapat membuka soket"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Tidak dapat mendengar pada soket"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Tidak dapat membaca soket"
+
+#~ msgid "Connection failed."
+#~ msgstr "Sambungan gagal."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Server telah memutuskan sambungan"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Tidak dapat menciptakan soket"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Tidak dapat tersambung ke host"
+
+#~ msgid "Read error"
+#~ msgstr "Kesalahan baca"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Tidak dapat membuat sambungan dengan server:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Kesalahan penulisan"
+
+#~ msgid "Last Activity"
+#~ msgstr "Aktifitas Terakhir"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Layani Info Temuan"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Layani Item Temuan"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Alamat Stanza Lengkap"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Percakapan Banyak-Pengguna"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Informasi Lengkap Kehadiran Percakpan Banyak-Pengguna"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "Arus byte Dalam-Pita"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Perintah Ad-Hoc"
+
+#~ msgid "PubSub Service"
+#~ msgstr "Layanan PubSub"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "Arus byte SOCKS5"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Kehabisan Pita Data"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "PI-XHTML"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "Pendaftaran Dalam-Pita"
+
+#~ msgid "User Location"
+#~ msgstr "Lokasi Pengguna"
+
+#~ msgid "User Avatar"
+#~ msgstr "Avatar Pengguna"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Pemberitahuan Keadaan Percakapan"
+
+#~ msgid "Software Version"
+#~ msgstr "Versi Piranti Lunak"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Inisasi Arus"
+
+#~ msgid "User Mood"
+#~ msgstr "Mood Pengguna"
+
+#~ msgid "User Activity"
+#~ msgstr "Aktifitas Pengguna"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Kemampuan Entitas"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Sesi Negosiasi Terenkripsi"
+
+#~ msgid "User Tune"
+#~ msgstr "Musik Pengguna"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Daftar Item Pertukaran"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Alamat Tetap"
+
+#~ msgid "User Profile"
+#~ msgstr "Profil Pengguna"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Audio Jingle"
+
+#~ msgid "User Nickname"
+#~ msgstr "Nama Panggilan Pengguna"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "ICE UDP Jingle"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "ICE TCP Jingle"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Raw UDP Jingle"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Video Jingle"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "DTMF Jingle"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Tanda Terima Pesan"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Penerbitan Kunci Publik"
+
+#~ msgid "User Chatting"
+#~ msgstr "Percakapan Pengguna"
+
+#~ msgid "User Browsing"
+#~ msgstr "Browsing Pengguna"
+
+#~ msgid "User Gaming"
+#~ msgstr "Permainan Pengguna"
+
+#~ msgid "User Viewing"
+#~ msgstr "Pandangan Pengguna"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Enkripsi Stanza"
+
+#~ msgid "Entity Time"
+#~ msgstr "Waktu Entitas"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Pengiriman Tertunda"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Obyek Data Kolaboratif"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Repoistory dan Sharing File"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "Temuan Layanan STUN untuk Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Negosiasi Sesi Enkripsi yang Disederhanakan"
+
+#~ msgid "Hop Check"
+#~ msgstr "Pemeriksaan Hop"
+
+#~ msgid "Read Error"
+#~ msgstr "Kesalahan Baca"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Gagal tersambung ke server."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Buffer baca penuh"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Pesan yang tidak dapat dipecah"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Tidak dapat tersambung ke host: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Login gagal (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Tidak dapat menyambung ke server."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Anda telah terlogout karena anda login pada komputer yang lain."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Kesalahan: dukungan SSL tidak terinstal."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Kata sandi salah."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Tidak dapat tersambung ke server BOS:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Anda dapat terputus sebentar lagi.  Periksa %s untuk pembaharuan."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Tidak Dapat Menyambung"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "Nama tidak valid"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Tidak bisa mendapatkan informasi server"
+
+#~ msgid "Connection lost"
+#~ msgstr "Sambungan putus"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Tidak dapat me-resolve host"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Sambugan tertutup (menulis)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Sambungan di-reset"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Kesalahan membaca dari soket: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Tidak dapat menyambung ke host"
+
+#~ msgid "Could not write"
+#~ msgstr "Tidak dapat menulis"
+
+#~ msgid "Could not connect"
+#~ msgstr "Tidak dapat menyambung"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Tidak dapat membuat soket pendengar"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Tidak dapat me-resolve nama host"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Kata sandi salah"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Tidak dapat membuat sambungan dengan %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Jepang"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Server Penyeranta Jepang"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Server Transfer File Jepang"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kehilangan sambungan dengan sever\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Tidak dapat resolve nama host"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Server memerlukan TLS/SSL untuk login.  Dukungan TLS/SSL tidak ditemukan."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Persembunyian Jendela Percakapan"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Mohon pilih mood anda dari daftar."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Aktifkan ID yang mana?"
 
@@ -15247,9 +15373,6 @@ msgstr "Plugin ini berguna untuk debug server atau klien XMPP."
 #~ msgid "Windows Live ID authentication Failed"
 #~ msgstr "Otentikasi Windows Live ID gagal"
 
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Tidak dapat menyambung ke server OIM"
-
 #~ msgid ""
 #~ "Sorry, passwords over %d characters in length (yours is %d) are not "
 #~ "supported by MySpace."
@@ -15257,14 +15380,6 @@ msgstr "Plugin ini berguna untuk debug server atau klien XMPP."
 #~ "Maaf, kata sandi melebihi %d karakter (milik anda %d) tidak didukung oleh "
 #~ "MySpace."
 
-#~ msgid ""
-#~ "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username and choose a username and try to login again."
-#~ msgstr ""
-#~ "Mohon kunjungi http://editprofile.myspace.com/index.cfm?"
-#~ "fuseaction=profile.nama pengguna dan pilih nama pengguna dan coba login "
-#~ "kembali."
-
 #~ msgid "Unable to make SSL connection to server."
 #~ msgstr "Tidak dapat membuat sambungan SSL ke server."
 
diff --git a/po/it.po b/po/it.po
index 6a8b658c62..f1d2d4314a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2008-08-26 14:12+0100\n"
 "Last-Translator: Claudio Satriano <satriano@na.infn.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -2614,9 +2614,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Consente di visualizzare i log di altri client MI."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2671,8 +2672,9 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 "Salva i messaggi inviati ad un utente non in linea sotto forma di allarmi."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Il resto del messaggio sarà salvato sotto forma di allarme. Puoi modificare/"
@@ -2923,14 +2925,16 @@ msgstr ""
 "Impossibile trovare un'installazione di ActiveTCL. Se vuoi usare i plugin "
 "TCL, installa ActiveTCL da http://www.activestate.com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Il toolkit Apple Bonjour per Windows non è stato trovato. Leggi le FAQ su: "
 "http://d.pidgin.im/BonjourWindows per maggiori informazioni."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Impossibile mettersi in ascolto per le connessioni MI in entrata\n"
 
 msgid ""
@@ -2986,14 +2990,21 @@ msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 "Impossibile inviare il messaggio. La conversazione non può essere avviata."
 
-msgid "Cannot open socket"
-msgstr "Impossibile aprire il socket"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Impossibile creare il socket:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Impossibile associare il socket alla porta"
 
-msgid "Could not listen on socket"
-msgstr "Impossibile ascoltare sul socket"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Impossibile creare il socket:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Errore di comunicazione con il responder mDNS locale."
@@ -3040,13 +3051,16 @@ msgstr "Salva lista contatti..."
 msgid "Load buddylist from file..."
 msgstr "Importa la lista contatti da file..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Riempi i campi per la registrazione."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Le password non coincidono."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Impossibile registrare il nuovo account. Si è verificato un errore.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3058,14 +3072,15 @@ msgstr "Registrazione completata con successo!"
 msgid "Password"
 msgstr "Password"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr "Password (di nuovo)"
 
-msgid "Enter current token"
-msgstr "Inserisci il token corrente"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Token corrente"
+#, fuzzy
+msgid "Captcha"
+msgstr "Salva l'immagine"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registra un nuovo account Gadu-Gadu"
@@ -3118,6 +3133,15 @@ msgstr "Password modificata con successo!"
 msgid "Current password"
 msgstr "Password attuale"
 
+msgid "Password (retype)"
+msgstr "Password (di nuovo)"
+
+msgid "Enter current token"
+msgstr "Inserisci il token corrente"
+
+msgid "Current token"
+msgstr "Token corrente"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Inserisci la tua password attuale e la nuova password per UIN:"
 
@@ -3165,8 +3189,8 @@ msgstr "Non è stato trovato nessun utente corrispondente"
 msgid "There are no users matching your search criteria."
 msgstr "Non ci sono utenti che corrispondono ai tuoi criteri di ricerca."
 
-msgid "Unable to read socket"
-msgstr "Impossibile leggere il socket"
+msgid "Unable to read from socket"
+msgstr "Impossibile leggere dal socket"
 
 msgid "Buddy list downloaded"
 msgstr "Lista contatti scaricata"
@@ -3180,8 +3204,14 @@ msgstr "Lista contatti esportata"
 msgid "Your buddy list was stored on the server."
 msgstr "La tua lista contatti è stata salvata sul server."
 
-msgid "Connection failed."
-msgstr "Connessione fallita."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Connesso"
+
+msgid "Connection failed"
+msgstr "Connessione fallita"
 
 msgid "Add to chat"
 msgstr "Aggiungi alla chat"
@@ -3189,18 +3219,23 @@ msgstr "Aggiungi alla chat"
 msgid "Chat _name:"
 msgstr "_Nome chat:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Impossibile connettersi al server."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Connessione in corso"
+
 msgid "Chat error"
 msgstr "Errore nella chat"
 
 msgid "This chat name is already in use"
 msgstr "Questo nome chat è già in uso"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Non connesso al server."
 
 msgid "Find buddies..."
@@ -3260,7 +3295,8 @@ msgstr "Non è impostato nessun argomento"
 msgid "File Transfer Failed"
 msgstr "Trasferimento file fallito"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Impossibile aprire una porta in ascolto."
 
 msgid "Error displaying MOTD"
@@ -3276,8 +3312,18 @@ msgstr "Non c'è nessun MOTD associato con questa connessione."
 msgid "MOTD for %s"
 msgstr "MOTD per %s"
 
-msgid "Server has disconnected"
-msgstr "Il server ti ha disconnesso"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Connessione persa col server:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Leggi il MOTD"
@@ -3292,22 +3338,20 @@ msgstr "_Password:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "I nick IRC non devono contenere spazi bianchi"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Connessione in corso"
-
 msgid "SSL support unavailable"
 msgstr "Supporto SSL non disponibile"
 
-msgid "Couldn't create socket"
-msgstr "Impossibile creare il socket"
+msgid "Unable to connect"
+msgstr "Impossibile connettersi"
 
-msgid "Couldn't connect to host"
-msgstr "Impossibile connettersi all'host"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Impossibile connettersi a %s"
 
-msgid "Read error"
-msgstr "Errore di lettura"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Il server ha chiuso la connessione."
 
 msgid "Users"
 msgstr "Utenti"
@@ -3739,11 +3783,13 @@ msgstr "Comando ad-hoc fallito"
 msgid "execute"
 msgstr "esegui"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "Il server richiede TLS/SSL per il login. Nessun supporto TLS/SSL trovato."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "Hai bisogno della crittografia, ma non è presente nessun supporto TLS/SSL."
 
@@ -3763,7 +3809,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Autenticazione come testo semplice"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Autenticazione fallita"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Risposta non valida da parte del server."
 
 msgid "Server does not use any supported authentication method"
@@ -3775,7 +3826,8 @@ msgstr "Hai richiesto la criptatura, ma non è disponibile su questo server."
 msgid "Invalid challenge from server"
 msgstr "Challenge non valido dal server"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Errore SASL"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3795,10 +3847,8 @@ msgstr ""
 "Impossibile stabilire una connessione con il server:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Impossibile stabilire una connessione con il server:\n"
 "%s"
@@ -3807,12 +3857,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "Impossibile inizializzare la connessione"
 
-msgid "Unable to create socket"
-msgstr "Impossibile creare il socket"
-
-msgid "Write error"
-msgstr "Errore di scrittura"
-
 msgid "Full Name"
 msgstr "Nome"
 
@@ -3883,180 +3927,6 @@ msgstr "Sistema operativo"
 msgid "Local Time"
 msgstr "File locale:"
 
-msgid "Last Activity"
-msgstr "Ultima attività"
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "/Conversazione/_Info"
-
-#, fuzzy
-msgid "Service Discovery Items"
-msgstr "<b>Oggetti da sincronizzare</b>"
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "Tipo di stanza non supportato"
-
-msgid "Multi-User Chat"
-msgstr "Chat multi-utente"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Non c'è nessuna informazione sull'utente nella directory."
-
-#, fuzzy
-msgid "In-Band Bytestreams"
-msgstr "Email nella cartella:"
-
-msgid "Ad-Hoc Commands"
-msgstr "Comandi ad-hoc"
-
-#, fuzzy
-msgid "PubSub Service"
-msgstr "Servizio non disponibile"
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Out of Band Data"
-msgstr "Tempo limite esaurito per il socket dati"
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "Finestre dei _messaggi immediati"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "Riempi i campi per la registrazione."
-
-msgid "User Location"
-msgstr "Posizione dell'utente"
-
-msgid "User Avatar"
-msgstr "Avatar dell'utente"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "Notifica i nuovi messaggi di posta"
-
-msgid "Software Version"
-msgstr "Versione del software"
-
-msgid "Stream Initiation"
-msgstr "Inizializzazione dello stream"
-
-msgid "File Transfer"
-msgstr "Trasferimento file"
-
-msgid "User Mood"
-msgstr "Umore dell'utente"
-
-msgid "User Activity"
-msgstr "Attività dell'utente"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "Capacità"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Negoziazione della sessione crittografata"
-
-msgid "User Tune"
-msgstr "Brano ascoltato dall'utente"
-
-msgid "Roster Item Exchange"
-msgstr "Scambio degli elementi del roster"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "Indirizzo notiziario:"
-
-msgid "User Profile"
-msgstr "Profilo dell'utente"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle audio"
-
-msgid "User Nickname"
-msgstr "Nickname dell'utente"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle Raw UDP"
-
-msgid "Jingle Video"
-msgstr "Jingle video"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Ricevute per il messaggio"
-
-msgid "Public Key Publishing"
-msgstr "Pubblicazione della chiave pubblica"
-
-msgid "User Chatting"
-msgstr "Chat con l'utente"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "Per utente"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "Per utente"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "Per utente"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Crittazione di trillian"
-
-#, fuzzy
-msgid "Entity Time"
-msgstr "Tempo di inattività"
-
-#, fuzzy
-msgid "Delayed Delivery"
-msgstr "Per i messaggi ritardati"
-
-#, fuzzy
-msgid "Collaborative Data Objects"
-msgstr "Mostra oggetti in database"
-
-#, fuzzy
-msgid "File Repository and Sharing"
-msgstr "%s: nessuna entry per il file `%s' e per la entry del menu `%s'"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Negoziazione di una sessione criptata semplificata"
-
-#, fuzzy
-msgid "Hop Check"
-msgstr "controllo annullato.\n"
-
-msgid "Capabilities"
-msgstr "Capacità"
-
 msgid "Priority"
 msgstr "Priorità"
 
@@ -4068,7 +3938,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Connesso"
 
 msgid "Middle Name"
@@ -4249,16 +4119,13 @@ msgstr "Non è stato trovato nessun utente corrispondente"
 msgid "Roles:"
 msgstr "Ruolo"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Timeout per il ping"
 
-msgid "Read Error"
-msgstr "Errore di lettura"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4435,9 +4302,6 @@ msgstr "La tua password è stata modificata."
 msgid "Error changing password"
 msgstr "Errore nella modifica della password"
 
-msgid "Password (again)"
-msgstr "Password (di nuovo)"
-
 msgid "Change XMPP Password"
 msgstr "Cambia la password XMPP"
 
@@ -4826,6 +4690,14 @@ msgstr "Errore di parsing XML"
 msgid "Unknown Error in presence"
 msgstr "Errore sconosciuto nella presenza"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Errore nell'ingresso nella chat %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Errore nella chat %s"
+
 msgid "Create New Room"
 msgstr "Crea una nuova stanza"
 
@@ -4842,16 +4714,20 @@ msgstr "_Configura la stanza"
 msgid "_Accept Defaults"
 msgstr "_Accetta impostazioni predefinite"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Errore nell'ingresso nella chat %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Nessun motivo fornito."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Errore nella chat %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Sei stato cacciato da %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Cacciato da %s: (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "C'è stato un errore nell'apertura del file."
 
 #, fuzzy
@@ -5351,9 +5227,6 @@ msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "Il supporto SSL è necessario per MSN. Installare una libreria SSL supportata."
 
-msgid "Failed to connect to server."
-msgstr "Impossibile connettersi al server."
-
 msgid "Error retrieving profile"
 msgstr "Errore nella ricezione del profilo"
 
@@ -5613,9 +5486,6 @@ msgstr ""
 "Il messaggio potrebbe non essere stato inviato a causa di un errore "
 "sconosciuto."
 
-msgid "Unable to connect"
-msgstr "Impossibile connettersi"
-
 msgid "Writing error"
 msgstr "Errore in scrittura"
 
@@ -5630,19 +5500,23 @@ msgstr ""
 "Errore di connessione dal server %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Il nostro protocollo non è supportato dal server."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Errore di parsing HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Sei connesso da un'altra postazione."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "I server MSN sono temporaneamente non disponibili. Riprova più tardi."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "I server MSN sono temporaneamente disattivi."
 
 #, c-format
@@ -5655,9 +5529,6 @@ msgstr ""
 "La tua lista contatti MSN è temporaneamente non disponibile. Riprova più "
 "tardi."
 
-msgid "Unknown error."
-msgstr "Errore sconosciuto."
-
 msgid "Handshaking"
 msgstr "Handshake in corso"
 
@@ -5767,6 +5638,9 @@ msgstr "Plugin per il protocollo MSN"
 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)"
@@ -5884,12 +5758,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Aggiungi contatti dal server"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Connesso"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Errore di protocollo. Codice %d: %s"
@@ -5914,16 +5782,6 @@ msgstr "Errore MySpaceIM"
 msgid "Invalid input condition"
 msgstr "Condizione di input non valida"
 
-msgid "Read buffer full (2)"
-msgstr "Buffer di lettura pieno (2)"
-
-msgid "Unparseable message"
-msgstr "Messaggio indecifrabile"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Impossibile connettersi all'host: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Impossibile aggiungere il contatto"
 
@@ -6011,6 +5869,12 @@ msgstr "Numero di amici"
 msgid "Client Version"
 msgstr "Versione del client"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Nome utente disponibile"
 
@@ -6277,9 +6141,9 @@ msgstr "L'utente non è in linea oppure sei bloccato"
 msgid "Unknown error: 0x%X"
 msgstr "Errore sconosciuto: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Login non riuscito (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Impossibile effettuare il login"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6386,9 +6250,6 @@ msgstr "Conferenza GroupWise %d"
 msgid "Authenticating..."
 msgstr "Autenticazione in corso..."
 
-msgid "Unable to connect to server."
-msgstr "Impossibile connettersi al server."
-
 msgid "Waiting for response..."
 msgstr "In attesa di risposta..."
 
@@ -6412,9 +6273,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Vuoi entrare nella conversazione?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Sei stato disconnesso perché ti sei collegato da un'altra macchina."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6422,16 +6280,14 @@ msgstr ""
 "%s sembra essere non in linea e non ha ricevuto il messaggio che hai appena "
 "inviato."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Impossibile connettersi al server. Inserisci l'indirizzo del server al quale "
 "connettersi."
 
-msgid "Error. SSL support is not installed."
-msgstr "Errore. Il supporto SSL non è installato."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 "Questa conferenza è stata chiusa. Non può essere più inviato nessun "
@@ -6472,10 +6328,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6484,18 +6337,8 @@ msgstr "Impossibile entrare nella chat room"
 msgid "Invalid chat room name"
 msgstr "Nome della chat room non valido"
 
-msgid "Server closed the connection."
-msgstr "Il server ha chiuso la connessione."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Connessione persa col server:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Ricevuti dati non validi durante la connessione con il server."
 
 #. *< type
@@ -6543,7 +6386,8 @@ msgstr "Connessione persa con l'utente remoto:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Ricevuti dati non validi durante la connessione con l'utente remoto."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Impossibile stabilire una connessione con l'utente remoto."
 
 msgid "Direct IM established"
@@ -6747,21 +6591,15 @@ msgstr "Livello di richiamo"
 msgid "Buddy Comment"
 msgstr "Commento per il contatto"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Impossibile connettersi al server di autenticazione:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Impossibile connettersi al server BOS:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Impossibile connettersi al server."
 
 msgid "Username sent"
 msgstr "Nome utente inviato"
@@ -6773,11 +6611,11 @@ msgstr "Connessione stabilita, cookie inviato"
 msgid "Finalizing connection"
 msgstr "Finalizzazione della connessione"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Impossibile connettersi. Impossibile effettuare il login come %s poiché il "
 "nome utente non è valido. I nomi utente devono essere indirizzi email "
@@ -6791,26 +6629,22 @@ 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."
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "L'utente non esiste"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Il tuo account è attualmente sospeso."
 
 #. service temporarily unavailable
@@ -6831,7 +6665,8 @@ 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 "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "La chiave SecurID immessa non è valida."
 
 msgid "Enter SecurID"
@@ -7011,6 +6846,9 @@ msgstr "Online da"
 msgid "Member Since"
 msgstr "Membro da"
 
+msgid "Capabilities"
+msgstr "Capacità"
+
 msgid "Profile"
 msgstr "Profilo"
 
@@ -7193,9 +7031,9 @@ msgstr[1] ""
 msgid "Away message too long."
 msgstr "Messaggio di assenza troppo lungo."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7223,9 +7061,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Orfani"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Impossibile aggiungere il contatto %s poiché hai troppi contatti nella tua "
@@ -7234,8 +7072,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(nessun nome)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Impossibile aggiungere il contatto %s per un motivo sconosciuto."
 
 #, c-format
@@ -8084,7 +7922,7 @@ msgid "Update interval (seconds)"
 msgstr "Intervallo(i) per l'aggiornamento"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Impossibile decrittare la risposta al login"
 
 #, c-format
@@ -8111,10 +7949,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Token non valido nel codice di risposta, 0x%02X"
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Impossibile decrittare la risposta al login"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "Richiedi l'attenzione di %s..."
 
@@ -8152,21 +7986,9 @@ msgid ""
 "%s"
 msgstr "Token non valido nel codice di risposta, 0x%02X"
 
-msgid "Unable to connect."
-msgstr "Impossibile connettersi."
-
 msgid "Socket error"
 msgstr "Errore socket"
 
-msgid "Unable to read from socket"
-msgstr "Impossibile leggere dal socket"
-
-msgid "Write Error"
-msgstr "Errore di scrittura"
-
-msgid "Connection lost"
-msgstr "Connessione persa"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "Imposta le informazioni utente..."
@@ -8175,8 +7997,9 @@ msgstr "Imposta le informazioni utente..."
 msgid "Requesting token"
 msgstr "Richiesta rifiutata"
 
-msgid "Couldn't resolve host"
-msgstr "Impossibile risolvere l'host"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Impossibile connettersi al server."
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8231,7 +8054,7 @@ msgid "QQ Qun Command"
 msgstr "Comando"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Impossibile decrittare la risposta al login"
 
 #, fuzzy
@@ -8253,9 +8076,6 @@ msgstr "File inviato"
 msgid "%d canceled the transfer of %s"
 msgstr "%d ha annullato il trasferimento di %s"
 
-msgid "Connection closed (writing)"
-msgstr "Connessione chiusa (scrittura in corso)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Titolo del gruppo:</b> %s<br>"
@@ -8310,17 +8130,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Annuncio dell'amministratore Sametime"
 
-msgid "Connection reset"
-msgstr "Connessione reimpostata"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Errore di lettura dal socket: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Impossibile connettersi all'host"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Annuncio da %s"
@@ -8343,6 +8152,9 @@ msgstr "Altoparlanti"
 msgid "Video Camera"
 msgstr "Video camera"
 
+msgid "File Transfer"
+msgstr "Trasferimento file"
+
 msgid "Supports"
 msgstr "Supporta"
 
@@ -9164,6 +8976,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Statistiche sulla rete"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping non riuscito"
 
@@ -9228,7 +9043,8 @@ msgstr "Tipo di chiave pubblica non supportato"
 msgid "Disconnected by server"
 msgstr "Disconnesso dal server"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Errore nella connessione al server SILC"
 
 msgid "Key Exchange failed"
@@ -9240,26 +9056,26 @@ msgstr ""
 "Ripristino della sessione distaccata non riuscito. Fai clic su \"Connetti di "
 "nuovo\" per creare una nuova connessione."
 
-msgid "Connection failed"
-msgstr "Connessione fallita"
-
 msgid "Performing key exchange"
 msgstr "Scambio delle chiavi in corso"
 
-msgid "Unable to create connection"
-msgstr "Impossibile creare la connessione"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Impossibile caricare la coppia di chiavi SILC"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Connessione al server SILC in corso"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Impossibile caricare la coppia di chiavi SILC"
+
 msgid "Out of memory"
 msgstr "Memoria esaurita"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Impossibile inizializzare il protocollo SILC"
 
 msgid "Error loading SILC key pair"
@@ -9559,7 +9375,8 @@ msgstr "Firma digitalmente e verifica tutti i messaggi"
 msgid "Creating SILC key pair..."
 msgstr "Creazione della coppia di chiavi SILC in corso..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Impossibile creare la coppia di chiavi SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9655,6 +9472,9 @@ msgstr "Lavagna"
 msgid "No server statistics available"
 msgstr "Statistiche sul server non disponibili"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Errore nella connessione al server SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Non riuscito: Versioni non coincidenti. Aggiorna il tuo client"
@@ -9697,31 +9517,28 @@ msgstr "Non riuscito: Cookie non valido"
 msgid "Failure: Authentication failed"
 msgstr "Non riuscito: Autenticazione fallita"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Impossibile inizializzare la connessione client SILC"
 
 #, fuzzy
 msgid "John Noname"
 msgstr "Nessun nome"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Impossibile caricare la coppia di chiavi SILC: %s"
 
-msgid "Could not write"
-msgstr "Impossibile scrivere"
-
-msgid "Could not connect"
-msgstr "Impossibile connettersi"
+msgid "Unable to create connection"
+msgstr "Impossibile creare la connessione"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Risposta sconosciuta dal server."
 
-msgid "Could not create listen socket"
-msgstr "Impossibile creare il socket in ascolto"
-
-msgid "Could not resolve hostname"
-msgstr "Impossibile risolvere il nome dell'host"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Impossibile creare il socket"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "I nomi utente SIP non devono contenere spazi bianchi o simboli @"
@@ -9765,6 +9582,78 @@ msgstr "Utente Auth"
 msgid "Auth Domain"
 msgstr "Dominio Auth"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;stanza&gt;: Entra in una chat room sul network Yahoo"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Elenca le stanze presenti sul network Yahoo"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "ID Yahoo!"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Plugin per il protocollo Yahoo"
+
+msgid "Pager server"
+msgstr "Sever pager"
+
+msgid "Pager port"
+msgstr "Porta Yahoo Pager"
+
+msgid "File transfer server"
+msgstr "Server per il trasferimento file"
+
+msgid "File transfer port"
+msgstr "Porta trasferimento file"
+
+msgid "Chat room locale"
+msgstr "Lingua della chat room"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignora gli inviti a conferenze e a chat room"
+
+msgid "Chat room list URL"
+msgstr "URL della lista delle chat room"
+
+msgid "Yahoo Chat server"
+msgstr "Server Yahoo Chat"
+
+msgid "Yahoo Chat port"
+msgstr "Porta Yahoo Chat"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "ID Yahoo!"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Plugin per il protocollo Yahoo"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9797,30 +9686,20 @@ msgstr "Aggiungi un contatto rifiutato"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  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!."
@@ -9865,39 +9744,34 @@ msgstr ""
 "Codice di errore %d sconosciuto. Il problema potrebbe essere risolto "
 "effettuando il login sul sito web di Yahoo!."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Impossibile aggiungere il contatto %s al gruppo %s alla lista del server per "
 "l'account %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Impossibile aggiungere il contatto alla lista del server"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "È stata ricevuta da parte del server una risposta HTTP inattesa."
 
-msgid "Connection problem"
-msgstr "Problema di connessione"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Connessione persa con %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Impossibile stabilire una connessione con %s:\n"
+"Impossibile stabilire una connessione con il server:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9961,68 +9835,6 @@ msgstr "Unisciti ad un utente in chat..."
 msgid "Open Inbox"
 msgstr "Apri posta in arrivo"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;stanza&gt;: Entra in una chat room sul network Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Elenca le stanze presenti sul network Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "ID Yahoo!"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Plugin per il protocollo Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Giappone"
-
-msgid "Pager server"
-msgstr "Sever pager"
-
-msgid "Japan Pager server"
-msgstr "Server pager (Giappone)"
-
-msgid "Pager port"
-msgstr "Porta Yahoo Pager"
-
-msgid "File transfer server"
-msgstr "Server per il trasferimento file"
-
-msgid "Japan file transfer server"
-msgstr "Server per il trasferimento file (Giappone)"
-
-msgid "File transfer port"
-msgstr "Porta trasferimento file"
-
-msgid "Chat room locale"
-msgstr "Lingua della chat room"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignora gli inviti a conferenze e a chat room"
-
-msgid "Chat room list URL"
-msgstr "URL della lista delle chat room"
-
-msgid "Yahoo Chat server"
-msgstr "Server Yahoo Chat"
-
-msgid "Yahoo Chat port"
-msgstr "Porta Yahoo Chat"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
@@ -10030,6 +9842,9 @@ msgstr "Porta Yahoo Chat"
 msgid "Sent Doodle request."
 msgstr "Richiedi nuovamente l'autorizzazione"
 
+msgid "Unable to connect."
+msgstr "Impossibile connettersi."
+
 msgid "Unable to establish file descriptor."
 msgstr "Impossibile creare un descrittore di file."
 
@@ -10037,6 +9852,9 @@ msgstr "Impossibile creare un descrittore di file."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s sta cercando di inviarti un gruppo di %d file.\n"
 
+msgid "Write Error"
+msgstr "Errore di scrittura"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Profilo Yahoo! Giappone"
 
@@ -10157,23 +9975,19 @@ msgstr "Voci"
 msgid "Webcams"
 msgstr "Webcam"
 
+msgid "Connection problem"
+msgstr "Problema di connessione"
+
 msgid "Unable to fetch room list."
 msgstr "Impossibile recuperare la lista delle stanze."
 
 msgid "User Rooms"
 msgstr "Stanze utente"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Problema di connessione con il server YCHT."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Connessione persa con il server\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10302,24 +10116,16 @@ msgstr "Vero nome"
 msgid "Exposure"
 msgstr "Esposizione"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Impossibile creare il socket:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Impossibile interpretare la risposta dal proxy HTTP: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Errore di connessione al proxy HTTP: %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "Accesso negato: il server proxy HTTP non permette il tunnelling sulla porta %"
 "d."
@@ -10328,9 +10134,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr "Errore nella risoluzione di %s"
 
-msgid "Could not resolve host name"
-msgstr "Impossibile risolvere il nome dell'host"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Richiedi l'attenzione di %s..."
@@ -10532,13 +10335,6 @@ msgstr "Errore di scrittura su %s: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "Impossibile connettersi a %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"Il server richiede TLS/SSL per il login. Nessun supporto TLS/SSL trovato."
-
 #, c-format
 msgid " - %s"
 msgstr ""
@@ -10789,9 +10585,14 @@ msgstr "Aggiungi un _allarme..."
 msgid "View _Log"
 msgstr "Mostra il _log"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Nascondi quando non sei in linea"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Mostra quando non sei in linea"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
@@ -11299,6 +11100,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Modifica le informazioni utente per %s"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Immetti il nome dell'host al quale è associato questo certificato."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Server SSL"
@@ -11347,7 +11152,8 @@ msgstr "Ignora"
 msgid "Get Away Message"
 msgstr "Ottieni messaggio di assenza"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Ultimo messaggio"
 
 msgid "Unable to save icon file to disk."
@@ -12244,7 +12050,7 @@ msgid "Hyperlink visited color"
 msgstr "Colore dei collegamenti"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Colore per i collegamenti al passaggio del mouse."
 
 #, fuzzy
@@ -12287,13 +12093,22 @@ msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
 #, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Colore per il nome di un messaggio di azione."
+
+#, fuzzy
 msgid "Whisper Message Name Color"
 msgstr "%s ti ha inviato un messaggio. (%s)"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Colore per il nome di un messaggio di azione."
+
 msgid "Typing notification color"
 msgstr "Colore per la notifica di scrittura"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "Il colore da usare per il carattere della notifica di scrittura"
 
 msgid "Typing notification font"
@@ -12695,6 +12510,10 @@ msgstr ""
 "È stato scelto di impostare il browser manualmente, ma non è stato immesso "
 "nessun comando."
 
+#, fuzzy
+msgid "No message"
+msgstr "Messaggio sconosciuto"
+
 msgid "Open All Messages"
 msgstr "Apri tutti i messaggi"
 
@@ -12712,10 +12531,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Posta in arrivo!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Messaggio sconosciuto"
-
 msgid "The following plugins will be unloaded."
 msgstr "I seguenti plugin saranno rimossi."
 
@@ -12931,8 +12746,9 @@ msgstr "_Mostra l'icona di notifica:"
 msgid "On unread messages"
 msgstr "Se ci sono messaggi non letti"
 
-msgid "Conversation Window Hiding"
-msgstr "Finestre di conversazione nascoste"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Finestre dei messaggi immediati"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Nascondi le nuove conversazioni:"
@@ -12940,6 +12756,9 @@ msgstr "_Nascondi le nuove conversazioni:"
 msgid "When away"
 msgstr "Se assente"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Minimi_zza le nuove finestre di conversazione"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Schede"
@@ -12998,9 +12817,6 @@ msgstr "Usa scrolling fluido"
 msgid "F_lash window when IMs are received"
 msgstr "_Illumina la finestra quando arriva un messaggio"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Minimi_zza le nuove finestre di conversazione"
-
 msgid "Minimum input area height in lines:"
 msgstr "Altezza minima in linee della casella di testo:"
 
@@ -13035,7 +12851,8 @@ msgstr "Impossibile avviare il programma di configurazione del browser."
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Esempio: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "Rileva _automaticamente l'indirizzo IP"
 
 msgid "Public _IP:"
@@ -13410,21 +13227,6 @@ msgstr "Sa_lva e utilizza"
 msgid "Status for %s"
 msgstr "Stato per %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "Smiley personalizzato"
-
-msgid "More Data needed"
-msgstr "C'è bisogno di più dati"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Scegli una scorciatoia da tastiera da associare con lo smiley."
-
 #, fuzzy, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
@@ -13432,12 +13234,12 @@ msgstr ""
 "Esiste già uno smiley personalizzato per la scorciatoia da tastiera "
 "selezionata. Specifica una scorciatoia differente."
 
+msgid "Custom Smiley"
+msgstr "Smiley personalizzato"
+
 msgid "Duplicate Shortcut"
 msgstr "Scorciatoia già esistente"
 
-msgid "Please select an image for the smiley."
-msgstr "Scegli un'immagine per lo smiley."
-
 msgid "Edit Smiley"
 msgstr "Modifica lo smiley"
 
@@ -13553,9 +13355,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Impossibile inviare l'icona di avvio"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Hai trascinato un'icona di avvio. Molto probabilmente vuoi inviare ciò cui "
 "l'icona si riferisce piuttosto che l'icona stessa."
@@ -14169,9 +13972,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Messaggi musicali, per la composizione collaborativa."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Il plugin per i messaggi musicali consente ad un gruppo di utenti di "
 "lavorare simultaneamente su di un brano musicale modificando in tempo reale "
@@ -14434,9 +14238,10 @@ msgid "Conversation Window Send Button."
 msgstr "Pulsante 'Invia' per la finestra di conversazione."
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Aggiunge un pulsante 'Invia' accanto alla casella di testo. Utile quando non "
 "si usa una tastiera reale."
@@ -14769,8 +14574,9 @@ msgstr "Opzioni di Pidgin per Windows"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opzioni specifiche di Pidgin per Windows."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Fornisce opzioni specifiche per Pidgin per Windows, come la lista contatti "
 "in modalità dock."
@@ -14813,6 +14619,327 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Questo plugin è utile per effettuare il debug dei server o dei client XMPP."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Impossibile aprire il socket"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Impossibile ascoltare sul socket"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Impossibile leggere il socket"
+
+#~ msgid "Connection failed."
+#~ msgstr "Connessione fallita."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Il server ti ha disconnesso"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Impossibile creare il socket"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Impossibile connettersi all'host"
+
+#~ msgid "Read error"
+#~ msgstr "Errore di lettura"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Impossibile stabilire una connessione con il server:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Errore di scrittura"
+
+#~ msgid "Last Activity"
+#~ msgstr "Ultima attività"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "/Conversazione/_Info"
+
+#, fuzzy
+#~ msgid "Service Discovery Items"
+#~ msgstr "<b>Oggetti da sincronizzare</b>"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Tipo di stanza non supportato"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Chat multi-utente"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Non c'è nessuna informazione sull'utente nella directory."
+
+#, fuzzy
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "Email nella cartella:"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Comandi ad-hoc"
+
+#, fuzzy
+#~ msgid "PubSub Service"
+#~ msgstr "Servizio non disponibile"
+
+#, fuzzy
+#~ msgid "Out of Band Data"
+#~ msgstr "Tempo limite esaurito per il socket dati"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "Finestre dei _messaggi immediati"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "Riempi i campi per la registrazione."
+
+#~ msgid "User Location"
+#~ msgstr "Posizione dell'utente"
+
+#~ msgid "User Avatar"
+#~ msgstr "Avatar dell'utente"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "Notifica i nuovi messaggi di posta"
+
+#~ msgid "Software Version"
+#~ msgstr "Versione del software"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Inizializzazione dello stream"
+
+#~ msgid "User Mood"
+#~ msgstr "Umore dell'utente"
+
+#~ msgid "User Activity"
+#~ msgstr "Attività dell'utente"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "Capacità"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Negoziazione della sessione crittografata"
+
+#~ msgid "User Tune"
+#~ msgstr "Brano ascoltato dall'utente"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Scambio degli elementi del roster"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "Indirizzo notiziario:"
+
+#~ msgid "User Profile"
+#~ msgstr "Profilo dell'utente"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Jingle audio"
+
+#~ msgid "User Nickname"
+#~ msgstr "Nickname dell'utente"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle Raw UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Jingle video"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Ricevute per il messaggio"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Pubblicazione della chiave pubblica"
+
+#~ msgid "User Chatting"
+#~ msgstr "Chat con l'utente"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "Per utente"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "Per utente"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "Per utente"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Crittazione di trillian"
+
+#, fuzzy
+#~ msgid "Entity Time"
+#~ msgstr "Tempo di inattività"
+
+#, fuzzy
+#~ msgid "Delayed Delivery"
+#~ msgstr "Per i messaggi ritardati"
+
+#, fuzzy
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Mostra oggetti in database"
+
+#, fuzzy
+#~ msgid "File Repository and Sharing"
+#~ msgstr "%s: nessuna entry per il file `%s' e per la entry del menu `%s'"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Negoziazione di una sessione criptata semplificata"
+
+#, fuzzy
+#~ msgid "Hop Check"
+#~ msgstr "controllo annullato.\n"
+
+#~ msgid "Read Error"
+#~ msgstr "Errore di lettura"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Impossibile connettersi al server."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Buffer di lettura pieno (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Messaggio indecifrabile"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Impossibile connettersi all'host: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Login non riuscito (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Sei stato disconnesso perché ti sei collegato da un'altra macchina."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Errore. Il supporto SSL non è installato."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Password non corretta."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Impossibile connettersi al server BOS:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "Potresti essere disconnesso a breve. Controlla %s per aggiornamenti."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Impossibile connettersi"
+
+#~ msgid "Invalid username."
+#~ msgstr "Nome utente non valido."
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Impossibile decrittare la risposta al login"
+
+#~ msgid "Connection lost"
+#~ msgstr "Connessione persa"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Impossibile risolvere l'host"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Connessione chiusa (scrittura in corso)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Connessione reimpostata"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Errore di lettura dal socket: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Impossibile connettersi all'host"
+
+#~ msgid "Could not write"
+#~ msgstr "Impossibile scrivere"
+
+#~ msgid "Could not connect"
+#~ msgstr "Impossibile connettersi"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Impossibile creare il socket in ascolto"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Impossibile risolvere il nome dell'host"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Password non corretta"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Impossibile stabilire una connessione con %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Giappone"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Server pager (Giappone)"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Server per il trasferimento file (Giappone)"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Connessione persa con il server\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Impossibile risolvere il nome dell'host"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Il server richiede TLS/SSL per il login. Nessun supporto TLS/SSL trovato."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Finestre di conversazione nascoste"
+
+#~ msgid "More Data needed"
+#~ msgstr "C'è bisogno di più dati"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Scegli una scorciatoia da tastiera da associare con lo smiley."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Scegli un'immagine per lo smiley."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Quale ID vuoi attivare?"
 
@@ -15317,9 +15444,6 @@ msgstr ""
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "Impossibile effettuare il login. Verifica il log di debug."
 
-#~ msgid "Unable to login"
-#~ msgstr "Impossibile effettuare il login"
-
 #, fuzzy
 #~ msgid "Failed room reply"
 #~ msgstr "Impossibile rimuovere il contatto"
diff --git a/po/ja.po b/po/ja.po
index f7aaa8cbf1..4baa9d6fbf 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2007-06-30 14:57+0900\n"
 "Last-Translator: Takeshi AIHANA <takeshi.aihana@gmail.com>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -2606,9 +2606,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "他の IM クライアントのログをログ・ビューアで表示します"
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2665,8 +2666,9 @@ msgstr "オフライン・メッセージ"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "オフラインのユーザに送信できなかったメッセージを保存します"
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "送信できなかった残りのメッセージを保存します。\"仲間をつかむ\" ダイアログで編"
@@ -2918,11 +2920,12 @@ msgstr ""
 "い。\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "受信した IM 接続を確立できませんでした\n"
 
 msgid ""
@@ -2977,14 +2980,21 @@ msgstr "%s さんが会話ウインドウを閉じました"
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "メッセージを送信できません (会話を開始できませんでした)"
 
-msgid "Cannot open socket"
-msgstr "ソケットを開けません"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"ソケットを生成できません:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "ポートにソケットを割り当てられませんでした"
 
-msgid "Could not listen on socket"
-msgstr "ソケットを監視できませんでした"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"ソケットを生成できません:\n"
+"%s"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3032,13 +3042,16 @@ msgstr "仲間リストの保存..."
 msgid "Load buddylist from file..."
 msgstr "仲間リストのインポート..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "登録情報の書き込みに失敗しました。"
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "パスワードが一致しません。"
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "新しいアカウントを登録できません。エラーが発生しました。\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3050,14 +3063,15 @@ msgstr "登録が完了しました！"
 msgid "Password"
 msgstr "パスワード"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr "パスワード (確認用)"
 
-msgid "Enter current token"
-msgstr "現在のトークンを入力して下さい"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "現在のトークン"
+#, fuzzy
+msgid "Captcha"
+msgstr "画像の保存"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "新しい Gadu-Gadu アカウントの登録"
@@ -3110,6 +3124,15 @@ msgstr "パスワードの変更が完了しました！"
 msgid "Current password"
 msgstr "現在のパスワード"
 
+msgid "Password (retype)"
+msgstr "パスワード (確認用)"
+
+msgid "Enter current token"
+msgstr "現在のトークンを入力して下さい"
+
+msgid "Current token"
+msgstr "現在のトークン"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "現在使用しているパスワードと UIN の新しいパスワードを入力して下さい:"
 
@@ -3157,7 +3180,7 @@ msgstr "一致するユーザが見つかりませんでした"
 msgid "There are no users matching your search criteria."
 msgstr "検索条件に一致するユーザが存在しませんでした。"
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "ソケットを読めません"
 
 msgid "Buddy list downloaded"
@@ -3172,8 +3195,14 @@ msgstr "仲間リストをアップロードしました"
 msgid "Your buddy list was stored on the server."
 msgstr "仲間リストをサーバに格納しました。"
 
-msgid "Connection failed."
-msgstr "接続に失敗しました"
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "接続しました"
+
+msgid "Connection failed"
+msgstr "接続に失敗"
 
 msgid "Add to chat"
 msgstr "チャットに追加"
@@ -3181,18 +3210,23 @@ msgstr "チャットに追加"
 msgid "Chat _name:"
 msgstr "チャット名(_N):"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "サーバへ接続できません"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "接続中です"
+
 msgid "Chat error"
 msgstr "チャットのエラー"
 
 msgid "This chat name is already in use"
 msgstr "そのチャット名は既に使用されています。"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "サーバへ接続していません。"
 
 msgid "Find buddies..."
@@ -3252,7 +3286,8 @@ msgstr "トピックが設定されていません"
 msgid "File Transfer Failed"
 msgstr "ファイルの転送が失敗しました"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "監視するポートを開けませんでした"
 
 msgid "Error displaying MOTD"
@@ -3268,8 +3303,18 @@ msgstr "この接続に関連した MOTD がありません。"
 msgid "MOTD for %s"
 msgstr "%s の MOTD"
 
-msgid "Server has disconnected"
-msgstr "サーバが接続を切りました"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"サーバとの接続を失いました:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "MOTD の表示"
@@ -3284,22 +3329,20 @@ msgstr "パスワード(_P):"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC のニックネームには空白が含まれていないかもしれません"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "接続中です"
-
 msgid "SSL support unavailable"
 msgstr "SSL サポートは無効です"
 
-msgid "Couldn't create socket"
-msgstr "ソケットを生成できませんでした"
+msgid "Unable to connect"
+msgstr "接続できません"
 
-msgid "Couldn't connect to host"
-msgstr "ホストへ接続できませんでした"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "%s へ接続できません"
 
-msgid "Read error"
-msgstr "読み込みエラーです"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "サーバが接続を閉じました"
 
 msgid "Users"
 msgstr "ユーザ数"
@@ -3734,13 +3777,14 @@ msgstr "コマンドが無効です"
 msgid "execute"
 msgstr "予想していないデータ"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "ログインするためにサーバが TLS/SSL を要求してきましたが、TLS/SSL はサポートし"
 "ていません。"
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "ログインするためにサーバが TLS/SSL を要求してきましたが、TLS/SSL はサポートし"
 "ていません。"
@@ -3759,7 +3803,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "プレーンテキスト認証"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "認証に失敗しました"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "サーバからの応答が不正です。"
 
 msgid "Server does not use any supported authentication method"
@@ -3771,7 +3820,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "サーバからの不正な challenge です"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL のエラー"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3791,10 +3841,8 @@ msgstr ""
 "サーバとの接続を確立できませんでした:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "サーバとの接続を確立できませんでした:\n"
 "%s"
@@ -3803,12 +3851,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "新しい接続を開けません"
 
-msgid "Unable to create socket"
-msgstr "ソケットを生成できません"
-
-msgid "Write error"
-msgstr "書き込みエラー"
-
 msgid "Full Name"
 msgstr "氏名"
 
@@ -3879,188 +3921,6 @@ msgstr "オペレーティング・システム"
 msgid "Local Time"
 msgstr "ローカル・ファイル:"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "フォルダ情報の設定"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "その他"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "チャットの別名"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "フォルダ情報がありません"
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "コマンド指定"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML 形式"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "登録エラー"
-
-#, fuzzy
-msgid "User Location"
-msgstr "場所"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "ユーザの検索"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "仲間の状態の通知"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "サポートしていないバージョン"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "向き"
-
-msgid "File Transfer"
-msgstr "ファイルの転送"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "ユーザ・モード"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "ユーザの制限"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "機能"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "ユーザ名"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "キー交換付き IM"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "E-メール・アドレス"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "プロフィール"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "参加する"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "ユーザ名"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "ライブ・ビデオ"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "メッセージを受信しました"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "公開鍵の Babbleprint"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "ユーザのオプション"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "ユーザ・モード"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "ユーザ名"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "ユーザの制限"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Trillian 暗号化"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "機能"
-
 msgid "Priority"
 msgstr "優先順位"
 
@@ -4072,7 +3932,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "既にログインしています"
 
 msgid "Middle Name"
@@ -4256,16 +4116,12 @@ msgid "Roles:"
 msgstr "役職"
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "通常のテキスト"
 
-msgid "Read Error"
-msgstr "読み込みエラー"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4454,9 +4310,6 @@ msgstr "パスワードを変更しました。"
 msgid "Error changing password"
 msgstr "パスワードを変更する際にエラー"
 
-msgid "Password (again)"
-msgstr "パスワード (確認用)"
-
 msgid "Change XMPP Password"
 msgstr "XMPP パスワードの変更"
 
@@ -4855,6 +4708,14 @@ msgstr "XML 解析エラー"
 msgid "Unknown Error in presence"
 msgstr "不明なエラーが起きています"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "チャット %s に参加する際にエラー"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "チャット %s でエラー"
+
 msgid "Create New Room"
 msgstr "新しいチャット・ルームの生成"
 
@@ -4871,16 +4732,20 @@ msgstr "ルームの設定(_C)"
 msgid "_Accept Defaults"
 msgstr "デフォルト値を適用する(_A)"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "チャット %s に参加する際にエラー"
+#, fuzzy
+msgid "No reason"
+msgstr "理由はわかりません。"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "チャット %s でエラー"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "あなたは %s に蹴られました: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s (%s) に蹴られました"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "ファイルをオープンする際にエラーが発生しました。"
 
 #, fuzzy
@@ -5394,9 +5259,6 @@ msgstr ""
 "MSN では SSL サポートが必要です (サポートする SSL ライブラリをインストールし"
 "て下さい)"
 
-msgid "Failed to connect to server."
-msgstr "サーバへの接続に失敗しました"
-
 msgid "Error retrieving profile"
 msgstr "プロフィールを取得する際にエラー"
 
@@ -5656,9 +5518,6 @@ msgstr "不明なエラーの発生により、メッセージは送信されま
 msgid "Message was not sent because an unknown error occurred."
 msgstr "不明なエラーの発生により、メッセージは送信されませんでした:"
 
-msgid "Unable to connect"
-msgstr "接続できません"
-
 msgid "Writing error"
 msgstr "書き込み時にエラー"
 
@@ -5673,13 +5532,16 @@ msgstr ""
 "サーバ %s で接続エラー:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "サーバはこのプロトコルをサポートしていません"
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "HTTP を解析する際にエラーが発生しました"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "別の場所からサイン・インしています"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5687,7 +5549,8 @@ msgstr ""
 "MSN サーバが一時的に利用不可になっています。時間をあけて後で試してみて下さ"
 "い。"
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN サーバが一時的にダウンしています"
 
 #, c-format
@@ -5700,9 +5563,6 @@ msgstr ""
 "お使いの MSN 仲間リストが一時的に利用不可になっています。時間をあけて後で試し"
 "てみて下さい。"
 
-msgid "Unknown error."
-msgstr "原因不明のエラーです"
-
 msgid "Handshaking"
 msgstr "通信を接続しています"
 
@@ -5803,6 +5663,9 @@ msgstr "MSN プロトコルのプラグイン"
 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"
@@ -5920,12 +5783,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "サーバからの応答が不正です。"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "接続しました"
-
 #, fuzzy, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "プロセスがエラー・コード %d を返してきました"
@@ -5949,18 +5806,6 @@ msgid "Invalid input condition"
 msgstr "接続の最終調整中"
 
 #, fuzzy
-msgid "Read buffer full (2)"
-msgstr "キューが一杯です"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "メッセージを解読できません"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "ホストへ接続できませんでした"
-
-#, fuzzy
 msgid "Failed to add buddy"
 msgstr "チャットの仲間に参加できません"
 
@@ -6055,6 +5900,12 @@ msgstr ""
 msgid "Client Version"
 msgstr "会話ウィンドウを閉じます"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 #, fuzzy
 msgid "MySpaceIM - Username Available"
 msgstr "サービスは利用できません"
@@ -6323,9 +6174,9 @@ msgstr "ユーザはオフラインか、あるいはブロックされていま
 msgid "Unknown error: 0x%X"
 msgstr "不明なエラー: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "ログインに失敗しました (%s)。"
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "ユーザの %s さんを追い出せません"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6428,9 +6279,6 @@ msgstr "GroupWise 会議 %d"
 msgid "Authenticating..."
 msgstr "認証中..."
 
-msgid "Unable to connect to server."
-msgstr "サーバへ接続できません"
-
 msgid "Waiting for response..."
 msgstr "応答待ちです..."
 
@@ -6454,24 +6302,17 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "会議に出席しますか？"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"別のワークステーションからログインしているので、強制的にログアウトされまし"
-"た。"
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s さんはオフラインのため、送信したメッセージを受け取りませんでした。"
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr "サーバへ接続できません。接続するサーバのアドレスを入力して下さい。"
 
-msgid "Error. SSL support is not installed."
-msgstr "エラーです。SSL サポートがインストールされていません。"
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "この会議は閉会しています。メッセージを送信することはできません。"
 
@@ -6510,10 +6351,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "接続を開始する際にエラー"
 
-msgid "Incorrect password."
-msgstr "パスワードが間違っています。"
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, fuzzy
@@ -6524,18 +6362,8 @@ msgstr "接続できませんでした"
 msgid "Invalid chat room name"
 msgstr "不正なルーム名"
 
-msgid "Server closed the connection."
-msgstr "サーバが接続を閉じました"
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"サーバとの接続を失いました:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "サーバと接続する際に不正なデータを受け取りました"
 
 #. *< type
@@ -6583,7 +6411,8 @@ msgstr "リモート・ユーザとの接続が切れました:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "リモート・ユーザとの接続で不正なデータを受け取りました"
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "リモート・ユーザとの接続を確立できませんでした"
 
 msgid "Direct IM established"
@@ -6783,21 +6612,15 @@ msgstr "警告レベル"
 msgid "Buddy Comment"
 msgstr "仲間のコメント"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "認証サーバに接続できませんでした:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"BOS サーバに接続できませんでした:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "サーバへ接続できません"
 
 #, fuzzy
 msgid "Username sent"
@@ -6812,9 +6635,9 @@ msgstr "接続の最終調整中"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "ログインできません: スクリーン名が間違っているため %s としてサイン・オンでき"
 "ませんでした。スクリーン名の先頭は文字にし、文字と数字とスペースのみ、または"
@@ -6827,27 +6650,22 @@ 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
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "名前が間違っています"
+msgid "Username does not exist"
+msgstr "ユーザがいません"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "お使いのアカウントは現在停止中です"
 
 #. service temporarily unavailable
@@ -6867,7 +6685,8 @@ msgstr ""
 "接続と切断を繰り返し行いました。10 分程待ってから再び試みてください。そのまま"
 "続行すると、さらに長く待たなければならなくなりますよ。"
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "入力したセキュア ID 鍵は不正です。"
 
 msgid "Enter SecurID"
@@ -7052,6 +6871,9 @@ msgstr "サイン・インした日時"
 msgid "Member Since"
 msgstr "メンバになった日時"
 
+msgid "Capabilities"
+msgstr "機能"
+
 msgid "Profile"
 msgstr "プロフィール"
 
@@ -7225,7 +7047,7 @@ msgstr "離席メッセージが長すぎます"
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7251,9 +7073,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "みなしご"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "仲間の %s さんを追加することができませんでした。仲間の数が多すぎます。一人削"
@@ -7263,7 +7085,7 @@ msgid "(no name)"
 msgstr "(名前無し)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "原因不明ですが、コマンド適用に失敗しました"
 
 #, fuzzy, c-format
@@ -8109,7 +7931,7 @@ msgid "Update interval (seconds)"
 msgstr "読み込み時にエラー"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "サーバの情報を取得できません"
 
 #, c-format
@@ -8136,10 +7958,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "サーバの情報を取得できません"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "質問ダイアログの文字"
 
@@ -8175,21 +7993,9 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "接続できません"
-
 msgid "Socket error"
 msgstr "ソケットのエラー"
 
-msgid "Unable to read from socket"
-msgstr "ソケットを読めません"
-
-msgid "Write Error"
-msgstr "書き込みエラー"
-
-msgid "Connection lost"
-msgstr "接続を閉じました"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "ユーザ情報のセット..."
@@ -8198,8 +8004,9 @@ msgstr "ユーザ情報のセット..."
 msgid "Requesting token"
 msgstr "リクエストが拒否されました"
 
-msgid "Couldn't resolve host"
-msgstr "ホスト名を解決できませんでした"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "サーバへ接続できません"
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8250,7 +8057,7 @@ msgid "QQ Qun Command"
 msgstr "コマンド指定"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "サーバの情報を取得できません"
 
 #, fuzzy
@@ -8272,9 +8079,6 @@ msgstr "ファイルの送信"
 msgid "%d canceled the transfer of %s"
 msgstr "%d さんは %s の転送をキャンセルしました"
 
-msgid "Connection closed (writing)"
-msgstr "書き込み用の接続を閉じました"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>グループ名:</b> %s<br>"
@@ -8328,17 +8132,6 @@ msgstr "Sametime 管理者がサーバ %s で次のアナウンスを発表し�
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime 管理者のアナウンス"
 
-msgid "Connection reset"
-msgstr "接続のリセット"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "ソケットから読み込む際にエラー: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "ホストに接続できません"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "%s からのお知らせ"
@@ -8361,6 +8154,9 @@ msgstr "スピーカ"
 msgid "Video Camera"
 msgstr "ビデオ・カメラ"
 
+msgid "File Transfer"
+msgstr "ファイルの転送"
+
 msgid "Supports"
 msgstr "サポート"
 
@@ -9173,6 +8969,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "ネットワークの統計情報"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping に失敗しました"
 
@@ -9236,7 +9035,8 @@ msgstr "サポートしていない公開鍵の種類"
 msgid "Disconnected by server"
 msgstr "サーバが接続を切断しました"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "SILC サーバへ接続する際にエラー"
 
 msgid "Key Exchange failed"
@@ -9248,26 +9048,26 @@ msgstr ""
 "切り離したセッションの復帰に失敗しました。新しい接続を確立する際は、ボタン "
 "[再接続] をクリックして下さい。"
 
-msgid "Connection failed"
-msgstr "接続に失敗"
-
 msgid "Performing key exchange"
 msgstr "鍵の交換の実行中"
 
-msgid "Unable to create connection"
-msgstr "新しい接続を開けません"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "SILC の鍵ペアを読み込めませんでした"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "SILC サーバへ接続中"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "SILC の鍵ペアを読み込めませんでした"
+
 msgid "Out of memory"
 msgstr "メモリが足りません"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "SILC プロトコルを初期化できません"
 
 msgid "Error loading SILC key pair"
@@ -9568,7 +9368,8 @@ msgstr "電子署名して全てのメッセージを検証する"
 msgid "Creating SILC key pair..."
 msgstr "SILC 鍵ペアの生成中..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "SILC 鍵ペアを生成できません\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9666,6 +9467,9 @@ msgstr "ホワイトボード"
 msgid "No server statistics available"
 msgstr "サーバの統計情報は利用できません"
 
+msgid "Error during connecting to SILC Server"
+msgstr "SILC サーバへ接続する際にエラー"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失敗: バージョン不整合、クライアントをアップグレードして下さい"
@@ -9707,31 +9511,27 @@ msgstr "失敗: 不正なクッキーです"
 msgid "Failure: Authentication failed"
 msgstr "失敗: 認証に失敗しました"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "SILC クライアント接続を初期化できません"
 
 msgid "John Noname"
 msgstr "名前なし"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "SILC の鍵ペアを読み込めませんでした: %s"
 
-msgid "Could not write"
-msgstr "書き込めませんでした"
-
-msgid "Could not connect"
-msgstr "接続できませんでした"
+msgid "Unable to create connection"
+msgstr "新しい接続を開けません"
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "原因は不明です"
 
-msgid "Could not create listen socket"
-msgstr "ソケットを生成できませんでした"
-
-msgid "Could not resolve hostname"
-msgstr "ホスト名を解決できませんでした"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "ソケットを生成できません"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -9774,6 +9574,78 @@ msgstr "ユーザ認証"
 msgid "Auth Domain"
 msgstr "ドメイン認証"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;ルーム&gt;: Yahoo ネットワーク上にあるチャットへ参加する"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Yahoo ネットワーク上にあるルームを一覧表示します"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: いたずら書きを始めることをユーザに要求する"
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo! プロトコル・プラグイン"
+
+msgid "Pager server"
+msgstr "ページャのサーバ"
+
+msgid "Pager port"
+msgstr "ページャのポート番号"
+
+msgid "File transfer server"
+msgstr "ファイル転送サーバ"
+
+msgid "File transfer port"
+msgstr "ファイル転送のポート番号"
+
+msgid "Chat room locale"
+msgstr "チャット・ルームの場所"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "会議とチャットルームの招待を無視する"
+
+msgid "Chat room list URL"
+msgstr "チャット・ルームの URL リスト"
+
+msgid "Yahoo Chat server"
+msgstr "Yahoo チャット・サーバ"
+
+msgid "Yahoo Chat port"
+msgstr "Yahoo チャットのポート番号"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo! プロトコル・プラグイン"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9805,30 +9677,20 @@ msgstr "拒否する仲間の追加"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 "不明なエラー番号 %d です。Yahoo! ウェブサイトへログインすると修正されるかもし"
 "れません。"
@@ -9873,39 +9735,34 @@ msgstr ""
 "不明なエラー番号 %d です。Yahoo! ウェブサイトへログインすると修正されるかもし"
 "れません。"
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "グループ %2$s の仲間 %1$s をアカウント %3$s でサーバ・リストに追加できません"
 "でした。"
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "仲間をサーバ・リストに追加できませんでした"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ 演奏可能 %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "サーバから想定外の HTTP 応答を受け取りました"
 
-msgid "Connection problem"
-msgstr "接続エラー"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "%s との接続を失いました:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"%s との接続を確立できませんでした:\n"
+"サーバとの接続を確立できませんでした:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9969,74 +9826,15 @@ msgstr "チャットに参加する..."
 msgid "Open Inbox"
 msgstr "Hotmail の受信箱を開く"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;ルーム&gt;: Yahoo ネットワーク上にあるチャットへ参加する"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Yahoo ネットワーク上にあるルームを一覧表示します"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: いたずら書きを始めることをユーザに要求する"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo! プロトコル・プラグイン"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan! に接続する"
-
-msgid "Pager server"
-msgstr "ページャのサーバ"
-
-msgid "Japan Pager server"
-msgstr "日本のページャ・サーバ"
-
-msgid "Pager port"
-msgstr "ページャのポート番号"
-
-msgid "File transfer server"
-msgstr "ファイル転送サーバ"
-
-msgid "Japan file transfer server"
-msgstr "日本のファイル転送サーバ"
-
-msgid "File transfer port"
-msgstr "ファイル転送のポート番号"
-
-msgid "Chat room locale"
-msgstr "チャット・ルームの場所"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "会議とチャットルームの招待を無視する"
-
-msgid "Chat room list URL"
-msgstr "チャット・ルームの URL リスト"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo チャット・サーバ"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo チャットのポート番号"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Doodle 要求を送信する"
 
+msgid "Unable to connect."
+msgstr "接続できません"
+
 msgid "Unable to establish file descriptor."
 msgstr "ファイル・デスクリプタを取得できません"
 
@@ -10044,6 +9842,9 @@ msgstr "ファイル・デスクリプタを取得できません"
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s さんがファイル %s の送信を要求しています"
 
+msgid "Write Error"
+msgstr "書き込みエラー"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan プロファイル"
 
@@ -10163,23 +9964,19 @@ msgstr "音声"
 msgid "Webcams"
 msgstr "ウェブカム"
 
+msgid "Connection problem"
+msgstr "接続エラー"
+
 msgid "Unable to fetch room list."
 msgstr "部屋一覧を取得できません"
 
 msgid "User Rooms"
 msgstr "ユーザの部屋"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "YCHT サーバを使った接続に問題があります。"
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"サーバとの接続が切れました\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10311,24 +10108,16 @@ msgstr "Realm"
 msgid "Exposure"
 msgstr "Exposure"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"ソケットを生成できません:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "HTTP プロキシからの応答を解析できません: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP プロキシの接続エラー %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "アクセスが拒否されました: HTTP プロキシ・サーバがポート番号 %d のトンネリング"
 "を拒否しました"
@@ -10337,9 +10126,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr "%s を解決する際にエラー"
 
-msgid "Could not resolve host name"
-msgstr "ホスト名を解決できませんでした"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10548,14 +10334,6 @@ msgstr "%s へ書き込む際にエラー: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "%s へ接続できません: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"ログインするためにサーバが TLS/SSL を要求してきましたが、TLS/SSL はサポートし"
-"ていません。"
-
 #, c-format
 msgid " - %s"
 msgstr ""
@@ -10807,7 +10585,11 @@ msgid "View _Log"
 msgstr "ログの表示(_L)"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "オフラインの時は許可できません"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "オフラインの時は許可できません"
 
 msgid "_Alias..."
@@ -11338,6 +11120,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "%s のユーザ情報の変更"
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11385,7 +11170,8 @@ msgstr "無視する対象"
 msgid "Get Away Message"
 msgstr "離席メッセージの取得"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "最後のメッセージ:"
 
 msgid "Unable to save icon file to disk."
@@ -12299,7 +12085,7 @@ msgid "Hyperlink visited color"
 msgstr "ハイパーリンクの色"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "ハイパーリンクの上にマウスをのせた時の色です"
 
 msgid "Hyperlink prelight color"
@@ -12337,15 +12123,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "通知を削除する時期"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "新着メールを通知する"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12767,6 +12560,10 @@ msgstr ""
 "ブラウザのコマンドを '手動設定' したようですが、コマンドが指定されていませ"
 "ん。"
 
+#, fuzzy
+msgid "No message"
+msgstr "不明なメッセージ"
+
 msgid "Open All Messages"
 msgstr "全てのメッセージを開く"
 
@@ -12784,10 +12581,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">新着メールがあります！</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "不明なメッセージ"
-
 msgid "The following plugins will be unloaded."
 msgstr "次のプラグインを解放します。"
 
@@ -13008,8 +12801,9 @@ msgstr "いつアイコンを表示するか...(_S):"
 msgid "On unread messages"
 msgstr "メッセージが届いた時"
 
-msgid "Conversation Window Hiding"
-msgstr "会話ウィンドウを隠す"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "IM の会話ウィンドウ"
 
 msgid "_Hide new IM conversations:"
 msgstr "いつ新しい会話ウィンドウを隠すか...(_H):"
@@ -13017,6 +12811,10 @@ msgstr "いつ新しい会話ウィンドウを隠すか...(_H):"
 msgid "When away"
 msgstr "離席する時だけ"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "会話ウィンドウを前面に出す(_A)"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "タブ"
@@ -13076,10 +12874,6 @@ msgstr "スクロールを滑らかにする"
 msgid "F_lash window when IMs are received"
 msgstr "メッセージを受け取ったらウィンドウを点滅させる(_L)"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "会話ウィンドウを前面に出す(_A)"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -13116,7 +12910,8 @@ msgstr "ユーザ情報を取得できません"
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">例: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "IP-アドレスを自動的に検出する(_A)"
 
 msgid "Public _IP:"
@@ -13493,34 +13288,18 @@ msgstr "保存して使う(_V)"
 msgid "Status for %s"
 msgstr "%s の状態"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "スマイリー (顔文字) を挿入します"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
 #, fuzzy
-msgid "Duplicate Shortcut"
-msgstr "文字列が重複しています"
+msgid "Custom Smiley"
+msgstr "スマイリー (顔文字) を挿入します"
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "%s さんの新しい名前を入力して下さい"
+msgid "Duplicate Shortcut"
+msgstr "文字列が重複しています"
 
 #, fuzzy
 msgid "Edit Smiley"
@@ -13642,9 +13421,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "ランチャは転送できません"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "ドラッグしたのはデスクトップのランチャです。おそらくランチャ自身ではなく、ラ"
 "ンチャが指しているオブジェクトを転送したいのでしょう。"
@@ -14242,9 +14022,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "コラボレートするための楽曲メッセージ・プラグインです"
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "リアルタイムで共通スコアを編集することにより、複数の仲間との間で、楽曲を一部"
 "分を同時に演奏することを可能にする楽曲メッセージのプラグインです。"
@@ -14509,7 +14290,7 @@ msgstr "会話ウィンドウを隠す"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14835,8 +14616,9 @@ msgstr "Windows 版 Pidgin のオプション"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Windows 版 Pidgin 専用のオプション機能を提供します"
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Windows 版の Pidgin に特化したオプション機能 (会話ウィンドウの組み込みなど) "
 "を提供します"
@@ -14879,6 +14661,288 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "これは XMPP サービスやクライアントをデバッグする際に便利なプラグインです。"
 
+#~ msgid "Cannot open socket"
+#~ msgstr "ソケットを開けません"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "ソケットを監視できませんでした"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "ソケットを読めません"
+
+#~ msgid "Connection failed."
+#~ msgstr "接続に失敗しました"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "サーバが接続を切りました"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "ソケットを生成できませんでした"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "ホストへ接続できませんでした"
+
+#~ msgid "Read error"
+#~ msgstr "読み込みエラーです"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "サーバとの接続を確立できませんでした:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "書き込みエラー"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "フォルダ情報の設定"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "その他"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "チャットの別名"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "フォルダ情報がありません"
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "コマンド指定"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML 形式"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "登録エラー"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "場所"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "ユーザの検索"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "仲間の状態の通知"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "サポートしていないバージョン"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "向き"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "ユーザ・モード"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "ユーザの制限"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "機能"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "ユーザ名"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "キー交換付き IM"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "E-メール・アドレス"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "プロフィール"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "参加する"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "ユーザ名"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "ライブ・ビデオ"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "メッセージを受信しました"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "公開鍵の Babbleprint"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "ユーザのオプション"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "ユーザ・モード"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "ユーザ名"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "ユーザの制限"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Trillian 暗号化"
+
+#~ msgid "Read Error"
+#~ msgstr "読み込みエラー"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "サーバへの接続に失敗しました"
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "キューが一杯です"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "メッセージを解読できません"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "ホストへ接続できませんでした"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "ログインに失敗しました (%s)。"
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "サーバへ接続できません"
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "別のワークステーションからログインしているので、強制的にログアウトされまし"
+#~ "た。"
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "エラーです。SSL サポートがインストールされていません。"
+
+#~ msgid "Incorrect password."
+#~ msgstr "パスワードが間違っています。"
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "BOS サーバに接続できませんでした:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "まもなく切断されるでしょう。更新のために、%s をチェックして下さい。"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "接続できませんでした"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "名前が間違っています"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "サーバの情報を取得できません"
+
+#~ msgid "Connection lost"
+#~ msgstr "接続を閉じました"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "ホスト名を解決できませんでした"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "書き込み用の接続を閉じました"
+
+#~ msgid "Connection reset"
+#~ msgstr "接続のリセット"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "ソケットから読み込む際にエラー: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "ホストに接続できません"
+
+#~ msgid "Could not write"
+#~ msgstr "書き込めませんでした"
+
+#~ msgid "Could not connect"
+#~ msgstr "接続できませんでした"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "ソケットを生成できませんでした"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "ホスト名を解決できませんでした"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "パスワードが間違っています"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s との接続を確立できませんでした:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan! に接続する"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "日本のページャ・サーバ"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "日本のファイル転送サーバ"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "サーバとの接続が切れました\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "ホスト名を解決できませんでした"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "ログインするためにサーバが TLS/SSL を要求してきましたが、TLS/SSL はサポー"
+#~ "トしていません。"
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "会話ウィンドウを隠す"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "%s さんの新しい名前を入力して下さい"
+
 #, fuzzy
 #~ msgid "Activate which ID?"
 #~ msgstr "どの ID を有効化しますか？"
@@ -15558,10 +15622,6 @@ msgstr ""
 #~ msgstr "現在のトークン"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "サーバへ接続できません"
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "メッセージ(_M):"
 
diff --git a/po/ka.po b/po/ka.po
index f745d8ed09..df24739b53 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0 CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2006-02-05 23:19+0100\n"
 "Last-Translator: Ubuntu Georgian Translators <>\n"
 "Language-Team: Georgian <ka@li.org>\n"
@@ -2596,7 +2596,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2647,7 +2647,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2892,12 +2892,13 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
+msgstr "ახალი კავშირის დამყარება შეუძლებელია"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2954,17 +2955,17 @@ msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 "პროტოკოლირება გამორთულია. ამ მომენტიდან საუბრის პროტოკოლირება შეწყვეტილია."
 
-#, fuzzy
-msgid "Cannot open socket"
-msgstr "ვერ ვაგზავნი ფაილს"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "ვერ ვქმნი სოკეტს"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "შეუძლებელია ჰოსტთან დაკავშირება"
 
-#, fuzzy
-msgid "Could not listen on socket"
-msgstr "შეუძლებელია სოკეტის შექმნა"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "ვერ ვქმნი სოკეტს"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
@@ -3011,13 +3012,14 @@ msgstr "მეგობრების სიის შენახვა..."
 msgid "Load buddylist from file..."
 msgstr ""
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "პაროლები არ ემთხვევა ერთმანეთს."
 
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr ""
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3029,14 +3031,15 @@ msgstr "რეგისტრაცია მოხერხდა!"
 msgid "Password"
 msgstr "პაროლი"
 
-msgid "Password (retype)"
-msgstr "პაროლი (მეორედ)"
+msgid "Password (again)"
+msgstr "პაროლი (კიდევ ერთხელ)"
 
-msgid "Enter current token"
+msgid "Enter captcha text"
 msgstr ""
 
-msgid "Current token"
-msgstr ""
+#, fuzzy
+msgid "Captcha"
+msgstr "სურათის შენახვა"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr ""
@@ -3089,6 +3092,15 @@ msgstr "პაროლი შეიცვალა!"
 msgid "Current password"
 msgstr ""
 
+msgid "Password (retype)"
+msgstr "პაროლი (მეორედ)"
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
@@ -3137,7 +3149,8 @@ msgstr ""
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-msgid "Unable to read socket"
+#, fuzzy
+msgid "Unable to read from socket"
 msgstr "ვერ ვკითხულობ სოკეტს"
 
 msgid "Buddy list downloaded"
@@ -3152,8 +3165,14 @@ msgstr ""
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
-msgid "Connection failed."
-msgstr "კავშირი ვერ განხორციელდა."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "შეერთებული"
+
+msgid "Connection failed"
+msgstr ""
 
 msgid "Add to chat"
 msgstr ""
@@ -3161,18 +3180,23 @@ msgstr ""
 msgid "Chat _name:"
 msgstr "ჩატის _სახელი:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "შეუძლებელია სერვერთან დაკავშირება"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "დაკავშირება"
+
 msgid "Chat error"
 msgstr "ჩატის შეცდომა"
 
 msgid "This chat name is already in use"
 msgstr ""
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "არ ვარ დაკავშირებული სერვერთან."
 
 #, fuzzy
@@ -3235,7 +3259,7 @@ msgid "File Transfer Failed"
 msgstr "ფაილის გადაგზავნა ვერ მოხერხდა"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Pidgin ვერ ხსნის მხმენელ პორტს."
 
 msgid "Error displaying MOTD"
@@ -3251,8 +3275,16 @@ msgstr ""
 msgid "MOTD for %s"
 msgstr ""
 
-msgid "Server has disconnected"
-msgstr "სერვერი გაითიშა"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "არ ვარ დაკავშირებული სერვერთან."
 
 msgid "View MOTD"
 msgstr ""
@@ -3266,23 +3298,21 @@ msgstr "_პაროლი:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "დაკავშირება"
-
 #, fuzzy
 msgid "SSL support unavailable"
 msgstr "SSL სუპორტი"
 
-msgid "Couldn't create socket"
-msgstr "შეუძლებელია სოკეტის შექმნა"
+msgid "Unable to connect"
+msgstr "დაკავშირება შეუძლებელია"
 
-msgid "Couldn't connect to host"
-msgstr "შეუძლებელია ჰოსტთან დაკავშირება"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "შეუძლებელია სერვერთან დაკავშირება"
 
-msgid "Read error"
-msgstr "კითხვის შეცდომა"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "სერვერი გაითიშა"
 
 msgid "Users"
 msgstr "მომხმარებლები"
@@ -3676,10 +3706,10 @@ msgstr "ბრძანება გაუქმებულია"
 msgid "execute"
 msgstr "მოულოდნელი"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3694,7 +3724,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "ტექსტური დადასტურება"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "აუტენტიფიკაცია ვერ მოხერხდა"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "სერვერის არასწორი პასუხი"
 
 msgid "Server does not use any supported authentication method"
@@ -3706,7 +3741,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr ""
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL შეცდომა"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3723,22 +3759,14 @@ msgstr ""
 msgid "Unable to establish a connection with the server"
 msgstr "შეუძლებელია სერვერთან დაკავშირება"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "შეუძლებელია სერვერთან დაკავშირება"
 
 #, fuzzy
 msgid "Unable to establish SSL connection"
 msgstr "ახალი კავშირის დამყარება შეუძლებელია"
 
-msgid "Unable to create socket"
-msgstr "ვერ ვქმნი სოკეტს"
-
-msgid "Write error"
-msgstr "წერის შეცდომა"
-
 msgid "Full Name"
 msgstr "სრული სახელი"
 
@@ -3809,184 +3837,6 @@ msgstr ""
 msgid "Local Time"
 msgstr "ლოკალური ფაილი:"
 
-msgid "Last Activity"
-msgstr ""
-
-msgid "Service Discovery Info"
-msgstr ""
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "მთლიანი მისამართი"
-
-msgid "Multi-User Chat"
-msgstr ""
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "ბრძანება"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr ""
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "რეგისტრაციის შეცდომა"
-
-#, fuzzy
-msgid "User Location"
-msgstr "ადგილმდებარეობა"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "მომხმარებლის ძებნა"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "მდგომარეობა შეტყობინება"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "საუბრის შენახვა"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "ორიენტაცია"
-
-#, fuzzy
-msgid "File Transfer"
-msgstr "ფაილის გადაგზავნა"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "მომხმარებლის ოთახები"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "მომხმარებელთა ლიმიტი"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "შეუძლია"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "მომხმარებლის სახელი"
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "Email მისამართი"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "MSN პროფაილი"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "Ping"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "მომხმარებლის სახელი"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "ცოცხალი ვიდეო"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "შეტყობინება მიღებულია"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "ავთენტურობის დადგენა ღია გასაღებით"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "მომხმარებლის პარამეტრები"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "მომხმარებლის ოთახები"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "მომხმარებლის სახელი"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "მომხმარებელთა ლიმიტი"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Trillian შიფრი"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "შეუძლია"
-
 msgid "Priority"
 msgstr "პრიორიტეტი"
 
@@ -3998,7 +3848,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "პროტოკოლირება"
 
 msgid "Middle Name"
@@ -4182,16 +4032,12 @@ msgid "Roles:"
 msgstr "როლი"
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "ტექსტი"
 
-msgid "Read Error"
-msgstr "კითხვის შეცდომა"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 #, fuzzy
@@ -4384,9 +4230,6 @@ msgstr ""
 msgid "Error changing password"
 msgstr "შეცდომა პაროლის შეცვლისას"
 
-msgid "Password (again)"
-msgstr "პაროლი (კიდევ ერთხელ)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "შეცვალე პაროლი"
@@ -4778,6 +4621,14 @@ msgstr "შეცდომა XML ფაილის შეტანისას
 msgid "Unknown Error in presence"
 msgstr "უცნობი შეცდომის კოდი"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr ""
+
+#, c-format
+msgid "Error in chat %s"
+msgstr ""
+
 msgid "Create New Room"
 msgstr "შექმენი ახალი ოთახი"
 
@@ -4792,15 +4643,19 @@ msgstr "ოთახის _კონფიგურაცია"
 msgid "_Accept Defaults"
 msgstr ""
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr ""
+#, fuzzy
+msgid "No reason"
+msgstr "მიზეზი მითითებული არაა"
+
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "%s გახდა უმოქმედო (%s)"
 
 #, c-format
-msgid "Error in chat %s"
+msgid "Kicked (%s)"
 msgstr ""
 
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr ""
 
 #, fuzzy
@@ -5299,9 +5154,6 @@ msgstr ""
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-msgid "Failed to connect to server."
-msgstr ""
-
 msgid "Error retrieving profile"
 msgstr "შეცდომა პროფაილის ჩამოტანისას"
 
@@ -5559,9 +5411,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 
-msgid "Unable to connect"
-msgstr "დაკავშირება შეუძლებელია"
-
 msgid "Writing error"
 msgstr "წერის შეცდომა"
 
@@ -5574,19 +5423,21 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Our protocol is not supported by the server."
-msgstr ""
+#, fuzzy
+msgid "Our protocol is not supported by the server"
+msgstr "ეს პროტოკოლს არ ააქ chat-ოთახების მხარდაჭერა."
 
-msgid "Error parsing HTTP."
-msgstr ""
+#, fuzzy
+msgid "Error parsing HTTP"
+msgstr "შეცდომა პროფაილის ჩამოტანისას"
 
-msgid "You have signed on from another location."
+msgid "You have signed on from another location"
 msgstr ""
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr ""
 
 #, c-format
@@ -5597,9 +5448,6 @@ msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "Unknown error."
-msgstr "უცნობი შეცდომა."
-
 msgid "Handshaking"
 msgstr "მისალმება"
 
@@ -5696,6 +5544,9 @@ msgstr "AIM/ICQ პროტოკოლის პლაგინი"
 msgid "%s is not a valid group."
 msgstr ""
 
+msgid "Unknown error."
+msgstr "უცნობი შეცდომა."
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr ""
@@ -5810,12 +5661,6 @@ msgstr[0] ""
 msgid "Add contacts from server"
 msgstr "სერვერის არასწორი პასუხი"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "შეერთებული"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr ""
@@ -5838,17 +5683,6 @@ msgstr ""
 msgid "Invalid input condition"
 msgstr "კავშირის დასრულება"
 
-msgid "Read buffer full (2)"
-msgstr ""
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "შეტყობინების გაგზავნა"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "შეუძლებელია ჰოსტთან დაკავშირება"
-
 msgid "Failed to add buddy"
 msgstr ""
 
@@ -5938,6 +5772,12 @@ msgstr ""
 msgid "Client Version"
 msgstr "დაასრულე საუბარი"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 #, fuzzy
 msgid "MySpaceIM - Username Available"
 msgstr "სერვისი მიუწვდომელია"
@@ -6202,9 +6042,9 @@ msgstr ""
 msgid "Unknown error: 0x%X"
 msgstr "უცნობი შეცდომა: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "შეუძლებელია შეტყობინების გაგზავნა: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6302,9 +6142,6 @@ msgstr ""
 msgid "Authenticating..."
 msgstr "მიმდენარეობს აუტენტიფიკაცია..."
 
-msgid "Unable to connect to server."
-msgstr "შეუძლებელია სერვერთან დაკავშირება"
-
 msgid "Waiting for response..."
 msgstr "ველოდები პასუხს..."
 
@@ -6325,20 +6162,14 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr ""
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-
-msgid "Error. SSL support is not installed."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 
 msgid "This conference has been closed. No more messages can be sent."
@@ -6377,10 +6208,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "შეცდომა პროფაილის ჩამოტანისას"
 
-msgid "Incorrect password."
-msgstr "არასწორი პაროლი."
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, fuzzy
@@ -6392,17 +6220,7 @@ msgid "Invalid chat room name"
 msgstr "არასწორი ოთახის სახელი"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "სერვერი გაითიშა"
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "არ ვარ დაკავშირებული სერვერთან."
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "შეუძლებელია სერვერთან დაკავშირება"
 
 #. *< type
@@ -6452,8 +6270,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "შეუძლებელია სერვერთან დაკავშირება"
 
 msgid "Direct IM established"
 msgstr ""
@@ -6647,16 +6466,12 @@ msgid "Buddy Comment"
 msgstr ""
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "არ ვარ დაკავშირებული სერვერთან."
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr "შეუძლებელია ჰოსტთან დაკავშირება"
+msgid "Unable to connect to BOS server: %s"
+msgstr "შეუძლებელია სერვერთან დაკავშირება"
 
 #, fuzzy
 msgid "Username sent"
@@ -6671,9 +6486,9 @@ msgstr "კავშირის დასრულება"
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 
 #, c-format
@@ -6684,28 +6499,22 @@ msgstr ""
 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
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "არასწორი"
+msgid "Username does not exist"
+msgstr "მომხმარებელი არ არსებობს"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+msgid "Your account is currently suspended"
 msgstr ""
 
 #. service temporarily unavailable
@@ -6722,7 +6531,7 @@ msgid ""
 "try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
-msgid "The SecurID key entered is invalid."
+msgid "The SecurID key entered is invalid"
 msgstr ""
 
 msgid "Enter SecurID"
@@ -6869,6 +6678,9 @@ msgstr ""
 msgid "Member Since"
 msgstr ""
 
+msgid "Capabilities"
+msgstr "შეუძლია"
+
 #, fuzzy
 msgid "Profile"
 msgstr "MSN პროფაილი"
@@ -7026,7 +6838,7 @@ msgstr "გასულობის შეტყობინება ძალ�
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7049,7 +6861,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
@@ -7057,7 +6869,7 @@ msgid "(no name)"
 msgstr "(უსახელო)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr ""
 
 #, c-format
@@ -7907,7 +7719,7 @@ msgid "Update interval (seconds)"
 msgstr "კითხვის შეცდომა"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "კავშირის სერვერი"
 
 #, c-format
@@ -7934,10 +7746,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "კავშირის სერვერი"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "პრივატი"
 
@@ -7972,26 +7780,11 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "დაკავშირება შეუძლებელია"
-
 #, fuzzy
 msgid "Socket error"
 msgstr "ჩატის შეცდომა"
 
 #, fuzzy
-msgid "Unable to read from socket"
-msgstr "ვერ ვკითხულობ სოკეტს"
-
-#, fuzzy
-msgid "Write Error"
-msgstr "წერის შეცდომა"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "კავშირის შეცდომა"
-
-#, fuzzy
 msgid "Getting server"
 msgstr "მომხმარებლის ინფორმაციის შეტანა..."
 
@@ -7999,8 +7792,9 @@ msgstr "მომხმარებლის ინფორმაციის �
 msgid "Requesting token"
 msgstr "პრივატი"
 
-msgid "Couldn't resolve host"
-msgstr ""
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "შეუძლებელია სერვერთან დაკავშირება"
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8051,7 +7845,7 @@ msgid "QQ Qun Command"
 msgstr "ბრძანება"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "კავშირის სერვერი"
 
 #, fuzzy
@@ -8074,9 +7868,6 @@ msgstr "ფაილის გაგზავნა ვერ მოხერხ
 msgid "%d canceled the transfer of %s"
 msgstr "%s -მა შეწყვიტა %s ფაილის გადატანა"
 
-msgid "Connection closed (writing)"
-msgstr ""
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>ჯგუფის სათაური:</b> %s<br>"
@@ -8131,17 +7922,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-msgid "Connection reset"
-msgstr ""
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr ""
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr ""
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -8165,6 +7945,10 @@ msgid "Video Camera"
 msgstr "ვიდეო კამერა"
 
 #, fuzzy
+msgid "File Transfer"
+msgstr "ფაილის გადაგზავნა"
+
+#, fuzzy
 msgid "Supports"
 msgstr "სუპორტი"
 
@@ -8932,6 +8716,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "ქსელის სტატისტიკა"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr ""
 
@@ -8991,8 +8778,9 @@ msgstr ""
 msgid "Disconnected by server"
 msgstr ""
 
-msgid "Error during connecting to SILC Server"
-msgstr ""
+#, fuzzy
+msgid "Error connecting to SILC Server"
+msgstr "კავშირის სერვერი"
 
 msgid "Key Exchange failed"
 msgstr ""
@@ -9001,27 +8789,27 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-msgid "Connection failed"
-msgstr ""
-
 msgid "Performing key exchange"
 msgstr ""
 
-msgid "Unable to create connection"
-msgstr ""
-
-msgid "Could not load SILC key pair"
-msgstr ""
+#, fuzzy
+msgid "Unable to load SILC key pair"
+msgstr "Pidgin-მა ვერ შეძლო თქვენი პლაგინის ჩატვირთვა"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr ""
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Pidgin-მა ვერ შეძლო თქვენი პლაგინის ჩატვირთვა"
+
 msgid "Out of memory"
 msgstr ""
 
-msgid "Cannot initialize SILC protocol"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
+msgstr "ახალი კავშირის დამყარება შეუძლებელია"
 
 msgid "Error loading SILC key pair"
 msgstr ""
@@ -9301,8 +9089,9 @@ msgstr ""
 msgid "Creating SILC key pair..."
 msgstr ""
 
-msgid "Cannot create SILC key pair\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to create SILC key pair"
+msgstr "ვერ ვქმნი სოკეტს"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9390,6 +9179,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr ""
 
+msgid "Error during connecting to SILC Server"
+msgstr ""
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -9430,35 +9222,28 @@ msgstr ""
 msgid "Failure: Authentication failed"
 msgstr ""
 
-msgid "Cannot initialize SILC Client connection"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
+msgstr "ახალი კავშირის დამყარება შეუძლებელია"
 
 #, fuzzy
 msgid "John Noname"
 msgstr "უსახელო"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr ""
-
-#, fuzzy
-msgid "Could not write"
-msgstr "ვერ ვაგზავნი"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
+msgstr "Pidgin-მა ვერ შეძლო თქვენი პლაგინის ჩატვირთვა"
 
-#, fuzzy
-msgid "Could not connect"
-msgstr "ვერ ვუკავშირდები"
+msgid "Unable to create connection"
+msgstr ""
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "სერვერის უცნობი შეცდომა."
 
-msgid "Could not create listen socket"
-msgstr ""
-
 #, fuzzy
-msgid "Could not resolve hostname"
-msgstr "ვერ ვაგზავნი"
+msgid "Unable to create listen socket"
+msgstr "ვერ ვქმნი სოკეტს"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
@@ -9500,6 +9285,81 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr ""
+
+msgid "list: List rooms on the Yahoo network"
+msgstr ""
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo პროტოკოლის პლაგინი"
+
+#, fuzzy
+msgid "Pager server"
+msgstr "პროქსი სერვერი"
+
+msgid "Pager port"
+msgstr ""
+
+#, fuzzy
+msgid "File transfer server"
+msgstr "ფაილების გადაგზავნა"
+
+msgid "File transfer port"
+msgstr ""
+
+msgid "Chat room locale"
+msgstr ""
+
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
+
+msgid "Chat room list URL"
+msgstr ""
+
+msgid "Yahoo Chat server"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo Chat port"
+msgstr "Yahoo იაპონია"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo პროტოკოლის პლაგინი"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9528,26 +9388,16 @@ msgstr ""
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 
 #. username or password missing
@@ -9582,34 +9432,28 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-msgid "Could not add buddy to server list"
-msgstr ""
+#, fuzzy
+msgid "Unable to add buddy to server list"
+msgstr "შეუძლებელია სერვერთან დაკავშირება"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
 #, fuzzy
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "სერვერის არასწორი პასუხი"
 
-msgid "Connection problem"
-msgstr ""
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "საუბარი %s-თან"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "შეუძლებელია სერვერთან დაკავშირება"
 
 msgid "Not at Home"
 msgstr ""
@@ -9672,79 +9516,15 @@ msgstr ""
 msgid "Open Inbox"
 msgstr "Hotmail საფოსტო ყუთის გახსნა"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-
-msgid "list: List rooms on the Yahoo network"
-msgstr ""
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo პროტოკოლის პლაგინი"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo იაპონია"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "პროქსი სერვერი"
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "იაპონური"
-
-msgid "Pager port"
-msgstr ""
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "ფაილების გადაგზავნა"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "ფაილის გადაგზავნა შესრულდა"
-
-msgid "File transfer port"
-msgstr ""
-
-msgid "Chat room locale"
-msgstr ""
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-msgid "Chat room list URL"
-msgstr ""
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "Yahoo იაპონია"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "დაკავშირება შეუძლებელია"
+
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -9752,6 +9532,10 @@ msgstr ""
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s სურს გამოგიგზავნოთ ფაილი"
 
+#, fuzzy
+msgid "Write Error"
+msgstr "წერის შეცდომა"
+
 msgid "Yahoo! Japan Profile"
 msgstr ""
 
@@ -9856,19 +9640,17 @@ msgstr "ხმები"
 msgid "Webcams"
 msgstr "ვებ კამერები"
 
+msgid "Connection problem"
+msgstr ""
+
 msgid "Unable to fetch room list."
 msgstr ""
 
 msgid "User Rooms"
 msgstr "მომხმარებლის ოთახები"
 
-msgid "Connection problem with the YCHT server."
-msgstr ""
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "არ ვარ დაკავშირებული სერვერთან."
 
 msgid ""
@@ -9989,31 +9771,21 @@ msgid "Exposure"
 msgstr ""
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "ვერ ვქმნი სოკეტს"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "შეუძლებელია შეტყობინების გაგზავნა: %s"
 
 #, fuzzy, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "კავშირის შეცდომა"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr "შეცდომა"
 
-#, fuzzy
-msgid "Could not resolve host name"
-msgstr "ვერ ვაგზავნი"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10221,12 +9993,6 @@ msgid "Unable to connect to %s: %s"
 msgstr "შეუძლებელია სერვერთან დაკავშირება"
 
 #, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-
-#, c-format
 msgid " - %s"
 msgstr ""
 
@@ -10471,7 +10237,11 @@ msgid "View _Log"
 msgstr "დაათვალიერე _ლოგი"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "მომხმარებელი გასულია ქსელიდან"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "მომხმარებელი გასულია ქსელიდან"
 
 msgid "_Alias..."
@@ -11001,6 +10771,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "ინფორმაციის შეცვლა %s მომხმარებლისათვის"
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11049,7 +10822,8 @@ msgstr "იგნორირება"
 msgid "Get Away Message"
 msgstr "მიიღე გასულობის შეტყობინება"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "ბოლოს ნათქვამი"
 
 msgid "Unable to save icon file to disk."
@@ -11972,7 +11746,7 @@ msgid "Hyperlink visited color"
 msgstr "ლინკების ფერი"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "ლინკების ფერი მაუსის შეხებისას."
 
 msgid "Hyperlink prelight color"
@@ -12010,15 +11784,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "ახალი ელ.ფოსტის შეტყობინებები"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "ახალი ელ.ფოსტის შეტყობინებები"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12376,6 +12157,10 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
+#, fuzzy
+msgid "No message"
+msgstr "უცნობი შეტყობინება"
+
 msgid "Open All Messages"
 msgstr "გახსენი ყველა შეტყობინება"
 
@@ -12396,10 +12181,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, fuzzy
-msgid "No message"
-msgstr "უცნობი შეტყობინება"
-
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -12619,7 +12400,7 @@ msgid "On unread messages"
 msgstr "შეტყობინების გაგზავნა"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "IMის საუბრის ფანჯარა"
 
 #, fuzzy
@@ -12629,6 +12410,10 @@ msgstr "_ახალი საუბარი:"
 msgid "When away"
 msgstr "როდესაც გასულია"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "IMის საუბრის ფანჯარა"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -12688,10 +12473,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr ""
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "IMის საუბრის ფანჯარა"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12729,7 +12510,8 @@ msgstr ""
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "IP მისამართის _ავტომატური დადგენა"
 
 msgid "Public _IP:"
@@ -13107,35 +12889,19 @@ msgstr "შენახვა და გამოყენება"
 msgid "Status for %s"
 msgstr ""
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "სიცილაკის ჩამატება"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
+#, fuzzy
+msgid "Custom Smiley"
+msgstr "სიცილაკის ჩამატება"
+
 msgid "Duplicate Shortcut"
 msgstr ""
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "გთხოვთ შეიყვანოთ თქვენი ახალი პაროლი"
-
-#, fuzzy
 msgid "Edit Smiley"
 msgstr "სიცილაკის ჩამატება"
 
@@ -13248,8 +13014,8 @@ msgid "Cannot send launcher"
 msgstr ""
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -13852,7 +13618,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -14110,7 +13876,7 @@ msgstr "IMის საუბრის ფანჯარა"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14432,9 +14198,10 @@ msgstr "შესვლის პარამეტრები"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Windows Pidgin-ის სპეციფიკური პარამეტრები."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "Windows Pidgin-ის სპეციფიკური პარამეტრები."
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr ""
@@ -14474,6 +14241,211 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Cannot open socket"
+#~ msgstr "ვერ ვაგზავნი ფაილს"
+
+#, fuzzy
+#~ msgid "Could not listen on socket"
+#~ msgstr "შეუძლებელია სოკეტის შექმნა"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "ვერ ვკითხულობ სოკეტს"
+
+#~ msgid "Connection failed."
+#~ msgstr "კავშირი ვერ განხორციელდა."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "სერვერი გაითიშა"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "შეუძლებელია სოკეტის შექმნა"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "შეუძლებელია ჰოსტთან დაკავშირება"
+
+#~ msgid "Read error"
+#~ msgstr "კითხვის შეცდომა"
+
+#~ msgid "Write error"
+#~ msgstr "წერის შეცდომა"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "მთლიანი მისამართი"
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "ბრძანება"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "რეგისტრაციის შეცდომა"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "ადგილმდებარეობა"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "მომხმარებლის ძებნა"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "მდგომარეობა შეტყობინება"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "საუბრის შენახვა"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "ორიენტაცია"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "მომხმარებლის ოთახები"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "მომხმარებელთა ლიმიტი"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "შეუძლია"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "მომხმარებლის სახელი"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "Email მისამართი"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "MSN პროფაილი"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "Ping"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "მომხმარებლის სახელი"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "ცოცხალი ვიდეო"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "შეტყობინება მიღებულია"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "ავთენტურობის დადგენა ღია გასაღებით"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "მომხმარებლის პარამეტრები"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "მომხმარებლის ოთახები"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "მომხმარებლის სახელი"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "მომხმარებელთა ლიმიტი"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Trillian შიფრი"
+
+#~ msgid "Read Error"
+#~ msgstr "კითხვის შეცდომა"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "შეტყობინების გაგზავნა"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "შეუძლებელია ჰოსტთან დაკავშირება"
+
+#~ msgid "Incorrect password."
+#~ msgstr "არასწორი პაროლი."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "შეუძლებელია ჰოსტთან დაკავშირება"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "ვერ ვუკავშირდები"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "არასწორი"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "კავშირის სერვერი"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "კავშირის შეცდომა"
+
+#, fuzzy
+#~ msgid "Could not write"
+#~ msgstr "ვერ ვაგზავნი"
+
+#, fuzzy
+#~ msgid "Could not connect"
+#~ msgstr "ვერ ვუკავშირდები"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "ვერ ვაგზავნი"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "არასწორი პაროლი."
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo იაპონია"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "იაპონური"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "ფაილის გადაგზავნა შესრულდა"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "არ ვარ დაკავშირებული სერვერთან."
+
+#, fuzzy
+#~ msgid "Could not resolve host name"
+#~ msgstr "ვერ ვაგზავნი"
+
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "IMის საუბრის ფანჯარა"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "გთხოვთ შეიყვანოთ თქვენი ახალი პაროლი"
+
 #~ msgid "Cursor Color"
 #~ msgstr "კურსორის ფერი"
 
@@ -14792,10 +14764,6 @@ msgstr ""
 #~ msgstr "შეუძლებელია სერვერთან დაკავშირება"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "შეუძლებელია სერვერთან დაკავშირება"
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_შეტყობინება:"
 
diff --git a/po/km.po b/po/km.po
index a413e9c4f9..9f04a1fb14 100644
--- a/po/km.po
+++ b/po/km.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2009-02-25 11:49+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros.info>\n"
@@ -2521,9 +2521,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "រួម​បញ្ចូល​កំណត់​ហេតុ​របស់​ម៉ាស៊ីនភ្ញៀវ IM ផ្សេងៗ​ទៀត​នៅ​ក្នុង​កម្មវិធីមើល​កំណត់​ហេតុ ។"
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2576,8 +2577,9 @@ msgstr "ក្លែង​ធ្វើសារ​ក្រៅ​បណ្ដា
 msgid "Save messages sent to an offline user as pounce."
 msgstr "រក្សាទុកសារ​ដែល​បានផ្ញើ​ទៅ​កាន់​អ្នក​ប្រើ​ក្រៅ​ជា​ក្រុម ។"
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr "សារ​ដែល​នៅ​សល់​នឹង​ត្រូវ​បានរក្សាទុកជា​ក្រុម ។ អ្នកអាច​កែសម្រួល/លុប​ក្រុម​ពី​ប្រអប់​ `ក្រុម​មិត្តភក្ដិ' ។"
 
@@ -2823,14 +2825,16 @@ msgstr ""
 "មិនអាច​រក​ឃើញ​ការ​ដំឡើងTCL ដែល​សកម្ម ។ ប្រសិន​បើ​អ្នក​ចង់​ប្រើ​កម្មវិធី​ជំនួយ TCL ដំឡើង TCL សកម្ម​ពី "
 "http://www.activestate.com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Apple Bonjour សម្រាប់​ប្រអប់​ឧបករណ៍​វីនដូ​ដែល​រក​មិនឃើញ សូម​មើល FAQ នៅ ៖ http://d.pidgin.im/"
 "BonjourWindows ចំពោះ​ព័ត៌មាន​លម្អិត ។"
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "មិនអាច​ស្ដាប់​ការ​តភ្ជាប់ IM ចូល​\n"
 
 msgid ""
@@ -2882,14 +2886,21 @@ msgstr "%s បានបិទ​ការ​សន្ទនា ។"
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "មិនអាច​ផ្ញើ​សារ​បានទេ ការ​សន្ទនា​មិនអាច​ត្រូវ​បាន​ចាប់ផ្ដើម​ទេ ។"
 
-msgid "Cannot open socket"
-msgstr "មិនអាច​បើក​រន្ធ​បានទេ"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"មិនអាច​បង្កើត​រន្ធ ៖\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "មិនអាច​ចង​រន្ធ​ទៅ​ច្រក​បានទេ"
 
-msgid "Could not listen on socket"
-msgstr "មិនអាច​ស្ដាប់​នៅ​លើ​រន្ធ​បានទេ"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"មិនអាច​បង្កើត​រន្ធ ៖\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "កំហុស​ក្នុងការ​ទាក់ទង​ជា​មួយ​នឹង mDNSResponder មូលដ្ឋាន ។"
@@ -2936,13 +2947,16 @@ msgstr "រក្សា​​ទុក​​បញ្ជីមិត្តភក
 msgid "Load buddylist from file..."
 msgstr "ផ្ទុក​បញ្ជីមិត្តភក្ដិ​ពី​ឯកសារ..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "បំពេញ​វាល​ចុះឈ្មោះ ។"
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "ពាក្យ​សម្ងាត់​មិន​ផ្គូផ្គង ។"
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "មិនអាច​ចុះឈ្មោះ​គណនី​ថ្មី​ទេ ។ កំហុស​បាន​កើត​ឡើង ។\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2954,14 +2968,15 @@ msgstr "ការ​ចុះឈ្មោះ​បានបញ្ចប់​ដ
 msgid "Password"
 msgstr "ពាក្យ​​​សម្ងាត់"
 
-msgid "Password (retype)"
-msgstr "ពាក្យ​​​សម្ងាត់ (វាយ​ឡើង​វិញ)"
+msgid "Password (again)"
+msgstr "ពាក្យ​សម្ងាត់ (ម្ដង​ទៀត)"
 
-msgid "Enter current token"
-msgstr "បញ្ចូល​ថូខឹន​បច្ចុប្បន្ន"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "ថូខឹន​បច្ចុប្បន្ន"
+#, fuzzy
+msgid "Captcha"
+msgstr "រូបភាព Captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "ចុះឈ្មោះ​គណនី Gadu-Gadu ថ្មី"
@@ -3014,6 +3029,15 @@ msgstr "ពាក្យ​សម្ងាត់​ត្រូវ​បាន​
 msgid "Current password"
 msgstr "ពាក្យ​សម្ងាត់​បច្ចុប្បន្ន"
 
+msgid "Password (retype)"
+msgstr "ពាក្យ​​​សម្ងាត់ (វាយ​ឡើង​វិញ)"
+
+msgid "Enter current token"
+msgstr "បញ្ចូល​ថូខឹន​បច្ចុប្បន្ន"
+
+msgid "Current token"
+msgstr "ថូខឹន​បច្ចុប្បន្ន"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "សូម​បញ្ចូល​ពាក្យ​សម្ងាត់​បច្ចុប្បន្ន និង​ពាក្យ​សម្ងាត់​ថ្មី​របស់​អ្នក​សម្រាប់ UIN ៖ "
 
@@ -3061,8 +3085,8 @@ msgstr "រក​មិនឃើញ​អ្នក​ប្រើ​ដែលផ
 msgid "There are no users matching your search criteria."
 msgstr "មិនមាន​អ្នក​ប្រើ​ដែល​ផ្គូផ្គង​នឹង​លក្ខខណ្ឌ​ស្វែងរក​របស់​អ្នក ។"
 
-msgid "Unable to read socket"
-msgstr "មិនអាច​អាន​រន្ធ​បានទេ"
+msgid "Unable to read from socket"
+msgstr "មិនអាច​អាន​ពី​រន្ធ​បានទេ"
 
 msgid "Buddy list downloaded"
 msgstr "បានទាញយក​បញ្ជីមិត្តភក្ដិ"
@@ -3076,8 +3100,14 @@ msgstr "បានផ្ទុក​បញ្ជីមិត្តភក្ដិ
 msgid "Your buddy list was stored on the server."
 msgstr "បញ្ជី​មិត្តភក្ដិ​របស់​អ្នក​ត្រូ​វបាន​ទុក​នៅ​លើ​ម៉ាស៊ីនបម្រើ ។"
 
-msgid "Connection failed."
-msgstr "បានបរាជ័យ​ក្នុងការ​តភ្ជាប់ ។"
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "បាន​តភ្ជាប់"
+
+msgid "Connection failed"
+msgstr "បានបរាជ័យ​ក្នុងការ​តភ្ជាប់"
 
 msgid "Add to chat"
 msgstr "បន្ថែម​ទៅ​កាន់​ការ​ជជែក"
@@ -3085,18 +3115,23 @@ msgstr "បន្ថែម​ទៅ​កាន់​ការ​ជជែក"
 msgid "Chat _name:"
 msgstr "ឈ្មោះការ​ជជែក ៖"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "មិនអាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​បម្រើ​បានទេ ។"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "តភ្ជាប់"
+
 msgid "Chat error"
 msgstr "កំហុស​ក្នុងកា​រជជែក"
 
 msgid "This chat name is already in use"
 msgstr "ឈ្មោះការ​ជជែក​នេះ​កំពុង​ប្រើ​រួច​ហើយ"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "មិន​បានតភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីនបម្រើ​ទេ ។"
 
 msgid "Find buddies..."
@@ -3156,7 +3191,8 @@ msgstr "គ្មាន​ប្រធាន​បទ​ត្រូវ​បា
 msgid "File Transfer Failed"
 msgstr "បាន​បរាជ័យ​ក្នុងកា​រផ្ទេរ​ឯកសារ"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "មិនអាច​បើក​ច្រក​ស្ដាប់​បានទេ ។"
 
 msgid "Error displaying MOTD"
@@ -3172,8 +3208,18 @@ msgstr "មិនមាន​ MOTD បាន​ភ្ជាប់​ជា​ម
 msgid "MOTD for %s"
 msgstr "MOTD សម្រាប់ %s"
 
-msgid "Server has disconnected"
-msgstr "ម៉ាស៊ីន​បម្រើ​បាន​ផ្ដាច់"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"បាត់​បង់​ការ​តភ្ជាប់​ជា​មួយ​ម៉ាស៊ីន​បម្រើ ៖\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "មើល MOTD"
@@ -3188,22 +3234,20 @@ msgstr "ពាក្យ​​​សម្ងាត់ ៖"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "សម្មតិនាម IRC អាច​​​​​​មិនមាន​ចន្លោះ"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "តភ្ជាប់"
-
 msgid "SSL support unavailable"
 msgstr "មិនមានការគាំទ្រ SSL"
 
-msgid "Couldn't create socket"
-msgstr "មិនអាច​បង្កើត​រន្ធ​បានទេ"
+msgid "Unable to connect"
+msgstr "មិនអាច​តភ្ជាប់​ទេ"
 
-msgid "Couldn't connect to host"
-msgstr "មិនអាច​តភ្ជាប់​ទៅកាន់​ម៉ាស៊ីនបាន​ទេ"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "មិនអាច​តភ្ជាប់​ទៅ %s"
 
-msgid "Read error"
-msgstr "កំហុស​ក្នុងការ​អាន"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "ម៉ាស៊ីនបម្រើ​បានបិទ​ការ​តភ្ជាប់ ។"
 
 msgid "Users"
 msgstr "អ្នក​ប្រើ"
@@ -3623,10 +3667,12 @@ msgstr "ពាក្យ​បញ្ជា​ Ad-Hoc បាន​បរាជ័�
 msgid "execute"
 msgstr "ប្រតិបត្តិ"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "ម៉ាស៊ីន​បម្រើ​ត្រូវការ TLS/SSL ដើម្បី​ចូល ។ រក​មិនឃើញការគាំទ្រ TLS/SSL នោះ​ទេ ។"
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "អ្នក​ត្រូវការ​ការ​អ៊ិនគ្រីប ប៉ុន្តែ​រក​មិនឃើញ​ការគាំទ្រ TLS/SSL ។"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3643,7 +3689,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "ផ្ទៀងផ្ទាត់​ភាព​​ត្រឹមត្រូវ​ធម្មតា"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "បាន​បរាជ័យ​ក្នុងកា​រផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "កា​រឆ្លើយ​តប​មិនត្រឹមត្រូវ​ពី​ម៉ាស៊ីន​បម្រើ ។"
 
 msgid "Server does not use any supported authentication method"
@@ -3655,7 +3706,8 @@ msgstr "អ្នកត្រូវកា​រការ​អ៊ិនគ្រ
 msgid "Invalid challenge from server"
 msgstr "ការ​ប្រខិតខំ​មិនត្រឹមត្រូវ​ពី​ម៉ាស៊ីនបម្រើ"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "កំហុស SASL"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3675,10 +3727,8 @@ msgstr ""
 "មិនអាច​បង្កើត​ការ​តភ្ជាប់​ជា​មួយ​ម៉ាស៊ីនបម្រើ ៖\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "មិនអាច​បង្កើត​ការ​តភ្ជាប់​ជា​មួយ​ម៉ាស៊ីនបម្រើ ៖\n"
 "%s"
@@ -3687,12 +3737,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "មិនអាច​ចាប់ផ្ដើម​កា​រតភ្ជាប់​បានទេ"
 
-msgid "Unable to create socket"
-msgstr "មិន​អាច​បង្កើត​រន្ធ​បានទេ"
-
-msgid "Write error"
-msgstr "កំហុស​ក្នុងកា​រសរសេរ"
-
 msgid "Full Name"
 msgstr "ឈ្មោះ​ពេញ"
 
@@ -3761,159 +3805,6 @@ msgstr "ប្រព័ន្ធ​ប្រតិបត្តិការ"
 msgid "Local Time"
 msgstr "ឯកសារ​មូលដ្ឋាន ៖"
 
-msgid "Last Activity"
-msgstr "សកម្មភាព​ចុងក្រោយ"
-
-msgid "Service Discovery Info"
-msgstr "ព័ត៌មាន​រកឃើញ​សេវា"
-
-msgid "Service Discovery Items"
-msgstr "ធាតុ​រក​ឃើញ​ព័ត៌មាន"
-
-msgid "Extended Stanza Addressing"
-msgstr "កំណត់​អាសយដ្ឋាន Stanza ដែល​បាន​ពង្រីក"
-
-msgid "Multi-User Chat"
-msgstr "ការ​ជជែក​ដែល​មាន​អ្នក​ប្រើច្រើន​នាក់"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "ព័ត៌មាន​វត្តមាន​ដែល​បាន​ពង្រីក​នៃ​កា​រជជែក​ដែល​មាន​អ្នកប្រើ​ច្រើននាក់"
-
-msgid "In-Band Bytestreams"
-msgstr "ស្ទ្រីម​បៃ​ក្នុងក្រុម"
-
-msgid "Ad-Hoc Commands"
-msgstr "ពាក្យ​បញ្ជា Ad-Hoc"
-
-msgid "PubSub Service"
-msgstr "សេវា PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "ស្ទ្រីម​បៃ SOCKS5"
-
-msgid "Out of Band Data"
-msgstr "ទិន្នន័យ​ក្រៅ​ក្រុម"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "ការ​ចុះឈ្មោះ​ក្នុងក្រុម"
-
-msgid "User Location"
-msgstr "ទីតាំង​របស់​អ្នក​ប្រើ"
-
-msgid "User Avatar"
-msgstr "រូបភាព​របស់​អ្នក"
-
-msgid "Chat State Notifications"
-msgstr "ការ​ជូនដំណឹង​ស្ថានភាព​ជជែក"
-
-msgid "Software Version"
-msgstr "កំណែ​​កម្មវិធី"
-
-msgid "Stream Initiation"
-msgstr "ការ​ចាប់ផ្ដើម​ស្ទ្រីម​"
-
-msgid "File Transfer"
-msgstr "កា​រផ្ទេរ​ឯកសារ"
-
-msgid "User Mood"
-msgstr "អារម្មណ៍​អ្នក​ប្រើ"
-
-msgid "User Activity"
-msgstr "សកម្មភាព​អ្នក​ប្រើ"
-
-msgid "Entity Capabilities"
-msgstr "សមត្ថភាព​អង្គភាព"
-
-msgid "Encrypted Session Negotiations"
-msgstr "ការ​ចរចារ​សម័យ​ដែល​បាន​អ៊ិនគ្រីប"
-
-msgid "User Tune"
-msgstr "អ្នក​ប្រើ​"
-
-msgid "Roster Item Exchange"
-msgstr "ផ្លាស់ប្ដូរ​ធាតុ​បញ្ជីឈ្មោះ"
-
-msgid "Reachability Address"
-msgstr "អាសយដ្ឋាន​ដែល​អាច​ចូល​បាន"
-
-msgid "User Profile"
-msgstr "ទម្រង់​អ្នក​ប្រើ"
-
-msgid "Jingle"
-msgstr "ឃ្លា​ខ្លីៗ"
-
-msgid "Jingle Audio"
-msgstr "អូឌីយ៉ូ​ឃ្លា​ខ្លីៗ"
-
-msgid "User Nickname"
-msgstr "សម្មតិនាម​អ្នក​ប្រើ"
-
-msgid "Jingle ICE UDP"
-msgstr "ឃ្លាខ្លីៗ​របស់ ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "ឃ្លាខ្លីៗ​របស់ ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "ឃ្លាខ្លីៗ​របស់ UDP ដើម"
-
-msgid "Jingle Video"
-msgstr "វីដេអូ​ឃ្លាខ្លីៗ"
-
-msgid "Jingle DTMF"
-msgstr "ឃ្លាខ្លីៗ DTMF"
-
-msgid "Message Receipts"
-msgstr "ទទួលសារ"
-
-msgid "Public Key Publishing"
-msgstr "បោះពុម្ព​គ្រាប់ចុច​សាធារណៈ"
-
-msgid "User Chatting"
-msgstr "ការ​ជជែក​របស់​អ្នក​ប្រើ"
-
-msgid "User Browsing"
-msgstr "កា​ររុករក​របស់​អ្នក​ប្រើ"
-
-msgid "User Gaming"
-msgstr "ការ​លេង​ល្បែង​របស់​អ្នក​ប្រើ"
-
-msgid "User Viewing"
-msgstr "កា​រមើលរបស់​អ្នក​ប្រើ"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "ការ​អ៊ិនគ្រីប Stanza"
-
-msgid "Entity Time"
-msgstr "ពេល​វេលា​​របស់​អង្គភាព"
-
-msgid "Delayed Delivery"
-msgstr "ការ​បញ្ជូន​បាន​ពន្យារពេល"
-
-msgid "Collaborative Data Objects"
-msgstr "វត្ថុ​ទិន្នន័យ​សហការណ៍"
-
-msgid "File Repository and Sharing"
-msgstr "ឃ្លាំង​ឯកសារ និង​ការ​ចែករំលែក"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "ការ​រកឃើញសេវា STUN សម្រាប់​ឃ្លាខ្លីៗ"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "ការ​ចរចារ​សម័យ​ដែល​បាន​អ៊ិនគ្រីប​សាមញ្ញ"
-
-msgid "Hop Check"
-msgstr "ពិនិត្យមើល​ដំណាក់"
-
-msgid "Capabilities"
-msgstr "សមត្ថភាព"
-
 msgid "Priority"
 msgstr "អាទិភាព"
 
@@ -3925,7 +3816,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "បាន​ចូល"
 
 msgid "Middle Name"
@@ -4106,16 +3997,13 @@ msgstr "រក​មិនឃើញ​អ្នក​ប្រើ​ដែលផ
 msgid "Roles:"
 msgstr "តួនាទី"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Ping អស់ពេល"
 
-msgid "Read Error"
-msgstr "កំហុស​ក្នុងការ​អាន"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4291,9 +4179,6 @@ msgstr "ពាក្យ​សម្ងាត់​របស់​អ្នក​
 msgid "Error changing password"
 msgstr "កំហុស​ក្នុងកា​រផ្លាស់ប្ដូរ​ពាក្យសម្ងាត់"
 
-msgid "Password (again)"
-msgstr "ពាក្យ​សម្ងាត់ (ម្ដង​ទៀត)"
-
 msgid "Change XMPP Password"
 msgstr "ផ្លាស់ប្ដូរ​ពាក្យ​សម្ងាត់ XMPP"
 
@@ -4674,6 +4559,14 @@ msgstr "កំហុស​ក្នុងកា​រញែក XML"
 msgid "Unknown Error in presence"
 msgstr "មិន​ស្គាល់​កំហុស​នៅ​ក្នុងវត្តមាន"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "កំហុស​ក្នុងកា​រចូល​ក្នុងការ​ជជែក %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "កំហុស​​នៅ​ក្នុង​ការ​ជជែក %s"
+
 msgid "Create New Room"
 msgstr "បង្កើត​បន្ទប់​ថ្មី"
 
@@ -4688,16 +4581,20 @@ msgstr "កំណត់​រចនាសម្ព័ន្ធ​បន្ទប
 msgid "_Accept Defaults"
 msgstr "ព្រមទទួល​លំនាំដើម"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "កំហុស​ក្នុងកា​រចូល​ក្នុងការ​ជជែក %s"
+#, fuzzy
+msgid "No reason"
+msgstr "គ្មាន​ហេតុផល​បាន​ផ្ដល់"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "កំហុស​​នៅ​ក្នុង​ការ​ជជែក %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "អ្នក​ត្រូ​វបាន​ធាក់ចេញ​ដោយ %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "បាន​ធាក់ចេញ​ដោយ %s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "កំហុស​មួយ​បានកើត​ឡើង​ខណៈពេល​បើក​ឯកសារ ។"
 
 #, fuzzy
@@ -5182,9 +5079,6 @@ msgstr "ចាប់ផ្ដើមជជែក"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "ការ​គាំទ្រ SSL ត្រូវ​បានទាមទារ​សម្រាប់ MSN ។ សូម​ដំឡើង​បណ្ណាល័យ SSL ដែល​បានគាំទ្រ ។"
 
-msgid "Failed to connect to server."
-msgstr "បាន​បរាជ័យ​ក្នុងការ​តភ្ជាប់​ទៅ​ម៉ាស៊ីន​បម្រើ ។"
-
 msgid "Error retrieving profile"
 msgstr "កំហុសក្នុងការ​ទៅ​ទទួល​យក​ទម្រង់"
 
@@ -5428,9 +5322,6 @@ msgstr "សារ​មិន​ត្រូវ​បាន​ផ្ញើ​ទ
 msgid "Message was not sent because an unknown error occurred."
 msgstr "សារ​មិន​ត្រូវ​បាន​ផ្ញើ​បានទេ ពីព្រោះ​មាន​កំហុស​ដែលមិនស្គាល់​បានកើត​ឡើង ។"
 
-msgid "Unable to connect"
-msgstr "មិនអាច​តភ្ជាប់​ទេ"
-
 msgid "Writing error"
 msgstr "កំហុស​ក្នុងការ​សរសេរ"
 
@@ -5445,19 +5336,23 @@ msgstr ""
 "កំហុស​ក្នុងការ​តភ្ជាប់​ពី​ម៉ាស៊ីន​បម្រើ %s ៖\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "ពិធីការ​របស់​យើង​មិន​ត្រូវ​បានគាំទ្រ​ដោយ​ម៉ាស៊ីនបម្រើ​ទេ ។"
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "កំហុស​ក្នុងកា​រញែក HTTP ។"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "អ្នក​បាន​ចុះហត្ថលេខា​ពី​ទីតាំង​ផ្សេង ។"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "ម៉ាស៊ីន​បម្រើ MSN មិនអាច​ប្រើ​បាន​ជា​បណ្ដោះ​អាសន្ន ។ សូម​រង់ចាំ ហើយ​ព្យាយាម​ម្ដង​ទៀត ។"
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "ម៉ាស៊ីន​បម្រើ MSN នឹង​ខូច​ជា​បណ្ដោះ​អាសន្ន ។"
 
 #, c-format
@@ -5468,9 +5363,6 @@ msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "បញ្ជី​​មិត្តភក្ដិ​របស់​អ្នក MSN ​មិន​អាច​ប្រើ​បាន​ជា​បណ្ដោះ​អាសន្ន ។ សូម​រង់ចាំ ហើយ​ព្យាយាម​ម្ដង​ទៀត ។"
 
-msgid "Unknown error."
-msgstr "មិន​ស្គាល់​កំហុស ។"
-
 msgid "Handshaking"
 msgstr "ការ​ចាប់ដៃ"
 
@@ -5567,6 +5459,9 @@ msgstr "កម្មវិធី​ជំនួយ​ពិធីការ​​
 msgid "%s is not a valid group."
 msgstr "%s មិន​មែន​ជា​ក្រុម​ត្រឹមត្រូវ​ទេ ។"
 
+msgid "Unknown error."
+msgstr "មិន​ស្គាល់​កំហុស ។"
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s នៅលើ %s (%s)"
@@ -5674,12 +5569,6 @@ msgstr[0] ""
 msgid "Add contacts from server"
 msgstr "បន្ថែម​ទំនាក់ទំនង​ពី​ម៉ាស៊ីន​បម្រើ"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "បាន​តភ្ជាប់"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "កំហុស​ពិធីការ កូដ %d: %s"
@@ -5703,16 +5592,6 @@ msgstr "កំហុស MySpaceIM"
 msgid "Invalid input condition"
 msgstr "លក្ខខណ្ឌ​បញ្ចូល​មិនត្រឹមត្រូវ"
 
-msgid "Read buffer full (2)"
-msgstr "អាន​សតិ​បណ្ដោះអាសន្ន​ពេញលេញ (២)"
-
-msgid "Unparseable message"
-msgstr "សារ​ដែល​មិន​អាច​ញែក​បាន"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "មិនអាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន ៖ %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "បាន​បរាជ័យ​ក្នុងការ​បន្ថែម​មិត្តភក្ដិ"
 
@@ -5796,6 +5675,12 @@ msgstr "មិត្តភក្ដិ​សរុប"
 msgid "Client Version"
 msgstr "កំណែ​ម៉ាស៊ីន​ភ្ញៀវ"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - មាន​ឈ្មោះ​អ្នក​ប្រើ"
 
@@ -6050,9 +5935,9 @@ msgstr "អ្នក​ប្រើ​នៅ​ក្រៅ​បណ្ដាញ
 msgid "Unknown error: 0x%X"
 msgstr "មិន​ស្គាល់​កំហុស ៖ 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "បាន​បរាជ័យ​ក្នុងកា​រចូល (%s) ។"
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "មិនអាច ping អ្នក​ប្រើ %s បានទេ"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6152,9 +6037,6 @@ msgstr "GroupWise សន្និសីទ %d"
 msgid "Authenticating..."
 msgstr "កំពុង​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ..."
 
-msgid "Unable to connect to server."
-msgstr "មិនអាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​បម្រើ​បានទេ ។"
-
 msgid "Waiting for response..."
 msgstr "កំពុង​រង់ចាំ​ការ​ឆ្លើយ​តប..."
 
@@ -6178,22 +6060,17 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "តើ​អ្នក​ចង់​ចូល​រួម​ក្នុងការ​សន្ទនា​ដែរឬទេ ?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "អ្នក​ត្រូវ​បាន​ចេញ ដោយ​សារ​តែ​អ្នក​បាន​ចូល​ក្នុងស្ថានីយការងារ​ផ្សេង​ទៀត ។"
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s បង្ហាញថា​នៅ​ក្រៅបណ្ដាញ ហើយ​មិន​បានទទួល​សារ​ដែល​អ្នក​ទើប​តែ​បាន​ផ្ញើ​នោះ​ទេ ។"
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr "មិន​អាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​បម្រើ​បានទេ ។ សូម​បញ្ចូល​អាសយដ្ឋាន​ម៉ាស៊ីនបម្រើ​ដែល​អ្នក​ចង់​តភ្ជាប់ ។"
 
-msgid "Error. SSL support is not installed."
-msgstr "កំហុស ។ ការ​គាំទ្រ SSL មិន​ត្រូវ​បាន​ដំឡើង​ទេ ។"
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "សន្និសីទ​នេះ​ត្រូ​វបាន​បិទ ។ គ្មាន​សារ​អាច​ត្រូវ​បាន​ផ្ញើ​ទេ ។"
 
@@ -6232,10 +6109,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "កំហុស​ក្នុងការ​ដោះស្រាយ %s"
 
-msgid "Incorrect password."
-msgstr "ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ ។"
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6244,18 +6118,8 @@ msgstr "មិនអាច​ចូល​រួម​ក្នុង​បន្
 msgid "Invalid chat room name"
 msgstr "ឈ្មោះ​បន្ទប់​ជជែក​មិន​ត្រឹមត្រូវ"
 
-msgid "Server closed the connection."
-msgstr "ម៉ាស៊ីនបម្រើ​បានបិទ​ការ​តភ្ជាប់ ។"
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"បាត់​បង់​ការ​តភ្ជាប់​ជា​មួយ​ម៉ាស៊ីន​បម្រើ ៖\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "បាន​ទទួល​ទិន្នន័យ​មិនត្រឹមត្រូវ​នៅ​លើ​កា​រតភ្ជាប់​ជា​មួយ​ម៉ាស៊ីន​បម្រើ ។ "
 
 #. *< type
@@ -6303,7 +6167,8 @@ msgstr "បាត់បង់​ការ​តភ្ជាប់​ជា​ម
 msgid "Received invalid data on connection with remote user."
 msgstr "បាន​ទទួល​ទិន្នន័យ​មិន​ត្រឹមត្រូវ​នៅ​ពេល​តភ្ជាប់​ជា​មួយ​អ្នកប្រើពី​ចម្ងាយ ។"
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "មិនអាច​បង្កើត​ការ​តភ្ជាប់​ជា​មួយ​អ្នក​ប្រើ​ពី​ចម្ងាយ​បាន​ទេ ។"
 
 msgid "Direct IM established"
@@ -6502,21 +6367,15 @@ msgstr "កម្រិត​ព្រមាន"
 msgid "Buddy Comment"
 msgstr "មតិយោបល់​មិត្តភក្ដិ"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "មិនអាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​បម្រើ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​បានទេ ៖\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"មិនអាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​បម្រើ BOS ៖\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "មិនអាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​បម្រើ​បានទេ ។"
 
 msgid "Username sent"
 msgstr "បានផ្ញើ​ឈ្មោះ​អ្នក​ប្រើ"
@@ -6528,11 +6387,11 @@ msgstr "បានបង្កើត​ការ​តភ្ជាប់ បា�
 msgid "Finalizing connection"
 msgstr "បញ្ចប់​ការ​តភ្ជាប់"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "មិនអាច​ចូល​បានទេ ៖ មិនអាច​ចូល​ជា​ %s ពីព្រោះ​ឈ្មោះ​អ្នក​ប្រើ​មិន​ត្រឹមត្រូវ ។ អ្នក​ប្រើ​ត្រូវ​តែ​មានអាសយដ្ឋាន​"
 "អ៊ីមែល ឬ​ចាប់ផ្ដើម​ដោយ​អក្សរ និង​មានតែ​អក្សរ លេខ និង​ចន្លោះ ឬ​មាន​តែ​លេខ ។"
@@ -6545,26 +6404,22 @@ msgstr ""
 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 "ឈ្មោះ​អ្នកប្រើ​មិន​ត្រឹមត្រូវ ។"
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "មិន​មាន​​អ្នក​ប្រើ​ទេ"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "គណនី​របស់​អ្នក​បច្ចុប្បន្ន​ត្រូវ​បានផ្អាក ។"
 
 #. service temporarily unavailable
@@ -6584,7 +6439,8 @@ msgstr ""
 "អ្នក​កំពុង​ត្រូវ​បានតភ្ជាប់ និង​ផ្ដាច់​ញឹក​ញាប់​ណាស់ ។ រង់ចាំ​ដប់នាទី ហើយ​ព្យាយាម​ម្ដង​ទៀត ។ ប្រសិនបើ​អ្នក​បន្ត​"
 "ដើម្បី​ព្យាយាម អ្នកនឹង​ត្រូវ​រង់ចាំ​យូរ​បន្តិច ។"
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "សោ SecurID ដែល​​បាន​បញ្ចូល​មិនត្រឹមត្រូវ ។"
 
 msgid "Enter SecurID"
@@ -6744,6 +6600,9 @@ msgstr "លើ​បណ្ដាញ​តាំងពី"
 msgid "Member Since"
 msgstr "សមាជិក​តាំង​ពី"
 
+msgid "Capabilities"
+msgstr "សមត្ថភាព"
+
 msgid "Profile"
 msgstr "ទម្រង់"
 
@@ -6905,9 +6764,9 @@ msgstr[0] ""
 msgid "Away message too long."
 msgstr "សារ​ចាកឆ្ងាយ​វែង​ពេក ។"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6930,9 +6789,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "កំព្រា"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "មិនអាច​បន្ថែម​មិត្តភក្ដិ %s បាន​ទេ ពីព្រោះ​អ្នក​មាន​មិត្តភក្ដិជា​ច្រើន​នៅ​ក្នុង​បញ្ជីមិត្តភក្ដិ​របស់​អ្នក ។ សូមយក​​"
@@ -6941,8 +6800,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(គ្មាន​ឈ្មោះ)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "មិនអាច​បន្ថែម​មិត្តភក្ដិ %s បាន​ទេ ដោយ​សារ​មិន​ស្គាល់​ហេតុផល ។"
 
 #, c-format
@@ -7711,7 +7570,8 @@ msgstr "ទុក​ខាងក្នុង (វិនាទី)"
 msgid "Update interval (seconds)"
 msgstr "ធ្វើ​ឲ្យ​ចន្លោះ​ទាន់សម័យ (វិនាទី)"
 
-msgid "Cannot decrypt server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "មិនអាច​ឌិគ្រីប​កា​រឆ្លើយ​តប​របស់​ម៉ាស៊ីន​បម្រើ​បានទេ"
 
 #, c-format
@@ -7736,9 +7596,6 @@ msgstr "ត្រូវការ​ធ្វើ​ឲ្យ​សកម្ម"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "កូដ​ឆ្លើយតប​មិន​​ស្គាល់​នៅ​ពេល​ចូល (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "មិនអាច​ឌិគ្រីប​ការ​​ឆ្លើយតប​របស់​ម៉ាស៊ីន​បម្រើ​បាន​ទេ"
-
 msgid "Requesting captcha"
 msgstr "ស្នើ captcha"
 
@@ -7772,29 +7629,18 @@ msgstr ""
 "កូដ​ឆ្លើយតប​មិនស្គាល់ នៅពេល​ចូល (0x%02X) ៖\n"
 "%s"
 
-msgid "Unable to connect."
-msgstr "មិនអាច​តភ្ជាប់​បានទេ ។"
-
 msgid "Socket error"
 msgstr "កំហុស​រន្ធ"
 
-msgid "Unable to read from socket"
-msgstr "មិនអាច​អាន​ពី​រន្ធ​បានទេ"
-
-msgid "Write Error"
-msgstr "កំហុស​ក្នុងកា​រសរសេរ"
-
-msgid "Connection lost"
-msgstr "បាត់បង់​ការ​តភ្ជាប់"
-
 msgid "Getting server"
 msgstr "យក​ម៉ាស៊ីនបម្រើ"
 
 msgid "Requesting token"
 msgstr "ស្នើ​ថូខឹន"
 
-msgid "Couldn't resolve host"
-msgstr "មិនអាច​ដោះស្រាយ​ម៉ាស៊ីនបានទេ"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "មិនអាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​បម្រើ​បានទេ ។"
 
 msgid "Invalid server or port"
 msgstr "ម៉ាស៊ីន​បម្រើ ឬ​ច្រក​មិន​ត្រឹមត្រូវ"
@@ -7847,7 +7693,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "ពាក្យ​បញ្ជា QQ Qun"
 
-msgid "Could not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "មិនអាច​ឌិគ្រីប​ការ​ឆ្លើយ​តប​ការ​ចូល​បានទេ"
 
 msgid "Unknown LOGIN CMD"
@@ -7867,9 +7714,6 @@ msgstr "ផ្ញើ​ឯកសារ"
 msgid "%d canceled the transfer of %s"
 msgstr "%d បានបោះបង់​ការ​ផ្ទេរ %s"
 
-msgid "Connection closed (writing)"
-msgstr "បាន​បិទ​ការ​តភ្ជាប់ (សរសេរ)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>ចំណង​ជ្រើ​ក្រុម ៖</b> %s<br>"
@@ -7923,17 +7767,6 @@ msgstr "ពេលមួយ​នោះ អ្នកគ្រប់គ្រង�
 msgid "Sametime Administrator Announcement"
 msgstr "ការ​ប្រកាស​របស់​អ្នកគ្រប់គ្រង​ពេល​តែ​មួយ"
 
-msgid "Connection reset"
-msgstr "កំណត់​ការ​តភ្ជាប់​ឡើង​វិញ"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "កំហុស​ក្នុងការ​អាន​ពី​រន្ធ ៖ %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "មិនអាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​ទេ"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "ការ​ប្រកាស​ពី %s"
@@ -7956,6 +7789,9 @@ msgstr "ធុងបាស"
 msgid "Video Camera"
 msgstr "ម៉ាស៊ីន​ថត​​វីដេអូ"
 
+msgid "File Transfer"
+msgstr "កា​រផ្ទេរ​ឯកសារ"
+
 msgid "Supports"
 msgstr "គាំទ្រ"
 
@@ -8760,6 +8596,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "ស្ថិតិ​បណ្ដាញ"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "បានបរាជ័យក្នុងការ Ping"
 
@@ -8823,7 +8662,8 @@ msgstr "ប្រភេទ​សោ​សាធារណៈ​មិន​បា
 msgid "Disconnected by server"
 msgstr "បានផ្ដាច់​ដោយ​ម៉ាស៊ីនបម្រើ"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "កំហុស​កំឡុងពេល​តភ្ជាប់​ទៅកាន់​ម៉ាស៊ីន​បម្រើ SILC"
 
 msgid "Key Exchange failed"
@@ -8833,26 +8673,26 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "បានបរាជ័យ​ក្នុងការ​បន្ត​សម័យ​ដែលបានផ្ដាច់ ។ ចុច​តភ្ជាប់ឡើង​វិញ​ដើម្បី​បង្កើត​ការ​តភ្ជាប់ថ្មី ។"
 
-msgid "Connection failed"
-msgstr "បានបរាជ័យ​ក្នុងការ​តភ្ជាប់"
-
 msgid "Performing key exchange"
 msgstr "អនុវត្ត​ការ​ផ្លាស់ប្ដូរ​សោ"
 
-msgid "Unable to create connection"
-msgstr "មិនអាច​បង្កើត​ការតភ្ជាប់​បានទេ"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "មិនអាច​ផ្ទុក​ការ​​ផ្គូផ្គង​សោ SILC បានទេ"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​បម្រើ SILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "មិនអាច​ផ្ទុក​ការ​​ផ្គូផ្គង​សោ SILC បានទេ"
+
 msgid "Out of memory"
 msgstr "អស់​សតិOut of memory"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "មិនអាច​ចាប់ផ្ដើម​ពិធីការ SILC បានទេ"
 
 msgid "Error loading SILC key pair"
@@ -9141,7 +8981,8 @@ msgstr "ចុះហត្ថលេខា​ឌីជីថល និង​ផ�
 msgid "Creating SILC key pair..."
 msgstr "កំពុង​បង្កើត​គូសោ SILC​..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "មិនអាច​បង្កើត​គូ​សោ SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9235,6 +9076,9 @@ msgstr "ក្ដារខៀន"
 msgid "No server statistics available"
 msgstr "មិនមាន​ស្ថិតិ​ម៉ាស៊ីន​បម្រើ"
 
+msgid "Error during connecting to SILC Server"
+msgstr "កំហុស​កំឡុងពេល​តភ្ជាប់​ទៅកាន់​ម៉ាស៊ីន​បម្រើ SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "បរាជ័យ ៖ កំណែ​មិនផ្គូផ្គង ធ្វើ​ឲ្យ​​ម៉ាស៊ីន​ភ្ញៀវ​របស់​អ្នក​ប្រសើរ​ឡើង"
@@ -9275,30 +9119,27 @@ msgstr "បរាជ័យ ៖ ខូគី​មិន​ត្រឹមត្�
 msgid "Failure: Authentication failed"
 msgstr "បរាជ័យ ៖ បានបរាជ័យ​ក្នុងការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "មិន​អាច​ចាប់ផ្ដើម​ការ​តភ្ជាប់ម៉ាស៊ីន​ភ្ញៀវ SILC បានទេ"
 
 msgid "John Noname"
 msgstr "John Noname"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "មិនអាច​ផ្ទុក​គូសោ SILC ៖ %s"
 
-msgid "Could not write"
-msgstr "មិនអាច​សរសេរ​បានទេ"
-
-msgid "Could not connect"
-msgstr "មិនអាច​តភ្ជាប់"
+msgid "Unable to create connection"
+msgstr "មិនអាច​បង្កើត​ការតភ្ជាប់​បានទេ"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "មិនស្គាល់​ការ​ឆ្លើយតប​របស់ម៉ាស៊ីនបម្រើ"
 
-msgid "Could not create listen socket"
-msgstr "មិនអាច​បង្កើត​រន្ធ​ស្ដាប់បានទេ"
-
-msgid "Could not resolve hostname"
-msgstr "មិនអាច​ដោះស្រាយ​ឈ្មោះ​ម៉ាស៊ីនបានទេ"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "មិន​អាច​បង្កើត​រន្ធ​បានទេ"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "ឈ្មោះអ្នកប្រើ SIP អាច​មិនមាន​ចន្លោះ​មិនឃើញ ឬ​និមិត្តសញ្ញា @"
@@ -9339,6 +9180,77 @@ msgstr "ផ្ទៀងផ្ទាត់​អ្នកប្រើ"
 msgid "Auth Domain"
 msgstr "ផ្ទៀងផ្ទាត់​ដែន"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "ចូលរួម &lt;room&gt; ៖  ចូលរួម​បន្ទប់​ជជែក​នៅ​ក្នុង​បណ្ដាញ​យ៉ាហ៊ូ"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "បញ្ជី ៖ រាយ​បន្ទប់​នៅ​ក្នុង​បណ្ដាញ​របស់​យ៉ាហ៊ូ"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle ៖ ស្នើ​អ្នកប្រើ​ឲ្យ​ចាប់ផ្ដើម​សម័យ​របស់ Doodle"
+
+msgid "Yahoo ID..."
+msgstr "លេខ​សម្គាល់​របស់​យ៉ាហ៊ូ..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "កម្មវិធី​ជំនួយ​ពិធីការ​របស់យ៉ាហ៊ូ"
+
+msgid "Pager server"
+msgstr "ម៉ាស៊ីនបម្រើ​ភេយ័រ"
+
+msgid "Pager port"
+msgstr "ច្រក​ភេយ័រ"
+
+msgid "File transfer server"
+msgstr "ម៉ាស៊ីនបម្រើ​ផ្ទេរ​ឯកសារ"
+
+msgid "File transfer port"
+msgstr "ច្រក​ផ្ទេរ​ឯកសារ"
+
+msgid "Chat room locale"
+msgstr "បន្ទប់​ជជែក​មូលដ្ឋាន"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "មិនអើពើ​សន្និសីទ និង​ការ​អញ្ជើញ​របស់​បន្ទប់​ជជែក"
+
+msgid "Chat room list URL"
+msgstr "URL បញ្ជី​បន្ទប់​ជជែក"
+
+msgid "Yahoo Chat server"
+msgstr "ម៉ាស៊ីនបម្រើ​ជជែក​យ៉ាហ៊ូ"
+
+msgid "Yahoo Chat port"
+msgstr "ច្រក​ជជែក​យ៉ាហ៊ូ"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "លេខ​សម្គាល់​របស់​យ៉ាហ៊ូ..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "កម្មវិធី​ជំនួយ​ពិធីការ​របស់យ៉ាហ៊ូ"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9369,28 +9281,18 @@ msgstr "បន្ថែម​មិត្តភក្ដិ​ដែល​បា
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr "មិន​ស្គាល់លេខ​កំហុស %d ។ ចូល​ក្នុង​តំបន់យ៉ាហ៊ូ ! អាចជួសជុល​វា​បាន ។"
 
 #. username or password missing
@@ -9428,37 +9330,32 @@ msgstr "គណនី​របស់​អ្នកត្រូវ​បាន​
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "មិន​ស្គាល់លេខ​កំហុស %d ។ ចូល​ក្នុង​តំបន់យ៉ាហ៊ូ ! អាចជួសជុល​វា​បាន ។"
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "មិនអាច​បន្ថែម​មិត្តភក្ដិ %s ដើម្បីដាក់ %s ជា​ក្រុម​ទៅកាន់​បញ្ជីម៉ាស៊ីន​បម្រើ​នៅ​ក្នុងគណនី %s ។"
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "មិនអាច​បន្ថែម​មិត្តភក្ដិ​ទៅ​កាន់បញ្ជី​ម៉ាស៊ីន​បម្រើ​ទេ"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "បាន​ទទួល​កា​រឆ្លើយ​តប HTTP ពី​ម៉ាស៊ីនបម្រើ ។"
 
-msgid "Connection problem"
-msgstr "បញ្ហា​ក្នុង​ការ​តភ្ជាប់"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "បាត់បង់​ការ​តភ្ជាប់​ជា​មួយ %s ៖\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"មិនអាច​បង្កើត​ការ​តភ្ជាប់​ជា​មួយ %s បានទេ ៖\n"
+"មិនអាច​បង្កើត​ការ​តភ្ជាប់​ជា​មួយ​ម៉ាស៊ីនបម្រើ ៖\n"
 "%s"
 
 msgid "Not at Home"
@@ -9521,73 +9418,15 @@ msgstr "ចូលរួម​អ្នកប្រើ​នៅ​ក្នុង
 msgid "Open Inbox"
 msgstr "បើក​ប្រអប់"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "ចូលរួម &lt;room&gt; ៖  ចូលរួម​បន្ទប់​ជជែក​នៅ​ក្នុង​បណ្ដាញ​យ៉ាហ៊ូ"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "បញ្ជី ៖ រាយ​បន្ទប់​នៅ​ក្នុង​បណ្ដាញ​របស់​យ៉ាហ៊ូ"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle ៖ ស្នើ​អ្នកប្រើ​ឲ្យ​ចាប់ផ្ដើម​សម័យ​របស់ Doodle"
-
-msgid "Yahoo ID..."
-msgstr "លេខ​សម្គាល់​របស់​យ៉ាហ៊ូ..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "កម្មវិធី​ជំនួយ​ពិធីការ​របស់យ៉ាហ៊ូ"
-
-msgid "Yahoo Japan"
-msgstr "យ៉ាហ៊ូ​ ជប៉ុន"
-
-msgid "Pager server"
-msgstr "ម៉ាស៊ីនបម្រើ​ភេយ័រ"
-
-msgid "Japan Pager server"
-msgstr "ម៉ាស៊ីន​បម្រើ​ភេយ័រ​ជប៉ុន"
-
-msgid "Pager port"
-msgstr "ច្រក​ភេយ័រ"
-
-msgid "File transfer server"
-msgstr "ម៉ាស៊ីនបម្រើ​ផ្ទេរ​ឯកសារ"
-
-msgid "Japan file transfer server"
-msgstr "ម៉ាស៊ីនបម្រើ​ផ្ទេរ​ឯកសារ​ជប៉ុន"
-
-msgid "File transfer port"
-msgstr "ច្រក​ផ្ទេរ​ឯកសារ"
-
-msgid "Chat room locale"
-msgstr "បន្ទប់​ជជែក​មូលដ្ឋាន"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "មិនអើពើ​សន្និសីទ និង​ការ​អញ្ជើញ​របស់​បន្ទប់​ជជែក"
-
-msgid "Chat room list URL"
-msgstr "URL បញ្ជី​បន្ទប់​ជជែក"
-
-msgid "Yahoo Chat server"
-msgstr "ម៉ាស៊ីនបម្រើ​ជជែក​យ៉ាហ៊ូ"
-
-msgid "Yahoo Chat port"
-msgstr "ច្រក​ជជែក​យ៉ាហ៊ូ"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "បានផ្ញើ​សំណើ Doodle ។"
 
+msgid "Unable to connect."
+msgstr "មិនអាច​តភ្ជាប់​បានទេ ។"
+
 msgid "Unable to establish file descriptor."
 msgstr "មិនអាច​បង្កើត​​ឧបករណ៍​ពិពណ៌នា​ឯកសារ​បានទេ ។"
 
@@ -9595,6 +9434,9 @@ msgstr "មិនអាច​បង្កើត​​ឧបករណ៍​ពិ
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s កំពុង​ព្យាយាម​ផ្ញើ​ឲ្យ​អ្នក​នូវ​ក្រុម​ឯកសារ %d ។\n"
 
+msgid "Write Error"
+msgstr "កំហុស​ក្នុងកា​រសរសេរ"
+
 msgid "Yahoo! Japan Profile"
 msgstr "ទម្រង់​យ៉ាហ៊ូ ជប៉ុន"
 
@@ -9704,23 +9546,19 @@ msgstr "សំឡេង"
 msgid "Webcams"
 msgstr "ម៉ាស៊ីន​ថត​តាមបណ្ដាញ"
 
+msgid "Connection problem"
+msgstr "បញ្ហា​ក្នុង​ការ​តភ្ជាប់"
+
 msgid "Unable to fetch room list."
 msgstr "មិនអាច​ទៅ​យក​បញ្ជី​បន្ទប់​បានទេ ។"
 
 msgid "User Rooms"
 msgstr "បន្ទប់​អ្នកប្រើ"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "បញ្ហា​ក្នុងកា​រតភ្ជាប់​ជា​មួយ​ម៉ាស៊ីន​បម្រើ YCHT ។"
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"បាត់បង់​ការ​តភ្ជាប់​ជា​មួយ​ម៉ាស៊ីនបម្រើ\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -9843,33 +9681,22 @@ msgstr "Realm"
 msgid "Exposure"
 msgstr "បង្ហាញ"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"មិនអាច​បង្កើត​រន្ធ ៖\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "មិនអាច​ញែក​ការ​ឆ្លើយតប​ពី​ប្រូកស៊ី HTTP ៖ %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "កំហុសក្នុងការ​តភ្ជាប់ប្រូកស៊ី HTTP %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "បដិសេធ ៖ ម៉ាស៊ីនបម្រើប្រូកស៊ី HTTP ហាមឃាត់​ច្រក %d ។"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "កំហុស​ក្នុងការ​ដោះស្រាយ %s"
 
-msgid "Could not resolve host name"
-msgstr "មិនអាច​ដោះស្រាយ​ឈ្មោះម៉ាស៊ីនបានទេ"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "កំពុងស្នើ​កា​រចាប់អារម្មណ៍​​របស់ %s..."
@@ -10065,12 +9892,6 @@ msgstr "កំហុស​ក្នុងការ​សរសេរ​ទៅ​
 msgid "Unable to connect to %s: %s"
 msgstr "មិនអាច​តភ្ជាប់​ទៅកាន់ %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "ម៉ាស៊ីន​បម្រើ​ត្រូវការ TLS/SSL ដើម្បី​ចូល ។ រក​មិនឃើញការគាំទ្រ TLS/SSL នោះ​ទេ ។"
-
 #, c-format
 msgid " - %s"
 msgstr " - %s"
@@ -10316,9 +10137,14 @@ msgstr "បន្ថែម​ក្រុម​មិត្តភក្ដិ...
 msgid "View _Log"
 msgstr "កំណត់​ហេតុ​មើល"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "លាក់​នៅពេល​នៅ​ក្រៅបណ្ដាញ"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "បង្ហាញ​​នៅពេល​នៅ​ក្រៅបណ្ដាញ"
+
 msgid "_Alias..."
 msgstr "ឈ្មោះ​ក្លែងក្លាយ..."
 
@@ -10814,6 +10640,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "ផ្លាស់ប្ដូរ​ព័ត៌មាន​អ្នក​ប្រើ​សម្រាប់ %s"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "វាយ​ឈ្មោះ​ម៉ាស៊ីន​នៃ​វិញ្ញាបនបត្រ​នេះ​គឺ​សម្រាប់ ។"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "ម៉ាស៊ីនបម្រើស SSL"
@@ -10859,7 +10689,8 @@ msgstr "មិន​អើពើ"
 msgid "Get Away Message"
 msgstr "យក​សារ​ចាកឆ្ងាយ"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "បាន​និយាយ​ចុង​ក្រោយ"
 
 msgid "Unable to save icon file to disk."
@@ -11738,7 +11569,8 @@ msgstr "ពណ៌​ត្រូវគូ​តំណខ្ពស់ ។"
 msgid "Hyperlink visited color"
 msgstr "ពណ៌ដែល​បាន​ទស្សនា​តំណខ្ពស់"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+#, fuzzy
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "ពណ៌​ត្រូវគូ​តំណខ្ពស់​បន្ទាប់ពី​វា​ត្រូវ​បានទស្សនា (ឬ​ធ្វើ​ឲ្យ​សកម្ម) ។"
 
 msgid "Hyperlink prelight color"
@@ -11774,13 +11606,22 @@ msgstr "ពណ៌​ត្រូវគូរ​ឈ្មោះ​សារ​ស
 msgid "Action Message Name Color for Whispered Message"
 msgstr "សកម្មភាព​ពណ៌​ឈ្មោះ​សារ​​សម្រាប់​សារ​ដែល​ខ្សឹប"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "ពណ៌​ត្រូវគូរ​ឈ្មោះ​សារ​សកម្មភាព ។"
+
 msgid "Whisper Message Name Color"
 msgstr "ពណ៌​ឈ្មោះ​សារ​ខ្សឹប"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "ពណ៌​ត្រូវគូរ​ឈ្មោះ​សារ​សកម្មភាព ។"
+
 msgid "Typing notification color"
 msgstr "វាយ​ពណ៌​ជូនដំណឹង"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "ពណ៌​ត្រូវ​ប្រើ​ដើម្បីវាយ​ពុម្ពអក្សរ​ជូនដំណឹង"
 
 msgid "Typing notification font"
@@ -12165,6 +12006,10 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "ពាក្យ​បញ្ជា​កម្មវិធី​រុករក 'ដោយដៃ' ត្រូវ​បាន​ជ្រើស ប៉ុន្តែ​គ្មាន​ពាក្យ​បញ្ជា​ត្រូវ​បាន​ជ្រើស​ទេ ។"
 
+#, fuzzy
+msgid "No message"
+msgstr "មិន​ស្គាល់​សារ"
+
 msgid "Open All Messages"
 msgstr "បើក​សារ​ទាំងអស់"
 
@@ -12182,10 +12027,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">អ្នក​មាន​សំបុត្រ !</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "មិន​ស្គាល់​សារ"
-
 msgid "The following plugins will be unloaded."
 msgstr "កម្មវិធី​ជំនួយ​ដូច​ខាងក្រោម​នឹង​ត្រូវ​បានផ្ទុក​ឡើង ។"
 
@@ -12399,8 +12240,9 @@ msgstr "បង្ហាញ​​រូបតំណាង​ថាស​ប្រ
 msgid "On unread messages"
 msgstr "សារ​មិន​ទាន់អាន"
 
-msgid "Conversation Window Hiding"
-msgstr "លាក់​បង្អួច​សន្ទនា"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "បង្អួច​សន្ទនា IM"
 
 msgid "_Hide new IM conversations:"
 msgstr "លាក់​កា​រសន្ទនា IM ថ្មី ៖"
@@ -12408,6 +12250,9 @@ msgstr "លាក់​កា​រសន្ទនា IM ថ្មី ៖"
 msgid "When away"
 msgstr "នៅពេល​ចាកឆ្ងាយ"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "បង្រួម​បង្អួច​សន្ទនា​ថ្មី​អប្បបរមា"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "ថេប"
@@ -12466,9 +12311,6 @@ msgstr "ប្រើ​រមូរ​រលូន"
 msgid "F_lash window when IMs are received"
 msgstr "បង្អួច Flash នៅពេល​បានទទួល IMs"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "បង្រួម​បង្អួច​សន្ទនា​ថ្មី​អប្បបរមា"
-
 msgid "Minimum input area height in lines:"
 msgstr "បង្រួម​កម្ពស់​ផ្ទៃ​បញ្ចូល​គិតជា​បន្ទាត់ ៖"
 
@@ -12502,7 +12344,8 @@ msgstr "មិនអាច​ចាប់ផ្ដើម​កម្មវិធ
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">ឧទាហរណ៍ ៖ stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "រកឃើញ​អាសយដ្ឋាន IP ដោយ​ស្វ័យ​ប្រវត្តិ"
 
 msgid "Public _IP:"
@@ -12868,32 +12711,17 @@ msgstr "រក្សាទុក​ការ​ប្រើ"
 msgid "Status for %s"
 msgstr "ស្ថានភាព​សម្រាប់ %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "សញ្ញា​អារម្មណ៍​ផ្ទាល់ខ្លួន"
-
-msgid "More Data needed"
-msgstr "ត្រូវការ​ទិន្នន័យ​បន្ថែម​ទៀត"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "សូម​ផ្ដល់​នូវ​ផ្លូវកាត់​ដើម្បី​ភ្ជាប់​ជា​មួយ​នឹង​សញ្ញា​អារម្មណ៍ ។"
-
 #, fuzzy, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr "សញ្ញា​អារម្មណ៍​ផ្ទាល់ខ្លួន​សម្រាប់​ផ្លូវកាត់​ដែល​បាន​ជ្រើស​មាន​រួច​ហើយ ។ សូម​បញ្ជី​ផ្លូវកាត់​ផ្សេង ។"
 
+msgid "Custom Smiley"
+msgstr "សញ្ញា​អារម្មណ៍​ផ្ទាល់ខ្លួន"
+
 msgid "Duplicate Shortcut"
 msgstr "ផ្លូវកាត់​ស្ទួន"
 
-msgid "Please select an image for the smiley."
-msgstr "សូម​ជ្រើស​រូបភាព​សម្រាប់​សញ្ញាអារម្មណ៍ ។"
-
 msgid "Edit Smiley"
 msgstr "កែ​សម្រួល​សញ្ញាអារម្មណ៍"
 
@@ -13001,9 +12829,10 @@ msgstr "អ្នក​អាច​បញ្ចូល​រូបភាព​ន
 msgid "Cannot send launcher"
 msgstr "មិនអាច​ផ្ញើ​កម្មវិធី​ចាប់ផ្ដើម​បានទេ"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "អ្នកបានអូស​កម្មវិធី​ចាប់ផ្ដើម​ផ្ទៃតុ ។ ទំនង​ជា​អ្នក​ចង់​ផ្ញើ​អ្វី​កម្មវិធី​នេះ​ចង្អុល​​ទៅ​កម្មវិធី​ចាប់ផ្ដើម​នេះ​ជំនួស​វិញ "
 "។"
@@ -13584,9 +13413,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "កម្មវិធី​ជំនួយ​ផ្ញើសារ​តន្ត្រី​សម្រាប់​ការ​តែង​សហការណ៍ ។"
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "កម្មវិធី​ផ្ញើសារ​តន្ត្រី​អនុញ្ញាត​ឲ្យ​អ្នកប្រើជា​ច្រើន​ធ្វើការ​ដំណាល​គ្នា​លើ​ផ្នែក​តន្ត្រី​ដោយ​កែសម្រួល​ពិន្ទុ​ធម្មតា​នៅ​"
 "ក្នុង​ពេលវេលា​ពិតប្រាកដ ។"
@@ -13838,9 +13668,10 @@ msgid "Conversation Window Send Button."
 msgstr "ប៊ូតុង​​ផ្ញើ​បង្អួច​សន្ទនា ។"
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr "បន្ថែម​ប៊ូតុង​ផ្ញើ​ទៅ​ផ្ទៃ​ធាតុ​របស់​បង្អួច​សន្ទនា ។ បំណង​សម្រាប់នៅពេល​ដែល​គ្មាន​ក្ដារចុច​ពិត ។"
 
 msgid "Duplicate Correction"
@@ -14165,8 +13996,9 @@ msgstr "ជម្រើស​​បង្អួច​របស់ Pidgin"
 msgid "Options specific to Pidgin for Windows."
 msgstr "ជម្រើស​ជាក់លាក់​ទៅ Pidgin សម្រាប់​បង្អួច ។"
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "ផ្ដល់​នូវ​ជម្រើស​ជាក់លាក់​ទៅ Pidgin សម្រាប់​វីនដូច​ជា​បញ្ជី​មិត្តភក្ដិ​ចូលផែ ។"
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14206,6 +14038,309 @@ msgstr "ផ្ញើ​ និង​ទទួល​ XMPP stanzas ដើម ។"
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "កម្មវិធី​ជំនួយ​នេះ​មានប្រយោជន៍​សម្រាប់បំបាត់​កំហុស​ម៉ាស៊ីនបម្រើ ឬ​ម៉ាស៊ីន​ភ្ញៀវ XMPP ។"
 
+#~ msgid "Cannot open socket"
+#~ msgstr "មិនអាច​បើក​រន្ធ​បានទេ"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "មិនអាច​ស្ដាប់​នៅ​លើ​រន្ធ​បានទេ"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "មិនអាច​អាន​រន្ធ​បានទេ"
+
+#~ msgid "Connection failed."
+#~ msgstr "បានបរាជ័យ​ក្នុងការ​តភ្ជាប់ ។"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "ម៉ាស៊ីន​បម្រើ​បាន​ផ្ដាច់"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "មិនអាច​បង្កើត​រន្ធ​បានទេ"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "មិនអាច​តភ្ជាប់​ទៅកាន់​ម៉ាស៊ីនបាន​ទេ"
+
+#~ msgid "Read error"
+#~ msgstr "កំហុស​ក្នុងការ​អាន"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "មិនអាច​បង្កើត​ការ​តភ្ជាប់​ជា​មួយ​ម៉ាស៊ីនបម្រើ ៖\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "កំហុស​ក្នុងកា​រសរសេរ"
+
+#~ msgid "Last Activity"
+#~ msgstr "សកម្មភាព​ចុងក្រោយ"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "ព័ត៌មាន​រកឃើញ​សេវា"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "ធាតុ​រក​ឃើញ​ព័ត៌មាន"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "កំណត់​អាសយដ្ឋាន Stanza ដែល​បាន​ពង្រីក"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "ការ​ជជែក​ដែល​មាន​អ្នក​ប្រើច្រើន​នាក់"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "ព័ត៌មាន​វត្តមាន​ដែល​បាន​ពង្រីក​នៃ​កា​រជជែក​ដែល​មាន​អ្នកប្រើ​ច្រើននាក់"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "ស្ទ្រីម​បៃ​ក្នុងក្រុម"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "ពាក្យ​បញ្ជា Ad-Hoc"
+
+#~ msgid "PubSub Service"
+#~ msgstr "សេវា PubSub"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "ស្ទ្រីម​បៃ SOCKS5"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "ទិន្នន័យ​ក្រៅ​ក្រុម"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "ការ​ចុះឈ្មោះ​ក្នុងក្រុម"
+
+#~ msgid "User Location"
+#~ msgstr "ទីតាំង​របស់​អ្នក​ប្រើ"
+
+#~ msgid "User Avatar"
+#~ msgstr "រូបភាព​របស់​អ្នក"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "ការ​ជូនដំណឹង​ស្ថានភាព​ជជែក"
+
+#~ msgid "Software Version"
+#~ msgstr "កំណែ​​កម្មវិធី"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "ការ​ចាប់ផ្ដើម​ស្ទ្រីម​"
+
+#~ msgid "User Mood"
+#~ msgstr "អារម្មណ៍​អ្នក​ប្រើ"
+
+#~ msgid "User Activity"
+#~ msgstr "សកម្មភាព​អ្នក​ប្រើ"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "សមត្ថភាព​អង្គភាព"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "ការ​ចរចារ​សម័យ​ដែល​បាន​អ៊ិនគ្រីប"
+
+#~ msgid "User Tune"
+#~ msgstr "អ្នក​ប្រើ​"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "ផ្លាស់ប្ដូរ​ធាតុ​បញ្ជីឈ្មោះ"
+
+#~ msgid "Reachability Address"
+#~ msgstr "អាសយដ្ឋាន​ដែល​អាច​ចូល​បាន"
+
+#~ msgid "User Profile"
+#~ msgstr "ទម្រង់​អ្នក​ប្រើ"
+
+#~ msgid "Jingle"
+#~ msgstr "ឃ្លា​ខ្លីៗ"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "អូឌីយ៉ូ​ឃ្លា​ខ្លីៗ"
+
+#~ msgid "User Nickname"
+#~ msgstr "សម្មតិនាម​អ្នក​ប្រើ"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "ឃ្លាខ្លីៗ​របស់ ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "ឃ្លាខ្លីៗ​របស់ ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "ឃ្លាខ្លីៗ​របស់ UDP ដើម"
+
+#~ msgid "Jingle Video"
+#~ msgstr "វីដេអូ​ឃ្លាខ្លីៗ"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "ឃ្លាខ្លីៗ DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "ទទួលសារ"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "បោះពុម្ព​គ្រាប់ចុច​សាធារណៈ"
+
+#~ msgid "User Chatting"
+#~ msgstr "ការ​ជជែក​របស់​អ្នក​ប្រើ"
+
+#~ msgid "User Browsing"
+#~ msgstr "កា​ររុករក​របស់​អ្នក​ប្រើ"
+
+#~ msgid "User Gaming"
+#~ msgstr "ការ​លេង​ល្បែង​របស់​អ្នក​ប្រើ"
+
+#~ msgid "User Viewing"
+#~ msgstr "កា​រមើលរបស់​អ្នក​ប្រើ"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "ការ​អ៊ិនគ្រីប Stanza"
+
+#~ msgid "Entity Time"
+#~ msgstr "ពេល​វេលា​​របស់​អង្គភាព"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "ការ​បញ្ជូន​បាន​ពន្យារពេល"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "វត្ថុ​ទិន្នន័យ​សហការណ៍"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "ឃ្លាំង​ឯកសារ និង​ការ​ចែករំលែក"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "ការ​រកឃើញសេវា STUN សម្រាប់​ឃ្លាខ្លីៗ"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "ការ​ចរចារ​សម័យ​ដែល​បាន​អ៊ិនគ្រីប​សាមញ្ញ"
+
+#~ msgid "Hop Check"
+#~ msgstr "ពិនិត្យមើល​ដំណាក់"
+
+#~ msgid "Read Error"
+#~ msgstr "កំហុស​ក្នុងការ​អាន"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "បាន​បរាជ័យ​ក្នុងការ​តភ្ជាប់​ទៅ​ម៉ាស៊ីន​បម្រើ ។"
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "អាន​សតិ​បណ្ដោះអាសន្ន​ពេញលេញ (២)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "សារ​ដែល​មិន​អាច​ញែក​បាន"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "មិនអាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន ៖ %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "បាន​បរាជ័យ​ក្នុងកា​រចូល (%s) ។"
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "អ្នក​ត្រូវ​បាន​ចេញ ដោយ​សារ​តែ​អ្នក​បាន​ចូល​ក្នុងស្ថានីយការងារ​ផ្សេង​ទៀត ។"
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "កំហុស ។ ការ​គាំទ្រ SSL មិន​ត្រូវ​បាន​ដំឡើង​ទេ ។"
+
+#~ msgid "Incorrect password."
+#~ msgstr "ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ ។"
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "មិនអាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​បម្រើ BOS ៖\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "អ្នក​អាច​ត្រូវ​បានផ្ដាច់​ក្នុង​រយៈពេល​បន្តិចទៀត​នេះ ។ ពិនិត្យ​មើលភាព​ទាន់សម័យ %s ។"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "មិនអាច​តភ្ជាប់​បានទេ"
+
+#~ msgid "Invalid username."
+#~ msgstr "ឈ្មោះ​អ្នកប្រើ​មិន​ត្រឹមត្រូវ ។"
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "មិនអាច​ឌិគ្រីប​ការ​​ឆ្លើយតប​របស់​ម៉ាស៊ីន​បម្រើ​បាន​ទេ"
+
+#~ msgid "Connection lost"
+#~ msgstr "បាត់បង់​ការ​តភ្ជាប់"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "មិនអាច​ដោះស្រាយ​ម៉ាស៊ីនបានទេ"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "បាន​បិទ​ការ​តភ្ជាប់ (សរសេរ)"
+
+#~ msgid "Connection reset"
+#~ msgstr "កំណត់​ការ​តភ្ជាប់​ឡើង​វិញ"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "កំហុស​ក្នុងការ​អាន​ពី​រន្ធ ៖ %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "មិនអាច​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​ទេ"
+
+#~ msgid "Could not write"
+#~ msgstr "មិនអាច​សរសេរ​បានទេ"
+
+#~ msgid "Could not connect"
+#~ msgstr "មិនអាច​តភ្ជាប់"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "មិនអាច​បង្កើត​រន្ធ​ស្ដាប់បានទេ"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "មិនអាច​ដោះស្រាយ​ឈ្មោះ​ម៉ាស៊ីនបានទេ"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "មិនអាច​បង្កើត​ការ​តភ្ជាប់​ជា​មួយ %s បានទេ ៖\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "យ៉ាហ៊ូ​ ជប៉ុន"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "ម៉ាស៊ីន​បម្រើ​ភេយ័រ​ជប៉ុន"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "ម៉ាស៊ីនបម្រើ​ផ្ទេរ​ឯកសារ​ជប៉ុន"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "បាត់បង់​ការ​តភ្ជាប់​ជា​មួយ​ម៉ាស៊ីនបម្រើ\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "មិនអាច​ដោះស្រាយ​ឈ្មោះម៉ាស៊ីនបានទេ"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "ម៉ាស៊ីន​បម្រើ​ត្រូវការ TLS/SSL ដើម្បី​ចូល ។ រក​មិនឃើញការគាំទ្រ TLS/SSL នោះ​ទេ ។"
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "លាក់​បង្អួច​សន្ទនា"
+
+#~ msgid "More Data needed"
+#~ msgstr "ត្រូវការ​ទិន្នន័យ​បន្ថែម​ទៀត"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "សូម​ផ្ដល់​នូវ​ផ្លូវកាត់​ដើម្បី​ភ្ជាប់​ជា​មួយ​នឹង​សញ្ញា​អារម្មណ៍ ។"
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "សូម​ជ្រើស​រូបភាព​សម្រាប់​សញ្ញាអារម្មណ៍ ។"
+
 #~ msgid "Activate which ID?"
 #~ msgstr "ធ្វើ​ឲ្យ​សកម្ម​នូវ​លេខសម្គាល់​ណា​មួយ ?"
 
diff --git a/po/kn.po b/po/kn.po
index ca2f096211..33edd99839 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2007-01-28 17:51+0530\n"
 "Last-Translator: Kannada Localization Team <translation@sampada.info>\n"
 "Language-Team: Kannada <translation@sampada.info>\n"
@@ -2589,7 +2589,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2640,7 +2640,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2883,12 +2883,13 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
+msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2942,14 +2943,17 @@ msgstr "%s ಮಾತುಕತೆಯನ್ನು ಮುಕ್ತಾಯಗೊಳ�
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-msgid "Cannot open socket"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "ಸಂಪರ್ಕ ರಚಿಸಲು ವಿಫಲ"
 
-msgid "Could not bind socket to port"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "%s ಬಳಕೆದಾರರನ್ನು  ನಿಷೇಧಿಸಲು ಆಗಲಿಲ್ಲ"
 
-msgid "Could not listen on socket"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "ಸಂಪರ್ಕ ರಚಿಸಲು ವಿಫಲ"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
@@ -2996,13 +3000,16 @@ msgstr "ಗೆಳೆಯರ ಪಟ್ಟಿ ಉಳಿಸಿ..."
 msgid "Load buddylist from file..."
 msgstr "ಗೆಳೆಯರ ಪಟ್ಟಿಯನ್ನು ಈ ಕಡತದಿಂದ  ತೆಗೆದುಕೊಳ್ಳಿ ..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "ನೋದಾವಣೆಗಾಗಿ ವಿವರಗಳನ್ನು ತುಂಬಿರಿ"
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "ಪ್ರವೇಶಪದಗಳು ತಾಳೆಯಾಗುವದಿಲ್ಲ"
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "ಹೊಸ ಖಾತೆಯನ್ನು ನೋಂದಾಯಿಸಲು ಅಗಲಿಲ್ಲ . ದೋಷ ಸಂಭವಿಸಿದೆ.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3014,14 +3021,15 @@ msgstr "ಯಶಸ್ವೀ ನೋಂದಾವಣೆ"
 msgid "Password"
 msgstr "ಪ್ರವೇಶ ಪದ"
 
-msgid "Password (retype)"
-msgstr "ಪ್ರವೇಶಪದ(ಪುನ:ಬರೆಯಿರಿ)"
+msgid "Password (again)"
+msgstr "ಪ್ರವೇಶಪದ(ಇನ್ನೊಮ್ಮೆ)"
 
-msgid "Enter current token"
+msgid "Enter captcha text"
 msgstr ""
 
-msgid "Current token"
-msgstr ""
+#, fuzzy
+msgid "Captcha"
+msgstr "ಚಿತ್ರ ಉಳಿಸಿ"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "ಹೊಸ Gadu-Gadu ಖಾತೆ ನೋಂದಾಯಿಸಿ"
@@ -3075,6 +3083,15 @@ msgstr "ಪ್ರವೇಶಪದದ ಬದಲಾವಣೆ ಯಶಸ್ವಿ!"
 msgid "Current password"
 msgstr "ಈಗಿನ ಪ್ರವೇಶಪದ"
 
+msgid "Password (retype)"
+msgstr "ಪ್ರವೇಶಪದ(ಪುನ:ಬರೆಯಿರಿ)"
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
@@ -3122,7 +3139,7 @@ msgstr ""
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr ""
 
 msgid "Buddy list downloaded"
@@ -3137,8 +3154,14 @@ msgstr ""
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
-msgid "Connection failed."
-msgstr "ಸಂಪರ್ಕ ವಿಫಲವಾಗಿದೆ."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "ಸಂಪರ್ಕ ಹೊಂದಿದೆ"
+
+msgid "Connection failed"
+msgstr "ಸಂಪರ್ಕ ವಿಫಲ"
 
 msgid "Add to chat"
 msgstr "ಮಾತುಕತೆಗೆ ಸೇರಿಸಿ"
@@ -3146,18 +3169,23 @@ msgstr "ಮಾತುಕತೆಗೆ ಸೇರಿಸಿ"
 msgid "Chat _name:"
 msgstr "ಮಾತುಕತೆ ಹೆಸರು(n)"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "ಸರ್ವರ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "ಸಂಪರ್ಕಿಸುತ್ತಿದೆ"
+
 msgid "Chat error"
 msgstr "ಮಾತುಕತೆ ದೋಷ"
 
 msgid "This chat name is already in use"
 msgstr "ಈ ಮಾತುಕತೆ ಹೆಸರು ಆಗಲೇ ಬಳಕೆಯಲ್ಲಿದೆ"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "ಸರ್ವರ್‍ಗೆ ಸಂಪರ್ಕ ಹೊಂದಿಲ್ಲ"
 
 msgid "Find buddies..."
@@ -3218,7 +3246,7 @@ msgid "File Transfer Failed"
 msgstr "ಕಡತ ವರ್ಗಾವಣೆ ವಿಫಲ."
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "ಬರೆಯುವದಕ್ಕಾಗಿ  %s ತೆರೆಯಲು ಆಗಲಿಲ್ಲ"
 
 msgid "Error displaying MOTD"
@@ -3234,8 +3262,16 @@ msgstr "ಈ ಸಂಪರ್ಕಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ದೈನ
 msgid "MOTD for %s"
 msgstr "%s ಗೆ ದಿನದ ಸಂದೇಶ"
 
-msgid "Server has disconnected"
-msgstr ""
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "ಸರ್ವರ್‍ಗೆ ಸಂಪರ್ಕ ಹೊಂದಿಲ್ಲ"
 
 msgid "View MOTD"
 msgstr "ದಿನದ ಸಂದೇಶ ನೋಡಿರಿ"
@@ -3249,22 +3285,20 @@ msgstr "ಪ್ರವೇಶಪದ:(P)"
 msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "ಸಂಪರ್ಕಿಸುತ್ತಿದೆ"
-
 msgid "SSL support unavailable"
 msgstr "SSL ಬೆಂಬಲ ಅಲಭ್ಯ"
 
-msgid "Couldn't create socket"
-msgstr ""
+msgid "Unable to connect"
+msgstr "ಸಂಪರ್ಕಿಸಲು ವಿಫಲ"
 
-msgid "Couldn't connect to host"
-msgstr ""
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "%s ಗೆ ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ "
 
-msgid "Read error"
-msgstr "ಓದುವಲ್ಲಿ ದೋಷ"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "ಸರ್ವರ್ ಸಂಪರ್ಕ ಮುಚ್ಚಿದೆ"
 
 msgid "Users"
 msgstr "ಬಳಕೆದಾರರು"
@@ -3658,10 +3692,10 @@ msgstr "ಆದೇಶ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದ�
 msgid "execute"
 msgstr "ನಿರೀಕ್ಷಿತ ಅಲ್ಲ"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3676,8 +3710,13 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
-msgid "Invalid response from server."
-msgstr ""
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "ಧೃಡೀಕರಣ ವಿಫಲ"
+
+#, fuzzy
+msgid "Invalid response from server"
+msgstr "ತಪ್ಪು ಸರ್ವರ್"
 
 msgid "Server does not use any supported authentication method"
 msgstr ""
@@ -3688,8 +3727,9 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr ""
 
-msgid "SASL error"
-msgstr ""
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "MSN ದೋಷ: %s\n"
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -3706,21 +3746,13 @@ msgid "Unable to establish a connection with the server"
 msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
 
 #, fuzzy, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+msgid "Unable to establish a connection with the server: %s"
 msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
 
 #, fuzzy
 msgid "Unable to establish SSL connection"
 msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
 
-msgid "Unable to create socket"
-msgstr ""
-
-msgid "Write error"
-msgstr "ಬರೆಯುವಲ್ಲಿ ದೋಷ"
-
 msgid "Full Name"
 msgstr "ಪೂರ್ಣ ಹೆಸರು"
 
@@ -3790,183 +3822,6 @@ msgstr "ಕಾರ್ಯಾಚರಣೆ ವ್ಯವಸ್ಥೆ"
 msgid "Local Time"
 msgstr "ಸ್ಥಳೀಯ ಕಡತ:"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "ಬಳಕೆದಾರ ಮಾಹಿತಿ  ಬರೆಯಿರಿ"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "ವಿಸ್ತೃತ ವಿಳಾಸ"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "ಅಲಿಯಾಸ್ ಮಾತುಕತೆ"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "ಬಳಕೆದಾರನಿಗೆ ಕಡತಕೋಶದ ಮಾಹಿತಿಯಿಲ್ಲ"
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "ಆದೇಶ"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "ಹೆಚ್.ಟಿ.ಎಮ್.ಎಲ್/ಅತಿ ಪಠ್ಯ"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "ನೋಂದಣಿ ದೋಷ"
-
-#, fuzzy
-msgid "User Location"
-msgstr "ಸ್ಥಳ"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "ಬಳಕೆದಾರರ ಹುಡುಕುವಿಕೆ"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "ಗೆಳೆಯನ ಸ್ಥಿತಿ ಸೂಚನೆ"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "ಮಾತುಕತೆಯನ್ನು ಉಳಿಸಿ"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "ಸರ್ವರ್ ಮಾಹಿತಿ"
-
-msgid "File Transfer"
-msgstr "ಕಡತ ವರ್ಗಾವಣೆ "
-
-#, fuzzy
-msgid "User Mood"
-msgstr "ಬಳಕೆದಾರ ಕೋಣೆಗಳು"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "ಬಳಕೆದಾರ ಮಿತಿ"
-
-msgid "Entity Capabilities"
-msgstr ""
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "ಬಳಕೆದಾರರ ಹೆಸರು "
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "ವಿ-ಅಂಚೆ ವಿಳಾಸ"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "MSN ವ್ಯಕ್ತಿಪರಿಚಯ"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "ಸೇರಿಕೊಳ್ಳಿ"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "ಬಳಕೆದಾರನ ಹೆಸರು"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr ""
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "ಸಂದೇಶ ಸಿಕ್ಕಿದೆ"
-
-msgid "Public Key Publishing"
-msgstr ""
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "ಬಳಕೆದಾರ ಆಯ್ಕೆಗಳು"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "ಬಳಕೆದಾರ ಕೋಣೆಗಳು"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "ಬಳಕೆದಾರನ ಹೆಸರು"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "ಬಳಕೆದಾರ ಮಿತಿ"
-
-msgid "Ping"
-msgstr "ಪಿಂಗ್"
-
-msgid "Stanza Encryption"
-msgstr ""
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr ""
-
 msgid "Priority"
 msgstr "ಆದ್ಯತೆ"
 
@@ -3978,7 +3833,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "ಈಗಾಗಲೇ ಲಾಗಿನ್ ಮಾಡಲಾಗಿದೆ"
 
 msgid "Middle Name"
@@ -4161,16 +4016,12 @@ msgid "Roles:"
 msgstr "ಪಾತ್ರ"
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "ಸಾದಾ ಪಠ್ಯ"
 
-msgid "Read Error"
-msgstr "ಓದುವಲ್ಲಿ ದೋಷ"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4357,9 +4208,6 @@ msgstr "ನಿಮ್ಮ ಪ್ರವೇಶಪದ ಬದಲಾಗಿದೆ"
 msgid "Error changing password"
 msgstr "ಪ್ರವೇಶಪದ ಬದಲಿಸುವಲ್ಲಿ ದೋಷ"
 
-msgid "Password (again)"
-msgstr "ಪ್ರವೇಶಪದ(ಇನ್ನೊಮ್ಮೆ)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "ಪ್ರವೇಶಪದ ಬದಲಿಸಿ"
@@ -4740,6 +4588,14 @@ msgstr ""
 msgid "Unknown Error in presence"
 msgstr ""
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "%s ಮಾತುಕತೆ ಸೇರುವಲ್ಲಿ ದೋಷ"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr " %s ಮಾತುಕತೆಯಲ್ಲಿ ದೋಷ"
+
 msgid "Create New Room"
 msgstr "ಹೊಸಕೋಣೆ ನಿರ್ಮಿಸಿ"
 
@@ -4754,16 +4610,20 @@ msgstr "ಮಾತುಕತೆ ಸಂರಚಿಸಿ(C)"
 msgid "_Accept Defaults"
 msgstr ""
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "%s ಮಾತುಕತೆ ಸೇರುವಲ್ಲಿ ದೋಷ"
+#, fuzzy
+msgid "No reason"
+msgstr "ಕಾರಣ ಕೊಟ್ಟಿಲ್ಲ"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr " %s ಮಾತುಕತೆಯಲ್ಲಿ ದೋಷ"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "%s: (%s) ನಿಮ್ಮನ್ನು ಒದ್ದಿದ್ದಾರೆ"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s (%s) ರಿಂದ ಒದೆತ"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "ಕಡತವನ್ನು ತೆರೆಯುವಾಗ ದೋಷವುಂಟಾಯಿತು"
 
 #, fuzzy
@@ -5262,9 +5122,6 @@ msgstr "ಮಾತುಕತೆ ಆರಂಭಿಸಿ(C)"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-msgid "Failed to connect to server."
-msgstr ""
-
 msgid "Error retrieving profile"
 msgstr ""
 
@@ -5514,9 +5371,6 @@ msgstr "ಯಾವುದೋ ಗೊತ್ತಿಲ್ಲದ ದೋಷ ಸಂಭವ
 msgid "Message was not sent because an unknown error occurred."
 msgstr "ಯಾವುದೋ ಗೊತ್ತಿಲ್ಲದ ದೋಷ ಸಂಭವಿಸಿದ್ದರಿಂದ ಸಂದೇಶವು ಕಳಿಸಲ್ಪಟ್ಟಿರಲಿಕ್ಕಿಲ್ಲ."
 
-msgid "Unable to connect"
-msgstr "ಸಂಪರ್ಕಿಸಲು ವಿಫಲ"
-
 msgid "Writing error"
 msgstr "ಬರೆಯುವಲ್ಲಿ ದೋಷ"
 
@@ -5529,19 +5383,21 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Our protocol is not supported by the server."
-msgstr ""
+#, fuzzy
+msgid "Our protocol is not supported by the server"
+msgstr "ಈ ಪ್ರೋಟೋಕಾಲ್ ಮಾತುಕತೆ ಕೋಣೆಗಳನ್ನು ಅಳವಡಿಸಿಲ್ಲ"
 
-msgid "Error parsing HTTP."
-msgstr ""
+#, fuzzy
+msgid "Error parsing HTTP"
+msgstr "ಸಂಪರ್ಕ ರಚಿಸುವಲ್ಲಿ ದೋಷ"
 
-msgid "You have signed on from another location."
+msgid "You have signed on from another location"
 msgstr ""
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr ""
 
 #, c-format
@@ -5552,9 +5408,6 @@ msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "Unknown error."
-msgstr "ಗೊತ್ತಿಲ್ಲದ ದೋಷ"
-
 msgid "Handshaking"
 msgstr "ಕೈ ಕುಲುಕಲಾಗುತ್ತಿದೆ"
 
@@ -5653,6 +5506,9 @@ msgstr "ಯಾಹೂ ಪ್ರೋಟೋಕಾಲ್ ಪ್ಲಗ್ಗಿನ್�
 msgid "%s is not a valid group."
 msgstr ""
 
+msgid "Unknown error."
+msgstr "ಗೊತ್ತಿಲ್ಲದ ದೋಷ"
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s  ರು %s (%s) ಮೇಲೆ  "
@@ -5765,12 +5621,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "ಸಂಪರ್ಕ ಹೊಂದಿದೆ"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr ""
@@ -5794,18 +5644,6 @@ msgid "Invalid input condition"
 msgstr "ತಪ್ಪು ಶೀರ್ಷಿಕೆ"
 
 #, fuzzy
-msgid "Read buffer full (2)"
-msgstr "ಸರತಿಯಸಾಲು ಭರತಿಯಾಗಿದೆ"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "ಓದಿರದ ಸಂದೇಶಗಳು"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "%s ಗೆ ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ :%s"
-
-#, fuzzy
 msgid "Failed to add buddy"
 msgstr "ಮಾತುಕತೆಯಲ್ಲಿ ಗೆಳೆಯನನ್ನು ಸೇರಿಕೊಳ್ಳಲಾಗಲಿಲ್ಲ"
 
@@ -5896,6 +5734,12 @@ msgstr ""
 msgid "Client Version"
 msgstr "ಮಾತುಕತೆಯನ್ನು ಮುಗಿಸಿರಿ"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 #, fuzzy
 msgid "MySpaceIM - Username Available"
 msgstr "ಸೇವೆ ಅಲಭ್ಯ"
@@ -6159,9 +6003,9 @@ msgstr ""
 msgid "Unknown error: 0x%X"
 msgstr "ಗೊತ್ತಿಲ್ಲದ ದೋಷ: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "ಲಾಗಿನ್ ವಿಫಲ(%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "%s ಬಳಕೆದಾರರನ್ನು  ನಿಷೇಧಿಸಲು ಆಗಲಿಲ್ಲ"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6259,9 +6103,6 @@ msgstr "ಗುಂಪುವಾರು ಸಮ್ಮೇಳನ %d"
 msgid "Authenticating..."
 msgstr "ಧೃಡೀಕರಿಸಲಾಗುತ್ತಿದೆ..."
 
-msgid "Unable to connect to server."
-msgstr "ಸರ್ವರ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ"
-
 msgid "Waiting for response..."
 msgstr "ಉತ್ತರಕ್ಕಾಗಿ ದಾರಿಕಾಯಲಾಗುತ್ತಿದೆ..."
 
@@ -6285,21 +6126,16 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "ಈ ಮಾತುಕತೆಯಲ್ಲಿ ಸೇರಬಯಸುವಿರಾ?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-
-msgid "Error. SSL support is not installed."
-msgstr ""
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
+msgstr "ನೀವು ತಡೆಗಟ್ಟ ಬಯಸುವ ಬಳಕೆದಾರರ ಹೆಸರು ಬರೆಯಿರಿ"
 
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "ಈ ಸಮ್ಮೇಳನ ಮುಗಿದಿದೆ . ಇನ್ನು ಸಂದೇಶಗಳನ್ನು ಕಳಿಸಲು ಆಗುವದಿಲ್ಲ"
@@ -6336,10 +6172,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "ಸಂಪರ್ಕ ರಚಿಸುವಲ್ಲಿ ದೋಷ"
 
-msgid "Incorrect password."
-msgstr "ತಪ್ಪು ಪ್ರವೇಶಪದ"
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, fuzzy
@@ -6350,18 +6183,10 @@ msgstr "ಸಂಪರ್ಕಿಸಲಾಗಲಿಲ್ಲ"
 msgid "Invalid chat room name"
 msgstr "ತಪ್ಪು ಕೋಣೆಯ ಹೆಸರು"
 
-msgid "Server closed the connection."
-msgstr "ಸರ್ವರ್ ಸಂಪರ್ಕ ಮುಚ್ಚಿದೆ"
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "ಸರ್ವರ್‍ಗೆ ಸಂಪರ್ಕ ಹೊಂದಿಲ್ಲ"
 
-msgid "Received invalid data on connection with server."
-msgstr ""
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6409,8 +6234,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
 
 msgid "Direct IM established"
 msgstr ""
@@ -6603,16 +6429,12 @@ msgid "Buddy Comment"
 msgstr ""
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "ವರ್ಗಾವಣೆಗಾಗಿ ಸಂಪರ್ಕಿಸಲು ಅಗಲಿಲ್ಲ"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr "ವರ್ಗಾವಣೆಗಾಗಿ ಸಂಪರ್ಕಿಸಲು ಅಗಲಿಲ್ಲ"
+msgid "Unable to connect to BOS server: %s"
+msgstr "ಸರ್ವರ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ"
 
 #, fuzzy
 msgid "Username sent"
@@ -6627,9 +6449,9 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 
 #, c-format
@@ -6640,28 +6462,22 @@ msgstr ""
 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
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "ತಪ್ಪು ಹೆಸರು"
+msgid "Username does not exist"
+msgstr "ಬಲಕೆದಾರರು ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+msgid "Your account is currently suspended"
 msgstr ""
 
 #. service temporarily unavailable
@@ -6678,8 +6494,9 @@ msgid ""
 "try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
-msgid "The SecurID key entered is invalid."
-msgstr ""
+#, fuzzy
+msgid "The SecurID key entered is invalid"
+msgstr "ಜಾಲವೀಕ್ಷಣಾ ಆದೇಶ  \"%s\" ತಪ್ಪಾಗಿದೆ"
 
 msgid "Enter SecurID"
 msgstr ""
@@ -6831,6 +6648,9 @@ msgstr ""
 msgid "Member Since"
 msgstr ""
 
+msgid "Capabilities"
+msgstr ""
+
 #, fuzzy
 msgid "Profile"
 msgstr "MSN ವ್ಯಕ್ತಿಪರಿಚಯ"
@@ -6988,7 +6808,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7009,9 +6829,9 @@ msgstr ""
 msgid "Orphans"
 msgstr ""
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "ನಿಮ್ಮ ಗೆಳೆಯರ ಪಟ್ಟಿಯಲ್ಲಿ ಬಹಳಷ್ಟು ಗೆಳೆಯರಿರುವದರಿಂದ ಗೆಳೆಯ %s ರನ್ನು ಸೇರಿಸಲಾಗಲಿಲ್ಲ . . "
@@ -7021,7 +6841,7 @@ msgid "(no name)"
 msgstr "(ಹೆಸರು ಇಲ್ಲ)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "ನಿಮ್ಮ ಆದೇಶವು ವಿಫಲವಾಯಿತು. ಕಾರಣ ತಿಳಿದುಬರಲಿಲ್ಲ."
 
 #, fuzzy, c-format
@@ -7861,7 +7681,7 @@ msgid "Update interval (seconds)"
 msgstr "ಓದುವಲ್ಲಿ ದೋಷ "
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "ಸರ್ವರ್ ಮಾಹಿತಿ ಪಡೆಯಲಾಗಲಿಲ್ಲ"
 
 #, c-format
@@ -7888,10 +7708,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "ಸರ್ವರ್ ಮಾಹಿತಿ ಪಡೆಯಲಾಗಲಿಲ್ಲ"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "ಸಂವಾದ ಕೋರಿರಿ"
 
@@ -7927,22 +7743,9 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "ಸಂಪರ್ಕಿಸಲು ವಿಫಲ"
-
 msgid "Socket error"
 msgstr ""
 
-msgid "Unable to read from socket"
-msgstr ""
-
-msgid "Write Error"
-msgstr "ಬರೆಯುವಲ್ಲಿ ದೋಷ"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "ಸಂಪರ್ಕ ಕಳೆದಿದೆ"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "ಬಳಕೆದಾರರ ಮಾಹಿತಿ ಕೊಡಿ.."
@@ -7951,8 +7754,9 @@ msgstr "ಬಳಕೆದಾರರ ಮಾಹಿತಿ ಕೊಡಿ.."
 msgid "Requesting token"
 msgstr "ಕೋರಿಕೆ ನಿರಾಕರಿಸಲಾಗಿದೆ."
 
-msgid "Couldn't resolve host"
-msgstr ""
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "ಸರ್ವರ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ"
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8003,7 +7807,7 @@ msgid "QQ Qun Command"
 msgstr "ಆದೇಶ"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "ಸರ್ವರ್ ಮಾಹಿತಿ ಪಡೆಯಲಾಗಲಿಲ್ಲ"
 
 #, fuzzy
@@ -8025,9 +7829,6 @@ msgstr "ಕಡತ  ಕಳಿಸಿ"
 msgid "%d canceled the transfer of %s"
 msgstr "%s ರವರು %s  ಕಡತದ ವರ್ಗಾವಣೆಯನ್ನು ರದ್ದುಗೊಳಿಸಿದರು."
 
-msgid "Connection closed (writing)"
-msgstr ""
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>ಗುಂಪಿನ ಶೀರ್ಷಿಕೆ:</b> %s<br>"
@@ -8081,17 +7882,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-msgid "Connection reset"
-msgstr ""
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr ""
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "ಆತಿಥೇಯಗಣಕ ಸಂಪರ್ಕಿಸಲಾಗಲಿಲ್ಲ"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "%s ರಿಂದ ಘೋಷಣೆ"
@@ -8114,6 +7904,9 @@ msgstr "ಸ್ಪೀಕರ್‍‍ಗಳು"
 msgid "Video Camera"
 msgstr "ವೀಡಿಯೋ ಕ್ಯಾಮೆರಾ"
 
+msgid "File Transfer"
+msgstr "ಕಡತ ವರ್ಗಾವಣೆ "
+
 #, fuzzy
 msgid "Supports"
 msgstr "ಬೆಂಬಲ"
@@ -8879,6 +8672,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "ಜಾಲದ ಅಂಕಿಸಂಖ್ಯೆ"
 
+msgid "Ping"
+msgstr "ಪಿಂಗ್"
+
 msgid "Ping failed"
 msgstr "ಪಿಂಗ್ ವಿಫಲ"
 
@@ -8937,7 +8733,8 @@ msgstr ""
 msgid "Disconnected by server"
 msgstr ""
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "SILC ಸರ್ವರ್ ಸಂಪರ್ಕಿಸುವಾಗ  ದೋಷ"
 
 msgid "Key Exchange failed"
@@ -8947,27 +8744,27 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-msgid "Connection failed"
-msgstr "ಸಂಪರ್ಕ ವಿಫಲ"
-
 msgid "Performing key exchange"
 msgstr ""
 
-msgid "Unable to create connection"
-msgstr "ಸಂಪರ್ಕ ರಚಿಸಲು ವಿಫಲ"
-
-msgid "Could not load SILC key pair"
-msgstr ""
+#, fuzzy
+msgid "Unable to load SILC key pair"
+msgstr "ಬಳಕೆದಾರನನ್ನು ಸೇರಿಸಲಾಗಲಿಲ್ಲ"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr ""
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "ಬಳಕೆದಾರನನ್ನು ಸೇರಿಸಲಾಗಲಿಲ್ಲ"
+
 msgid "Out of memory"
 msgstr ""
 
-msgid "Cannot initialize SILC protocol"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
+msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
 
 msgid "Error loading SILC key pair"
 msgstr ""
@@ -9244,8 +9041,9 @@ msgstr ""
 msgid "Creating SILC key pair..."
 msgstr ""
 
-msgid "Cannot create SILC key pair\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to create SILC key pair"
+msgstr "ಸಂಪರ್ಕ ರಚಿಸಲು ವಿಫಲ"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9333,6 +9131,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr "ಸರ್ವರ್ ಅಂಕಿಸಂಖ್ಯೆ ಲಭ್ಯವಿಲ್ಲ"
 
+msgid "Error during connecting to SILC Server"
+msgstr "SILC ಸರ್ವರ್ ಸಂಪರ್ಕಿಸುವಾಗ  ದೋಷ"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -9373,32 +9174,28 @@ msgstr ""
 msgid "Failure: Authentication failed"
 msgstr ""
 
-msgid "Cannot initialize SILC Client connection"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
+msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
 
 #, fuzzy
 msgid "John Noname"
 msgstr "ಹೆಸರು ಇಲ್ಲ."
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr ""
-
-msgid "Could not write"
-msgstr "ಬರೆಯಲಾಗಲಿಲ್ಲ"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
+msgstr "ಬಳಕೆದಾರನನ್ನು ಸೇರಿಸಲಾಗಲಿಲ್ಲ"
 
-msgid "Could not connect"
-msgstr "ಸಂಪರ್ಕಿಸಲಾಗಲಿಲ್ಲ"
+msgid "Unable to create connection"
+msgstr "ಸಂಪರ್ಕ ರಚಿಸಲು ವಿಫಲ"
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "ಗೊತ್ತಿಲ್ಲದ ಕಾರಣ:"
 
-msgid "Could not create listen socket"
-msgstr ""
-
-msgid "Could not resolve hostname"
-msgstr ""
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "ಸಂಪರ್ಕ ರಚಿಸಲು ವಿಫಲ"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
@@ -9440,6 +9237,78 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr ""
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:ಯಾಹೂ ಜಾಲದಲ್ಲಿನ ಕೋಣೆಗಳ ಪಟ್ಟಿ ಮಾಡಿ"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "ಯಾಹೂ! ಗುರುತು"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "ಯಾಹೂ ಪ್ರೋಟೋಕಾಲ್ ಪ್ಲಗ್ಗಿನ್ನು"
+
+msgid "Pager server"
+msgstr ""
+
+msgid "Pager port"
+msgstr ""
+
+msgid "File transfer server"
+msgstr "ಕಡತವರ್ಗಾವಣೆ ಸರ್ವರ್ "
+
+msgid "File transfer port"
+msgstr "ಕಡತ ವರ್ಗಾವಣೆ ಪೋರ್ಟ್"
+
+msgid "Chat room locale"
+msgstr ""
+
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
+
+msgid "Chat room list URL"
+msgstr "ಮಾತುಕತೆಕೋಣೆಗಳ ಪಟ್ಟಿಯ  URL"
+
+msgid "Yahoo Chat server"
+msgstr "ಯಾಹೂ  ಮಾತುಕತೆಯ ಸರ್ವರ್"
+
+msgid "Yahoo Chat port"
+msgstr "ಯಾಹೂ  ಮಾತುಕತೆಯ ಪೋರ್ಟ್"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "ಯಾಹೂ! ಗುರುತು"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "ಯಾಹೂ ಪ್ರೋಟೋಕಾಲ್ ಪ್ಲಗ್ಗಿನ್ನು"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9467,29 +9336,19 @@ msgstr ""
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 "ಗೊತ್ತಿಲ್ಲದ ದೋಷ ಸಂಖ್ಯೆ %d. ಯಾಹೂ! ತಾಣಕ್ಕೆ ಲಾಗಿನ್ ಆಗುವುದರಿಂದ ಇದನ್ನು ಸರಿಪಡಿಸಬಹುದು. "
 
@@ -9525,33 +9384,27 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "ಗೊತ್ತಿಲ್ಲದ ದೋಷ ಸಂಖ್ಯೆ %d. ಯಾಹೂ! ತಾಣಕ್ಕೆ ಲಾಗಿನ್ ಆಗುವುದರಿಂದ ಇದನ್ನು ಸರಿಪಡಿಸಬಹುದು. "
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "ಗೆಳೆಯ %s ರನ್ನು  %s  ಗುಂಪಿಗೆ  ಸರ್ವರ್‍ಪಟ್ಟಿ‍ಗೆ %s ಖಾತೆಯಲ್ಲಿ ಸೇರಿಸಲಾಗಲಿಲ್ಲ  ."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "ಗೆಳೆಯನನ್ನು ಸರ್ವರ್ ಪಟ್ಟಿಗೆ ಸೇರಿಸಲಾಗಲಿಲ್ಲ"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[  %s/%s/%s.swf ಕೇಳಬಹುದು] %s"
 
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr ""
 
-msgid "Connection problem"
-msgstr "ಸಂಪರ್ಕ ಸಮಸ್ಯೆ"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "%s ಗೆ ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ :%s"
 
 #, fuzzy, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
 msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
 
 msgid "Not at Home"
@@ -9614,74 +9467,15 @@ msgstr "ಬಳಕೆದಾರರನ್ನು ಮಾತುಕತೆಯಲ್ಲ�
 msgid "Open Inbox"
 msgstr ""
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:ಯಾಹೂ ಜಾಲದಲ್ಲಿನ ಕೋಣೆಗಳ ಪಟ್ಟಿ ಮಾಡಿ"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "ಯಾಹೂ! ಗುರುತು"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "ಯಾಹೂ ಪ್ರೋಟೋಕಾಲ್ ಪ್ಲಗ್ಗಿನ್ನು"
-
-msgid "Yahoo Japan"
-msgstr "ಯಾಹೂ ಜಪಾನ್"
-
-msgid "Pager server"
-msgstr ""
-
-msgid "Japan Pager server"
-msgstr ""
-
-msgid "Pager port"
-msgstr ""
-
-msgid "File transfer server"
-msgstr "ಕಡತವರ್ಗಾವಣೆ ಸರ್ವರ್ "
-
-msgid "Japan file transfer server"
-msgstr ""
-
-msgid "File transfer port"
-msgstr "ಕಡತ ವರ್ಗಾವಣೆ ಪೋರ್ಟ್"
-
-msgid "Chat room locale"
-msgstr ""
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-msgid "Chat room list URL"
-msgstr "ಮಾತುಕತೆಕೋಣೆಗಳ ಪಟ್ಟಿಯ  URL"
-
-msgid "Yahoo Chat server"
-msgstr "ಯಾಹೂ  ಮಾತುಕತೆಯ ಸರ್ವರ್"
-
-msgid "Yahoo Chat port"
-msgstr "ಯಾಹೂ  ಮಾತುಕತೆಯ ಪೋರ್ಟ್"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "ಸಂಪರ್ಕಿಸಲು ವಿಫಲ"
+
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -9689,6 +9483,9 @@ msgstr ""
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr " %s ರವರು %s ಕಡತವನ್ನು ಕಳಿಸಲು ಸಿದ್ಧರಿದ್ದಾರೆ."
 
+msgid "Write Error"
+msgstr "ಬರೆಯುವಲ್ಲಿ ದೋಷ"
+
 msgid "Yahoo! Japan Profile"
 msgstr ""
 
@@ -9795,21 +9592,19 @@ msgstr "ದನಿಗಳು"
 msgid "Webcams"
 msgstr ""
 
+msgid "Connection problem"
+msgstr "ಸಂಪರ್ಕ ಸಮಸ್ಯೆ"
+
 msgid "Unable to fetch room list."
 msgstr "ಕೋಣೆಪಟ್ಟಿಗಳನ್ನು ಪಡೆಯಲಾಗಲಿಲ್ಲ"
 
 msgid "User Rooms"
 msgstr "ಬಳಕೆದಾರ ಕೋಣೆಗಳು"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "YCHT ಸರ್ವರಿನೊಂದಿಗೆ ಸಂಪರ್ಕ ಸಮಸ್ಯೆ"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "ಸರ್ವರ್‍ಗೆ ಸಂಪರ್ಕ ಹೊಂದಿಲ್ಲ"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -9927,30 +9722,21 @@ msgid "Exposure"
 msgstr ""
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "ಸಂಪರ್ಕ ರಚಿಸಲು ವಿಫಲ"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr " \"%s\" ಪಾತ್ರವನ್ನು   %s ಇವರಿಗೆ  ಗೊತ್ತುಪಡಿಸಲು ಆಗಲಿಲ್ಲ"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP ಪ್ರಾಕ್ಸಿ ಸಂಪರ್ಕ ದೋಷ %d"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr "%s: %s ದೋಷ ಪರಿಹರಿಸಲಾಗುತ್ತಿದೆ "
 
-msgid "Could not resolve host name"
-msgstr ""
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10162,12 +9948,6 @@ msgid "Unable to connect to %s: %s"
 msgstr "%s ಗೆ ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ :%s"
 
 #, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-
-#, c-format
 msgid " - %s"
 msgstr ""
 
@@ -10415,7 +10195,11 @@ msgid "View _Log"
 msgstr "ಲಾಗ್ ಅನ್ನು ನೋಡಿ(L)"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "ಗೆಳೆಯನು ಆಫ್ಲೈನ್ ಆಗಿದ್ದಾನೆ"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "ಗೆಳೆಯನು ಆಫ್ಲೈನ್ ಆಗಿದ್ದಾನೆ"
 
 msgid "_Alias..."
@@ -10948,6 +10732,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "%s ಬಳಕೆದಾರ ಮಾಹಿತಿ ಬದಲಾಯಿಸಿ"
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -10995,7 +10782,8 @@ msgstr "ನಿರ್ಲಕ್ಷಿಸಿ"
 msgid "Get Away Message"
 msgstr ""
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "ಕೊನೆಯಾಗಿ ಹೇಳಿದ್ದು"
 
 msgid "Unable to save icon file to disk."
@@ -11906,7 +11694,7 @@ msgstr ""
 msgid "Hyperlink visited color"
 msgstr "ಕೊಂಡಿಯ ಬಣ್ಣ"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 
 msgid "Hyperlink prelight color"
@@ -11944,15 +11732,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "ಸೂಚನೆ ತೆಗೆದುಹಾಕುವಿಕೆ"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "ಹೊಸ ಸಂದೇಶದ ಸೂಚನೆ"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12315,6 +12110,10 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
+#, fuzzy
+msgid "No message"
+msgstr "ಗೊತ್ತಿಲ್ಲದ ಸಂದೇಶ"
+
 msgid "Open All Messages"
 msgstr "ಎಲ್ಲ ಸಂದೇಶಗಳನ್ನು ತೆರೆಯಿರಿ"
 
@@ -12332,10 +12131,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">ನಿಮಗೆ ಸಂದೇಶ ಬಂದಿದೆ!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "ಗೊತ್ತಿಲ್ಲದ ಸಂದೇಶ"
-
 msgid "The following plugins will be unloaded."
 msgstr "ಕೆಳಕಂಡ ಪ್ಲಗ್ಗಿನ್‍ಗಳನ್ನು  ತೆಗೆದುಹಾಕಿ"
 
@@ -12551,7 +12346,7 @@ msgid "On unread messages"
 msgstr "ಓದಿರದ ಸಂದೇಶಗಳು"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr " %s ದಲ್ಲಿ ಮಾತುಕತೆ"
 
 #, fuzzy
@@ -12561,6 +12356,10 @@ msgstr "ಹೊಸ ಮಾತುಕತೆಗಳು(e):"
 msgid "When away"
 msgstr "ಆಚೆ ಹೋಗಿರುವಾಗ"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "ಪ್ರತಿ ಕಿಟಕಿಗೆ ಮಾತುಕತೆಗಳ ಸಂಖ್ಯೆ"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -12621,10 +12420,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr "ತಕ್ಷಣ ಸಂದೇಶಗಳು ಬಂದಾಗ ಕಿಟಕಿಯನ್ನು ಮಿಂಚಿಸಿ(F)"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "ಪ್ರತಿ ಕಿಟಕಿಗೆ ಮಾತುಕತೆಗಳ ಸಂಖ್ಯೆ"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12660,7 +12455,8 @@ msgstr "ಬಳಕೆದಾರನ ಮಾಹಿತಿ ಪಡೆಯಲಾಗಲಿ�
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-msgid "_Autodetect IP address"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr ""
 
 msgid "Public _IP:"
@@ -13037,34 +12833,18 @@ msgstr "ಉಳಿಸಿ ಹಾಗೂ ಬಳಸಿ"
 msgid "Status for %s"
 msgstr "%s ನ ಸ್ಥಿತಿ"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "ಸ್ಮೈಲಿ ಸೇರಿಸಿ"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
 #, fuzzy
-msgid "Duplicate Shortcut"
-msgstr "ಡೂಪ್ಲಿಕೇಟ್ ತಿದ್ದುಪಡಿ"
+msgid "Custom Smiley"
+msgstr "ಸ್ಮೈಲಿ ಸೇರಿಸಿ"
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "%sಗಾಗಿ ಹೊಸ ಹೆಸರನ್ನು ದಾಖಲಿಸಿ"
+msgid "Duplicate Shortcut"
+msgstr "ಡೂಪ್ಲಿಕೇಟ್ ತಿದ್ದುಪಡಿ"
 
 #, fuzzy
 msgid "Edit Smiley"
@@ -13181,8 +12961,8 @@ msgid "Cannot send launcher"
 msgstr ""
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -13771,7 +13551,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -14028,7 +13808,7 @@ msgstr " %s ದಲ್ಲಿ ಮಾತುಕತೆ"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14350,9 +14130,10 @@ msgstr "ಪ್ರವೇಶದ ಆಯ್ಕೆಗಳು"
 msgid "Options specific to Pidgin for Windows."
 msgstr "ವಿಂಡೋಸ್ ಗೈಮ್ ಗೆ ವಿಶಿಷ್ಟವಾದ ಆಯ್ಕೆಗಳು"
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "ವಿಂಡೋಸ್ ಗೈಮ್ ಗೆ ವಿಶಿಷ್ಟವಾದ ಆಯ್ಕೆಗಳು"
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr ""
@@ -14393,6 +14174,194 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
+#~ msgid "Connection failed."
+#~ msgstr "ಸಂಪರ್ಕ ವಿಫಲವಾಗಿದೆ."
+
+#~ msgid "Read error"
+#~ msgstr "ಓದುವಲ್ಲಿ ದೋಷ"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
+
+#~ msgid "Write error"
+#~ msgstr "ಬರೆಯುವಲ್ಲಿ ದೋಷ"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "ಬಳಕೆದಾರ ಮಾಹಿತಿ  ಬರೆಯಿರಿ"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "ವಿಸ್ತೃತ ವಿಳಾಸ"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "ಅಲಿಯಾಸ್ ಮಾತುಕತೆ"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "ಬಳಕೆದಾರನಿಗೆ ಕಡತಕೋಶದ ಮಾಹಿತಿಯಿಲ್ಲ"
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "ಆದೇಶ"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "ಹೆಚ್.ಟಿ.ಎಮ್.ಎಲ್/ಅತಿ ಪಠ್ಯ"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "ನೋಂದಣಿ ದೋಷ"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "ಸ್ಥಳ"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "ಬಳಕೆದಾರರ ಹುಡುಕುವಿಕೆ"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "ಗೆಳೆಯನ ಸ್ಥಿತಿ ಸೂಚನೆ"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "ಮಾತುಕತೆಯನ್ನು ಉಳಿಸಿ"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "ಸರ್ವರ್ ಮಾಹಿತಿ"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "ಬಳಕೆದಾರ ಕೋಣೆಗಳು"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "ಬಳಕೆದಾರ ಮಿತಿ"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "ಬಳಕೆದಾರರ ಹೆಸರು "
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "ವಿ-ಅಂಚೆ ವಿಳಾಸ"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "MSN ವ್ಯಕ್ತಿಪರಿಚಯ"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "ಸೇರಿಕೊಳ್ಳಿ"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "ಬಳಕೆದಾರನ ಹೆಸರು"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "ಸಂದೇಶ ಸಿಕ್ಕಿದೆ"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "ಬಳಕೆದಾರ ಆಯ್ಕೆಗಳು"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "ಬಳಕೆದಾರ ಕೋಣೆಗಳು"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "ಬಳಕೆದಾರನ ಹೆಸರು"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "ಬಳಕೆದಾರ ಮಿತಿ"
+
+#~ msgid "Read Error"
+#~ msgstr "ಓದುವಲ್ಲಿ ದೋಷ"
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "ಸರತಿಯಸಾಲು ಭರತಿಯಾಗಿದೆ"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "ಓದಿರದ ಸಂದೇಶಗಳು"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "%s ಗೆ ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ :%s"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "ಲಾಗಿನ್ ವಿಫಲ(%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "ಸರ್ವರ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ"
+
+#~ msgid "Incorrect password."
+#~ msgstr "ತಪ್ಪು ಪ್ರವೇಶಪದ"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "ವರ್ಗಾವಣೆಗಾಗಿ ಸಂಪರ್ಕಿಸಲು ಅಗಲಿಲ್ಲ"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "ಸಂಪರ್ಕ ಪಡೆಯಲಾಗಲಿಲ್ಲ"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "ತಪ್ಪು ಹೆಸರು"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "ಸರ್ವರ್ ಮಾಹಿತಿ ಪಡೆಯಲಾಗಲಿಲ್ಲ"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "ಸಂಪರ್ಕ ಕಳೆದಿದೆ"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "ಆತಿಥೇಯಗಣಕ ಸಂಪರ್ಕಿಸಲಾಗಲಿಲ್ಲ"
+
+#~ msgid "Could not write"
+#~ msgstr "ಬರೆಯಲಾಗಲಿಲ್ಲ"
+
+#~ msgid "Could not connect"
+#~ msgstr "ಸಂಪರ್ಕಿಸಲಾಗಲಿಲ್ಲ"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "ತಪ್ಪು ಪ್ರವೇಶಪದ"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr "ಸಂಪರ್ಕ  ಸಾಧ್ಯವಗಲಿಲ್ಲ"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "ಯಾಹೂ ಜಪಾನ್"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "ಸರ್ವರ್‍ಗೆ ಸಂಪರ್ಕ ಹೊಂದಿಲ್ಲ"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "%sಗಾಗಿ ಹೊಸ ಹೆಸರನ್ನು ದಾಖಲಿಸಿ"
+
 #, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "ಸಂದೇಶದಲ್ಲಿ ಸೇರಿಸಿ"
@@ -14861,10 +14830,6 @@ msgstr ""
 #~ msgstr "ಈಗಿನ ಪ್ರವೇಶಪದ"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "ಸರ್ವರ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಲು ಆಗಲಿಲ್ಲ"
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_ಸಂದೇಶ:"
 
diff --git a/po/ko.po b/po/ko.po
index fefd92a776..48ca9a4b4e 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2007-10-01 16:15+0900\n"
 "Last-Translator: sushizang <sushizang@empal.com>\n"
 "Language-Team: GTP Korean <gnome-kr-translation@gnome.or.kr>\n"
@@ -2627,9 +2627,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "다른 메시지 클라이언트의 로그를 로그 뷰어로 표시"
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2686,8 +2687,9 @@ msgstr "Offline Message Emulation"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "오프라인 사용자에게 보내지 못한 메시지를 저장합니다."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "보내지 못한 남은 메시지를 저장합니다. \"친구 알림\" 창에서 편집 또는 삭제할 "
@@ -2939,11 +2941,12 @@ msgstr ""
 "http://www.activestate.com 에 있는 ActiveTCL 을 설치해 주십시오.\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "수신한 메시지 접속을 확립할 수 없었습니다.\n"
 
 msgid ""
@@ -3000,14 +3003,21 @@ msgstr "%s 님이 대화 계정을 닫았습니다."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "메시지를 보낼 수 없습니다. 대화를 시작할 수 없었습니다."
 
-msgid "Cannot open socket"
-msgstr "소켓을 열 수 없습니다."
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"소켓을 생성할 수 없습니다:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "포트에 소켓을 할당할 수 없었습니다."
 
-msgid "Could not listen on socket"
-msgstr "소켓을 감시할 수 없었습니다."
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"소켓을 생성할 수 없습니다:\n"
+"%s"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3055,13 +3065,16 @@ msgstr "친구 목록 저장..."
 msgid "Load buddylist from file..."
 msgstr "친구 목록 가져오기..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "등록 정보 항목을 입력해 주십시오."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "비밀번호가 일치하지 않습니다."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "새 계정을 등록할 수 없습니다. 오류가 발생했습니다.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3073,14 +3086,15 @@ msgstr "등록이 성공적으로 완료되었습니다!"
 msgid "Password"
 msgstr "비밀번호"
 
-msgid "Password (retype)"
-msgstr "비밀번호 (재입력)"
+msgid "Password (again)"
+msgstr "비밀번호 (재확인)"
 
-msgid "Enter current token"
-msgstr "현재의 토큰을 입력해 주십시오."
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "현재의 토큰"
+#, fuzzy
+msgid "Captcha"
+msgstr "이미지 저장"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "새로운 Gadu-Gadu 계정 등록"
@@ -3133,6 +3147,15 @@ msgstr "비밀번호를 성공적으로 변경했습니다!"
 msgid "Current password"
 msgstr "현재의 비밀번호"
 
+msgid "Password (retype)"
+msgstr "비밀번호 (재입력)"
+
+msgid "Enter current token"
+msgstr "현재의 토큰을 입력해 주십시오."
+
+msgid "Current token"
+msgstr "현재의 토큰"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "현재 사용하고 있는 비밀번호와 UIN 의 새 비밀번호를 입력해 주십시오:"
 
@@ -3180,8 +3203,8 @@ msgstr "일치하는 사용자를 찾지 못했습니다."
 msgid "There are no users matching your search criteria."
 msgstr "검색 조건에 일치하는 사용자가 존재하지 않았습니다."
 
-msgid "Unable to read socket"
-msgstr "소켓을 읽을 수 없습니다."
+msgid "Unable to read from socket"
+msgstr "소켓으로부터 읽을 수 없습니다."
 
 msgid "Buddy list downloaded"
 msgstr "친구 목록을 다운로드 했습니다."
@@ -3195,8 +3218,14 @@ msgstr "친구 목록을 업로드 했습니다."
 msgid "Your buddy list was stored on the server."
 msgstr "친구 목록을 서버에 업로드 했습니다."
 
-msgid "Connection failed."
-msgstr "접속에 실패했습니다."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "접속되었습니다."
+
+msgid "Connection failed"
+msgstr "접속 실패"
 
 msgid "Add to chat"
 msgstr "대화에 추가"
@@ -3204,18 +3233,23 @@ msgstr "대화에 추가"
 msgid "Chat _name:"
 msgstr "대화명(_N):"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "서버에 접속할 수 없습니다."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "접속 중입니다."
+
 msgid "Chat error"
 msgstr "대화 오류"
 
 msgid "This chat name is already in use"
 msgstr "이 대화명은 이미 사용 중입니다."
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "서버에 접속되어 있지 않습니다."
 
 msgid "Find buddies..."
@@ -3275,7 +3309,8 @@ msgstr "주제가 설정되어 있지 않습니다."
 msgid "File Transfer Failed"
 msgstr "파일 전송이 실패했습니다."
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "감시 포트를 열 수 없었습니다."
 
 msgid "Error displaying MOTD"
@@ -3291,8 +3326,18 @@ msgstr "이 접속에 관련있는 MOTD 가 없습니다."
 msgid "MOTD for %s"
 msgstr "%s 의 MOTD"
 
-msgid "Server has disconnected"
-msgstr "서버가 접속을 끊었습니다."
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"서버와의 접속에 실패했습니다:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "MOTD 보기"
@@ -3307,22 +3352,21 @@ msgstr "비밀번호(_P):"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC 별명에 공백이 포함되어 있을 지도 모릅니다."
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "접속 중입니다."
-
 msgid "SSL support unavailable"
 msgstr "SSL 지원은 사용할 수 없습니다."
 
-msgid "Couldn't create socket"
-msgstr "소켓을 생성하지 못했습니다."
+msgid "Unable to connect"
+msgstr "접속할 수 없습니다."
 
-msgid "Couldn't connect to host"
-msgstr "호스트에 접속하지 못했습니다."
+# msgstr[1] "%d 분"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "%s (으)로 접속할 수 없습니다."
 
-msgid "Read error"
-msgstr "읽기 오류입니다."
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "서버가 접속을 닫았습니다."
 
 msgid "Users"
 msgstr "사용자 수"
@@ -3753,13 +3797,14 @@ msgstr "명령을 사용할 수 없습니다."
 msgid "execute"
 msgstr "예상치 못한 데이터"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "로그인하기 위해 서버가 TLS/SSL 을 요구해 왔지만, TLS/SSL 은 지원되지 않습니"
 "다."
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "로그인하기 위해 서버가 TLS/SSL 을 요구해 왔지만, TLS/SSL 은 지원되지 않습니"
 "다."
@@ -3778,7 +3823,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "문자열 인증"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "인증에 실패했습니다."
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "서버로부터의 응답이 잘못되었습니다."
 
 msgid "Server does not use any supported authentication method"
@@ -3790,7 +3840,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "서버로부터의 잘못된 challenge 입니다."
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL 오류"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3810,10 +3861,8 @@ msgstr ""
 "서버와의 접속을 확립하지 못했습니다:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "서버와의 접속을 확립하지 못했습니다:\n"
 "%s"
@@ -3822,12 +3871,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "새로운 접속을 열 수 없습니다."
 
-msgid "Unable to create socket"
-msgstr "소켓을 생성할 수 없습니다."
-
-msgid "Write error"
-msgstr "쓰기 오류"
-
 msgid "Full Name"
 msgstr "전체 이름"
 
@@ -3897,188 +3940,6 @@ msgstr "운영 체제"
 msgid "Local Time"
 msgstr "로컬 파일:"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "폴더 정보 설정"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "주소2"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "대화 별칭"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "디렉토리 정보가 없습니다."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "명령 지정"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML 형식"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "등록 오류"
-
-#, fuzzy
-msgid "User Location"
-msgstr "위치"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "사용자 검색"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "Buddy State Notification"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "지원되지 않는 버전"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "방향"
-
-msgid "File Transfer"
-msgstr "파일 전송"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "사용자 모드"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "사용자 제한"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "기능"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "사용자명"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "키 교환 첨부 IM"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "이메일 주소"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "프로파일"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "참가"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "사용자명"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "라이브 영상"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "메시지를 받았습니다."
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "공개 키 Babbleprint"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "사용자 설정"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "사용자 모드"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "사용자명"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "사용자 제한"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Trillian 암호화"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "기능"
-
 msgid "Priority"
 msgstr "우선 순위"
 
@@ -4090,7 +3951,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "접속 시간"
 
 msgid "Middle Name"
@@ -4276,16 +4137,12 @@ msgid "Roles:"
 msgstr "직위"
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "일반 문자열"
 
-msgid "Read Error"
-msgstr "읽기 오류"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 #, fuzzy
@@ -4475,9 +4332,6 @@ msgstr "비밀번호가 변경되었습니다."
 msgid "Error changing password"
 msgstr "비밀번호 변경 오류"
 
-msgid "Password (again)"
-msgstr "비밀번호 (재확인)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "비밀번호 변경"
@@ -4877,6 +4731,14 @@ msgstr "XML 해석 오류"
 msgid "Unknown Error in presence"
 msgstr "알 수 없는 오류가 발생했습니다."
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "대화 %s 에 참가하는 중 오류"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "대화 %s 에서 오류"
+
 msgid "Create New Room"
 msgstr "새 대화실 만들기"
 
@@ -4893,16 +4755,20 @@ msgstr "대화실 설정(_C)"
 msgid "_Accept Defaults"
 msgstr "기본값 적용(_A)"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "대화 %s 에 참가하는 중 오류"
+#, fuzzy
+msgid "No reason"
+msgstr "이유를 알 수 없습니다."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "대화 %s 에서 오류"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "%s 에게 차였습니다: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s (%s) 에게 차였습니다"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "파일을 여는 중 오류가 발생했습니다."
 
 #, fuzzy
@@ -5416,9 +5282,6 @@ msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "MSN 에서는 SSL 지원이 필요합니다. 지원하는 SSL 라이브러리를 설치해 주십시오."
 
-msgid "Failed to connect to server."
-msgstr "서버 접속에 실패했습니다."
-
 msgid "Error retrieving profile"
 msgstr "프로파일을 가져오는 중 오류"
 
@@ -5671,9 +5534,6 @@ msgstr "알 수 없는 오류로 인해 메시지를 보내지 못했습니다:"
 msgid "Message was not sent because an unknown error occurred."
 msgstr "알 수 없는 오류로 인해 메시지를 보내지 못했습니다:"
 
-msgid "Unable to connect"
-msgstr "접속할 수 없습니다."
-
 # msgstr[1] ""
 # "MSN 서비스가 유지보수를 위해 %d 분간 정지하고 있습니다. 자동으로 접속이 끊길 예정이므로, 지금 수행되고 있는 대화를 종료해 주십시오.\n"
 # "\n"
@@ -5692,13 +5552,16 @@ msgstr ""
 "서버 %s 에서 접속 오류:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "서버는 이 프로토콜을 지원하지 않습니다."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "HTTP 해석 중 오류가 발생했습니다."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "다른 장소로부터 접속되어 있습니다."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5706,7 +5569,8 @@ msgstr ""
 "MSN 서버가 일시적으로 이용할 수 없게 되었습니다. 잠시 후 다시 시도해 보시기 "
 "바랍니다."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN 서버가 일시적으로 다운되어 있습니다."
 
 #, c-format
@@ -5719,9 +5583,6 @@ msgstr ""
 "사용 중인 MSN 친구 목록이 일시적으로 사용할수 없게 되었습니다. 잠시 후 다시 "
 "시도해 보시기 바랍니다."
 
-msgid "Unknown error."
-msgstr "알 수 없는 오류입니다."
-
 msgid "Handshaking"
 msgstr "통신에 접속 중입니다."
 
@@ -5819,6 +5680,9 @@ msgstr "MSN 프로토콜 플러그인"
 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"
@@ -5934,12 +5798,6 @@ msgstr[0] ""
 msgid "Add contacts from server"
 msgstr "서버로부터의 응답이 잘못되었습니다."
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "접속되었습니다."
-
 #, fuzzy, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "프로세스가 오류 코드 %d 을(를) 반환했습니다."
@@ -5962,17 +5820,6 @@ msgstr ""
 msgid "Invalid input condition"
 msgstr "최종 접속 조정 중"
 
-msgid "Read buffer full (2)"
-msgstr ""
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "메시지를 해독할 수 없습니다."
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "호스트에 접속하지 못했습니다."
-
 #, fuzzy
 msgid "Failed to add buddy"
 msgstr "대화 중인 친구에게 참가할 수 없습니다."
@@ -6067,6 +5914,12 @@ msgstr ""
 msgid "Client Version"
 msgstr "대화 창을 닫습니다."
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 #, fuzzy
 msgid "MySpaceIM - Username Available"
 msgstr "서비스를 이용할 수 없습니다."
@@ -6333,9 +6186,9 @@ msgstr "사용자는 오프라인 또는 차단되어 있습니다."
 msgid "Unknown error: 0x%X"
 msgstr "알 수 없는 오류: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "로그인에 실패했습니다. (%s)。"
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "사용자 %s 님을 차단할 수 없습니다."
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6438,9 +6291,6 @@ msgstr "GroupWise 회의 %d"
 msgid "Authenticating..."
 msgstr "인증 중..."
 
-msgid "Unable to connect to server."
-msgstr "서버에 접속할 수 없습니다."
-
 msgid "Waiting for response..."
 msgstr "응답을 기다리고 있습니다..."
 
@@ -6464,24 +6314,17 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "회의에 참석하시겠습니까?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"다른 워크스테이션으로부터 로그인 되어 있기 때문에, 강제적으로 로그아웃 되었습"
-"니다."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s 님은 오프라인이기 때문에, 전송한 메시지를 받지 못했습니다."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr "서버에 접속할 수 없습니다. 접속할 서버의 주소를 입력해 주십시오."
 
-msgid "Error. SSL support is not installed."
-msgstr "오류입니다. SSL 지원이 설치되어 있지 않습니다."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "이 회의는 폐회되었습니다. 메시지를 전송할 수 없습니다."
 
@@ -6520,10 +6363,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "%s 을(를) 해석하는 중 오류"
 
-msgid "Incorrect password."
-msgstr "비밀번호가 틀립니다."
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, fuzzy
@@ -6534,18 +6374,8 @@ msgstr "접속할 수 없었습니다."
 msgid "Invalid chat room name"
 msgstr "잘못된 대화실명"
 
-msgid "Server closed the connection."
-msgstr "서버가 접속을 닫았습니다."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"서버와의 접속에 실패했습니다:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "서버와 접속하는 동안에 잘못된 데이터를 받았습니다."
 
 #. *< type
@@ -6593,7 +6423,8 @@ msgstr "리모트 사용자와 접속이 끊어졌습니다:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "리모트 사용자의 접속에서 잘못된 데이터를 받았습니다."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "리모트 사용자와의 접속을 확립하지 못했습니다."
 
 msgid "Direct IM established"
@@ -6791,21 +6622,15 @@ msgstr "경고 수준"
 msgid "Buddy Comment"
 msgstr "친구의 코멘트"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "인증 서버에 접속할 수 없었습니다:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"BOS 서버에 접속할 수 없었습니다:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "서버에 접속할 수 없습니다."
 
 #, fuzzy
 msgid "Username sent"
@@ -6820,9 +6645,9 @@ msgstr "최종 접속 조정 중"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "로그인 할 수 없습니다: 아이디가 틀렸기 때문에 %s (으)로서 접속할 수 없었습니"
 "다. 아이디의 앞 부분은 문자, 문자와 숫자와 공백 또는 숫자만이 가능합니다."
@@ -6834,27 +6659,22 @@ 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
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "이름이 잘못되었습니다."
+msgid "Username does not exist"
+msgstr "사용자가 없습니다."
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "사용 중인 계정은 현재 정지 중입니다."
 
 #. service temporarily unavailable
@@ -6874,7 +6694,8 @@ msgstr ""
 "접속과 해제를 반복 수행했습니다. 10분 정도 후 다시 시도해 보시기 바랍니다. 이"
 "대로 계속하면 더 오래 기다려야 합니다."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "입력한 보안 ID 키는 잘못되었습니다."
 
 msgid "Enter SecurID"
@@ -7042,6 +6863,9 @@ msgstr "접속한 일시"
 msgid "Member Since"
 msgstr "멤버가 된 일시"
 
+msgid "Capabilities"
+msgstr "기능"
+
 msgid "Profile"
 msgstr "프로파일"
 
@@ -7213,7 +7037,7 @@ msgstr "자리 비움 메시지가 너무 깁니다."
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7239,9 +7063,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "고아"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "치구 %s 님을 추가할 수 없었습니다. 친구 수가 너무 많습니다. 한 명을 삭제한 "
@@ -7251,7 +7075,7 @@ msgid "(no name)"
 msgstr "(이름 없음)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "알 수 없는 이유로 명령 적용에 실패했습니다."
 
 #, fuzzy, c-format
@@ -8095,7 +7919,7 @@ msgid "Update interval (seconds)"
 msgstr "정보 갱신"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "서버 정보를 가져올 수 없습니다."
 
 #, c-format
@@ -8122,10 +7946,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "서버 정보를 가져올 수 없습니다."
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "질문 창의 글꼴"
 
@@ -8162,21 +7982,9 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "접속할 수 없습니다."
-
 msgid "Socket error"
 msgstr "소켓 오류"
 
-msgid "Unable to read from socket"
-msgstr "소켓으로부터 읽을 수 없습니다."
-
-msgid "Write Error"
-msgstr "쓰기 오류"
-
-msgid "Connection lost"
-msgstr "접속을 닫았습니다."
-
 #, fuzzy
 msgid "Getting server"
 msgstr "사용자 정보 설정..."
@@ -8185,8 +7993,9 @@ msgstr "사용자 정보 설정..."
 msgid "Requesting token"
 msgstr "요청이 거부되었습니다."
 
-msgid "Couldn't resolve host"
-msgstr "호스트명을 해석할 수 없었습니다."
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "서버에 접속할 수 없습니다."
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8237,7 +8046,7 @@ msgid "QQ Qun Command"
 msgstr "명령 지정"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "서버 정보를 가져올 수 없습니다."
 
 #, fuzzy
@@ -8259,9 +8068,6 @@ msgstr "파일 보내기"
 msgid "%d canceled the transfer of %s"
 msgstr "%d 님이 %s 의 전송을 취소했습니다."
 
-msgid "Connection closed (writing)"
-msgstr "쓰기 연결을 닫았습니다."
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>그룹명:</b> %s<br>"
@@ -8315,17 +8121,6 @@ msgstr "Sametime 관리자가 서버 %s 에서 다음의 공지를 발표했습�
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime 관리자 공지"
 
-msgid "Connection reset"
-msgstr "접속 초기화"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "소켓으로부터 읽는 중 오류: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "호스트에 접속할 수 없습니다."
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "%s (으)로부터의 공지"
@@ -8348,6 +8143,9 @@ msgstr "스피커"
 msgid "Video Camera"
 msgstr "비디오 카메라"
 
+msgid "File Transfer"
+msgstr "파일 전송"
+
 msgid "Supports"
 msgstr "지원"
 
@@ -9163,6 +8961,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "네트워크 통계 정보"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping 에 실패했습니다."
 
@@ -9227,7 +9028,8 @@ msgstr "지원하지 않는 공개 키 형식"
 msgid "Disconnected by server"
 msgstr "서버가 접속을 끊었습니다."
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "SILC 서버에 접속하는 중 오류"
 
 msgid "Key Exchange failed"
@@ -9239,27 +9041,26 @@ msgstr ""
 "분리된 세션의 복귀에 실패했습니다. 새로운 접속을 확립하려면 [재접속] 버튼을 "
 "눌러 주십시오."
 
-msgid "Connection failed"
-msgstr "접속 실패"
-
 msgid "Performing key exchange"
 msgstr "키 교환 실행 중"
 
-msgid "Unable to create connection"
-msgstr "새로운 접속을 생성할 수 없습니다."
-
 #, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "SILC 의 키 쌍을 읽을 수 없습니다: %s"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "SILC 서버에 접속 중"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "SILC 의 키 쌍을 읽을 수 없습니다: %s"
+
 msgid "Out of memory"
 msgstr "메모리가 부족합니다."
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "SILC 프로토콜을 초기화 할 수 없습니다."
 
 #, fuzzy
@@ -9560,7 +9361,7 @@ msgid "Creating SILC key pair..."
 msgstr "SILC 키 쌍 생성 중..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "SILC 키 쌍 생성 중..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9657,6 +9458,9 @@ msgstr "화이트보드"
 msgid "No server statistics available"
 msgstr "서버 통계 정보를 사용할 수 없습니다."
 
+msgid "Error during connecting to SILC Server"
+msgstr "SILC 서버에 접속하는 중 오류"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "실패: 버전 불일치, 클라이언트를 업그레이드 하십시오."
@@ -9697,32 +9501,28 @@ msgstr "실패: 잘못된 쿠키입니다."
 msgid "Failure: Authentication failed"
 msgstr "실패: 인증에 실패했습니다."
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "SILC 클라이언트 접속을 초기화 할 수 없습니다."
 
 #, fuzzy
 msgid "John Noname"
 msgstr "이름 없음"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "SILC 의 키 쌍을 읽을 수 없습니다: %s"
 
-msgid "Could not write"
-msgstr "쓸 수 없었습니다."
-
-msgid "Could not connect"
-msgstr "접속할 수 없었습니다."
+msgid "Unable to create connection"
+msgstr "새로운 접속을 생성할 수 없습니다."
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "원인을 알 수 없습니다."
 
-msgid "Could not create listen socket"
-msgstr "감시 소켓을 생성할 수 없었습니다."
-
-msgid "Could not resolve hostname"
-msgstr "호스트명을 해석할 수 없었습니다."
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "소켓을 생성할 수 없습니다."
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -9765,6 +9565,78 @@ msgstr "사용자 인증"
 msgid "Auth Domain"
 msgstr "도메인 인증"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;대화실&gt;: Yahoo 네트워크 상에 있는 대화에 참가"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Yahoo 네트워크 상에 있는 대화실 목록 표시"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: 사용자에게 낙서 요구"
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo! 프로토콜 플러그인"
+
+msgid "Pager server"
+msgstr "호출기 서버"
+
+msgid "Pager port"
+msgstr "호출기 포트"
+
+msgid "File transfer server"
+msgstr "파일 전송 서버"
+
+msgid "File transfer port"
+msgstr "파일 전송 포트"
+
+msgid "Chat room locale"
+msgstr "대화실 위치"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "회의 및 대화실 초대 무시"
+
+msgid "Chat room list URL"
+msgstr "대화실 URL 목록"
+
+msgid "Yahoo Chat server"
+msgstr "Yahoo 대화 서버"
+
+msgid "Yahoo Chat port"
+msgstr "Yahoo 대화 포트 번호"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo! 프로토콜 플러그인"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9797,30 +9669,20 @@ msgstr "거부할 친구 추가"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 "알 수 없는 오류 번호 %d 입니다. Yahoo! 웹사이트로 로그인하면 해결될 수도 있습"
 "니다."
@@ -9863,37 +9725,32 @@ msgstr ""
 "알 수 없는 오류 번호 %d 입니다. Yahoo! 웹사이트로 로그인하면 해결될 수도 있습"
 "니다."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "그룹 %2$s 의 친구 %1$s 을(를) 계정 %3$s (으)로 서버 목록에 추가할 수 없었습니"
 "다."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "친구를 서버 목록에 추가할 수 없었습니다."
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ 재생 가능 %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "서버로부터 예상치 못한 HTTP 응답을 받았습니다."
 
-msgid "Connection problem"
-msgstr "접속 오류"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr ""
 "서버와의 접속에 실패했습니다:\n"
 "%s"
 
 #, fuzzy, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
 "서버와의 접속을 확립하지 못했습니다:\n"
 "%s"
@@ -9960,74 +9817,15 @@ msgstr "대화에 참가..."
 msgid "Open Inbox"
 msgstr "Hotmail의 받은 편지함 열기"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;대화실&gt;: Yahoo 네트워크 상에 있는 대화에 참가"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Yahoo 네트워크 상에 있는 대화실 목록 표시"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: 사용자에게 낙서 요구"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo! 프로토콜 플러그인"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Korea! 에 접속"
-
-msgid "Pager server"
-msgstr "호출기 서버"
-
-msgid "Japan Pager server"
-msgstr "한국 호출기 서버"
-
-msgid "Pager port"
-msgstr "호출기 포트"
-
-msgid "File transfer server"
-msgstr "파일 전송 서버"
-
-msgid "Japan file transfer server"
-msgstr "한국 파일 전송 서버"
-
-msgid "File transfer port"
-msgstr "파일 전송 포트"
-
-msgid "Chat room locale"
-msgstr "대화실 위치"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "회의 및 대화실 초대 무시"
-
-msgid "Chat room list URL"
-msgstr "대화실 URL 목록"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo 대화 서버"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo 대화 포트 번호"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "낙서 요청을 보냄"
 
+msgid "Unable to connect."
+msgstr "접속할 수 없습니다."
+
 msgid "Unable to establish file descriptor."
 msgstr "파일 기술자를 가져올 수 없습니다."
 
@@ -10035,6 +9833,9 @@ msgstr "파일 기술자를 가져올 수 없습니다."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s 님이 파일 %s 의 전송을 요구하고 있습니다."
 
+msgid "Write Error"
+msgstr "쓰기 오류"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Korea 프로파일"
 
@@ -10152,23 +9953,19 @@ msgstr "음성"
 msgid "Webcams"
 msgstr "웹카메라"
 
+msgid "Connection problem"
+msgstr "접속 오류"
+
 msgid "Unable to fetch room list."
 msgstr "대화실 목록 가져올 수 없습니다."
 
 msgid "User Rooms"
 msgstr "사용자실"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "YCHT 서버를 사용한 접속에 문제가 있습니다."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"서버와의 접속이 끊어졌습니다.\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10295,24 +10092,16 @@ msgstr "Realm"
 msgid "Exposure"
 msgstr "노출"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"소켓을 생성할 수 없습니다:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "HTTP 프록시로부터의 응답을 해석할 수 없습니다: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP 프록시 접속 오류 %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "접근이 거부되었습니다: HTTP 프록시 서버가 포트 번호 %d 의 터널링을 거부했습니"
 "다."
@@ -10321,9 +10110,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr "%s 을(를) 해석하는 중 오류"
 
-msgid "Could not resolve host name"
-msgstr "호스트명을 해석할 수 없었습니다."
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10529,14 +10315,6 @@ msgstr "%s (으)로 쓰는 중 오류: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "%s (으)로 접속할 수 없습니다: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"로그인하기 위해 서버가 TLS/SSL 을 요구해 왔지만, TLS/SSL 은 지원되지 않습니"
-"다."
-
 #, c-format
 msgid " - %s"
 msgstr ""
@@ -10787,7 +10565,11 @@ msgid "View _Log"
 msgstr "로그 보기(_L)"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "오프라인일 때에는 허가되지 않았습니다."
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "오프라인일 때에는 허가되지 않았습니다."
 
 msgid "_Alias..."
@@ -11313,6 +11095,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "%s 의 사용자 정보 변경"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "이 인증을 위한 호스트명을 입력하십시오."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL 서버"
@@ -11359,7 +11145,8 @@ msgstr "무시할 대상"
 msgid "Get Away Message"
 msgstr "자리 비움 메시지"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "마지막 메시지:"
 
 msgid "Unable to save icon file to disk."
@@ -12268,7 +12055,7 @@ msgid "Hyperlink visited color"
 msgstr "하이퍼링크 색상"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "하이퍼링크 위에 커서가 놓였을 때의 색상입니다."
 
 msgid "Hyperlink prelight color"
@@ -12306,15 +12093,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "알림을 삭제할 시기"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "새 메일 알림"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12709,6 +12503,10 @@ msgid ""
 msgstr ""
 "브라우저 명령이 '수동설정'으로 되어 있지만, 명령이 지정되어 있지 않습니다."
 
+#, fuzzy
+msgid "No message"
+msgstr "알 수 없는 메시지"
+
 msgid "Open All Messages"
 msgstr "모든 메시지 열기"
 
@@ -12728,10 +12526,6 @@ msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">새로운 메일이 도착했습니다!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "알 수 없는 메시지"
-
 msgid "The following plugins will be unloaded."
 msgstr "다음의 플러그인을 해제합니다."
 
@@ -12953,8 +12747,9 @@ msgstr "시스템 트레이 아이콘 표시(_S):"
 msgid "On unread messages"
 msgstr "메시지를 받았을 때"
 
-msgid "Conversation Window Hiding"
-msgstr "대화 창 숨기기"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "메시지 대화 창"
 
 msgid "_Hide new IM conversations:"
 msgstr "새 대화 창 숨기기(_H):"
@@ -12962,6 +12757,9 @@ msgstr "새 대화 창 숨기기(_H):"
 msgid "When away"
 msgstr "자리 비움일 때만"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "최소화로 새 대화창 열기(_Z)"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "탭"
@@ -13020,9 +12818,6 @@ msgstr "부드러운 스크롤 사용"
 msgid "F_lash window when IMs are received"
 msgstr "메시지를 받으면 창을 깜빡거림(_L)"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "최소화로 새 대화창 열기(_Z)"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -13058,7 +12853,8 @@ msgstr "사용자 정보를 가져오지 못했습니다."
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">예: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "IP 주소를 자동으로 감지(_A)"
 
 msgid "Public _IP:"
@@ -13434,34 +13230,18 @@ msgstr "저장 후 사용(_V)"
 msgid "Status for %s"
 msgstr "%s 의 상태"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "이모티콘을 삽입합니다."
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
 #, fuzzy
-msgid "Duplicate Shortcut"
-msgstr "문자열이 중복되고 있습니다."
+msgid "Custom Smiley"
+msgstr "이모티콘을 삽입합니다."
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "상태 제목을 입력해 주십시오."
+msgid "Duplicate Shortcut"
+msgstr "문자열이 중복되고 있습니다."
 
 #, fuzzy
 msgid "Edit Smiley"
@@ -13585,9 +13365,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "실행기는 전송할 수 없습니다."
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "드래그 한 것은 데스크탑 실행기입니다. 아마도 실행기 자신이 아닌, 실행기가 지"
 "시하고 있는 오브젝트를 전송하고자 할 것입니다."
@@ -14184,9 +13965,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "합작하기 위한 음악 메시지 플러그인입니다."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "실시간으로 공통 점수를 편집함으로써 여러 명의 친구 사이에서 음악의 일부분을 "
 "동시에 연주할 수 있도록 하는 음악 메시지 플러그인입니다."
@@ -14453,7 +14235,7 @@ msgstr "대화 창 숨기기"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14778,8 +14560,9 @@ msgstr "Windows Pidgin 설정"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Windows를 위한 Pidgin 설정을 제공합니다."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "친구 목록 도킹과 같은 Windows에 대한 Pidgin 설정을 제공합니다."
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14820,6 +14603,282 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "이것은 XMPP 서버 또는 클라이언트를 디버그 할 때에 편리한 플러그인입니다."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "소켓을 열 수 없습니다."
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "소켓을 감시할 수 없었습니다."
+
+#~ msgid "Unable to read socket"
+#~ msgstr "소켓을 읽을 수 없습니다."
+
+#~ msgid "Connection failed."
+#~ msgstr "접속에 실패했습니다."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "서버가 접속을 끊었습니다."
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "소켓을 생성하지 못했습니다."
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "호스트에 접속하지 못했습니다."
+
+#~ msgid "Read error"
+#~ msgstr "읽기 오류입니다."
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "서버와의 접속을 확립하지 못했습니다:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "쓰기 오류"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "폴더 정보 설정"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "주소2"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "대화 별칭"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "디렉토리 정보가 없습니다."
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "명령 지정"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML 형식"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "등록 오류"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "위치"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "사용자 검색"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "Buddy State Notification"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "지원되지 않는 버전"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "방향"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "사용자 모드"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "사용자 제한"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "기능"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "사용자명"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "키 교환 첨부 IM"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "이메일 주소"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "프로파일"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "참가"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "사용자명"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "라이브 영상"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "메시지를 받았습니다."
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "공개 키 Babbleprint"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "사용자 설정"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "사용자 모드"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "사용자명"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "사용자 제한"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Trillian 암호화"
+
+#~ msgid "Read Error"
+#~ msgstr "읽기 오류"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "서버 접속에 실패했습니다."
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "메시지를 해독할 수 없습니다."
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "호스트에 접속하지 못했습니다."
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "로그인에 실패했습니다. (%s)。"
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "다른 워크스테이션으로부터 로그인 되어 있기 때문에, 강제적으로 로그아웃 되"
+#~ "었습니다."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "오류입니다. SSL 지원이 설치되어 있지 않습니다."
+
+#~ msgid "Incorrect password."
+#~ msgstr "비밀번호가 틀립니다."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "BOS 서버에 접속할 수 없었습니다:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "곧 접속이 끊깁니다. 갱신을 위해 %s 을(를) 선택하십시오."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "접속할 수 없었습니다."
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "이름이 잘못되었습니다."
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "서버 정보를 가져올 수 없습니다."
+
+#~ msgid "Connection lost"
+#~ msgstr "접속을 닫았습니다."
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "호스트명을 해석할 수 없었습니다."
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "쓰기 연결을 닫았습니다."
+
+#~ msgid "Connection reset"
+#~ msgstr "접속 초기화"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "소켓으로부터 읽는 중 오류: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "호스트에 접속할 수 없습니다."
+
+#~ msgid "Could not write"
+#~ msgstr "쓸 수 없었습니다."
+
+#~ msgid "Could not connect"
+#~ msgstr "접속할 수 없었습니다."
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "감시 소켓을 생성할 수 없었습니다."
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "호스트명을 해석할 수 없었습니다."
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "비밀번호가 틀립니다."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "서버와의 접속을 확립하지 못했습니다:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Korea! 에 접속"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "한국 호출기 서버"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "한국 파일 전송 서버"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "서버와의 접속이 끊어졌습니다.\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "호스트명을 해석할 수 없었습니다."
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "로그인하기 위해 서버가 TLS/SSL 을 요구해 왔지만, TLS/SSL 은 지원되지 않습"
+#~ "니다."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "대화 창 숨기기"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "상태 제목을 입력해 주십시오."
+
 #, fuzzy
 #~ msgid "Activate which ID?"
 #~ msgstr "어느 ID 를 활성화 하시겠습니까?"
diff --git a/po/ku.po b/po/ku.po
index b2bdcbf559..ab44a7cce0 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2007-02-26 09:48+0000\n"
 "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
 "Language-Team: Kurdish <gnu-ku-wergerandin@lists.sourceforge.net>\n"
@@ -2666,7 +2666,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2717,7 +2717,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2965,12 +2965,13 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
+msgstr "Girêdana nû nehat çêkirin."
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -3025,16 +3026,17 @@ msgstr "%s Deriyê sohbetê girt"
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-msgid "Cannot open socket"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Girêdan venabe"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Bi pêşkêşkar re têkilî nehat danîn"
 
-#, fuzzy
-msgid "Could not listen on socket"
-msgstr "Soket nehat afirandin"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Girêdan venabe"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3082,13 +3084,16 @@ msgstr "Lîsteya Kesan Tomar Bike..."
 msgid "Load buddylist from file..."
 msgstr "Lîsteya hevalan ji pelî bar bike..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Qadên tomarkirinê tije bike."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Şîfre ne weke hev in."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Hesabekî nû nehate tomarkirin. Çewtî çêbû.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3100,14 +3105,15 @@ msgstr "Tomarkirin bi awayekî serkeftî hate bidawîkirin!"
 msgid "Password"
 msgstr "Şîfre"
 
-msgid "Password (retype)"
-msgstr "Şîfre (dubare bike)"
+msgid "Password (again)"
+msgstr "Şîfre (dîsa)"
 
-msgid "Enter current token"
-msgstr "Bikarhêner %s danişîn venekiriye"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Niha vekirî ye"
+#, fuzzy
+msgid "Captcha"
+msgstr "Wêneyê Tomar Bike"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Hesabekî nû yê Gadu-Gadu Çêbike"
@@ -3161,6 +3167,15 @@ msgstr "Şîfre bi rengekî serkeftî hate guhertin"
 msgid "Current password"
 msgstr "Şîfreya heyî"
 
+msgid "Password (retype)"
+msgstr "Şîfre (dubare bike)"
+
+msgid "Enter current token"
+msgstr "Bikarhêner %s danişîn venekiriye"
+
+msgid "Current token"
+msgstr "Niha vekirî ye"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Ji kerema xwe bo UIN şîfreya xwe ya niha û ya nû binivîse: "
 
@@ -3208,7 +3223,8 @@ msgstr ""
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-msgid "Unable to read socket"
+#, fuzzy
+msgid "Unable to read from socket"
 msgstr "Xwendina socket serneket"
 
 msgid "Buddy list downloaded"
@@ -3223,8 +3239,14 @@ msgstr "Lîsteya heval hate daxistin"
 msgid "Your buddy list was stored on the server."
 msgstr "Lîsteya te ya heval di pêşkêşker de hate bicihkirin"
 
-msgid "Connection failed."
-msgstr "Girêdan pêk nehat."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Girêdayî"
+
+msgid "Connection failed"
+msgstr "Girêdan serneket"
 
 msgid "Add to chat"
 msgstr "Têxe Sohbetê"
@@ -3232,18 +3254,23 @@ msgstr "Têxe Sohbetê"
 msgid "Chat _name:"
 msgstr "_Navê sohbetê:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Bi pêşkêşkarê re girêdan pêk nehat"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Girêdide"
+
 msgid "Chat error"
 msgstr "Çewtiya sohbetê"
 
 msgid "This chat name is already in use"
 msgstr "Vî navê sohbetê vêga dixebite"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Li pêşkêşkerê nehate girêdan."
 
 msgid "Find buddies..."
@@ -3304,7 +3331,7 @@ msgid "File Transfer Failed"
 msgstr "Guheztina Pelgehê Bi Ser Neket"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Pidginê porteke guhdarkirinê venekir."
 
 msgid "Error displaying MOTD"
@@ -3320,8 +3347,16 @@ msgstr "MOTD'eke têkilî girêdanê nehat dîtin."
 msgid "MOTD for %s"
 msgstr "MOTD ji bo %s"
 
-msgid "Server has disconnected"
-msgstr "Girêdana pêşkêşkar qut bû"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "Li pêşkêşkerê nehate girêdan."
 
 msgid "View MOTD"
 msgstr "MOTD'ê nîşan bide"
@@ -3336,22 +3371,20 @@ msgstr "Şî_fre:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "Navên IRC'ê bi valahî çênabin"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Girêdide"
-
 msgid "SSL support unavailable"
 msgstr "Desteka SSL tune"
 
-msgid "Couldn't create socket"
-msgstr "Soket nehat afirandin"
+msgid "Unable to connect"
+msgstr "Nayê girêdan"
 
-msgid "Couldn't connect to host"
-msgstr "Bi pêşkêşkar re têkilî nehat danîn"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Bi pêşkêşkarê re girêdan pêk nehat."
 
-msgid "Read error"
-msgstr "Xeletiya xwendinê"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "%s Deriyê sohbetê girt"
 
 msgid "Users"
 msgstr "Bikarhêner"
@@ -3778,13 +3811,14 @@ msgstr "Fermana nederbasdar"
 msgid "execute"
 msgstr "Ya ne li bendê"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "Daxwaza TLS/SSL a pêşkêşkar ji bo têketinê. Tu piştgiriyeke TLS/SSL nehat "
 "dîtin."
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "Daxwaza TLS/SSL a pêşkêşkar ji bo têketinê. Tu piştgiriyeke TLS/SSL nehat "
 "dîtin."
@@ -3805,7 +3839,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Pelgekirina nivîsên neşifrekirî"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Têketin serneket"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Ji pêşkêşkarê bersiva xeletiyê"
 
 msgid "Server does not use any supported authentication method"
@@ -3817,7 +3856,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "Xeletî: Ji pêşkêşkar bersiva nederbasdar"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Çewtiya SASL"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3835,22 +3875,14 @@ msgstr "Guhertoya Nederbasdar"
 msgid "Unable to establish a connection with the server"
 msgstr "Girêdana SSL li pêşkêşkerê nayê kirin."
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Girêdana SSL li pêşkêşkerê nayê kirin."
 
 #, fuzzy
 msgid "Unable to establish SSL connection"
 msgstr "Girêdana nû nehat çêkirin."
 
-msgid "Unable to create socket"
-msgstr "Girêdan venabe"
-
-msgid "Write error"
-msgstr "Xeletiya Nivîsandinê"
-
 msgid "Full Name"
 msgstr "Nav û paşnav"
 
@@ -3923,187 +3955,6 @@ msgstr "Pergala Xebatê Veşêre"
 msgid "Local Time"
 msgstr "Bikarhênera Herêmî"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "Agahiyên Bikarhêner Têkevê"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "Navnîşan (dûmahîk)"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "Chata Xuya Dibe"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "Ferman"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "Şaşîtiya Tomarkirinê"
-
-#, fuzzy
-msgid "User Location"
-msgstr "Cih"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "Navê bikarhêner"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "Hişyarkirina Rewşa Kesan"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "Guhertoya Nederbasdar"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "Beralîkirin"
-
-msgid "File Transfer"
-msgstr "Şandina Pelgehê"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "Modên Bikarhêner"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "Sînorkirina Bikarhêner"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "Taybetmendî"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "Navê bikarhêner"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "Bi IMê re Guhertina Mifteyan"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "Navnîşana E-peyamê"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "Profîla Jabber"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "Ping"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "Navê bikarhêner"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "Vîdeoya Zindî"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "Peyam hat standin"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "Pelgeha Mifteyên Giştî"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "Vebijartokên Bikarhêneran"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "Modên Bikarhêner"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "Navê bikarhêner"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "Sînorkirina Bikarhêner"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Şîfrekirina Trillian"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Taybetmendî"
-
 msgid "Priority"
 msgstr "Pêşî"
 
@@ -4115,7 +3966,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Daniştin hat girtin"
 
 msgid "Middle Name"
@@ -4300,16 +4151,12 @@ msgid "Roles:"
 msgstr "Rol"
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "Deqa rast"
 
-msgid "Read Error"
-msgstr "Çewtiya Xwendinê"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 #, fuzzy
@@ -4499,9 +4346,6 @@ msgstr "Şîfreya te hat guherandin"
 msgid "Error changing password"
 msgstr "Xeletiya guherandina şîfreyê"
 
-msgid "Password (again)"
-msgstr "Şîfre (dîsa)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "Şîfreyê Biguherîne"
@@ -4896,6 +4740,14 @@ msgstr "Xeletiya jeveqetandina XML"
 msgid "Unknown Error in presence"
 msgstr "Xeletiya Nayê Zanîn"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Di tevlibûna sohbeta %s de xeletî"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Di sohbeta %s de xeletî"
+
 msgid "Create New Room"
 msgstr "Odeya Nû Biafirîne"
 
@@ -4910,16 +4762,20 @@ msgstr ""
 msgid "_Accept Defaults"
 msgstr ""
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Di tevlibûna sohbeta %s de xeletî"
+#, fuzzy
+msgid "No reason"
+msgstr "Navê xuya dibe tune."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Di sohbeta %s de xeletî"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Ji hêla %s ve hatî dakirin: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Ji hêla %s ve hatî dakirin (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Di vekirina pelî de xeletiyek çêbû."
 
 #, fuzzy
@@ -5435,9 +5291,6 @@ msgstr ""
 "derbasdar bar bike. Ji bo zêdetir agahî here navnîşana http://Pidgin.sf.net/"
 "faq-ssl.php ."
 
-msgid "Failed to connect to server."
-msgstr "Li makekompîturê nehate girêdan."
-
 msgid "Error retrieving profile"
 msgstr "Di standina Profîlê de xeletî"
 
@@ -5713,9 +5566,6 @@ msgstr "Ji ber xeletiyeke nayê zanîn peyam nehat şandin:"
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Ji ber xeletiyeke nayê zanîn peyam nehat şandin:"
 
-msgid "Unable to connect"
-msgstr "Nayê girêdan"
-
 msgid "Writing error"
 msgstr "Çewtiya nivîsandinê"
 
@@ -5730,13 +5580,16 @@ msgstr ""
 "Çewtiya têkiliyê ji pêşkêşker%s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Protokola me ji hêla pêşkêşkar ve nayê destekirin."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Xeletiya jevcihêkirina HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Te bi pernameyeke din daniştin vekir"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5744,7 +5597,8 @@ msgstr ""
 "Bi lîsteya te ya MSN'ê re ji bo demekê têkilî nayê danîn. Ji kerema xwe re "
 "dû re dîsa biceribîne."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Pêşkêşkara MSN'ê ji bo demekê tê girtin."
 
 #, c-format
@@ -5757,9 +5611,6 @@ msgstr ""
 "Bi lîsteya te ya MSN'ê re ji bo demekê têkilî nayê danîn. Ji kerema xwe re "
 "dû re dîsa biceribîne."
 
-msgid "Unknown error."
-msgstr "Xeletiya nayê zanîn."
-
 msgid "Handshaking"
 msgstr "Dest hejandin"
 
@@ -5859,6 +5710,9 @@ msgstr "Pêveka Protokola IRC"
 msgid "%s is not a valid group."
 msgstr "%s ne grubeke derbasdar e."
 
+msgid "Unknown error."
+msgstr "Xeletiya nayê zanîn."
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s - %s (%s)"
@@ -5974,12 +5828,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Ji pêşkêşkarê bersiva xeletiyê"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Girêdayî"
-
 #, fuzzy, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Di xebatê de çewtî. koda çewtiyê %d"
@@ -6003,18 +5851,6 @@ msgid "Invalid input condition"
 msgstr "GirÊdan qut bû."
 
 #, fuzzy
-msgid "Read buffer full (2)"
-msgstr "Lîste tije ye"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "Peyam ji hev nayê veqetandin"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Bi pêşkêşkar re têkilî nehat danîn"
-
-#, fuzzy
 msgid "Failed to add buddy"
 msgstr "Bi kes re beşdarî sohbetê nebû"
 
@@ -6110,6 +5946,12 @@ msgstr ""
 msgid "Client Version"
 msgstr "Axaftinê dade"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 #, fuzzy
 msgid "MySpaceIM - Username Available"
 msgstr "Servîs tune"
@@ -6379,9 +6221,9 @@ msgstr "An bikarhêner negirêdayî ye an jî tu hatiyê qedexekirin"
 msgid "Unknown error: 0x%X"
 msgstr "Xeletiya nayê zanîn: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Daniştin venebû (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "%s nehat qedexekirin"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6481,9 +6323,6 @@ msgstr "Konferansa GroupWise %d"
 msgid "Authenticating..."
 msgstr "Têdikeve..."
 
-msgid "Unable to connect to server."
-msgstr "Bi pêşkêşkarê re girêdan pêk nehat."
-
 msgid "Waiting for response..."
 msgstr "Bo bersivdanê tê rawestandin..."
 
@@ -6506,24 +6345,19 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Tu dixwazî li sohbetê were girêdan?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Danişîna te hate girtin, te ji dereke din danişîn vekir"
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s girêdayî dixuye û peyamên ku te jê re şandiye nikare bistîne."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Li pêşkêşker nehate girêdan. Ji kerema xwe re navnîşana ku tu dixwazî lê "
 "were girêdan binivîse."
 
-msgid "Error. SSL support is not installed."
-msgstr "Xeletî. Desteka SSL nehatiye sazkirin."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Ev konferans hat girtin. Êdî peyam nayên şandin."
 
@@ -6563,10 +6397,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "Çewtiya pêkanîna girêdanan"
 
-msgid "Incorrect password."
-msgstr "Şîfre şaş e."
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, fuzzy
@@ -6578,17 +6409,7 @@ msgid "Invalid chat room name"
 msgstr "Navê Nederbasdar ê Odeyan"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "%s Deriyê sohbetê girt"
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "Li pêşkêşkerê nehate girêdan."
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "Girêdana SSL li pêşkêşkerê nayê kirin."
 
 #. *< type
@@ -6641,8 +6462,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Girêdana SSL li pêşkêşkerê nayê kirin."
 
 #, fuzzy
 msgid "Direct IM established"
@@ -6836,16 +6658,12 @@ msgid "Buddy Comment"
 msgstr "Raveya Hevalan"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "Li pêşkêşkerê nehate girêdan."
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr "Li makekompîturê nehate girêdan."
+msgid "Unable to connect to BOS server: %s"
+msgstr "Bi pêşkêşkarê re girêdan pêk nehat."
 
 #, fuzzy
 msgid "Username sent"
@@ -6860,9 +6678,9 @@ msgstr "GirÊdan qut bû."
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 
 #, fuzzy, c-format
@@ -6873,28 +6691,23 @@ msgstr "Girêdana te ya bi pêşkêşkerê re qut bû."
 msgid "Unable to get a valid AIM login hash."
 msgstr "Pelgeh nayê vekirin %s."
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Girêdana te ya bi pêşkêşkerê re qut bû."
-
 #, fuzzy
 msgid "Unable to get a valid login hash."
 msgstr "Pelgeh nayê vekirin %s."
 
-msgid "Could Not Connect"
-msgstr "Nehat Girêdan"
-
 msgid "Received authorization"
 msgstr "Peyam hat standin"
 
 #. Unregistered username
 #. uid is not exist
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "Nicka nederbasdar"
+msgid "Username does not exist"
+msgstr "Bikarhêner ne mevcûd e"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Hesabê ye ji bo niha hatiye rawestandin."
 
 #. service temporarily unavailable
@@ -6915,8 +6728,9 @@ msgstr ""
 "ragirin û dîsa biceribîne. Heke tu ceribandinê zêde berdewam bike tu yê "
 "mecbûr bimîne ku pir zêde li bendê bisekine."
 
-msgid "The SecurID key entered is invalid."
-msgstr ""
+#, fuzzy
+msgid "The SecurID key entered is invalid"
+msgstr "Navê dîmenê yê hatiye diyarkirin ne derbasdar e."
 
 msgid "Enter SecurID"
 msgstr "Enter Dişîne"
@@ -7083,6 +6897,9 @@ msgstr "Maweya ku girêdayî mayî"
 msgid "Member Since"
 msgstr "Maweyê Girêdanê:"
 
+msgid "Capabilities"
+msgstr "Taybetmendî"
+
 msgid "Profile"
 msgstr "Profîl"
 
@@ -7240,7 +7057,7 @@ msgstr "Peyama te pir dirêj e."
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7263,7 +7080,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
@@ -7271,7 +7088,7 @@ msgid "(no name)"
 msgstr "(nav tune)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Ji ber sedemeke ku nayêzanîn fermana ku te da bicih nehat."
 
 #, fuzzy, c-format
@@ -8142,7 +7959,7 @@ msgid "Update interval (seconds)"
 msgstr "Xeletiya xwendinê"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Agahiyên pêşkêşkerê nayên wergirtin"
 
 #, c-format
@@ -8169,10 +7986,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Agahiyên pêşkêşkerê nayên wergirtin"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "Diyaloga Daxwazan"
 
@@ -8207,25 +8020,11 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "Girêdan serneket."
-
 #, fuzzy
 msgid "Socket error"
 msgstr "Çewtiya Diyarkirinê"
 
 #, fuzzy
-msgid "Unable to read from socket"
-msgstr "Xwendina socket serneket"
-
-msgid "Write Error"
-msgstr "Çewtiya Nivîsandinê"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "Girêdan Hate Qutkirin"
-
-#, fuzzy
 msgid "Getting server"
 msgstr "Agahiya Bikarhêner Biguherîne..."
 
@@ -8233,8 +8032,9 @@ msgstr "Agahiya Bikarhêner Biguherîne..."
 msgid "Requesting token"
 msgstr "Daxwaz hat redkirin"
 
-msgid "Couldn't resolve host"
-msgstr ""
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Bi pêşkêşkarê re girêdan pêk nehat"
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8285,7 +8085,7 @@ msgid "QQ Qun Command"
 msgstr "Ferman"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Agahiyên pêşkêşkerê nayên wergirtin"
 
 #, fuzzy
@@ -8308,9 +8108,6 @@ msgstr "Verêkirina Pelî Bi Ser Neket"
 msgid "%d canceled the transfer of %s"
 msgstr "%s, şandina %s'yê betal kir"
 
-msgid "Connection closed (writing)"
-msgstr ""
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr ""
@@ -8364,17 +8161,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-msgid "Connection reset"
-msgstr ""
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr ""
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr ""
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -8397,6 +8183,9 @@ msgstr ""
 msgid "Video Camera"
 msgstr ""
 
+msgid "File Transfer"
+msgstr "Şandina Pelgehê"
+
 #, fuzzy
 msgid "Supports"
 msgstr "piştgirî"
@@ -9168,6 +8957,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Îstatîstîkên Torê"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Pîng ne serkeftî bû"
 
@@ -9229,7 +9021,8 @@ msgstr "Nirxên mifteyên ku nayên destekkirin"
 msgid "Disconnected by server"
 msgstr "Girêdana bi pêşkêşkerê re hate birrîn"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Dema li Pêşkêşkera SILC dihate girêdan çewtî çêbû"
 
 msgid "Key Exchange failed"
@@ -9241,28 +9034,27 @@ msgstr ""
 "Li danişîna ku hatibû cveqetandin nehate domandin. Ji bo avakirina "
 "girêdaneke din pel Dîsa Girê Bide bike"
 
-msgid "Connection failed"
-msgstr "Girêdan serneket"
-
 msgid "Performing key exchange"
 msgstr "Guherandina mifteyan tê kirin"
 
-msgid "Unable to create connection"
-msgstr ""
-
 #, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "Mifteya giştî nayê barkirin"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Li Pêşkêşkera SILC tê Girêdan"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Mifteya giştî nayê barkirin"
+
 msgid "Out of memory"
 msgstr "Bîr têrê nake"
 
-msgid "Cannot initialize SILC protocol"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
+msgstr "Girêdana nû nehat çêkirin."
 
 #, fuzzy
 msgid "Error loading SILC key pair"
@@ -9550,7 +9342,7 @@ msgid "Creating SILC key pair..."
 msgstr "Fera mifteya SILC tê afirandin..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "Fera mifteya SILC tê afirandin..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9639,6 +9431,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr "Îstatîstîkên pêşkêşkerê ne mevcûd e"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Dema li Pêşkêşkera SILC dihate girêdan çewtî çêbû"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Neserkeftî: Guherto li hev nakin, bernameyê rojane bike"
@@ -9681,33 +9476,28 @@ msgstr ""
 msgid "Failure: Authentication failed"
 msgstr "Çewtî: Venihêrtina Nasnameyê Neserkeftî ye"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Girêdana SILC Client nehate destpêkirin"
 
 #, fuzzy
 msgid "John Noname"
 msgstr "Nav tune"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
+msgstr "Mifteya giştî nayê barkirin"
 
-msgid "Could not write"
+msgid "Unable to create connection"
 msgstr ""
 
-msgid "Could not connect"
-msgstr "Nekarî girêbide"
-
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "Çewtiya Pêşkêşkerê ya nenas."
 
-msgid "Could not create listen socket"
-msgstr ""
-
 #, fuzzy
-msgid "Could not resolve hostname"
-msgstr "Girêdan venabe."
+msgid "Unable to create listen socket"
+msgstr "Girêdan venabe"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -9750,6 +9540,81 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr ""
+
+msgid "list: List rooms on the Yahoo network"
+msgstr ""
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "ID ya Yahoo!"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Pêveka Protokola Yahooyê"
+
+#, fuzzy
+msgid "Pager server"
+msgstr "Pêşkêşkara Proxyê"
+
+msgid "Pager port"
+msgstr "Porta Bangkirinê"
+
+#, fuzzy
+msgid "File transfer server"
+msgstr "Porta veguheztina pelan"
+
+msgid "File transfer port"
+msgstr "Porta veguheztina pelan"
+
+msgid "Chat room locale"
+msgstr ""
+
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
+
+msgid "Chat room list URL"
+msgstr ""
+
+msgid "Yahoo Chat server"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo Chat port"
+msgstr "Yahoo Japon"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "ID ya Yahoo!"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Pêveka Protokola Yahooyê"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9778,30 +9643,20 @@ msgstr "Lêzêdekirina kesan hate redkirin"
 msgid "Received invalid data"
 msgstr "Girêdana SSL li pêşkêşkerê nayê kirin."
 
-#. Password incorrect
-#, fuzzy
-msgid "Incorrect Password"
-msgstr "Şîfre şaş e."
-
 #. 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."
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
 msgstr ""
 "Hesabê te yê bikarhêneriyê hate quflekirin, ji kerema xwe re têkeve malpera "
 "Yahoo!"
 
-#. the username does not exist
-#, fuzzy
-msgid "Username does not exist"
-msgstr "Bikarhêner ne mevcûd e"
-
 #. indicates a lock of some description
 #, fuzzy
 msgid ""
-"Account locked: Unknown reason.\n"
-"Logging into the Yahoo! website may fix this."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 "Hesabê te yê bikarhêneriyê hate quflekirin, ji kerema xwe re têkeve malpera "
 "Yahoo!"
@@ -9839,11 +9694,12 @@ msgstr ""
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
+msgstr "%s nekete lîsteya bi destûr (%s)."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Hevalê/a te nekete lîsteya pêşkêşkeran"
 
 #, c-format
@@ -9851,23 +9707,16 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
 #, fuzzy
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "Ji pêşkêşkarê bersiva xeletiyê"
 
-msgid "Connection problem"
-msgstr "Pirsgirêka girêdanê"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "Bi %s 'ê re axaftin"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Girêdana SSL li pêşkêşkerê nayê kirin."
 
 msgid "Not at Home"
 msgstr ""
@@ -9930,79 +9779,15 @@ msgstr ""
 msgid "Open Inbox"
 msgstr "Qutiya Peyamên Hatiye ya Hotmaîlê Veke"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-
-msgid "list: List rooms on the Yahoo network"
-msgstr ""
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "ID ya Yahoo!"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Pêveka Protokola Yahooyê"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japon"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "Pêşkêşkara Proxyê"
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "Hosta Bangkirinê ya Japonan"
-
-msgid "Pager port"
-msgstr "Porta Bangkirinê"
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "Porta veguheztina pelan"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "Danişîna şandina pelgehên çalak tuneye"
-
-msgid "File transfer port"
-msgstr "Porta veguheztina pelan"
-
-msgid "Chat room locale"
-msgstr ""
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-msgid "Chat room list URL"
-msgstr ""
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "Yahoo Japon"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "Girêdan serneket."
+
 msgid "Unable to establish file descriptor."
 msgstr "Danaskerê pelgehê nehate sazkirin."
 
@@ -10010,6 +9795,9 @@ msgstr "Danaskerê pelgehê nehate sazkirin."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s şandina pelê %s pêşniyar dike"
 
+msgid "Write Error"
+msgstr "Çewtiya Nivîsandinê"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Profîla Japonan ya Yahoo!yê"
 
@@ -10116,21 +9904,19 @@ msgstr "Deng"
 msgid "Webcams"
 msgstr "Kamera"
 
+msgid "Connection problem"
+msgstr "Pirsgirêka girêdanê"
+
 msgid "Unable to fetch room list."
 msgstr ""
 
 msgid "User Rooms"
 msgstr "Jûrên Bikarhêneran"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Teşqeleya girêdana bi pêşkêşker YCHT re"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "Li pêşkêşkerê nehate girêdan."
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10248,13 +10034,7 @@ msgid "Exposure"
 msgstr ""
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "Girêdan venabe"
-
-#, fuzzy, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Nikare pêwira \"%s\" bixebitîne ji bo bikarhêner: %s"
 
 #, fuzzy, c-format
@@ -10262,17 +10042,13 @@ msgid "HTTP proxy connection error %d"
 msgstr "Çewtiya girêdana proxy %d"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr "%s çewtiya xebitandinê"
 
-#, fuzzy
-msgid "Could not resolve host name"
-msgstr "Girêdan venabe."
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10486,14 +10262,6 @@ msgstr ""
 msgid "Unable to connect to %s: %s"
 msgstr "Bi pêşkêşkarê re girêdan pêk nehat."
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"Daxwaza TLS/SSL a pêşkêşkar ji bo têketinê. Tu piştgiriyeke TLS/SSL nehat "
-"dîtin."
-
 #, c-format
 msgid " - %s"
 msgstr ""
@@ -10742,7 +10510,11 @@ msgid "View _Log"
 msgstr "_Tomarkirinan Nîşan Bide"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "Dema negirêdayî be destûrê nade"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "Dema negirêdayî be destûrê nade"
 
 msgid "_Alias..."
@@ -11285,6 +11057,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Ji bo %s agahiyên bikarhêneran biguherîne"
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11333,7 +11108,8 @@ msgstr "Guh medê"
 msgid "Get Away Message"
 msgstr "Peyama Li Derve ye! Bistîne"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Gotinên dawî"
 
 msgid "Unable to save icon file to disk."
@@ -12255,7 +12031,7 @@ msgid "Hyperlink visited color"
 msgstr "Rengê girêdanê"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Dema mişk hate ser girêdanan birengîne."
 
 msgid "Hyperlink prelight color"
@@ -12293,15 +12069,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "Rakirina Hişyariyan"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "Danezankarê peyamên nû"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12673,6 +12456,10 @@ msgstr ""
 "Fermana gerok a \"Bi destan mîheng bike\" hat hilbijartin lê tu ferman nehat "
 "nivîsandin."
 
+#, fuzzy
+msgid "No message"
+msgstr "(peyamek)"
+
 msgid "Open All Messages"
 msgstr "Hemû peyaman veke"
 
@@ -12693,10 +12480,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, fuzzy
-msgid "No message"
-msgstr "(peyamek)"
-
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -12923,7 +12706,7 @@ msgid "On unread messages"
 msgstr "Peyamên nexwendî"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "Paceyên Nivîsandinê"
 
 #, fuzzy
@@ -12933,6 +12716,10 @@ msgstr "Hevpeyvîneke n_û:"
 msgid "When away"
 msgstr "Dema Li derve be"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "Paceya hevpeyvînê B_ilind bike"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -12993,10 +12780,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr "_Dema ku peyam bighîjin paceyê hişyar bike"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "Paceya hevpeyvînê B_ilind bike"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -13036,8 +12819,9 @@ msgstr "Agahiya bikarhêner nayê stendin"
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-msgid "_Autodetect IP address"
-msgstr ""
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
+msgstr "Navnîşana IP'ê bixweber bistîne"
 
 msgid "Public _IP:"
 msgstr "_IP'a herêmî"
@@ -13419,34 +13203,18 @@ msgstr "_Tomar bike & Bikar bîne"
 msgid "Status for %s"
 msgstr "Rewşa %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "Smily têxê"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
 #, fuzzy
-msgid "Duplicate Shortcut"
-msgstr "Pelgeha Mifteyên Giştî"
+msgid "Custom Smiley"
+msgstr "Smily têxê"
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Ji kerema xwe re ji bo gruba ku hatiye hilbijartin navekî din bibîne."
+msgid "Duplicate Shortcut"
+msgstr "Pelgeha Mifteyên Giştî"
 
 #, fuzzy
 msgid "Edit Smiley"
@@ -13566,8 +13334,8 @@ msgid "Cannot send launcher"
 msgstr "Xebatker nikare bişîne"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -14187,7 +13955,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -14456,7 +14224,7 @@ msgstr "Paceyên Nivîsandinê"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14784,9 +14552,10 @@ msgstr "Vebijartokên Têketinê"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Vebijartokên ku ji bo WinPidginê taybet in."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "Vebijartokên ku ji bo WinPidginê taybet in."
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr ""
@@ -14828,6 +14597,251 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Could not listen on socket"
+#~ msgstr "Soket nehat afirandin"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Xwendina socket serneket"
+
+#~ msgid "Connection failed."
+#~ msgstr "Girêdan pêk nehat."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Girêdana pêşkêşkar qut bû"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Soket nehat afirandin"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Bi pêşkêşkar re têkilî nehat danîn"
+
+#~ msgid "Read error"
+#~ msgstr "Xeletiya xwendinê"
+
+#~ msgid "Write error"
+#~ msgstr "Xeletiya Nivîsandinê"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "Agahiyên Bikarhêner Têkevê"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Navnîşan (dûmahîk)"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "Chata Xuya Dibe"
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ferman"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "Şaşîtiya Tomarkirinê"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "Cih"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "Navê bikarhêner"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "Hişyarkirina Rewşa Kesan"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "Guhertoya Nederbasdar"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "Beralîkirin"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "Modên Bikarhêner"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "Sînorkirina Bikarhêner"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "Taybetmendî"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "Navê bikarhêner"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Bi IMê re Guhertina Mifteyan"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "Navnîşana E-peyamê"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "Profîla Jabber"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "Ping"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "Navê bikarhêner"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "Vîdeoya Zindî"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "Peyam hat standin"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "Pelgeha Mifteyên Giştî"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "Vebijartokên Bikarhêneran"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "Modên Bikarhêner"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "Navê bikarhêner"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "Sînorkirina Bikarhêner"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Şîfrekirina Trillian"
+
+#~ msgid "Read Error"
+#~ msgstr "Çewtiya Xwendinê"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Li makekompîturê nehate girêdan."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Lîste tije ye"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "Peyam ji hev nayê veqetandin"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Bi pêşkêşkar re têkilî nehat danîn"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Daniştin venebû (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Bi pêşkêşkarê re girêdan pêk nehat."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Danişîna te hate girtin, te ji dereke din danişîn vekir"
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Xeletî. Desteka SSL nehatiye sazkirin."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Şîfre şaş e."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "Li makekompîturê nehate girêdan."
+
+#, fuzzy
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Girêdana te ya bi pêşkêşkerê re qut bû."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Nehat Girêdan"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "Nicka nederbasdar"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Agahiyên pêşkêşkerê nayên wergirtin"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "Girêdan Hate Qutkirin"
+
+#~ msgid "Could not connect"
+#~ msgstr "Nekarî girêbide"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Girêdan venabe."
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Şîfre şaş e."
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japon"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "Hosta Bangkirinê ya Japonan"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "Danişîna şandina pelgehên çalak tuneye"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "Li pêşkêşkerê nehate girêdan."
+
+#, fuzzy
+#~ msgid "Could not resolve host name"
+#~ msgstr "Girêdan venabe."
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Daxwaza TLS/SSL a pêşkêşkar ji bo têketinê. Tu piştgiriyeke TLS/SSL nehat "
+#~ "dîtin."
+
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Paceyên Nivîsandinê"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr ""
+#~ "Ji kerema xwe re ji bo gruba ku hatiye hilbijartin navekî din bibîne."
+
+#, fuzzy
 #~ msgid "Activate which ID?"
 #~ msgstr "IDê çalak bike..."
 
@@ -15350,10 +15364,6 @@ msgstr ""
 #~ msgstr "Niha vekirî ye"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Bi pêşkêşkarê re girêdan pêk nehat."
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_Peyam"
 
@@ -16299,9 +16309,6 @@ msgstr ""
 #~ msgid "New conversation _placement:"
 #~ msgstr "Bicîkirina nivîsandina nû"
 
-#~ msgid "_Autodetect IP Address"
-#~ msgstr "Navnîşana IP'ê bixweber bistîne"
-
 #~ msgid "_Start Port:"
 #~ msgstr "Porta Destpêkê:"
 
diff --git a/po/lo.po b/po/lo.po
index 8b389ba4b7..4a6a3926e2 100644
--- a/po/lo.po
+++ b/po/lo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2009-04-29 09:28+0700\n"
 "Last-Translator: Anousak Souphavanh <anousak@gmail.com>\n"
 "Language-Team: Lao <lo@li.org>\n"
@@ -2424,7 +2424,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2472,7 +2472,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2712,11 +2712,11 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr ""
 
 msgid ""
@@ -2768,13 +2768,16 @@ msgstr ""
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-msgid "Cannot open socket"
+#, c-format
+msgid "Unable to create socket: %s"
 msgstr ""
 
-msgid "Could not bind socket to port"
+#, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr ""
 
-msgid "Could not listen on socket"
+#, c-format
+msgid "Unable to listen on socket: %s"
 msgstr ""
 
 msgid "Error communicating with local mDNSResponder."
@@ -2822,13 +2825,13 @@ msgstr ""
 msgid "Load buddylist from file..."
 msgstr ""
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
-msgid "Passwords do not match."
+msgid "Passwords do not match"
 msgstr ""
 
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr ""
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2840,13 +2843,13 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr ""
 
-msgid "Enter current token"
+msgid "Enter captcha text"
 msgstr ""
 
-msgid "Current token"
+msgid "Captcha"
 msgstr ""
 
 msgid "Register New Gadu-Gadu Account"
@@ -2900,6 +2903,15 @@ msgstr ""
 msgid "Current password"
 msgstr ""
 
+msgid "Password (retype)"
+msgstr ""
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
@@ -2947,7 +2959,7 @@ msgstr ""
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr ""
 
 msgid "Buddy list downloaded"
@@ -2962,7 +2974,13 @@ msgstr ""
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
-msgid "Connection failed."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr ""
+
+msgid "Connection failed"
 msgstr ""
 
 msgid "Add to chat"
@@ -2971,8 +2989,13 @@ msgstr ""
 msgid "Chat _name:"
 msgstr ""
 
-#. should this be a settings error?
-msgid "Unable to resolve server"
+#, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr ""
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
 msgstr ""
 
 msgid "Chat error"
@@ -2981,7 +3004,7 @@ msgstr ""
 msgid "This chat name is already in use"
 msgstr ""
 
-msgid "Not connected to the server."
+msgid "Not connected to the server"
 msgstr ""
 
 msgid "Find buddies..."
@@ -3040,7 +3063,7 @@ msgstr ""
 msgid "File Transfer Failed"
 msgstr ""
 
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr ""
 
 msgid "Error displaying MOTD"
@@ -3056,7 +3079,15 @@ msgstr ""
 msgid "MOTD for %s"
 msgstr ""
 
-msgid "Server has disconnected"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, c-format
+msgid "Lost connection with server: %s"
 msgstr ""
 
 msgid "View MOTD"
@@ -3071,21 +3102,19 @@ msgstr ""
 msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr ""
-
 msgid "SSL support unavailable"
 msgstr ""
 
-msgid "Couldn't create socket"
+msgid "Unable to connect"
 msgstr ""
 
-msgid "Couldn't connect to host"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
 msgstr ""
 
-msgid "Read error"
+#, c-format
+msgid "Server closed the connection"
 msgstr ""
 
 msgid "Users"
@@ -3471,10 +3500,10 @@ msgstr ""
 msgid "execute"
 msgstr ""
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3489,7 +3518,10 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
-msgid "Invalid response from server."
+msgid "SASL authentication failed"
+msgstr ""
+
+msgid "Invalid response from server"
 msgstr ""
 
 msgid "Server does not use any supported authentication method"
@@ -3501,7 +3533,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr ""
 
-msgid "SASL error"
+#, c-format
+msgid "SASL error: %s"
 msgstr ""
 
 msgid "The BOSH connection manager terminated your session."
@@ -3517,20 +3550,12 @@ msgid "Unable to establish a connection with the server"
 msgstr ""
 
 #, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 
 msgid "Unable to establish SSL connection"
 msgstr ""
 
-msgid "Unable to create socket"
-msgstr ""
-
-msgid "Write error"
-msgstr ""
-
 msgid "Full Name"
 msgstr ""
 
@@ -3598,159 +3623,6 @@ msgstr ""
 msgid "Local Time"
 msgstr ""
 
-msgid "Last Activity"
-msgstr ""
-
-msgid "Service Discovery Info"
-msgstr ""
-
-msgid "Service Discovery Items"
-msgstr ""
-
-msgid "Extended Stanza Addressing"
-msgstr ""
-
-msgid "Multi-User Chat"
-msgstr ""
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr ""
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr ""
-
-msgid "In-Band Registration"
-msgstr ""
-
-msgid "User Location"
-msgstr ""
-
-msgid "User Avatar"
-msgstr ""
-
-msgid "Chat State Notifications"
-msgstr ""
-
-msgid "Software Version"
-msgstr ""
-
-msgid "Stream Initiation"
-msgstr ""
-
-msgid "File Transfer"
-msgstr ""
-
-msgid "User Mood"
-msgstr ""
-
-msgid "User Activity"
-msgstr ""
-
-msgid "Entity Capabilities"
-msgstr ""
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-msgid "User Tune"
-msgstr ""
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-msgid "Reachability Address"
-msgstr ""
-
-msgid "User Profile"
-msgstr ""
-
-msgid "Jingle"
-msgstr ""
-
-msgid "Jingle Audio"
-msgstr ""
-
-msgid "User Nickname"
-msgstr ""
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr ""
-
-msgid "Jingle DTMF"
-msgstr ""
-
-msgid "Message Receipts"
-msgstr ""
-
-msgid "Public Key Publishing"
-msgstr ""
-
-msgid "User Chatting"
-msgstr ""
-
-msgid "User Browsing"
-msgstr ""
-
-msgid "User Gaming"
-msgstr ""
-
-msgid "User Viewing"
-msgstr ""
-
-msgid "Ping"
-msgstr ""
-
-msgid "Stanza Encryption"
-msgstr ""
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr ""
-
 msgid "Priority"
 msgstr ""
 
@@ -3761,7 +3633,7 @@ msgstr ""
 msgid "%s ago"
 msgstr ""
 
-msgid "Logged off"
+msgid "Logged Off"
 msgstr ""
 
 msgid "Middle Name"
@@ -3938,16 +3810,12 @@ msgstr ""
 msgid "Roles:"
 msgstr ""
 
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr ""
 
-msgid "Read Error"
-msgstr ""
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4121,9 +3989,6 @@ msgstr ""
 msgid "Error changing password"
 msgstr ""
 
-msgid "Password (again)"
-msgstr ""
-
 msgid "Change XMPP Password"
 msgstr ""
 
@@ -4496,6 +4361,14 @@ msgstr ""
 msgid "Unknown Error in presence"
 msgstr ""
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr ""
+
+#, c-format
+msgid "Error in chat %s"
+msgstr ""
+
 msgid "Create New Room"
 msgstr ""
 
@@ -4510,15 +4383,18 @@ msgstr ""
 msgid "_Accept Defaults"
 msgstr ""
 
+msgid "No reason"
+msgstr ""
+
 #, c-format
-msgid "Error joining chat %s"
+msgid "You have been kicked: (%s)"
 msgstr ""
 
 #, c-format
-msgid "Error in chat %s"
+msgid "Kicked (%s)"
 msgstr ""
 
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr ""
 
 msgid "Transfer was closed."
@@ -4995,9 +4871,6 @@ msgstr ""
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-msgid "Failed to connect to server."
-msgstr ""
-
 msgid "Error retrieving profile"
 msgstr ""
 
@@ -5234,9 +5107,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 
-msgid "Unable to connect"
-msgstr ""
-
 msgid "Writing error"
 msgstr ""
 
@@ -5249,19 +5119,19 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Our protocol is not supported by the server."
+msgid "Our protocol is not supported by the server"
 msgstr ""
 
-msgid "Error parsing HTTP."
+msgid "Error parsing HTTP"
 msgstr ""
 
-msgid "You have signed on from another location."
+msgid "You have signed on from another location"
 msgstr ""
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr ""
 
 #, c-format
@@ -5272,9 +5142,6 @@ msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "Unknown error."
-msgstr ""
-
 msgid "Handshaking"
 msgstr ""
 
@@ -5369,6 +5236,9 @@ msgstr ""
 msgid "%s is not a valid group."
 msgstr ""
 
+msgid "Unknown error."
+msgstr ""
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr ""
@@ -5475,12 +5345,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr ""
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr ""
@@ -5501,16 +5365,6 @@ msgstr ""
 msgid "Invalid input condition"
 msgstr ""
 
-msgid "Read buffer full (2)"
-msgstr ""
-
-msgid "Unparseable message"
-msgstr ""
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr ""
-
 msgid "Failed to add buddy"
 msgstr ""
 
@@ -5592,6 +5446,12 @@ msgstr ""
 msgid "Client Version"
 msgstr ""
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr ""
 
@@ -5847,7 +5707,7 @@ msgid "Unknown error: 0x%X"
 msgstr ""
 
 #, c-format
-msgid "Login failed (%s)."
+msgid "Unable to login: %s"
 msgstr ""
 
 #, c-format
@@ -5946,9 +5806,6 @@ msgstr ""
 msgid "Authenticating..."
 msgstr ""
 
-msgid "Unable to connect to server."
-msgstr ""
-
 msgid "Waiting for response..."
 msgstr ""
 
@@ -5969,20 +5826,14 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr ""
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-
-msgid "Error. SSL support is not installed."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 
 msgid "This conference has been closed. No more messages can be sent."
@@ -6020,10 +5871,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr ""
 
-msgid "Incorrect password."
-msgstr ""
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6032,16 +5880,7 @@ msgstr ""
 msgid "Invalid chat room name"
 msgstr ""
 
-msgid "Server closed the connection."
-msgstr ""
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr ""
 
 #. *< type
@@ -6089,7 +5928,7 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr ""
 
 msgid "Direct IM established"
@@ -6282,15 +6121,11 @@ msgid "Buddy Comment"
 msgstr ""
 
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 
 #, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
 msgstr ""
 
 msgid "Username sent"
@@ -6305,9 +6140,9 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 
 #, c-format
@@ -6317,26 +6152,20 @@ 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."
+#. the username does not exist
+msgid "Username does not exist"
 msgstr ""
 
 #. Suspended account
-msgid "Your account is currently suspended."
+msgid "Your account is currently suspended"
 msgstr ""
 
 #. service temporarily unavailable
@@ -6353,7 +6182,7 @@ msgid ""
 "try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
-msgid "The SecurID key entered is invalid."
+msgid "The SecurID key entered is invalid"
 msgstr ""
 
 msgid "Enter SecurID"
@@ -6504,6 +6333,9 @@ msgstr ""
 msgid "Member Since"
 msgstr ""
 
+msgid "Capabilities"
+msgstr ""
+
 msgid "Profile"
 msgstr ""
 
@@ -6660,7 +6492,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6681,7 +6513,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
@@ -6689,7 +6521,7 @@ msgid "(no name)"
 msgstr ""
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr ""
 
 #, c-format
@@ -7438,7 +7270,7 @@ msgstr ""
 msgid "Update interval (seconds)"
 msgstr ""
 
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr ""
 
 #, c-format
@@ -7463,9 +7295,6 @@ msgstr ""
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
-msgid "Could not decrypt server reply"
-msgstr ""
-
 msgid "Requesting captcha"
 msgstr ""
 
@@ -7497,28 +7326,16 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr ""
-
 msgid "Socket error"
 msgstr ""
 
-msgid "Unable to read from socket"
-msgstr ""
-
-msgid "Write Error"
-msgstr ""
-
-msgid "Connection lost"
-msgstr ""
-
 msgid "Getting server"
 msgstr ""
 
 msgid "Requesting token"
 msgstr ""
 
-msgid "Couldn't resolve host"
+msgid "Unable to resolve hostname"
 msgstr ""
 
 msgid "Invalid server or port"
@@ -7565,7 +7382,7 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr ""
 
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr ""
 
 msgid "Unknown LOGIN CMD"
@@ -7585,9 +7402,6 @@ msgstr ""
 msgid "%d canceled the transfer of %s"
 msgstr ""
 
-msgid "Connection closed (writing)"
-msgstr ""
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr ""
@@ -7641,17 +7455,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-msgid "Connection reset"
-msgstr ""
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr ""
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr ""
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -7674,6 +7477,9 @@ msgstr ""
 msgid "Video Camera"
 msgstr ""
 
+msgid "File Transfer"
+msgstr ""
+
 msgid "Supports"
 msgstr ""
 
@@ -8429,6 +8235,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr ""
 
+msgid "Ping"
+msgstr ""
+
 msgid "Ping failed"
 msgstr ""
 
@@ -8486,7 +8295,7 @@ msgstr ""
 msgid "Disconnected by server"
 msgstr ""
 
-msgid "Error during connecting to SILC Server"
+msgid "Error connecting to SILC Server"
 msgstr ""
 
 msgid "Key Exchange failed"
@@ -8496,26 +8305,23 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-msgid "Connection failed"
-msgstr ""
-
 msgid "Performing key exchange"
 msgstr ""
 
-msgid "Unable to create connection"
-msgstr ""
-
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr ""
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr ""
 
+msgid "Unable to not load SILC key pair"
+msgstr ""
+
 msgid "Out of memory"
 msgstr ""
 
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr ""
 
 msgid "Error loading SILC key pair"
@@ -8792,7 +8598,7 @@ msgstr ""
 msgid "Creating SILC key pair..."
 msgstr ""
 
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr ""
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -8881,6 +8687,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr ""
 
+msgid "Error during connecting to SILC Server"
+msgstr ""
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -8921,29 +8730,23 @@ msgstr ""
 msgid "Failure: Authentication failed"
 msgstr ""
 
-msgid "Cannot initialize SILC Client connection"
+msgid "Unable to initialize SILC Client connection"
 msgstr ""
 
 msgid "John Noname"
 msgstr ""
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr ""
 
-msgid "Could not write"
-msgstr ""
-
-msgid "Could not connect"
-msgstr ""
-
-msgid "Unknown server response."
+msgid "Unable to create connection"
 msgstr ""
 
-msgid "Could not create listen socket"
+msgid "Unknown server response"
 msgstr ""
 
-msgid "Could not resolve hostname"
+msgid "Unable to create listen socket"
 msgstr ""
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -8985,6 +8788,74 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr ""
+
+msgid "list: List rooms on the Yahoo network"
+msgstr ""
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+msgid "Yahoo ID..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! Protocol Plugin"
+msgstr ""
+
+msgid "Pager server"
+msgstr ""
+
+msgid "Pager port"
+msgstr ""
+
+msgid "File transfer server"
+msgstr ""
+
+msgid "File transfer port"
+msgstr ""
+
+msgid "Chat room locale"
+msgstr ""
+
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
+
+msgid "Chat room list URL"
+msgstr ""
+
+msgid "Yahoo Chat server"
+msgstr ""
+
+msgid "Yahoo Chat port"
+msgstr ""
+
+msgid "Yahoo JAPAN ID..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr ""
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9012,24 +8883,16 @@ msgstr ""
 msgid "Received invalid data"
 msgstr ""
 
-#. Password incorrect
-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
-msgid "Username does not exist"
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
 msgstr ""
 
 #. indicates a lock of some description
 msgid ""
-"Account locked: Unknown reason.\n"
-"Logging into the Yahoo! website may fix this."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 
 #. username or password missing
@@ -9063,32 +8926,25 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-msgid "Could not add buddy to server list"
+msgid "Unable to add buddy to server list"
 msgstr ""
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-msgid "Received unexpected HTTP response from server."
-msgstr ""
-
-msgid "Connection problem"
+msgid "Received unexpected HTTP response from server"
 msgstr ""
 
 #, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr ""
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
 
 msgid "Not at Home"
@@ -9151,73 +9007,15 @@ msgstr ""
 msgid "Open Inbox"
 msgstr ""
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-
-msgid "list: List rooms on the Yahoo network"
-msgstr ""
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-msgid "Yahoo ID..."
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr ""
-
-msgid "Yahoo Japan"
-msgstr ""
-
-msgid "Pager server"
-msgstr ""
-
-msgid "Japan Pager server"
-msgstr ""
-
-msgid "Pager port"
-msgstr ""
-
-msgid "File transfer server"
-msgstr ""
-
-msgid "Japan file transfer server"
-msgstr ""
-
-msgid "File transfer port"
-msgstr ""
-
-msgid "Chat room locale"
-msgstr ""
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-msgid "Chat room list URL"
-msgstr ""
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-msgid "Yahoo Chat port"
-msgstr ""
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr ""
+
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -9225,6 +9023,9 @@ msgstr ""
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr ""
 
+msgid "Write Error"
+msgstr ""
+
 msgid "Yahoo! Japan Profile"
 msgstr ""
 
@@ -9329,19 +9130,16 @@ msgstr ""
 msgid "Webcams"
 msgstr ""
 
-msgid "Unable to fetch room list."
+msgid "Connection problem"
 msgstr ""
 
-msgid "User Rooms"
+msgid "Unable to fetch room list."
 msgstr ""
 
-msgid "Connection problem with the YCHT server."
+msgid "User Rooms"
 msgstr ""
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
+msgid "Connection problem with the YCHT server"
 msgstr ""
 
 msgid ""
@@ -9460,13 +9258,7 @@ msgid "Exposure"
 msgstr ""
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
 
 #, c-format
@@ -9474,16 +9266,13 @@ msgid "HTTP proxy connection error %d"
 msgstr ""
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
 #, c-format
 msgid "Error resolving %s"
 msgstr ""
 
-msgid "Could not resolve host name"
-msgstr ""
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -9682,12 +9471,6 @@ msgid "Unable to connect to %s: %s"
 msgstr ""
 
 #, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-
-#, c-format
 msgid " - %s"
 msgstr ""
 
@@ -9918,7 +9701,10 @@ msgstr ""
 msgid "View _Log"
 msgstr ""
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr ""
+
+msgid "Show When Offline"
 msgstr ""
 
 msgid "_Alias..."
@@ -10394,6 +10180,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr ""
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr ""
@@ -10439,7 +10228,7 @@ msgstr ""
 msgid "Get Away Message"
 msgstr ""
 
-msgid "Last said"
+msgid "Last Said"
 msgstr ""
 
 msgid "Unable to save icon file to disk."
@@ -11296,7 +11085,7 @@ msgstr ""
 msgid "Hyperlink visited color"
 msgstr ""
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 
 msgid "Hyperlink prelight color"
@@ -11332,13 +11121,19 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 msgid "Typing notification color"
 msgstr ""
 
-msgid "The color to use for the typing notification font"
+msgid "The color to use for the typing notification"
 msgstr ""
 
 msgid "Typing notification font"
@@ -11673,6 +11468,9 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
+msgid "No message"
+msgstr ""
+
 msgid "Open All Messages"
 msgstr ""
 
@@ -11688,9 +11486,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr ""
 
-msgid "No message"
-msgstr ""
-
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -11895,7 +11690,7 @@ msgstr ""
 msgid "On unread messages"
 msgstr ""
 
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr ""
 
 msgid "_Hide new IM conversations:"
@@ -11904,6 +11699,9 @@ msgstr ""
 msgid "When away"
 msgstr ""
 
+msgid "Minimi_ze new conversation windows"
+msgstr ""
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -11962,9 +11760,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr ""
 
-msgid "Minimi_ze new conversation windows"
-msgstr ""
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -11997,7 +11792,8 @@ msgstr ""
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-msgid "_Autodetect IP address"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr ""
 
 msgid "Public _IP:"
@@ -12359,30 +12155,15 @@ msgstr ""
 msgid "Status for %s"
 msgstr ""
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr ""
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
-msgid "Duplicate Shortcut"
+msgid "Custom Smiley"
 msgstr ""
 
-msgid "Please select an image for the smiley."
+msgid "Duplicate Shortcut"
 msgstr ""
 
 msgid "Edit Smiley"
@@ -12487,8 +12268,8 @@ msgid "Cannot send launcher"
 msgstr ""
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -13041,7 +12822,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -13283,7 +13064,7 @@ msgstr ""
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -13584,7 +13365,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr ""
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 
 msgid "<font color='#777777'>Logged out.</font>"
diff --git a/po/lt.po b/po/lt.po
index d45161e7cb..fa0a0b0efc 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2009-02-24 09:02+0100\n"
 "Last-Translator: Laurynas Biveinis <laurynas.biveinis@gmail.com>\n"
 "Language-Team:\n"
@@ -2637,9 +2637,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Žurnalų žiūryklėje parodo ir kitų pokalbių programų žurnalus."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2694,8 +2695,9 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 "Išsaugo žinutes, išsiųstas atsijungusiems bičiuliams, kaip reakcijas į juos."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Likusios žinutės bus išsaugotos kaip reakcija į bičiulį.  Galite keisti arba "
@@ -2984,14 +2986,16 @@ msgstr ""
 "Nepavyko rasti įdiegto „ActiveTCL“.  Jei norite naudoti TCL papildinius, "
 "įdiekite „ActiveTCL“ iš http://www.activestate.com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Apple Bonjour Windows priemonių rinkinys nerastas.  Adresu http://d.pidgin."
 "im/BonjourWindow rasite daugiau informacijos."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr ""
 "Nepavyko sukurti klausymo prievado įeinančioms greitųjų žinučių jungtims\n"
 
@@ -3044,14 +3048,21 @@ msgstr "%s uždarė pokalbio langą."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Negalima išsiųsti žinutės ir pradėti pokalbio."
 
-msgid "Cannot open socket"
-msgstr "Nepavyko atidaryti prievado"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Nepavyko sukurti jungties:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Nepavyko susieti jungties su prievadu"
 
-msgid "Could not listen on socket"
-msgstr "Nepavyko nustatyti jungties klausymuisi"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Nepavyko sukurti jungties:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Komunikacijos su vietiniu mDNSResponder klaida"
@@ -3100,13 +3111,16 @@ msgstr "Išsaugoti bičiulių sąrašą..."
 msgid "Load buddylist from file..."
 msgstr "Įkelti bičiulių sąrašą iš failo..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Užpildykite registracijos formos laukus."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Slaptažodžiai nesutampa."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Nepavyko registruoti naujos paskyros, nes įvyko klaida.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3118,14 +3132,15 @@ msgstr "Registracija sėkmingai užbaigta!"
 msgid "Password"
 msgstr "Slaptažodis"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr "Pakartotas slaptažodis"
 
-msgid "Enter current token"
-msgstr "Įveskite dabartinę žymę"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Dabartinė žymė"
+#, fuzzy
+msgid "Captcha"
+msgstr "„Captcha“ paveiksliukas"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registruoti naują Gadu-Gadu abonentą"
@@ -3178,6 +3193,15 @@ msgstr "Slaptažodis buvo sėkmingai pakeistas!"
 msgid "Current password"
 msgstr "Dabartinis slaptažodis"
 
+msgid "Password (retype)"
+msgstr "Pakartotas slaptažodis"
+
+msgid "Enter current token"
+msgstr "Įveskite dabartinę žymę"
+
+msgid "Current token"
+msgstr "Dabartinė žymė"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Prašome įvesti Jūsų dabartinį slaptažodį ir Jūsų naują UIN slaptažodį:"
 
@@ -3225,7 +3249,7 @@ msgstr "Ieškotų vartotojų nerasta"
 msgid "There are no users matching your search criteria."
 msgstr "Vartotojų, tenkinančių paieškos kriterijus, nėra."
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "Nepavyko skaityti iš jungties"
 
 #  Buddy List trans options

@@ -3241,8 +3265,14 @@ msgstr "Bičiulių sąrašas nusiųstas į serverį"
 msgid "Your buddy list was stored on the server."
 msgstr "Jūsų bičiulių sąrašas išsaugotas serveryje."
 
-msgid "Connection failed."
-msgstr "Nepavyko prisijungti."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Prisijungta"
+
+msgid "Connection failed"
+msgstr "Jungties klaida"
 
 msgid "Add to chat"
 msgstr "Įtraukti į pokalbių kambarį"
@@ -3250,18 +3280,23 @@ msgstr "Įtraukti į pokalbių kambarį"
 msgid "Chat _name:"
 msgstr "Ka_nalo pavadinimas:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Nepavyko prisijungti prie serverio."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Jungiamasi"
+
 msgid "Chat error"
 msgstr "Pokalbių kambario klaida"
 
 msgid "This chat name is already in use"
 msgstr "Toks pokalbių kambario vardas jau yra vartojamas"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Neprisijungta prie serverio."
 
 msgid "Find buddies..."
@@ -3321,7 +3356,8 @@ msgstr "Temos nėra"
 msgid "File Transfer Failed"
 msgstr "Failo perdavimas nepavyko"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Nepavyko atverti prievado klausymui."
 
 msgid "Error displaying MOTD"
@@ -3337,8 +3373,18 @@ msgstr "Nėra su šia jungtimi susieto MOTD."
 msgid "MOTD for %s"
 msgstr "%s MOTD"
 
-msgid "Server has disconnected"
-msgstr "Serveris atsijungė"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Dingo jungtis su serveriu:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Žiūrėti MOTD"
@@ -3353,22 +3399,20 @@ msgstr "Sla_ptažodis:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC vardai negali turėti matomų tarpų"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Jungiamasi"
-
 msgid "SSL support unavailable"
 msgstr "Nėra SSL palaikymo"
 
-msgid "Couldn't create socket"
-msgstr "Nepavyko sukurti jungties"
+msgid "Unable to connect"
+msgstr "Negalima prisijungti"
 
-msgid "Couldn't connect to host"
-msgstr "Nepavyko prisijungti prie mazgo"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Nepavyko prisijungti prie %s"
 
-msgid "Read error"
-msgstr "Skaitymo klaida"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Serveris uždarė jungtį."
 
 msgid "Users"
 msgstr "Vartotojai"
@@ -3813,10 +3857,12 @@ msgstr "Specialios (ad hoc) komandos klaida"
 msgid "execute"
 msgstr "vykdyti"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Serveris reikalauja TLS/SSL prisijungimui.  Nėra TLS/SSL palaikymo."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Jūs reikalaujate šifravimo, bet TLS/SSL palaikymas nerastas."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3835,7 +3881,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Tapatybės nustatymas grynu tekstu"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Nepavyko nustatyti tapatybę"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Neteisingas atsakas iš serverio."
 
 msgid "Server does not use any supported authentication method"
@@ -3847,7 +3898,8 @@ msgstr "Jūs reikalaujate šifravimo, bet jo šis serveris nesiūlo."
 msgid "Invalid challenge from server"
 msgstr "Neteisingas serverio iššūkis"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL klaida"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3867,10 +3919,8 @@ msgstr ""
 "Nepavyko prisijungti prie serverio:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Nepavyko prisijungti prie serverio:\n"
 "%s"
@@ -3879,12 +3929,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "Nepavyko sukurti jungties"
 
-msgid "Unable to create socket"
-msgstr "Negalima sukurti jungties"
-
-msgid "Write error"
-msgstr "Rašymo klaida"
-
 msgid "Full Name"
 msgstr "Pilnas vardas"
 
@@ -3956,167 +4000,6 @@ msgstr "Operacinė sistema"
 msgid "Local Time"
 msgstr "Vietinis failas:"
 
-msgid "Last Activity"
-msgstr "Paskutinis veiksmas"
-
-msgid "Service Discovery Info"
-msgstr "Paslaugų paieškos informacija"
-
-msgid "Service Discovery Items"
-msgstr "Paslaugų paieškos elementai"
-
-msgid "Extended Stanza Addressing"
-msgstr "Išplėstinių strofų adresavimas"
-
-msgid "Multi-User Chat"
-msgstr "Pokalbis su keliais vartotojais"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Išplėstinė buvimo informacija pokalbiuose su keliais vartotojais"
-
-msgid "In-Band Bytestreams"
-msgstr "Kanalo vidaus baitų srautai"
-
-msgid "Ad-Hoc Commands"
-msgstr "Specialios (ad hoc) komandos"
-
-msgid "PubSub Service"
-msgstr "PubSub paslauga"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 baitų srautai"
-
-msgid "Out of Band Data"
-msgstr "Užkanaliniai duomenys"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "Registracija kanalo viduje"
-
-msgid "User Location"
-msgstr "Naudotojo vietovė"
-
-msgid "User Avatar"
-msgstr "Naudotojo avataras"
-
-#  *< api_version

-#  *< type

-#  *< ui_requirement

-#  *< flags

-#  *< dependencies

-#  *< priority

-#  *< id

-msgid "Chat State Notifications"
-msgstr "Pranešimai apie pokalbio būseną"
-
-msgid "Software Version"
-msgstr "Programinės įrangos versija"
-
-msgid "Stream Initiation"
-msgstr "Kanalo inicijavimas"
-
-msgid "File Transfer"
-msgstr "Failų perdavimas"
-
-msgid "User Mood"
-msgstr "Naudotojo nuotaika"
-
-msgid "User Activity"
-msgstr "Naudotojo aktyvumas"
-
-msgid "Entity Capabilities"
-msgstr "Objektų gebos"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Šifruoti seansų susitarimai"
-
-msgid "User Tune"
-msgstr "Naudotojo daina"
-
-msgid "Roster Item Exchange"
-msgstr "Sąrašo objektų apsikeitimas"
-
-msgid "Reachability Address"
-msgstr "Pasiekiamumo adresas"
-
-msgid "User Profile"
-msgstr "Naudotojo profilis"
-
-#  join button

-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle Audio"
-
-msgid "User Nickname"
-msgstr "Naudotojo vardas"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle grynu UDP"
-
-msgid "Jingle Video"
-msgstr "Jingle Video"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Pranešimai apie žinučių pristatymą"
-
-msgid "Public Key Publishing"
-msgstr "Viešojo rakto skelbimas"
-
-msgid "User Chatting"
-msgstr "Naudotojas šnekasi"
-
-msgid "User Browsing"
-msgstr "Naudotojas naršo"
-
-msgid "User Gaming"
-msgstr "Naudotojas žaidžia"
-
-msgid "User Viewing"
-msgstr "Naudotojas žiūri"
-
-msgid "Ping"
-msgstr "Skimbtelėti"
-
-msgid "Stanza Encryption"
-msgstr "Strofų šifravimas"
-
-msgid "Entity Time"
-msgstr "Objekto laikas"
-
-msgid "Delayed Delivery"
-msgstr "Uždelstinis pristatymas"
-
-msgid "Collaborative Data Objects"
-msgstr "Bendradarbiavimo duomenų objektai"
-
-msgid "File Repository and Sharing"
-msgstr "Failų saugykla ir dalinimasis"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "STUN paslaugos paieška, skirta Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Supaprastintas susitarimas dėl šifruoto seanso"
-
-msgid "Hop Check"
-msgstr "Šuolių patikrinimas"
-
-msgid "Capabilities"
-msgstr "Sugebėjimai"
-
 msgid "Priority"
 msgstr "Prioritetas"
 
@@ -4128,7 +4011,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Prisijungęs"
 
 msgid "Middle Name"
@@ -4312,16 +4195,13 @@ msgstr "Ieškotų vartotojų nerasta"
 msgid "Roles:"
 msgstr "Pareigos"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Baigėsi skimbtelėjimo laukimo laikas"
 
-msgid "Read Error"
-msgstr "Skaitymo klaida"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4498,9 +4378,6 @@ msgstr "Jūsų slaptažodis pakeistas."
 msgid "Error changing password"
 msgstr "Slaptažodžio keitimo klaida"
 
-msgid "Password (again)"
-msgstr "Pakartotas slaptažodis"
-
 msgid "Change XMPP Password"
 msgstr "Pakeiskite XMPP slaptažodį"
 
@@ -4890,6 +4767,14 @@ msgstr "XML sintaksinės analizės klaida"
 msgid "Unknown Error in presence"
 msgstr "Nežinoma būsenos klaida"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Prisijungimo prie pokalbio %s klaida"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Klaida pokalbyje %s"
+
 msgid "Create New Room"
 msgstr "Sukurti naują kambarį"
 
@@ -4906,16 +4791,20 @@ msgstr "_Konfigūruoti kambarį"
 msgid "_Accept Defaults"
 msgstr "_Priimti numatytąsias nuostatas"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Prisijungimo prie pokalbio %s klaida"
+#, fuzzy
+msgid "No reason"
+msgstr "Priežastis nenurodyta"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Klaida pokalbyje %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Tave išspyrė %s: %s"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Išspyrė %s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Failo atvėrimo metu įvyko klaida."
 
 #, fuzzy
@@ -5411,9 +5300,6 @@ msgstr ""
 "MSN protokolui SSL palaikymas yra būtinas.  Prašome įdiegti palaikomą SSL "
 "biblioteką."
 
-msgid "Failed to connect to server."
-msgstr "Nepavyko prisijungti prie serverio."
-
 msgid "Error retrieving profile"
 msgstr "Profilio gavimo klaida"
 
@@ -5672,9 +5558,6 @@ msgstr "Žinutė nebuvo išsiųsta, nes įvyko nežinoma užkodavimo klaida."
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Žinutė nebuvo išsiųsta, nes įvyko nežinoma klaida."
 
-msgid "Unable to connect"
-msgstr "Negalima prisijungti"
-
 msgid "Writing error"
 msgstr "Rašymo klaida"
 
@@ -5689,13 +5572,16 @@ msgstr ""
 "Jungties klaida su severiu %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Mūsų protokolo serveris nepalaiko."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "HTTP sintaksinės analizės klaida."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Jūs prisijungėte iš kitur."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5703,7 +5589,8 @@ msgstr ""
 "MSN serveriai yra laikinai neprieinami. Prašome palaukti ir pabandyti iš "
 "naujo."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN serveriai yra laikinai išjungiami."
 
 #  Data is assumed to be the destination sn

@@ -5717,9 +5604,6 @@ 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"
 
@@ -5820,6 +5704,9 @@ msgstr "MSN protokolo papildinys"
 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)."
@@ -5934,12 +5821,6 @@ msgstr[2] ""
 msgid "Add contacts from server"
 msgstr "Pridėti kontaktus iš serverio"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Prisijungta"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protokolo klaida, kodas %d: %s"
@@ -5964,16 +5845,6 @@ msgstr "MySpaceIM klaida"
 msgid "Invalid input condition"
 msgstr "Neteisinga įvesties sąlyga"
 
-msgid "Read buffer full (2)"
-msgstr "Skaitymo buferis pripildytas (2)"
-
-msgid "Unparseable message"
-msgstr "Nepavyko išanalizuoti pranešimo"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Nepavyko prisijungti prie mazgo: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Nepavyko pridėti bičiulio"
 
@@ -6057,6 +5928,12 @@ msgstr "Iš viso draugų"
 msgid "Client Version"
 msgstr "Kliento programos versija"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM – naudotojo vardas laisvas"
 
@@ -6315,9 +6192,9 @@ msgstr "Vartotojas yra atsijungęs arba Jūs esate užblokuotas"
 msgid "Unknown error: 0x%X"
 msgstr "Nežinoma klaida: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Prisijungimas nepavyko (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Nepavyko skimbtelėti naudotojui %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6421,9 +6298,6 @@ msgstr "GroupWise konferencija %d"
 msgid "Authenticating..."
 msgstr "Nustatoma tapatybė..."
 
-msgid "Unable to connect to server."
-msgstr "Nepavyko prisijungti prie serverio."
-
 msgid "Waiting for response..."
 msgstr "Laukiama atsako..."
 
@@ -6447,25 +6321,20 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Ar norite prisijungti prie pokalbio?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Jūs buvote atjungtas, kadangi prisijungėte kitoje darbo vietoje."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 "Atrodo, kad %s yra atsijungęs ir negavo žinutės, kurią ką tik išsiuntėte."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Negalima prisijungti prie servrio.  Prašome įvesti serverio, prie kurio "
 "norite prisijungti, adresą."
 
-msgid "Error. SSL support is not installed."
-msgstr "Klaida. SSL palaikymas neįdiegtas."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Ši konferencija uždaryta. Daugiau žinučių siųsti negalima."
 
@@ -6505,10 +6374,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6517,18 +6383,8 @@ msgstr "Nepavyko prisijungti prie pokalbių kambario"
 msgid "Invalid chat room name"
 msgstr "Neteisingas pokalbių kambario pavadinimas"
 
-msgid "Server closed the connection."
-msgstr "Serveris uždarė jungtį."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Dingo jungtis su serveriu:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Jungtimi su serveriu gauti neteisingi duomenys."
 
 #  *< api_version

@@ -6596,7 +6452,8 @@ msgstr "Prarastas ryšys su nutolusiu vartotoju:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Gauti neteisingi duomenys ryšiu su nutolusiu vartotoju."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Nepavyko sukurti jungties su nutolusiu vartotoju."
 
 msgid "Direct IM established"
@@ -6798,21 +6655,15 @@ msgstr "Perspėjimo lygis"
 msgid "Buddy Comment"
 msgstr "Bičiulio komentaras"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Nepavyko prisijungti prie tapatybės nustatymo serverio:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Nepavyko prisijungti prie BOS serverio:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Nepavyko prisijungti prie serverio."
 
 msgid "Username sent"
 msgstr "Vartotojo vardas nusiųstas"
@@ -6824,11 +6675,11 @@ msgstr "Jungtis nustatyta, nusiųstas slapukas"
 msgid "Finalizing connection"
 msgstr "Pabaigiama jungtis"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Negalima prisijungti: vardu %s prisijungti nepavyko, nes naudotojo vardas "
 "neteisingas.  Naudotojo vardas turi būti arba teisingas el. pašto adresas, "
@@ -6844,26 +6695,22 @@ msgstr ""
 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"
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Vartotojas neegzistuoja"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Jūsų abonentas šiuo metu suspenduotas."
 
 #. service temporarily unavailable
@@ -6886,7 +6733,8 @@ msgstr ""
 "ir bandykite vėl. Jei vis tiek bandysite jungtis, Jums reikės laukti dar "
 "ilgiau."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Įvestas SecurID raktas yra neteisingas."
 
 msgid "Enter SecurID"
@@ -7079,6 +6927,9 @@ msgstr "Prisijungęs nuo"
 msgid "Member Since"
 msgstr "Narys nuo"
 
+msgid "Capabilities"
+msgstr "Sugebėjimai"
+
 msgid "Profile"
 msgstr "Profilis"
 
@@ -7270,9 +7121,9 @@ msgstr[2] ""
 msgid "Away message too long."
 msgstr "Pasitraukimo žinutė per ilga."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7296,9 +7147,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Našlaičiai"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Nepavyko pridėti bičiulio %s, nes Jūs turite per daug bičiulių savo bičiulių "
@@ -7307,8 +7158,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(nėra vardo)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Bičiulio %s pridėti nepavyko dėl nežinamos priežasties."
 
 #, c-format
@@ -8106,7 +7957,8 @@ msgstr "Jungties palaikymo intervalas (sekundėmis)"
 msgid "Update interval (seconds)"
 msgstr "Atnaujinimo intervalas (sekundėmis)"
 
-msgid "Cannot decrypt server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "Nepavyko iššifruoti serverio atsakymo"
 
 #, c-format
@@ -8131,9 +7983,6 @@ msgstr "Būtinas aktyvavimas"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Nežinomas atsakymo kodas prisijungimo metu (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Nepavyko iššifruoti serverio atsakymo"
-
 msgid "Requesting captcha"
 msgstr "Prašoma „captcha“"
 
@@ -8167,29 +8016,18 @@ msgstr ""
 "Neteisingas atsakymo kodas prisijungimo metu (0x%02X):\n"
 "%s"
 
-msgid "Unable to connect."
-msgstr "Nepavyko prisijungti."
-
 msgid "Socket error"
 msgstr "Jungties klaida"
 
-msgid "Unable to read from socket"
-msgstr "Nepavyko skaityti iš jungties"
-
-msgid "Write Error"
-msgstr "Rašymo klaida"
-
-msgid "Connection lost"
-msgstr "Prisijungimas prarastas"
-
 msgid "Getting server"
 msgstr "Gaunamas serveris"
 
 msgid "Requesting token"
 msgstr "Prašoma žymės"
 
-msgid "Couldn't resolve host"
-msgstr "Nepavyko nustatyti mazgo IP adreso"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Nepavyko prisijungti prie serverio."
 
 msgid "Invalid server or port"
 msgstr "Neteisingas serveris ar prievadas"
@@ -8242,7 +8080,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "QQ pokalbių kambario komanda"
 
-msgid "Could not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "Nepavyko iššifruoti prisijungimo atsakymo"
 
 msgid "Unknown LOGIN CMD"
@@ -8262,9 +8101,6 @@ msgstr "Failo siuntimas"
 msgid "%d canceled the transfer of %s"
 msgstr "%d nutraukė %s perdavimą"
 
-msgid "Connection closed (writing)"
-msgstr "Jungtis uždaryta (rašoma)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Grupės pavadinimas:</b> %s<br>"
@@ -8318,17 +8154,6 @@ msgstr "„Sametime“ administratoriaus skelbimas serveryje %s"
 msgid "Sametime Administrator Announcement"
 msgstr "„Sametime“ administratoriaus skelbimas"
 
-msgid "Connection reset"
-msgstr "Jungtis atidaryta iš naujo"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Skaitymo iš jungties klaida: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Nepavyko prisijungti prie mazgo"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Abonento %s skelbimas"
@@ -8352,6 +8177,9 @@ msgstr "Garsiakalbiai"
 msgid "Video Camera"
 msgstr "Videokamera"
 
+msgid "File Transfer"
+msgstr "Failų perdavimas"
+
 msgid "Supports"
 msgstr "Palaiko"
 
@@ -9169,6 +8997,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Tinklo statistika"
 
+msgid "Ping"
+msgstr "Skimbtelėti"
+
 msgid "Ping failed"
 msgstr "Nepavyko skimbtelėti"
 
@@ -9233,7 +9064,8 @@ msgstr "Nepalaikomas viešojo rakto tipas"
 msgid "Disconnected by server"
 msgstr "Atjungtas serverio"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Jungimosi į SILC serverį klaida"
 
 msgid "Key Exchange failed"
@@ -9245,26 +9077,26 @@ msgstr ""
 "Atskirto seanso pratęsimas nepavyko. Paspauskite „Jungtis iš naujo\", kad "
 "sukurtumėtę naują jungtį."
 
-msgid "Connection failed"
-msgstr "Jungties klaida"
-
 msgid "Performing key exchange"
 msgstr "Apsikeičiama raktais"
 
-msgid "Unable to create connection"
-msgstr "Nepavyko sukurti jungties."
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Nepavyko įkelti SILC raktų poros"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Jungiamasi prie SILC serverio"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Nepavyko įkelti SILC raktų poros"
+
 msgid "Out of memory"
 msgstr "Trūksta atminties"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Nepavyko inicijuoti SILC protokolo"
 
 msgid "Error loading SILC key pair"
@@ -9578,7 +9410,8 @@ msgstr "Skaitmeniškai pasirašyti ir patikrinti visas greitąsias žinutes"
 msgid "Creating SILC key pair..."
 msgstr "Kuriama SILC raktų pora..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Negalima sukurti SILC raktų poros\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9673,6 +9506,9 @@ msgstr "Lenta"
 msgid "No server statistics available"
 msgstr "Nėra prieinamos serverio statistikos"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Jungimosi į SILC serverį klaida"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Nesėkmė: versijų neatitikimas, atnaujinkite savo klientą"
@@ -9714,30 +9550,27 @@ msgstr "Nesekmė: neteisingas slapukas"
 msgid "Failure: Authentication failed"
 msgstr "Nesekmė: tapatybės nustatymas nepavyko"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Nepavyko inicijuoti SILC kliento jungties"
 
 msgid "John Noname"
 msgstr "Vardenis Pavardenis"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Nepavyko įkelti SILC raktų poros: %s"
 
-msgid "Could not write"
-msgstr "Nepavyko rašyti"
-
-msgid "Could not connect"
-msgstr "Nepavyko prisijungti"
+msgid "Unable to create connection"
+msgstr "Nepavyko sukurti jungties."
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Nežinomas serverio atsakymas."
 
-msgid "Could not create listen socket"
-msgstr "Nepavyko sukurti jungties klausymuisi"
-
-msgid "Could not resolve hostname"
-msgstr "Nepavyko nustatyti mazgo IP adreso"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Negalima sukurti jungties"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP naudotojų vardai negali turėti matomų tarpų arba „@“ simbolių"
@@ -9798,6 +9631,78 @@ msgstr "Vartotojas prieigos teisės tikrinimui"
 msgid "Auth Domain"
 msgstr "Sritis prieigos teisės tikrinimui"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr ""
+"join &lt;kambarys&gt;:  prisijungti prie pokalbių kambario Yahoo tinkle"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  parodyti šio Yahoo tinklo kanalų sąrašą"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle:  paprašyti kontakto pradėti su juo paišymo seansą"
+
+msgid "Yahoo ID..."
+msgstr "Yahoo ID..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo protokolo papildinys"
+
+msgid "Pager server"
+msgstr "Pranešimų gaviklio serveris"
+
+msgid "Pager port"
+msgstr "Pranešimų gaviklio prievadas"
+
+msgid "File transfer server"
+msgstr "Failų perdavimo serveris"
+
+msgid "File transfer port"
+msgstr "Failų perdavimo prievadas"
+
+msgid "Chat room locale"
+msgstr "Pokalbių kambario lokalė"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignoruoti kvietimus į konferencijas ir pokalbių kambarius"
+
+msgid "Chat room list URL"
+msgstr "Pokalbių kambarių sąrašo URL"
+
+msgid "Yahoo Chat server"
+msgstr "Yahoo pokalbių serveris"
+
+msgid "Yahoo Chat port"
+msgstr "Yahoo pokalbių serverio prievadas"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo ID..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo protokolo papildinys"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9829,30 +9734,20 @@ msgstr "Bičiulio pridėjimas atmestas"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 "Nežinomas klaidos numeris %d.  Prisijungimas prie Yahoo! svetainės galbūt "
 "tai pataisys."
@@ -9895,37 +9790,32 @@ msgstr ""
 "Nežinomas klaidos numeris %d.  Prisijungimas prie Yahoo! svetainės galbūt "
 "tai pataisys."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "Nepavyko pridėti bičiulio %s į grupę %s serverio sąraše paskyroje %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Nepavyko pridėti bičiulio į serverio sarašą"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Garsinė žinutė %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Gautas nelauktas HTTP atsakymas iš serverio."
 
-msgid "Connection problem"
-msgstr "Jungties klaida"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Prarasta jungtis su %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Nepavyko sukurti jungties su %s:\n"
+"Nepavyko prisijungti prie serverio:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9989,74 +9879,15 @@ msgstr "Prisijungti prie vartotojo pokalbyje..."
 msgid "Open Inbox"
 msgstr "Atidaryti pašto dėžutę"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-"join &lt;kambarys&gt;:  prisijungti prie pokalbių kambario Yahoo tinkle"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  parodyti šio Yahoo tinklo kanalų sąrašą"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle:  paprašyti kontakto pradėti su juo paišymo seansą"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo ID..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo protokolo papildinys"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japonija"
-
-msgid "Pager server"
-msgstr "Pranešimų gaviklio serveris"
-
-msgid "Japan Pager server"
-msgstr "Japonijos pranešimų gaviklio serveris"
-
-msgid "Pager port"
-msgstr "Pranešimų gaviklio prievadas"
-
-msgid "File transfer server"
-msgstr "Failų perdavimo serveris"
-
-msgid "Japan file transfer server"
-msgstr "Japonijos failų perdavimo serveris"
-
-msgid "File transfer port"
-msgstr "Failų perdavimo prievadas"
-
-msgid "Chat room locale"
-msgstr "Pokalbių kambario lokalė"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignoruoti kvietimus į konferencijas ir pokalbių kambarius"
-
-msgid "Chat room list URL"
-msgstr "Pokalbių kambarių sąrašo URL"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo pokalbių serveris"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo pokalbių serverio prievadas"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Nusiųsta Doodle užklausa."
 
+msgid "Unable to connect."
+msgstr "Nepavyko prisijungti."
+
 msgid "Unable to establish file descriptor."
 msgstr "Negalima nustatyti failo deskriptoriaus."
 
@@ -10064,6 +9895,9 @@ msgstr "Negalima nustatyti failo deskriptoriaus."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s siūlo atsiųsti %d failo(-ų) grupę\n"
 
+msgid "Write Error"
+msgstr "Rašymo klaida"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japonija profilis"
 
@@ -10180,23 +10014,19 @@ msgstr "Balsai"
 msgid "Webcams"
 msgstr "Internetinės kameros"
 
+msgid "Connection problem"
+msgstr "Jungties klaida"
+
 msgid "Unable to fetch room list."
 msgstr "Nepavyko gauti kambarių sąrašo."
 
 msgid "User Rooms"
 msgstr "Vartotojų kambariai"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Jungties su YCHT serveriu problemos."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Prarastas prisijungimas prie serverio\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10327,25 +10157,17 @@ msgstr "Sritis"
 msgid "Exposure"
 msgstr "Atskleidimas"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Nepavyko sukurti jungties:\n"
-"%s"
-
 #  Data is assumed to be the destination sn

-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Nepavyko suprasti HTTP tarpininko serverio atsakymo: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP tarpininko serverio jungties klaida %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "Kreiptis atmesta: tarpininkaujantis serveris draudžia prievado %d "
 "tuneliavimą."
@@ -10354,9 +10176,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr "Klaida nustatant %s"
 
-msgid "Could not resolve host name"
-msgstr "Nepavyko nustatyti mazgo IP adreso"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Prašoma %s dėmesio..."
@@ -10567,12 +10386,6 @@ msgstr "Rašymo į %s klaida: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "Nepavyko prisijungti prie %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "Serveris reikalauja TLS/SSL prisijungimui.  Nėra TLS/SSL palaikymo."
-
 #, c-format
 msgid " - %s"
 msgstr " – %s"
@@ -10831,9 +10644,14 @@ msgstr "Sukurti #reakciją į bičiulį..."
 msgid "View _Log"
 msgstr "Žiūrėti žurna_lą"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Paslėpti, kai neprisijungęs"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Rodyti, kai neprisijungęs"
+
 msgid "_Alias..."
 msgstr "N_aujas alternatyvusis vardas..."
 
@@ -11361,6 +11179,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Pakeisti vartotojo %s informaciją"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Įveskite mazgo, kuriam skirtas šis liudijimas, vardą"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL serveriai"
@@ -11408,7 +11230,8 @@ msgstr "Ignoruoti"
 msgid "Get Away Message"
 msgstr "Gauti pasitraukimo žinutę"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Paskutinė žinutė"
 
 msgid "Unable to save icon file to disk."
@@ -12316,7 +12139,8 @@ msgstr "Spalva hipersaitų vaizdavimui."
 msgid "Hyperlink visited color"
 msgstr "Aplankyto hipersaito spalva"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+#, fuzzy
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Aplankyto ar aktyvuoto hipersaito spalva."
 
 msgid "Hyperlink prelight color"
@@ -12352,14 +12176,23 @@ msgstr "Spalva vardui veiksmo žinutėje."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Veiksmo žinutės vardo spalva pašnibždėtoms žinutėms"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Spalva vardui veiksmo žinutėje."
+
 msgid "Whisper Message Name Color"
 msgstr "Vardo spalva pašnibždėtose žinutėse"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Spalva vardui veiksmo žinutėje."
+
 #  ---------- "Notification Removals" ----------

 msgid "Typing notification color"
 msgstr "Pranešimo apie pašnekovo renkamą žinutę spalva"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "Spalva pranešimui apie pašnekovo renkamą žinutę"
 
 msgid "Typing notification font"
@@ -12757,6 +12590,10 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Pasirinkta 'Rankinė' naršyklės komanda, tačiau komanda nenustatyta."
 
+#, fuzzy
+msgid "No message"
+msgstr "Nežinoma pranešimas"
+
 msgid "Open All Messages"
 msgstr "Atidaryti visas žinutes"
 
@@ -12775,10 +12612,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Jūs gavote laišką!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Nežinoma pranešimas"
-
 msgid "The following plugins will be unloaded."
 msgstr "Šie papildiniai bus iškelti."
 
@@ -13012,8 +12845,9 @@ msgid "On unread messages"
 msgstr "kai yra neperskaitytų žinučių"
 
 #  IM Convo trans options

-msgid "Conversation Window Hiding"
-msgstr "Pokalbių langų slėpimas"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Pokalbių langai"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Slėpti naujus pokalbius"
@@ -13021,6 +12855,10 @@ msgstr "_Slėpti naujus pokalbius"
 msgid "When away"
 msgstr "kai pasitraukęs"
 
+#  IM Convo trans options

+msgid "Minimi_ze new conversation windows"
+msgstr "_Suskleisti naujus pokalbių langus"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Kortelės"
@@ -13087,10 +12925,6 @@ msgstr "Naudoti _tolygią slinktį"
 msgid "F_lash window when IMs are received"
 msgstr "Mirginti _langą, kai gaunamos žinutės"
 
-#  IM Convo trans options

-msgid "Minimi_ze new conversation windows"
-msgstr "_Suskleisti naujus pokalbių langus"
-
 msgid "Minimum input area height in lines:"
 msgstr "Mažiausias įvedimo srities aukštis linijomis:"
 
@@ -13126,7 +12960,8 @@ msgstr "Nepavyko paleisti naršyklės nustatymų programos."
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\\\"italic\\\">Pavyzdžiui: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Automatiškai aptikti IP adresą"
 
 msgid "Public _IP:"
@@ -13495,21 +13330,6 @@ msgstr "I_šsaugoti ir pasišalinti"
 msgid "Status for %s"
 msgstr "Paskyros %s būsena"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "Tinkinta šypsenėlė"
-
-msgid "More Data needed"
-msgstr "Reikia daugiau duomenų"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Nurodykite klavišų seką susiejimui su šypsenėle."
-
 #, fuzzy, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
@@ -13517,12 +13337,12 @@ msgstr ""
 "Šiai klavišų sekai jau priskirta tinkinta šypsenelė.  Pasirinkite kitokią "
 "kombinaciją."
 
+msgid "Custom Smiley"
+msgstr "Tinkinta šypsenėlė"
+
 msgid "Duplicate Shortcut"
 msgstr "Klavišų seka jau priskirta"
 
-msgid "Please select an image for the smiley."
-msgstr "Parinkite šypsenėlei paveiksliuką."
-
 msgid "Edit Smiley"
 msgstr "Keisti šypsenėlę"
 
@@ -13638,9 +13458,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Negalima išsiųsti paleidyklės"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Jūs atitempėte pele darbastalio paleidyklę.  Greičiausiai norite siųsti ne "
 "pačią paleidyklę, o jos paleidžiamą objektą."
@@ -14293,9 +14114,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Muzikinių žinučių papildinys kolektyviniam muzikos kūrimui."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Muzikinių žinučių papildinys leidžia keliems vartotojams vienu metu kurti tą "
 "patį muzikinį kūrinį."
@@ -14605,9 +14427,10 @@ msgid "Conversation Window Send Button."
 msgstr "Mygtukas „Siųsti“ pokalbių languose"
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Prideda mygtuką „Siųsti“ į pokalbių lango įvedimo sritį.  Skirta naudojimui, "
 "kai nėra realios klaviatūros."
@@ -14968,8 +14791,9 @@ msgstr "Windows Pidgin parinktys"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Specifinės Pidgin parinktys Windows operacinei sistemai."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Leidžia keisti Pidgin parinktis, kurios yra specifinės Windows operacinėje "
 "sistemoje, pavyzdžiui, bičiulių sąrašo lango pritvirtinimą."
@@ -15012,6 +14836,318 @@ msgstr "Siųsti ir gauti neapdorotas XMPP strofas."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Šis papildinys naudingas XMPP serverių ir klientų derinimui."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Nepavyko atidaryti prievado"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Nepavyko nustatyti jungties klausymuisi"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Nepavyko skaityti iš jungties"
+
+#~ msgid "Connection failed."
+#~ msgstr "Nepavyko prisijungti."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Serveris atsijungė"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Nepavyko sukurti jungties"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Nepavyko prisijungti prie mazgo"
+
+#~ msgid "Read error"
+#~ msgstr "Skaitymo klaida"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nepavyko prisijungti prie serverio:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Rašymo klaida"
+
+#~ msgid "Last Activity"
+#~ msgstr "Paskutinis veiksmas"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Paslaugų paieškos informacija"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Paslaugų paieškos elementai"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Išplėstinių strofų adresavimas"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Pokalbis su keliais vartotojais"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Išplėstinė buvimo informacija pokalbiuose su keliais vartotojais"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "Kanalo vidaus baitų srautai"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Specialios (ad hoc) komandos"
+
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub paslauga"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5 baitų srautai"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Užkanaliniai duomenys"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "Registracija kanalo viduje"
+
+#~ msgid "User Location"
+#~ msgstr "Naudotojo vietovė"
+
+#~ msgid "User Avatar"
+#~ msgstr "Naudotojo avataras"
+
+#  *< api_version

+#  *< type

+#  *< ui_requirement

+#  *< flags

+#  *< dependencies

+#  *< priority

+#  *< id

+#~ msgid "Chat State Notifications"
+#~ msgstr "Pranešimai apie pokalbio būseną"
+
+#~ msgid "Software Version"
+#~ msgstr "Programinės įrangos versija"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Kanalo inicijavimas"
+
+#~ msgid "User Mood"
+#~ msgstr "Naudotojo nuotaika"
+
+#~ msgid "User Activity"
+#~ msgstr "Naudotojo aktyvumas"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Objektų gebos"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Šifruoti seansų susitarimai"
+
+#~ msgid "User Tune"
+#~ msgstr "Naudotojo daina"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Sąrašo objektų apsikeitimas"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Pasiekiamumo adresas"
+
+#~ msgid "User Profile"
+#~ msgstr "Naudotojo profilis"
+
+#  join button

+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Jingle Audio"
+
+#~ msgid "User Nickname"
+#~ msgstr "Naudotojo vardas"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle grynu UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Jingle Video"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Pranešimai apie žinučių pristatymą"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Viešojo rakto skelbimas"
+
+#~ msgid "User Chatting"
+#~ msgstr "Naudotojas šnekasi"
+
+#~ msgid "User Browsing"
+#~ msgstr "Naudotojas naršo"
+
+#~ msgid "User Gaming"
+#~ msgstr "Naudotojas žaidžia"
+
+#~ msgid "User Viewing"
+#~ msgstr "Naudotojas žiūri"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Strofų šifravimas"
+
+#~ msgid "Entity Time"
+#~ msgstr "Objekto laikas"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Uždelstinis pristatymas"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Bendradarbiavimo duomenų objektai"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Failų saugykla ir dalinimasis"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "STUN paslaugos paieška, skirta Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Supaprastintas susitarimas dėl šifruoto seanso"
+
+#~ msgid "Hop Check"
+#~ msgstr "Šuolių patikrinimas"
+
+#~ msgid "Read Error"
+#~ msgstr "Skaitymo klaida"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Nepavyko prisijungti prie serverio."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Skaitymo buferis pripildytas (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Nepavyko išanalizuoti pranešimo"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Nepavyko prisijungti prie mazgo: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Prisijungimas nepavyko (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Jūs buvote atjungtas, kadangi prisijungėte kitoje darbo vietoje."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Klaida. SSL palaikymas neįdiegtas."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Neteisingas slaptažodis."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nepavyko prisijungti prie BOS serverio:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Jus netrukus gali atjungti.  Patikrinkite %s, ar nėra atnaujinimų."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Nepavyko prisijungti"
+
+#~ msgid "Invalid username."
+#~ msgstr "Neteisingas naudotojo vardas"
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Nepavyko iššifruoti serverio atsakymo"
+
+#~ msgid "Connection lost"
+#~ msgstr "Prisijungimas prarastas"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Nepavyko nustatyti mazgo IP adreso"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Jungtis uždaryta (rašoma)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Jungtis atidaryta iš naujo"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Skaitymo iš jungties klaida: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Nepavyko prisijungti prie mazgo"
+
+#~ msgid "Could not write"
+#~ msgstr "Nepavyko rašyti"
+
+#~ msgid "Could not connect"
+#~ msgstr "Nepavyko prisijungti"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Nepavyko sukurti jungties klausymuisi"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Nepavyko nustatyti mazgo IP adreso"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Neteisingas slaptažodis"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nepavyko sukurti jungties su %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japonija"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Japonijos pranešimų gaviklio serveris"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japonijos failų perdavimo serveris"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Prarastas prisijungimas prie serverio\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Nepavyko nustatyti mazgo IP adreso"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "Serveris reikalauja TLS/SSL prisijungimui.  Nėra TLS/SSL palaikymo."
+
+#  IM Convo trans options

+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Pokalbių langų slėpimas"
+
+#~ msgid "More Data needed"
+#~ msgstr "Reikia daugiau duomenų"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Nurodykite klavišų seką susiejimui su šypsenėle."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Parinkite šypsenėlei paveiksliuką."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Kurį ID aktyvuoti?"
 
diff --git a/po/mk.po b/po/mk.po
index d486332690..4ee35649d8 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2008-05-07 12:24+0200\n"
 "Last-Translator: Arangel Angov <ufo@linux.net.mk>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
@@ -2589,9 +2589,10 @@ msgstr ""
 "на логови."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2647,8 +2648,9 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 "Зачувај ги пораките испратени до офлајн корисниците како дејство за пријател."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Остатокот од пораката ќе биде зачуван како дејство за пријател. Можете да "
@@ -2900,11 +2902,12 @@ msgstr ""
 "приклучоци, инсталирајте ActiveTCL од http://www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Не можам да слушам за доаѓачки врски\n"
 
 msgid ""
@@ -2958,14 +2961,21 @@ msgstr "%s го затвори разговорот."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Не можам да ја испратам пораката, разговорот не може да биде започнат."
 
-msgid "Cannot open socket"
-msgstr "Не можам да го отворам сокетот."
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Не можам да креирам сокет:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Не можам да го врзам сокетот за портата"
 
-msgid "Could not listen on socket"
-msgstr "Не можам да слушам на сокетот"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Не можам да креирам сокет:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Грешка во комуникацијата со локалниот mDNSResponder."
@@ -3015,13 +3025,16 @@ msgstr "Зачувај листа со пријатели..."
 msgid "Load buddylist from file..."
 msgstr "Вчитај ја листата со пријатели од датотека..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Пополнете ги полињата за регистрирање."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Лозинките не се совпаѓаат."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Не можам да регистрирам нова сметка. Се случи грешка.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3033,14 +3046,15 @@ msgstr "Регистрацијата успешно е завршена!"
 msgid "Password"
 msgstr "Лозинка"
 
-msgid "Password (retype)"
-msgstr "Лозинка (повторно внесување)"
+msgid "Password (again)"
+msgstr "Лозинка (повторно)"
 
-msgid "Enter current token"
-msgstr "Внесете го тековниот знак"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Тековен знак"
+#, fuzzy
+msgid "Captcha"
+msgstr "Зачувај ја сликата"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Регистрирај нова Gadu-Gadu сметка"
@@ -3093,6 +3107,15 @@ msgstr "Лозинката успешно е променета!"
 msgid "Current password"
 msgstr "Тековната лозинка"
 
+msgid "Password (retype)"
+msgstr "Лозинка (повторно внесување)"
+
+msgid "Enter current token"
+msgstr "Внесете го тековниот знак"
+
+msgid "Current token"
+msgstr "Тековен знак"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Ве молам внесете ја тековната лозинка и новата лозинка за Вашиот UIN: "
 
@@ -3140,7 +3163,7 @@ msgstr "Нема пронајдени корисници"
 msgid "There are no users matching your search criteria."
 msgstr "Нема корисници кои што се совпаѓаат со Вашето пребарување."
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "Не можам да го прочитам сокетот"
 
 msgid "Buddy list downloaded"
@@ -3155,8 +3178,14 @@ msgstr "Листата на пријатели е качена"
 msgid "Your buddy list was stored on the server."
 msgstr "Вашата листа на пријатели беше зачувана на серверот."
 
-msgid "Connection failed."
-msgstr "Поврзување е неуспешно."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Врзано"
+
+msgid "Connection failed"
+msgstr "Поврзувањето не успеа"
 
 msgid "Add to chat"
 msgstr "Додај во разговор"
@@ -3164,18 +3193,23 @@ msgstr "Додај во разговор"
 msgid "Chat _name:"
 msgstr "_Име на разговор:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Не можам да се поврзам со серверот."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Поврзување"
+
 msgid "Chat error"
 msgstr "Грешка во разговорот"
 
 msgid "This chat name is already in use"
 msgstr "Ова име на разговор веќе постои"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Не сум поврзан со серверот."
 
 msgid "Find buddies..."
@@ -3235,7 +3269,8 @@ msgstr "Не е поставен наслов"
 msgid "File Transfer Failed"
 msgstr "Преносот на датотеки не успеа"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Не можам да отворам порта за слушање."
 
 msgid "Error displaying MOTD"
@@ -3251,8 +3286,18 @@ msgstr "Нема MOTD поврзан со оваа врска"
 msgid "MOTD for %s"
 msgstr "MOTD за %s"
 
-msgid "Server has disconnected"
-msgstr "Серверот ја прекина врската"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Изгубив врска со серверот:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Види MOTD"
@@ -3267,22 +3312,20 @@ msgstr "_Лозинка:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC прекарите не смеат да содржат празни места"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Поврзување"
-
 msgid "SSL support unavailable"
 msgstr "SSL поддршката не е достапна"
 
-msgid "Couldn't create socket"
-msgstr "Не можам да креирам сокет"
+msgid "Unable to connect"
+msgstr "Не можам да се поврзам"
 
-msgid "Couldn't connect to host"
-msgstr "Не може да се врзе со серверот"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Не можам да се поврзам со %s"
 
-msgid "Read error"
-msgstr "Грешка во читањето"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Грешка во креирањето на врска."
 
 msgid "Users"
 msgstr "Корисници"
@@ -3711,10 +3754,12 @@ msgstr "Ад-хок командата не успеа"
 msgid "execute"
 msgstr "изврши"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Серверот бара TLS/SSL за најавување.  Не пронајдов TLS/SSL поддршка."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Серверот бара TLS/SSL за најавување, но не пронајдов поддршка за тоа."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3732,7 +3777,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Проверка со обичен текст"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Проверката не успеа"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Невалиден одговор од серверот."
 
 msgid "Server does not use any supported authentication method"
@@ -3744,7 +3794,8 @@ msgstr "Барате енкрипција, но не е достапна на о
 msgid "Invalid challenge from server"
 msgstr "Невалиден предизвик од серверот"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL грешка"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3764,10 +3815,8 @@ msgstr ""
 "Не можам да воспоставам врска со серверот:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Не можам да воспоставам врска со серверот:\n"
 "%s"
@@ -3776,12 +3825,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "Не можам да иницијализирам врска"
 
-msgid "Unable to create socket"
-msgstr "Не можам да креирам сокет"
-
-msgid "Write error"
-msgstr "Грешка во запишувањето"
-
 msgid "Full Name"
 msgstr "Целосно име"
 
@@ -3852,159 +3895,6 @@ msgstr "Оперативен систем"
 msgid "Local Time"
 msgstr "Локална датотека:"
 
-msgid "Last Activity"
-msgstr "Последна активност"
-
-msgid "Service Discovery Info"
-msgstr "Информации за откривање на сервиси"
-
-msgid "Service Discovery Items"
-msgstr "Предмети за откривање на сервиси"
-
-msgid "Extended Stanza Addressing"
-msgstr "Проширена stanza адреса"
-
-msgid "Multi-User Chat"
-msgstr "Мулти-кориснички разговор"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Информации за продолежно присуство за мулти-кориснички разговор"
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr "Ад-хок команди"
-
-msgid "PubSub Service"
-msgstr "PubSub сервис"
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "Грешка во регистрацијата"
-
-msgid "User Location"
-msgstr "Локација на корисникот"
-
-msgid "User Avatar"
-msgstr "Аватар на корисникот"
-
-msgid "Chat State Notifications"
-msgstr "Известување за состојбата на разговорот"
-
-msgid "Software Version"
-msgstr "Верзија на софтверот"
-
-msgid "Stream Initiation"
-msgstr "Иницирање на стримот"
-
-msgid "File Transfer"
-msgstr "Пренос на датотеки"
-
-msgid "User Mood"
-msgstr "Расположение на корисникот"
-
-msgid "User Activity"
-msgstr "Активност на корисникот"
-
-msgid "Entity Capabilities"
-msgstr ""
-
-msgid "Encrypted Session Negotiations"
-msgstr "Преговори за енкриптирана сесија"
-
-msgid "User Tune"
-msgstr ""
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-msgid "Reachability Address"
-msgstr "Адреса за достапност"
-
-msgid "User Profile"
-msgstr "Кориснички профил"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle аудио"
-
-msgid "User Nickname"
-msgstr "Кориснички прекар"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle Raw UDP"
-
-msgid "Jingle Video"
-msgstr "Jingle видео"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Примачи на пораката"
-
-msgid "Public Key Publishing"
-msgstr "Објавување на јавниот клуч"
-
-msgid "User Chatting"
-msgstr "Корисникот разговара"
-
-msgid "User Browsing"
-msgstr "Корисникот сурфа"
-
-msgid "User Gaming"
-msgstr "Корисникот игра"
-
-msgid "User Viewing"
-msgstr "Корисникот гледа"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Stanza енкрипција"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr "Одложено праќање"
-
-msgid "Collaborative Data Objects"
-msgstr "Колаборативни објекти со податоци"
-
-msgid "File Repository and Sharing"
-msgstr "Складирање и споделување на датотеки"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "Откривање на STUN за Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Можности"
-
 msgid "Priority"
 msgstr "Приоритет"
 
@@ -4016,7 +3906,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Најавен"
 
 msgid "Middle Name"
@@ -4199,16 +4089,13 @@ msgstr "Нема пронајдени корисници"
 msgid "Roles:"
 msgstr "Улога"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Времето за ping истече"
 
-msgid "Read Error"
-msgstr "Грешка во читањето"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4388,9 +4275,6 @@ msgstr "Вашата лозинка е променета."
 msgid "Error changing password"
 msgstr "Грешка во промената на лозинката"
 
-msgid "Password (again)"
-msgstr "Лозинка (повторно)"
-
 msgid "Change XMPP Password"
 msgstr "Промени ја лозинката за XMPP"
 
@@ -4776,6 +4660,14 @@ msgstr "Грешка во анализирањето на XML"
 msgid "Unknown Error in presence"
 msgstr "Непозната грешка во присуство"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Грешка при приклучување во разговорот %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Грешка во разговорот %s"
+
 msgid "Create New Room"
 msgstr "Креирај нова соба"
 
@@ -4792,16 +4684,20 @@ msgstr "_Конфигурирај соба"
 msgid "_Accept Defaults"
 msgstr "_Прифати стандардно"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Грешка при приклучување во разговорот %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Не е дадена причина."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Грешка во разговорот %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Бевте исфрлени од %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Исфрлен/а од %s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Се случи грешка при отворање на датотеката."
 
 #, fuzzy
@@ -5301,9 +5197,6 @@ msgstr ""
 "SSL поддршка е потребна за MSN. Ве молам, инсталирајте поддржана SSL "
 "библиотека."
 
-msgid "Failed to connect to server."
-msgstr "Не можам да се поврзам со серверот."
-
 msgid "Error retrieving profile"
 msgstr "Грешка при добивањето на профилот"
 
@@ -5568,9 +5461,6 @@ msgstr "Пораката може да не е испратена бидејќи
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Пораката може да не е испратена бидејќи се појави непозната грешка:"
 
-msgid "Unable to connect"
-msgstr "Не можам да се поврзам"
-
 msgid "Writing error"
 msgstr "Грешка во запишувањето"
 
@@ -5585,19 +5475,23 @@ msgstr ""
 "Грешка во поврзувањето од %s серверот:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Нашиот протокол не е поддржан од серверот."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Грешка во парсирањето на HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Се имате најавено од друга локација."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "MSN серверите се моментално недостапни. Ве молам, обидете се повторно."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN серверите ќе се недостапни привремено."
 
 #, c-format
@@ -5610,9 +5504,6 @@ msgstr ""
 "Вашата листа на пријатели од MSN е моментално недостапна. Ве молам почекајте "
 "и пробајте пак."
 
-msgid "Unknown error."
-msgstr "Непозната грешка."
-
 msgid "Handshaking"
 msgstr "Ракување"
 
@@ -5715,6 +5606,9 @@ msgstr "Приклучок за MSN протоколот"
 msgid "%s is not a valid group."
 msgstr "%s не е валидна група."
 
+msgid "Unknown error."
+msgstr "Непозната грешка."
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s на %s (%s)"
@@ -5825,12 +5719,6 @@ msgstr[2] ""
 msgid "Add contacts from server"
 msgstr "Додај контакти од серверот"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Врзано"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Грешка во протоколот, код %d: %s"
@@ -5851,16 +5739,6 @@ msgstr "Грешка со MySpaceIM"
 msgid "Invalid input condition"
 msgstr "Невалиден влезен услов"
 
-msgid "Read buffer full (2)"
-msgstr "Баферот за читање е полн (2)"
-
-msgid "Unparseable message"
-msgstr "Порака што не може да се парсира"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Не можам да се поврзам со хостот: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Не успеав да го додадам пријателот"
 
@@ -5942,6 +5820,12 @@ msgstr "Вкупно пријатели"
 msgid "Client Version"
 msgstr "Верзија на клиентот"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Корисничкото име е достапно"
 
@@ -6198,9 +6082,9 @@ msgstr "Или корисникот е офлајн или сте блокира
 msgid "Unknown error: 0x%X"
 msgstr "Непозната грешка: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Најавата не успеа (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Не можам да ве најавам"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6309,9 +6193,6 @@ msgstr "GroupWise конференција %d"
 msgid "Authenticating..."
 msgstr "Автентицирање..."
 
-msgid "Unable to connect to server."
-msgstr "Не можам да се поврзам со серверот."
-
 msgid "Waiting for response..."
 msgstr "Чекам одговор..."
 
@@ -6335,25 +6216,20 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Дали сакате да се приклучите на разговорот?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Одјавени сте бидејќи се најавивте од друга работна станица."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 "%s изгледа дека е исклучен(a) и не ја прими пораката која што ја испративте."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Не можам да се врзам на серверот. Ве молам внесете ја адресата на серверот "
 "на кој што сакате да се врзете."
 
-msgid "Error. SSL support is not installed."
-msgstr "Грешка. SSL поддршката не е инсталирана."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Оваа конференција е затворена. Не може да се испраќаат пораки."
 
@@ -6392,10 +6268,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "Грешка при барањето на токенот за најава"
 
-msgid "Incorrect password."
-msgstr "Грешна лозинка."
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6404,18 +6277,8 @@ msgstr "Не можам да се приклучам на собата за че
 msgid "Invalid chat room name"
 msgstr "Невалидно име на соба за чет"
 
-msgid "Server closed the connection."
-msgstr "Грешка во креирањето на врска."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Изгубив врска со серверот:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Примив невалидни податоци на врската со серверот."
 
 #. *< type
@@ -6463,7 +6326,8 @@ msgstr "Се изгуби врската со оддалечениот кори�
 msgid "Received invalid data on connection with remote user."
 msgstr "Примив невалидни податоци за врската со оддалечениот корисник."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Не можам да воспоставам врска со оддалечениот сервер."
 
 msgid "Direct IM established"
@@ -6661,21 +6525,15 @@ msgstr "Ниво на предупредување"
 msgid "Buddy Comment"
 msgstr "Коментар за пријател"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Не можам да се поврзам со серверот за проверка:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Не можам да се поврзам со BOS серверот:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Не можам да се поврзам со серверот."
 
 msgid "Username sent"
 msgstr "Корисничкото име е испратено"
@@ -6687,11 +6545,11 @@ msgstr "Врската е воспоставена, испраќам колач�
 msgid "Finalizing connection"
 msgstr "Привршување на поврзувањето"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Не можам да се најавам: Не можам да се најавам како %s, бидејќи корисничкото "
 "именајава е невалидно.  Имињата за најава мора да започнуваат со буква и да "
@@ -6704,26 +6562,22 @@ msgstr "Може да бидете накратко исклучени.  Про�
 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 "Невалидно корисничко име."
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Корисникот не постои"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Вашата сметка е моментално суспендирана."
 
 #. service temporarily unavailable
@@ -6744,7 +6598,8 @@ msgstr ""
 "Се поврзувате и исклучувате пречесто. Почекајте десет минути и обидете се "
 "повторно. Ако продолжите со обидeте, ќе треба да чекате уште повеќе."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "SecurID клучот кој го внесовте е невалиден."
 
 msgid "Enter SecurID"
@@ -6925,6 +6780,9 @@ msgstr "Поврзан од"
 msgid "Member Since"
 msgstr "Член од"
 
+msgid "Capabilities"
+msgstr "Можности"
+
 msgid "Profile"
 msgstr "Профил"
 
@@ -7116,9 +6974,9 @@ msgstr[2] ""
 msgid "Away message too long."
 msgstr "Пораката за отсутност е предолга."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7146,9 +7004,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Без родител"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Не можам да го додадам пријателот %s, бидејќи имате премногу пријатели во "
@@ -7157,8 +7015,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(без име)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Не можам да го додадам пријателот %s поради непозната причина."
 
 #, c-format
@@ -8004,7 +7862,7 @@ msgid "Update interval (seconds)"
 msgstr "Грешка"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Не можам да добијам информации за серверот"
 
 #, c-format
@@ -8031,10 +7889,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Не можам да добијам информации за серверот"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "Го барам вниманието на %s..."
 
@@ -8072,21 +7926,9 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "Не можам да се поврзам."
-
 msgid "Socket error"
 msgstr "Грешка во сокетот"
 
-msgid "Unable to read from socket"
-msgstr "Не можам да го прочитам сокетот"
-
-msgid "Write Error"
-msgstr "Грешка во запишувањето"
-
-msgid "Connection lost"
-msgstr "Врската е изгубена"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "Постави ги информациите за корисникот..."
@@ -8095,8 +7937,9 @@ msgstr "Постави ги информациите за корисникот..
 msgid "Requesting token"
 msgstr "Барањето е одбиено"
 
-msgid "Couldn't resolve host"
-msgstr "Не можам да го преведам хостот"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Не можам да се поврзам со серверот."
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8147,7 +7990,7 @@ msgid "QQ Qun Command"
 msgstr "Команда"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Не можам да добијам информации за серверот"
 
 #, fuzzy
@@ -8169,9 +8012,6 @@ msgstr "Испраќање на датотека"
 msgid "%d canceled the transfer of %s"
 msgstr "%d го откажа преносот на %s"
 
-msgid "Connection closed (writing)"
-msgstr "Врската се затвори (пишувам)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Наслов на групата:</b> %s<br>"
@@ -8225,17 +8065,6 @@ msgstr "Администратор на Sametime ја издаде следна�
 msgid "Sametime Administrator Announcement"
 msgstr "Администраторска најава на Sametime"
 
-msgid "Connection reset"
-msgstr "Врската се ресетира"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Грешка при читање од сокетот: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Не можам да се поврзам со хостот"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Најава од %s"
@@ -8258,6 +8087,9 @@ msgstr "Звучници"
 msgid "Video Camera"
 msgstr "Видео камера"
 
+msgid "File Transfer"
+msgstr "Пренос на датотеки"
+
 msgid "Supports"
 msgstr "Поддржува"
 
@@ -9080,6 +8912,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Мрежни статистики"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Пинг не успеа"
 
@@ -9144,7 +8979,8 @@ msgstr "Неподдржан тип на јавен клуч"
 msgid "Disconnected by server"
 msgstr "Исклучен од серверот"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Грешка со поврзувањето на SILC серверот"
 
 msgid "Key Exchange failed"
@@ -9156,26 +8992,26 @@ msgstr ""
 "Продолжувањето на одделената сесија не успеа. Притиснете на „Поврзи се "
 "повторно“ за да креирате нова врска."
 
-msgid "Connection failed"
-msgstr "Поврзувањето не успеа"
-
 msgid "Performing key exchange"
 msgstr "Извршувам размена на клучеви"
 
-msgid "Unable to create connection"
-msgstr "Не можам да креирам врска"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Не можам да ги вчитам клучевите за SILC"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Се поврзувам на SILC сервер"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Не можам да ги вчитам клучевите за SILC"
+
 msgid "Out of memory"
 msgstr "Без меморија"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Не можам да го иницијализирам протоколот SILC"
 
 msgid "Error loading SILC key pair"
@@ -9470,7 +9306,8 @@ msgstr "Дигитално потпиши ги сите инстант пора�
 msgid "Creating SILC key pair..."
 msgstr "Креирам SILC пар од клучеви..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Не можам да креирам пар од SILC пар од клучеви\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9566,6 +9403,9 @@ msgstr "Табла"
 msgid "No server statistics available"
 msgstr "Нема достапни статистики за серверот"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Грешка со поврзувањето на SILC серверот"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Неуспех: Несогласување на верзијата, надградете го Вашиот клиент"
@@ -9607,30 +9447,27 @@ msgstr "Неуспех: Невалидно колаче"
 msgid "Failure: Authentication failed"
 msgstr "Неуспех: Авторизирањето не успеа"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Не можам да ја иницијализирам SILC врската со клиентот"
 
 msgid "John Noname"
 msgstr "Џон Безименко"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Не можам да го вчитам клучот за SILC: %s"
 
-msgid "Could not write"
-msgstr "Не можам да запишам"
-
-msgid "Could not connect"
-msgstr "Не можам да се поврзам"
+msgid "Unable to create connection"
+msgstr "Не можам да креирам врска"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Непознат одговор од серверот."
 
-msgid "Could not create listen socket"
-msgstr "Не можам да креирам сокет за слушање"
-
-msgid "Could not resolve hostname"
-msgstr "Не можам да го преведам името на хостот"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Не можам да креирам сокет"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
@@ -9673,6 +9510,78 @@ msgstr "Автентицирај корисник"
 msgid "Auth Domain"
 msgstr "Домен за проверка"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;соба&gt;:  Приклучи се во соба на Yahoo мрежата"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Ги листа сите соби на Yahoo мрежата"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Побарајте од некој корисник да започне Doodle сесија"
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! Ид."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Приклучок за Yahoo протоколот"
+
+msgid "Pager server"
+msgstr "Пејџер сервер"
+
+msgid "Pager port"
+msgstr "Порта на пејџер"
+
+msgid "File transfer server"
+msgstr "Сервер за размена на датотеки"
+
+msgid "File transfer port"
+msgstr "Порта за размена на датотеки"
+
+msgid "Chat room locale"
+msgstr "Locale на собата за разговор"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Игнорирај покани за разговори и конференции"
+
+msgid "Chat room list URL"
+msgstr "Url на листата со соби"
+
+msgid "Yahoo Chat server"
+msgstr "Сервер за разговор на Yahoo"
+
+msgid "Yahoo Chat port"
+msgstr "Порта за разговор на Yahoo"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! Ид."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Приклучок за Yahoo протоколот"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9703,30 +9612,20 @@ msgstr "Додавањето на пријател е одбиено"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 "Непозната грешка со број %d. Најавувањет на страницата на Yahoo! може да го "
 "поправи ова."
@@ -9770,39 +9669,34 @@ msgstr ""
 "Непозната грешка со број %d. Најавувањет на страницата на Yahoo! може да го "
 "поправи ова."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Не можам да го додадам пријателот %s во групата %s на листата на серверот на "
 "сметката %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Не можам да го додадам пријателот во листата на серверот"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Звучен %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Добив неочекуван HTTP одговор од серверот."
 
-msgid "Connection problem"
-msgstr "Проблем со врската"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Изгубив врска со %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Не можам да воспоставам врска со %s:\n"
+"Не можам да воспоставам врска со серверот:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9865,74 +9759,15 @@ msgstr "Приклучи корисник во разговор..."
 msgid "Open Inbox"
 msgstr "Отвори сандаче"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;соба&gt;:  Приклучи се во соба на Yahoo мрежата"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Ги листа сите соби на Yahoo мрежата"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Побарајте од некој корисник да започне Doodle сесија"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! Ид."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Приклучок за Yahoo протоколот"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-msgid "Pager server"
-msgstr "Пејџер сервер"
-
-msgid "Japan Pager server"
-msgstr "Јапонски пејџер сервер"
-
-msgid "Pager port"
-msgstr "Порта на пејџер"
-
-msgid "File transfer server"
-msgstr "Сервер за размена на датотеки"
-
-msgid "Japan file transfer server"
-msgstr "Јапонски сервер за пренос на датотеки"
-
-msgid "File transfer port"
-msgstr "Порта за размена на датотеки"
-
-msgid "Chat room locale"
-msgstr "Locale на собата за разговор"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Игнорирај покани за разговори и конференции"
-
-msgid "Chat room list URL"
-msgstr "Url на листата со соби"
-
-msgid "Yahoo Chat server"
-msgstr "Сервер за разговор на Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "Порта за разговор на Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Испрати барање за Doodle."
 
+msgid "Unable to connect."
+msgstr "Не можам да се поврзам."
+
 msgid "Unable to establish file descriptor."
 msgstr "Не можам да воспоставам опишувач за датотеката."
 
@@ -9940,6 +9775,9 @@ msgstr "Не можам да воспоставам опишувач за дат
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s се обидува да ви испрати група од %d датотеки\n"
 
+msgid "Write Error"
+msgstr "Грешка во запишувањето"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan профил"
 
@@ -10059,23 +9897,19 @@ msgstr "Гласови"
 msgid "Webcams"
 msgstr "Веб камери"
 
+msgid "Connection problem"
+msgstr "Проблем со врската"
+
 msgid "Unable to fetch room list."
 msgstr "Не можам да добијам листа со соби."
 
 msgid "User Rooms"
 msgstr "Кориснички соби"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Грешка во поврзувањето со YCHT серверот."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Врската со серверот е изгубена\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10206,33 +10040,22 @@ msgstr "Област"
 msgid "Exposure"
 msgstr "Појавување"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Не можам да креирам сокет:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Не можам да го парсирам одговорот од HTTP proxy-то: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Грешки при поврзување со HTTP proxy-то %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Пристапот е одбиен: HTTP proxy серверот забранува тунелирање на %d."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Грешка при преведување на %s"
 
-msgid "Could not resolve host name"
-msgstr "Не можам да го преведам името на хостот"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Го барам вниманието на %s..."
@@ -10443,12 +10266,6 @@ msgstr "Грешка при запишување на %s: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "Не можам да се поврзам со %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "Серверот бара TLS/SSL за најавување.  Не пронајдов TLS/SSL поддршка."
-
 #, c-format
 msgid " - %s"
 msgstr " - %s"
@@ -10699,9 +10516,14 @@ msgstr "Додај дејство за _пријател..."
 msgid "View _Log"
 msgstr "Прегледај _лог"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Скриј кога не сум на интернет"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Прикажи додека не сум на интернет"
+
 msgid "_Alias..."
 msgstr "_Алиjас..."
 
@@ -11208,6 +11030,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Промени корисничко инфо за %s"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Внесете име на хост за сертификатот."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL сервери"
@@ -11254,7 +11080,8 @@ msgstr "Игнорирај"
 msgid "Get Away Message"
 msgstr "Нова порака за отсуство"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Последно"
 
 msgid "Unable to save icon file to disk."
@@ -12166,7 +11993,7 @@ msgid "Hyperlink visited color"
 msgstr "Боја на хиперврски"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Боја за исцртување на хиперврските кога глувчето е над нив."
 
 msgid "Hyperlink prelight color"
@@ -12204,13 +12031,22 @@ msgid "Action Message Name Color for Whispered Message"
 msgstr "Име на боја на порака за дејство"
 
 #, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Боја за исцртување на името на пораката за дејство."
+
+#, fuzzy
 msgid "Whisper Message Name Color"
 msgstr "Име на бојата на испратени пораки"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Боја за исцртување на името на пораката за дејство."
+
 msgid "Typing notification color"
 msgstr "Боја на известувања при куцање"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "Бојата на фонтот за известувањата"
 
 msgid "Typing notification font"
@@ -12612,6 +12448,10 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Избрана е рачната команда на прелистувачот, но не е поставена команда."
 
+#, fuzzy
+msgid "No message"
+msgstr "Непозната порака"
+
 msgid "Open All Messages"
 msgstr "Отвори ги сите пораки"
 
@@ -12629,10 +12469,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Имате пошта!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Непозната порака"
-
 msgid "The following plugins will be unloaded."
 msgstr "Следниве додатоци ќе бидат извадени."
 
@@ -12848,8 +12684,9 @@ msgstr "_Покажи системска икона на панелот:"
 msgid "On unread messages"
 msgstr "Не непрочитани пораки"
 
-msgid "Conversation Window Hiding"
-msgstr "Криење на прозорците при разговор"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Прозорците за IM разговори"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Криј ги новите инстант разговори:"
@@ -12857,6 +12694,9 @@ msgstr "_Криј ги новите инстант разговори:"
 msgid "When away"
 msgstr "Кога сум отсутен"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Мини_мизирај нови прозореци за разговор"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Јазичиња"
@@ -12915,9 +12755,6 @@ msgstr "Користи мазно лизгање"
 msgid "F_lash window when IMs are received"
 msgstr "Т_репкање на прозорецот кога е примена порака"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Мини_мизирај нови прозореци за разговор"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12952,7 +12789,8 @@ msgstr "Не можам да ја подигнам програмата за к�
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Пример: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Автоматски детектирај IP адреса"
 
 msgid "Public _IP:"
@@ -13327,34 +13165,18 @@ msgstr "Зач_увај и користи"
 msgid "Status for %s"
 msgstr "Статус за %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "Внеси смајли"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
 #, fuzzy
-msgid "Duplicate Shortcut"
-msgstr "Корекција на дупликати"
+msgid "Custom Smiley"
+msgstr "Внеси смајли"
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Ве молам изберете го расположението од листата."
+msgid "Duplicate Shortcut"
+msgstr "Корекција на дупликати"
 
 #, fuzzy
 msgid "Edit Smiley"
@@ -13475,9 +13297,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Не може да се испрати стартувач"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Влечевте стартувач од работната површина. Најверојатно сакавте да го "
 "испратите тоа што стартувачот го стартува, наместо самиот стартувач."
@@ -14079,9 +13902,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Приклучок за музичко допишување за заедничко компонирање."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Приклучокот за музичко допишување овозможува корисниците истовремено да "
 "работат на исто парче музика со уредување на основна скала."
@@ -14344,7 +14168,7 @@ msgstr "Копче за испраќање во прозорецот за раз
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14675,8 +14499,9 @@ msgstr "Опции за Pidgin за Windows"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Опции наменети за Pidgin за Windows."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Овозможува опции наменети за Pidgin за Windows, како што се прикачување на "
 "листата со пријатели и трепкање на разговорите."
@@ -14718,6 +14543,279 @@ msgstr "Испрати и прими чисти XMPP делови."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Овој приклучок е корисен за дебагирање на XMPP сервери или клиенти."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Не можам да го отворам сокетот."
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Не можам да слушам на сокетот"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Не можам да го прочитам сокетот"
+
+#~ msgid "Connection failed."
+#~ msgstr "Поврзување е неуспешно."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Серверот ја прекина врската"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Не можам да креирам сокет"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Не може да се врзе со серверот"
+
+#~ msgid "Read error"
+#~ msgstr "Грешка во читањето"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не можам да воспоставам врска со серверот:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Грешка во запишувањето"
+
+#~ msgid "Last Activity"
+#~ msgstr "Последна активност"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Информации за откривање на сервиси"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Предмети за откривање на сервиси"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Проширена stanza адреса"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Мулти-кориснички разговор"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Информации за продолежно присуство за мулти-кориснички разговор"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ад-хок команди"
+
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub сервис"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "Грешка во регистрацијата"
+
+#~ msgid "User Location"
+#~ msgstr "Локација на корисникот"
+
+#~ msgid "User Avatar"
+#~ msgstr "Аватар на корисникот"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Известување за состојбата на разговорот"
+
+#~ msgid "Software Version"
+#~ msgstr "Верзија на софтверот"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Иницирање на стримот"
+
+#~ msgid "User Mood"
+#~ msgstr "Расположение на корисникот"
+
+#~ msgid "User Activity"
+#~ msgstr "Активност на корисникот"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Преговори за енкриптирана сесија"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Адреса за достапност"
+
+#~ msgid "User Profile"
+#~ msgstr "Кориснички профил"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Jingle аудио"
+
+#~ msgid "User Nickname"
+#~ msgstr "Кориснички прекар"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle Raw UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Jingle видео"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Примачи на пораката"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Објавување на јавниот клуч"
+
+#~ msgid "User Chatting"
+#~ msgstr "Корисникот разговара"
+
+#~ msgid "User Browsing"
+#~ msgstr "Корисникот сурфа"
+
+#~ msgid "User Gaming"
+#~ msgstr "Корисникот игра"
+
+#~ msgid "User Viewing"
+#~ msgstr "Корисникот гледа"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Stanza енкрипција"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Одложено праќање"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Колаборативни објекти со податоци"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Складирање и споделување на датотеки"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "Откривање на STUN за Jingle"
+
+#~ msgid "Read Error"
+#~ msgstr "Грешка во читањето"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Не можам да се поврзам со серверот."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Баферот за читање е полн (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Порака што не може да се парсира"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Не можам да се поврзам со хостот: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Најавата не успеа (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Одјавени сте бидејќи се најавивте од друга работна станица."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Грешка. SSL поддршката не е инсталирана."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Грешна лозинка."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не можам да се поврзам со BOS серверот:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Може да бидете накратко исклучени.  Проверете %s за надградби.."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Не можам да се поврзам"
+
+#~ msgid "Invalid username."
+#~ msgstr "Невалидно корисничко име."
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Не можам да добијам информации за серверот"
+
+#~ msgid "Connection lost"
+#~ msgstr "Врската е изгубена"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Не можам да го преведам хостот"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Врската се затвори (пишувам)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Врската се ресетира"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Грешка при читање од сокетот: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Не можам да се поврзам со хостот"
+
+#~ msgid "Could not write"
+#~ msgstr "Не можам да запишам"
+
+#~ msgid "Could not connect"
+#~ msgstr "Не можам да се поврзам"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Не можам да креирам сокет за слушање"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Не можам да го преведам името на хостот"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Грешна лозинка"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не можам да воспоставам врска со %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Јапонски пејџер сервер"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Јапонски сервер за пренос на датотеки"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Врската со серверот е изгубена\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Не можам да го преведам името на хостот"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Серверот бара TLS/SSL за најавување.  Не пронајдов TLS/SSL поддршка."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Криење на прозорците при разговор"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Ве молам изберете го расположението од листата."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Кој ID. да го активирам?"
 
@@ -15219,9 +15317,6 @@ msgstr "Овој приклучок е корисен за дебагирање
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "Не можам да ве најавам. Проверете го логот за дебагирање."
 
-#~ msgid "Unable to login"
-#~ msgstr "Не можам да ве најавам"
-
 #~ msgid "TCP Address"
 #~ msgstr "TCP адреса"
 
diff --git a/po/mn.po b/po/mn.po
index 4f501096a6..7ca2944936 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2005-06-17 23:22-0800\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2495,7 +2495,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2542,10 +2542,11 @@ msgstr ""
 msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
-msgstr ""
+msgstr "`Харилцагчийн Сануулга' аас сануулгыг засварлаж, устгаж болно"
 
 #, c-format
 msgid ""
@@ -2784,12 +2785,13 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
+msgstr "Холболтыг эхлүүлэх боломжгүй байна"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2841,14 +2843,21 @@ msgstr "%s харилцааг хаасан."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Харилцааг эхлүүлэхгүй бол, мессежийг илгээх боломжгүй."
 
-msgid "Cannot open socket"
-msgstr "Сокетыг нээж чадсангүй"
-
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
 msgstr ""
+"Сокет үүсгэх боломжгүй:\n"
+"%s"
 
-msgid "Could not listen on socket"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "%s харилцагчийг хориглох боломжгүй"
+
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
 msgstr ""
+"Сокет үүсгэх боломжгүй:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
@@ -2895,13 +2904,16 @@ msgstr "Харилцагчийн жагсаалтыг хадгалах..."
 msgid "Load buddylist from file..."
 msgstr "Файлаас харилцагчдын жагсаалтыг ачаалах"
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Бүртгэлийн талбаруудыг бөглө."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Нууц үг тохирохгүй байна."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Шинэ бүртгэл  бүртгэх боломжгүй.Алдаа гарлаа.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2913,14 +2925,15 @@ msgstr "Бүртгэл ажилттай боллоо"
 msgid "Password"
 msgstr "Нууц үг"
 
-msgid "Password (retype)"
-msgstr "Нууц үг (дахин оруул)"
+msgid "Password (again)"
+msgstr "Нууц үг (дахиад)"
 
-msgid "Enter current token"
+msgid "Enter captcha text"
 msgstr ""
 
-msgid "Current token"
-msgstr ""
+#, fuzzy
+msgid "Captcha"
+msgstr "Зургийг Хадгалах"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Шинэ Gadu-Gadu бүртгэлийг бүртгэх"
@@ -2973,6 +2986,15 @@ msgstr "Нууц үгийг амжилттай өөрчиллөө"
 msgid "Current password"
 msgstr "Одоогийн нууц үг"
 
+msgid "Password (retype)"
+msgstr "Нууц үг (дахин оруул)"
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
@@ -3020,8 +3042,8 @@ msgstr ""
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-msgid "Unable to read socket"
-msgstr "Сокет унших боломжгүй"
+msgid "Unable to read from socket"
+msgstr "Сокетоос унших боломжгүй"
 
 msgid "Buddy list downloaded"
 msgstr "Харилцагчийн жагсаалтыг татаж авсан"
@@ -3035,8 +3057,14 @@ msgstr "Харилцагчийн жагсаалтыг сервер лүү хуу
 msgid "Your buddy list was stored on the server."
 msgstr "Таны харилцагчийн жагсаалт серверт хадгалагдлаа."
 
-msgid "Connection failed."
-msgstr "Холболт амжилтгүй боллоо."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Холбогдсон"
+
+msgid "Connection failed"
+msgstr "Холболт амжилтгүй боллоо"
 
 msgid "Add to chat"
 msgstr "Чатад нэмэх"
@@ -3044,18 +3072,23 @@ msgstr "Чатад нэмэх"
 msgid "Chat _name:"
 msgstr "Чатын нэр:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Сервертэй холбогдох боломжгүй."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr ""
+
 msgid "Chat error"
 msgstr "Чатын алдаа"
 
 msgid "This chat name is already in use"
 msgstr "Энэ чатын нэрийг ашиглаж байна"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Сервертэй холбогдож чадсангүй."
 
 msgid "Find buddies..."
@@ -3115,8 +3148,9 @@ msgstr "Ямар ч сэдэвийг тохируулаагүй байна"
 msgid "File Transfer Failed"
 msgstr ""
 
-msgid "Could not open a listening port."
-msgstr ""
+#, fuzzy
+msgid "Unable to open a listening port."
+msgstr "Файл нээх боломжгүй."
 
 msgid "Error displaying MOTD"
 msgstr ""
@@ -3131,8 +3165,18 @@ msgstr ""
 msgid "MOTD for %s"
 msgstr ""
 
-msgid "Server has disconnected"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
 msgstr ""
+"Сервертэй холболт тасарсан:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr ""
@@ -3146,22 +3190,20 @@ msgstr "Нууц үг"
 msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr ""
-
 msgid "SSL support unavailable"
 msgstr "SSL дэмжлэг бэлэн биш байна"
 
-msgid "Couldn't create socket"
+msgid "Unable to connect"
 msgstr ""
 
-msgid "Couldn't connect to host"
-msgstr ""
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "%s рүү холбогдох боломжгүй"
 
-msgid "Read error"
-msgstr "Унших алдаа"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Сервер холболтыг тасалсан. "
 
 msgid "Users"
 msgstr "Хэрэглэгчид"
@@ -3553,10 +3595,12 @@ msgstr "Ad-Hoc Команд Биелэгдээгүй"
 msgid "execute"
 msgstr "гүйцэтгэх"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr ""
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
+msgstr "Кодчилол шаардлагатай, гэхдээ ямар ч TLS/SSL дэмжлэг олдсонгүй."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Кодчилол шаардлагатай, гэхдээ ямар ч TLS/SSL дэмжлэг олдсонгүй."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3571,8 +3615,13 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
-msgid "Invalid response from server."
-msgstr ""
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "SSL Холболт амжилтгүй болсон"
+
+#, fuzzy
+msgid "Invalid response from server"
+msgstr "Алдаа: серверийн буруу PONG "
 
 msgid "Server does not use any supported authentication method"
 msgstr ""
@@ -3583,7 +3632,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr ""
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL алдаа"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3602,10 +3652,8 @@ msgstr ""
 "Сервертэй холбогдож чадсангүй:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Сервертэй холбогдож чадсангүй:\n"
 "%s"
@@ -3614,12 +3662,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "Холболтыг эхлүүлэх боломжгүй байна"
 
-msgid "Unable to create socket"
-msgstr "Сокет үүсгэх боломжгүй"
-
-msgid "Write error"
-msgstr "Бичих алдаа"
-
 msgid "Full Name"
 msgstr "Бүтэн нэр"
 
@@ -3688,159 +3730,6 @@ msgstr "Үйлдлийн систем"
 msgid "Local Time"
 msgstr "Локал Файл:"
 
-msgid "Last Activity"
-msgstr ""
-
-msgid "Service Discovery Info"
-msgstr ""
-
-msgid "Service Discovery Items"
-msgstr ""
-
-msgid "Extended Stanza Addressing"
-msgstr ""
-
-msgid "Multi-User Chat"
-msgstr ""
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr "Ad-Hoc ийн командууд"
-
-msgid "PubSub Service"
-msgstr "PubSub үйлчилгээ"
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr ""
-
-msgid "User Location"
-msgstr "Харилцагчийн байрлал"
-
-msgid "User Avatar"
-msgstr ""
-
-msgid "Chat State Notifications"
-msgstr ""
-
-msgid "Software Version"
-msgstr "Програм хангамжийн хувилбар"
-
-msgid "Stream Initiation"
-msgstr ""
-
-msgid "File Transfer"
-msgstr "Файл шилжүүлэлт"
-
-msgid "User Mood"
-msgstr ""
-
-msgid "User Activity"
-msgstr ""
-
-msgid "Entity Capabilities"
-msgstr ""
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-msgid "User Tune"
-msgstr ""
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-msgid "Reachability Address"
-msgstr ""
-
-msgid "User Profile"
-msgstr "Хэрэглэгчийн товч мэдээлэл"
-
-msgid "Jingle"
-msgstr ""
-
-msgid "Jingle Audio"
-msgstr ""
-
-msgid "User Nickname"
-msgstr "Хэрэглэгчийн хоч нэр"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr ""
-
-msgid "Jingle DTMF"
-msgstr ""
-
-msgid "Message Receipts"
-msgstr ""
-
-msgid "Public Key Publishing"
-msgstr ""
-
-msgid "User Chatting"
-msgstr ""
-
-msgid "User Browsing"
-msgstr ""
-
-msgid "User Gaming"
-msgstr ""
-
-msgid "User Viewing"
-msgstr ""
-
-msgid "Ping"
-msgstr ""
-
-msgid "Stanza Encryption"
-msgstr ""
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr ""
-
 msgid "Priority"
 msgstr ""
 
@@ -3852,7 +3741,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Мессенжерээс гарах"
 
 msgid "Middle Name"
@@ -4031,16 +3920,13 @@ msgstr "Ямар ч архив байхгүй байна"
 msgid "Roles:"
 msgstr "Үүрэг"
 
-msgid "Ping timeout"
-msgstr ""
-
-msgid "Read Error"
-msgstr "Унших алдаа"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Холболтын хугацаа дууссан."
 
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4216,9 +4102,6 @@ msgstr "Таны нууц үг өөрчилөгдсөн"
 msgid "Error changing password"
 msgstr "Нууц үг өөрчлөхөд алдаа гарлаа"
 
-msgid "Password (again)"
-msgstr "Нууц үг (дахиад)"
-
 msgid "Change XMPP Password"
 msgstr "XMPP ийн нууц үгийг өөрчлөх"
 
@@ -4596,6 +4479,14 @@ msgstr ""
 msgid "Unknown Error in presence"
 msgstr ""
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Чат %s д холбогдоход алдаа гарлаа"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Чат %s алдаа "
+
 msgid "Create New Room"
 msgstr "Шинэ Өрөө Үүсгэх"
 
@@ -4612,16 +4503,20 @@ msgstr "Өрөөний Тохиргоог Хийх"
 msgid "_Accept Defaults"
 msgstr "Стандарт байдлаар нь хэрэглэх"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Чат %s д холбогдоход алдаа гарлаа"
+#, fuzzy
+msgid "No reason"
+msgstr "Үл мэдэгдэх шалтгаан"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Чат %s алдаа "
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "%s таныг нэмсэн"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr " (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Файл нээхэд алдаа гарлаа"
 
 #, fuzzy
@@ -5111,9 +5006,6 @@ msgstr "Чатыг эхлүүлэх"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-msgid "Failed to connect to server."
-msgstr ""
-
 msgid "Error retrieving profile"
 msgstr "Профилыг харуулах алдаа"
 
@@ -5355,9 +5247,6 @@ msgstr "Холболтын алдаа гарсан учраас мессеж и�
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Холболтын алдаа гарсан учраас мессеж илгээгдсэнгүй"
 
-msgid "Unable to connect"
-msgstr ""
-
 msgid "Writing error"
 msgstr "Бичих Алдаа"
 
@@ -5372,19 +5261,21 @@ msgstr ""
 "%s сервертэй холбогдох алдаа:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Энэ протоколыг сервер дэмжихгүй байна."
 
-msgid "Error parsing HTTP."
-msgstr ""
+#, fuzzy
+msgid "Error parsing HTTP"
+msgstr "%s ажилуулахад алдаа гарлаа"
 
-msgid "You have signed on from another location."
+msgid "You have signed on from another location"
 msgstr ""
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr ""
 
 #, c-format
@@ -5395,9 +5286,6 @@ msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "Unknown error."
-msgstr "Үл мэдэгдэх алдаа."
-
 msgid "Handshaking"
 msgstr ""
 
@@ -5496,6 +5384,9 @@ msgstr ""
 msgid "%s is not a valid group."
 msgstr ""
 
+msgid "Unknown error."
+msgstr "Үл мэдэгдэх алдаа."
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s (%s) ийн тухай %s "
@@ -5605,12 +5496,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Холбогдсон"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Протоколын алдаа, код %d: %s"
@@ -5631,16 +5516,6 @@ msgstr ""
 msgid "Invalid input condition"
 msgstr ""
 
-msgid "Read buffer full (2)"
-msgstr ""
-
-msgid "Unparseable message"
-msgstr ""
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr ""
-
 msgid "Failed to add buddy"
 msgstr ""
 
@@ -5722,6 +5597,12 @@ msgstr "Нийт найзууд"
 msgid "Client Version"
 msgstr "Клиентын хувилбар"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr ""
 
@@ -5976,9 +5857,9 @@ msgstr ""
 msgid "Unknown error: 0x%X"
 msgstr ""
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Нэвтэрэхэд алдаа гарлаа (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Нэвтрэх боломжгүй байна"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6080,9 +5961,6 @@ msgstr ""
 msgid "Authenticating..."
 msgstr ""
 
-msgid "Unable to connect to server."
-msgstr "Сервертэй холбогдох боломжгүй."
-
 msgid "Waiting for response..."
 msgstr "Хариулт хүлээж байна..."
 
@@ -6103,21 +5981,16 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr ""
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-
-msgid "Error. SSL support is not installed."
-msgstr "Алдаа. SSL дэмжлэгийг суулгаагүй байна."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
+msgstr "Хаахыг хүсэж байгаа харилцагчийн нэрийг оруул."
 
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Энэ зөвлөгөөнийг хаасан. Ямар ч мессеж илгээгдээгүй."
@@ -6154,10 +6027,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "%s ажилуулахад алдаа гарлаа"
 
-msgid "Incorrect password."
-msgstr "Нууц үг буруу."
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6166,20 +6036,12 @@ msgstr "Чат өрөөнд холбогдох боломжгүй"
 msgid "Invalid chat room name"
 msgstr "Буруу чат өрөөний нэр"
 
-msgid "Server closed the connection."
-msgstr "Сервер холболтыг тасалсан. "
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr ""
 "Сервертэй холболт тасарсан:\n"
 "%s"
 
-msgid "Received invalid data on connection with server."
-msgstr ""
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6225,7 +6087,8 @@ msgstr "Алсын харилцагчтай холболт тасарсан:<br>
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Алсын хэрэглэгчтэй холболтыг үүсгэх боломжгүй."
 
 msgid "Direct IM established"
@@ -6422,21 +6285,15 @@ msgstr "Анхааруулах Түвшин"
 msgid "Buddy Comment"
 msgstr "Харилцагчийн Тайлбар"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Баталгаажсан сервер лүү холбогдож чадсангүй:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"BOS сервер лүү холбогдож чадсангүй с:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Сервертэй холбогдох боломжгүй."
 
 msgid "Username sent"
 msgstr "Хэрэглэгчийн нэрийг илгээсэн"
@@ -6448,11 +6305,11 @@ msgstr "Холболтыг хийж, күүкиг илгээсэн"
 msgid "Finalizing connection"
 msgstr "Холболтыг дуусгаж байна"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Холбогдох боломжгүй: Хэрэглэгчийн нэр буруу учраас холбогдож чадсангүй. "
 "Хэрэглэгчийн нэр нь мэйлийн хаяг байх ёстой."
@@ -6466,26 +6323,22 @@ 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 "Хэрэглэгчийн нэр буруу."
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Харилцагч үүсээгүй байна"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Таны бүртгэлийг одоогоор түр зогссон байна."
 
 #. service temporarily unavailable
@@ -6502,7 +6355,8 @@ msgid ""
 "try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Оруулсан SecurID түлхүүр буруу байна."
 
 msgid "Enter SecurID"
@@ -6665,6 +6519,9 @@ msgstr "Онлайн болсоноос хойш"
 msgid "Member Since"
 msgstr "Гишүүн болсоноос хойш"
 
+msgid "Capabilities"
+msgstr ""
+
 msgid "Profile"
 msgstr "Товч мэдээлэл"
 
@@ -6821,12 +6678,14 @@ msgstr[1] ""
 msgid "Away message too long."
 msgstr ""
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
+"Холбогдох боломжгүй: Хэрэглэгчийн нэр буруу учраас холбогдож чадсангүй. "
+"Хэрэглэгчийн нэр нь мэйлийн хаяг байх ёстой."
 
 #, fuzzy
 msgid "Unable to Add"
@@ -6848,15 +6707,15 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
 msgid "(no name)"
 msgstr "(нэргүй)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Тодорхойгүй шалтгаанаас болоод %s харилцагчийг нэмж чадсангүй."
 
 #, c-format
@@ -7669,7 +7528,7 @@ msgid "Update interval (seconds)"
 msgstr "Миний мэдээллийг шинчлэх"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Серверийн мэдээллийг авам боложгүй"
 
 #, c-format
@@ -7695,10 +7554,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Серверийн мэдээллийг авам боложгүй"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "Буруу хүсэлт"
 
@@ -7733,21 +7588,9 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "Холбогдох боломжгүй байна."
-
 msgid "Socket error"
 msgstr "Сокетын алдаа"
 
-msgid "Unable to read from socket"
-msgstr "Сокетоос унших боломжгүй"
-
-msgid "Write Error"
-msgstr "Бичих алдаа"
-
-msgid "Connection lost"
-msgstr "Холболтыг тасалсан"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "Харилцагчийн мэдээллийг тохируулах..."
@@ -7756,8 +7599,9 @@ msgstr "Харилцагчийн мэдээллийг тохируулах..."
 msgid "Requesting token"
 msgstr "Хүсэлтийг татгалзсан"
 
-msgid "Couldn't resolve host"
-msgstr ""
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Сервертэй холбогдох боломжгүй."
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -7808,7 +7652,7 @@ msgid "QQ Qun Command"
 msgstr "Команд"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Серверийн мэдээллийг авам боложгүй"
 
 #, fuzzy
@@ -7830,9 +7674,6 @@ msgstr "Файл илгээх"
 msgid "%d canceled the transfer of %s"
 msgstr ""
 
-msgid "Connection closed (writing)"
-msgstr "Холболтыг хаасан"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Бүлгийн Гарчиг:</b> %s<br>"
@@ -7886,17 +7727,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-msgid "Connection reset"
-msgstr "Холболтыг дахин тохируулах"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr ""
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Хост руу холбогдох боломжгүй"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -7919,6 +7749,9 @@ msgstr "Чанга яригч"
 msgid "Video Camera"
 msgstr "Видео Камер"
 
+msgid "File Transfer"
+msgstr "Файл шилжүүлэлт"
+
 msgid "Supports"
 msgstr "Дэмжлэг"
 
@@ -8687,6 +8520,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Сүлжээний статистик"
 
+msgid "Ping"
+msgstr ""
+
 msgid "Ping failed"
 msgstr "Ping команд би"
 
@@ -8744,7 +8580,8 @@ msgstr "Дэмжигдэхгүй нийтийн түлхүүрийн төрөл"
 msgid "Disconnected by server"
 msgstr "Сервер холболтыг тасалсан"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "SILC сервертэй холбогдох үед алдаа гарлаа"
 
 msgid "Key Exchange failed"
@@ -8754,26 +8591,26 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-msgid "Connection failed"
-msgstr "Холболт амжилтгүй боллоо"
-
 msgid "Performing key exchange"
 msgstr "Түлхүүр солилцоог гүйцэтгэж байна"
 
-msgid "Unable to create connection"
-msgstr "Холболт үүсгэх боломжгүй"
-
-msgid "Could not load SILC key pair"
-msgstr ""
+#, fuzzy
+msgid "Unable to load SILC key pair"
+msgstr "Нэмэлт програмыг ачаалах боломжгүй"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "SILC сервертэй холбогдож байна"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Нэмэлт програмыг ачаалах боломжгүй"
+
 msgid "Out of memory"
 msgstr "Санах ой дүүрсэн"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "SILC протоколыг эхлүүлж чадсангүйl"
 
 msgid "Error loading SILC key pair"
@@ -9051,8 +8888,9 @@ msgstr ""
 msgid "Creating SILC key pair..."
 msgstr ""
 
-msgid "Cannot create SILC key pair\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to create SILC key pair"
+msgstr "Сокет үүсгэх боломжгүй"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9140,6 +8978,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr ""
 
+msgid "Error during connecting to SILC Server"
+msgstr "SILC сервертэй холбогдох үед алдаа гарлаа"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -9180,30 +9021,27 @@ msgstr ""
 msgid "Failure: Authentication failed"
 msgstr ""
 
-msgid "Cannot initialize SILC Client connection"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
+msgstr "Холболтыг эхлүүлэх боломжгүй байна"
 
 msgid "John Noname"
 msgstr ""
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr ""
-
-msgid "Could not write"
-msgstr "Бичиж чадсангүй"
-
-msgid "Could not connect"
-msgstr "Холбогдож чадсангүй"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
+msgstr "Нэмэлт програмыг ачаалах боломжгүй"
 
-msgid "Unknown server response."
-msgstr ""
+msgid "Unable to create connection"
+msgstr "Холболт үүсгэх боломжгүй"
 
-msgid "Could not create listen socket"
-msgstr ""
+#, fuzzy
+msgid "Unknown server response"
+msgstr "Үл мэдэгдэх шалтгаан"
 
-msgid "Could not resolve hostname"
-msgstr ""
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Сокет үүсгэх боломжгүй"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
@@ -9245,6 +9083,78 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;room&gt;:  Yahoo сүлжээний чат өрөөнд холбогдох"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Yahoo сүлжээний чат өрөөнүүдийг жагсаах"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo Портокол Нэмэлт програм"
+
+msgid "Pager server"
+msgstr "Пежер сервер"
+
+msgid "Pager port"
+msgstr "Пежер порт"
+
+msgid "File transfer server"
+msgstr "Файл шилжүүлэх сервер"
+
+msgid "File transfer port"
+msgstr "Файл шилжүүлэх порт"
+
+msgid "Chat room locale"
+msgstr ""
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Зөвлөгөөн, чат өрөөний урилгыг татгалзах"
+
+msgid "Chat room list URL"
+msgstr ""
+
+msgid "Yahoo Chat server"
+msgstr "Yahoo Чат сервер"
+
+msgid "Yahoo Chat port"
+msgstr "Yahoo Чат порт"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo Портокол Нэмэлт програм"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9273,26 +9183,16 @@ msgstr ""
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 
 #. username or password missing
@@ -9326,37 +9226,31 @@ msgstr ""
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
+msgstr "Зөвшөөрөх жагсаалтанд  (%s) %sийг нэмэх боломжгүй."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Серверийн жагсаалтанд харилцагч нэмж чадсангүй"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr ""
 
-msgid "Connection problem"
-msgstr "Холболтын асуудал"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "%s тэй холболт тасарсан:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"%sтэй холболт үүсгэж чадсангүй:\n"
+"Сервертэй холбогдож чадсангүй:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9419,74 +9313,15 @@ msgstr "Чатад хэрэглэгчийг холбох"
 msgid "Open Inbox"
 msgstr ""
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;room&gt;:  Yahoo сүлжээний чат өрөөнд холбогдох"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Yahoo сүлжээний чат өрөөнүүдийг жагсаах"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo Портокол Нэмэлт програм"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Япон"
-
-msgid "Pager server"
-msgstr "Пежер сервер"
-
-msgid "Japan Pager server"
-msgstr "Японы Пежер сервер"
-
-msgid "Pager port"
-msgstr "Пежер порт"
-
-msgid "File transfer server"
-msgstr "Файл шилжүүлэх сервер"
-
-msgid "Japan file transfer server"
-msgstr "Японы файл шилжүүлэх сервер"
-
-msgid "File transfer port"
-msgstr "Файл шилжүүлэх порт"
-
-msgid "Chat room locale"
-msgstr ""
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Зөвлөгөөн, чат өрөөний урилгыг татгалзах"
-
-msgid "Chat room list URL"
-msgstr ""
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo Чат сервер"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo Чат порт"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "Холбогдох боломжгүй байна."
+
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -9494,6 +9329,9 @@ msgstr ""
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr ""
 
+msgid "Write Error"
+msgstr "Бичих алдаа"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Япон Профиль"
 
@@ -9600,20 +9438,20 @@ msgstr ""
 msgid "Webcams"
 msgstr "Вэб камер"
 
+msgid "Connection problem"
+msgstr "Холболтын асуудал"
+
 msgid "Unable to fetch room list."
 msgstr "Өрөөний жагсаалтыг тусгаарлах боломжгүй."
 
 msgid "User Rooms"
 msgstr "Хэрэглэгчийн Өрөө"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr ""
-
-#, c-format
-msgid ""
-"Lost connection with server\n"
+"Сервертэй холболт тасарсан:\n"
 "%s"
-msgstr ""
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9738,33 +9576,22 @@ msgstr ""
 msgid "Exposure"
 msgstr ""
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Сокет үүсгэх боломжгүй:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "%s рүү мессеж илгээх боломжгүй."
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr ""
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
 #, c-format
 msgid "Error resolving %s"
 msgstr ""
 
-msgid "Could not resolve host name"
-msgstr ""
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -9964,12 +9791,6 @@ msgstr "%s рүү бичихэд алдаа гарлаа: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "%s рүү холбогдоход алдаа гарлаа: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "Кодчилол шаардлагатай, гэхдээ ямар ч TLS/SSL дэмжлэг олдсонгүй."
-
 #, c-format
 msgid " - %s"
 msgstr " - %s"
@@ -10212,9 +10033,14 @@ msgstr "Харилцагчийн Сануулга нэмэх..."
 msgid "View _Log"
 msgstr "Архив үзэх"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Оффлайн байхад нуух"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Оффлайн байхад харуулах"
+
 msgid "_Alias..."
 msgstr "Өөр нэр..."
 
@@ -10711,6 +10537,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "%s ийн мэдээллийг өөрчлөх"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Энэ сертификатыг авах хостын нэрийг бич."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL Сервер"
@@ -10756,8 +10586,9 @@ msgstr "Татгалзах"
 msgid "Get Away Message"
 msgstr ""
 
-msgid "Last said"
-msgstr ""
+#, fuzzy
+msgid "Last Said"
+msgstr "Овог"
 
 msgid "Unable to save icon file to disk."
 msgstr "Дискэнд зургийн файл хадгалах боломжгүй."
@@ -11631,7 +11462,7 @@ msgstr ""
 msgid "Hyperlink visited color"
 msgstr "Доогуур холбоосын өнгө"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 
 msgid "Hyperlink prelight color"
@@ -11667,13 +11498,19 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 msgid "Typing notification color"
 msgstr ""
 
-msgid "The color to use for the typing notification font"
+msgid "The color to use for the typing notification"
 msgstr ""
 
 msgid "Typing notification font"
@@ -12039,6 +11876,10 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
+#, fuzzy
+msgid "No message"
+msgstr "Мессеж"
+
 msgid "Open All Messages"
 msgstr "Бүх мессежийг нээх"
 
@@ -12056,10 +11897,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Танд мэйл ирсэн байна!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Мессеж"
-
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -12269,8 +12106,9 @@ msgstr "Системийн сануулах дүрсийг харуулах"
 msgid "On unread messages"
 msgstr "Уншаагүй мессеж"
 
-msgid "Conversation Window Hiding"
-msgstr "Харилцааны Цонхыг Нуух"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Мессеж харилцааны цонх"
 
 msgid "_Hide new IM conversations:"
 msgstr "Шинэ харилцааг нуух"
@@ -12278,6 +12116,9 @@ msgstr "Шинэ харилцааг нуух"
 msgid "When away"
 msgstr "Гарахад"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Харилцааны шинэ цонхыг багасгах"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Табууд"
@@ -12336,9 +12177,6 @@ msgstr "Гүйлгэх сумыг ашиглах"
 msgid "F_lash window when IMs are received"
 msgstr "Мессеж ирэхэд цонхыг шууд харуулах"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Харилцааны шинэ цонхыг багасгах"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12373,7 +12211,8 @@ msgstr "Браузер тохируулах програмыг тохируул�
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Жишээ нь: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "IP хаягийг автоматаар таних"
 
 msgid "Public _IP:"
@@ -12742,30 +12581,15 @@ msgstr "Хадгалах & Ашиглах"
 msgid "Status for %s"
 msgstr "%s ийн төлөв"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr ""
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
-msgid "Duplicate Shortcut"
+msgid "Custom Smiley"
 msgstr ""
 
-msgid "Please select an image for the smiley."
+msgid "Duplicate Shortcut"
 msgstr ""
 
 msgid "Edit Smiley"
@@ -12876,8 +12700,8 @@ msgid "Cannot send launcher"
 msgstr ""
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -13453,7 +13277,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -13699,7 +13523,7 @@ msgstr ""
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14014,7 +13838,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr ""
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14054,6 +13878,119 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Сокетыг нээж чадсангүй"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Сокет унших боломжгүй"
+
+#~ msgid "Connection failed."
+#~ msgstr "Холболт амжилтгүй боллоо."
+
+#~ msgid "Read error"
+#~ msgstr "Унших алдаа"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Сервертэй холбогдож чадсангүй:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Бичих алдаа"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ad-Hoc ийн командууд"
+
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub үйлчилгээ"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "User Location"
+#~ msgstr "Харилцагчийн байрлал"
+
+#~ msgid "Software Version"
+#~ msgstr "Програм хангамжийн хувилбар"
+
+#~ msgid "User Profile"
+#~ msgstr "Хэрэглэгчийн товч мэдээлэл"
+
+#~ msgid "User Nickname"
+#~ msgstr "Хэрэглэгчийн хоч нэр"
+
+#~ msgid "Read Error"
+#~ msgstr "Унших алдаа"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Нэвтэрэхэд алдаа гарлаа (%s)."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Алдаа. SSL дэмжлэгийг суулгаагүй байна."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Нууц үг буруу."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "BOS сервер лүү холбогдож чадсангүй с:\n"
+#~ "%s"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Холбогдож Чадсангүй"
+
+#~ msgid "Invalid username."
+#~ msgstr "Хэрэглэгчийн нэр буруу."
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Серверийн мэдээллийг авам боложгүй"
+
+#~ msgid "Connection lost"
+#~ msgstr "Холболтыг тасалсан"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Холболтыг хаасан"
+
+#~ msgid "Connection reset"
+#~ msgstr "Холболтыг дахин тохируулах"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Хост руу холбогдох боломжгүй"
+
+#~ msgid "Could not write"
+#~ msgstr "Бичиж чадсангүй"
+
+#~ msgid "Could not connect"
+#~ msgstr "Холбогдож чадсангүй"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Буруу нууц үг"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%sтэй холболт үүсгэж чадсангүй:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Япон"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Японы Пежер сервер"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Японы файл шилжүүлэх сервер"
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Харилцааны Цонхыг Нуух"
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Аль ID ийг идэвхжүүлэх вэ?"
 
@@ -14298,9 +14235,6 @@ msgstr ""
 #~ msgid "Enter your reason:"
 #~ msgstr "Шалтгаанаа оруул:"
 
-#~ msgid "Unable to login"
-#~ msgstr "Нэвтрэх боломжгүй байна"
-
 #~ msgid "TCP Address"
 #~ msgstr "TCP Хаяг"
 
diff --git a/po/my_MM.po b/po/my_MM.po
index 0fdc9886ee..557cd842f0 100644
--- a/po/my_MM.po
+++ b/po/my_MM.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 1.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2004-01-14 12:26+0000\n"
 "Last-Translator: Minn Myat Soe <mmyatsoe@gmail.com>\n"
 "Language-Team: \n"
@@ -2679,7 +2679,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2731,7 +2731,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2979,12 +2979,12 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
 #, fuzzy
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr "Unable to create new connection."
 
 msgid ""
@@ -3044,17 +3044,17 @@ msgstr "%s has been invited to this conversation."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Message ပို့လို့ မရပာ။ အလ္ဝန္‌ရ္ဟည္‌လ္ဟသည္။"
 
-#, fuzzy
-msgid "Cannot open socket"
-msgstr "socket ဖ္ဝင့္လို့ မရပာ"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Unable to create socket"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Couldn't create socket"
 
-#, fuzzy
-msgid "Could not listen on socket"
-msgstr "Couldn't create socket"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Unable to create socket"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3113,15 +3113,15 @@ msgstr "Send Buddy List"
 msgid "Load buddylist from file..."
 msgstr "Import Buddy List from Server"
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
 #, fuzzy
-msgid "Passwords do not match."
+msgid "Passwords do not match"
 msgstr "Password မ္ယား မတူက္ရပာ။"
 
 #, fuzzy
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Unable to create new connection."
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3134,17 +3134,15 @@ msgstr "Registration Successful"
 msgid "Password"
 msgstr "Password"
 
-#, fuzzy
-msgid "Password (retype)"
-msgstr "Password sent"
+msgid "Password (again)"
+msgstr "Password (again)"
 
-#, fuzzy
-msgid "Enter current token"
-msgstr "%s not currently logged in."
+msgid "Enter captcha text"
+msgstr ""
 
 #, fuzzy
-msgid "Current token"
-msgstr "Currently on"
+msgid "Captcha"
+msgstr "Save Image"
 
 #, fuzzy
 msgid "Register New Gadu-Gadu Account"
@@ -3206,6 +3204,18 @@ msgid "Current password"
 msgstr "Incorrect password."
 
 #, fuzzy
+msgid "Password (retype)"
+msgstr "Password sent"
+
+#, fuzzy
+msgid "Enter current token"
+msgstr "%s not currently logged in."
+
+#, fuzzy
+msgid "Current token"
+msgstr "Currently on"
+
+#, fuzzy
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "လက္‌ရ္ဟိ password န္ဟင့္ password အသစ္‌ကို ရိုက္‌ထည့္ပာ"
 
@@ -3259,7 +3269,8 @@ msgstr "Non-matching Hosts"
 msgid "There are no users matching your search criteria."
 msgstr "Please enter your new password"
 
-msgid "Unable to read socket"
+#, fuzzy
+msgid "Unable to read from socket"
 msgstr "Unable to read socket"
 
 #, fuzzy
@@ -3278,8 +3289,14 @@ msgstr "Buddy Display"
 msgid "Your buddy list was stored on the server."
 msgstr "There is no Buddy List stored on the Gadu-Gadu server."
 
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
 #, fuzzy
-msgid "Connection failed."
+msgid "Connected"
+msgstr "Connect"
+
+msgid "Connection failed"
 msgstr "Connection failed"
 
 #, fuzzy
@@ -3290,11 +3307,15 @@ msgstr "Chat ထပ္‌ထည့္မယ္‌"
 msgid "Chat _name:"
 msgstr "Last name:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Unable to ping server"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Connecting"
+
 #, fuzzy
 msgid "Chat error"
 msgstr "Read error"
@@ -3304,7 +3325,7 @@ msgid "This chat name is already in use"
 msgstr "That file already exists"
 
 #, fuzzy
-msgid "Not connected to the server."
+msgid "Not connected to the server"
 msgstr "You were disconnected from the server."
 
 #, fuzzy
@@ -3373,7 +3394,7 @@ msgid "File Transfer Failed"
 msgstr "File transfer already started"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Pidgin could not open a listening port."
 
 msgid "Error displaying MOTD"
@@ -3389,8 +3410,16 @@ msgstr "There is no MOTD associated with this connection."
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-msgid "Server has disconnected"
-msgstr "Server has disconnected"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "You were disconnected from the server."
 
 msgid "View MOTD"
 msgstr "View MOTD"
@@ -3405,22 +3434,20 @@ msgstr "_Password:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC nicks may not contain whitespace"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Connecting"
-
 msgid "SSL support unavailable"
 msgstr "SSL support unavailable"
 
-msgid "Couldn't create socket"
-msgstr "Couldn't create socket"
+msgid "Unable to connect"
+msgstr "Unable to connect"
 
-msgid "Couldn't connect to host"
-msgstr "Couldn't connect to host"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Unable to connect to server"
 
-msgid "Read error"
-msgstr "Read error"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Error creating connection"
 
 msgid "Users"
 msgstr "Users"
@@ -3863,11 +3890,11 @@ msgid "execute"
 msgstr "Not expected"
 
 #, fuzzy
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Server requires SSL for login"
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Server requires SSL for login"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3884,7 +3911,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Plaintext Authentication"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Authentication failed"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Invalid response from server."
 
 msgid "Server does not use any supported authentication method"
@@ -3896,8 +3928,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "Invalid challenge from server"
 
-#, fuzzy
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Read error"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3915,22 +3947,14 @@ msgstr "Unsupported Version"
 msgid "Unable to establish a connection with the server"
 msgstr "Unable to make SSL connection to server."
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Unable to make SSL connection to server."
 
 #, fuzzy
 msgid "Unable to establish SSL connection"
 msgstr "Unable to create new connection."
 
-msgid "Unable to create socket"
-msgstr "Unable to create socket"
-
-msgid "Write error"
-msgstr "Write error"
-
 msgid "Full Name"
 msgstr "Full Name"
 
@@ -4004,188 +4028,6 @@ msgstr "Hide Operating System"
 msgid "Local Time"
 msgstr "Local Users"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "Set Dir Info"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "Extended Address"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "Alias Chat"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "User has no directory information."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "Command"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "Registration Error"
-
-#, fuzzy
-msgid "User Location"
-msgstr "Location"
-
-msgid "User Avatar"
-msgstr ""
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "ေဘာ္‌ဒာရဲ့ အခ္ရေအနေကို အသိပေးခ္ရင္း"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "Unsupported Version"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "Organisation"
-
-#, fuzzy
-msgid "File Transfer"
-msgstr "ဖိုင္ အရ္ဝေ့အပ္ရောင္းမ္ယား"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "User Modes"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "User Limit"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "Capabilities"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "Username"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "IM with Key Exchange"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "Email Address"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "Set Profile"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "Ping"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "Nickname"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "Live Video"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "Message received"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "Public Key Babbleprint"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "User Options"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "User Modes"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "User Limit"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "User Limit"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Trillian Encryption"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Capabilities"
-
 #, fuzzy
 msgid "Priority"
 msgstr "Port"
@@ -4198,7 +4040,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Logged out"
 
 msgid "Middle Name"
@@ -4388,16 +4230,12 @@ msgid "Roles:"
 msgstr "Role"
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "Plain text"
 
-msgid "Read Error"
-msgstr "Read Error"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 #, fuzzy
@@ -4588,9 +4426,6 @@ msgstr "Your password has been changed."
 msgid "Error changing password"
 msgstr "Error changing password"
 
-msgid "Password (again)"
-msgstr "Password (again)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "Change Password"
@@ -4982,6 +4817,14 @@ msgstr "XML Parse error"
 msgid "Unknown Error in presence"
 msgstr "Unknown Error in presence"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Error joining chat %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Error in chat %s"
+
 msgid "Create New Room"
 msgstr "Create New Room"
 
@@ -5000,16 +4843,20 @@ msgstr "Configure Room"
 msgid "_Accept Defaults"
 msgstr "Accept Defaults"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Error joining chat %s"
+#, fuzzy
+msgid "No reason"
+msgstr "No reason given."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Error in chat %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "You have been kicked by %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Kicked by %s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "An error occurred while opening the file."
 
 #, fuzzy
@@ -5527,10 +5374,6 @@ msgstr ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://Pidgin.sf.net/faq-ssl.php for more information."
 
-#, fuzzy
-msgid "Failed to connect to server."
-msgstr "Unable to connect to server."
-
 msgid "Error retrieving profile"
 msgstr "Error retreiving profile"
 
@@ -5811,9 +5654,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 
-msgid "Unable to connect"
-msgstr "Unable to connect"
-
 #, fuzzy
 msgid "Writing error"
 msgstr "Write error"
@@ -5829,21 +5669,23 @@ msgid ""
 msgstr "Unknown error from %s server"
 
 #, fuzzy
-msgid "Our protocol is not supported by the server."
+msgid "Our protocol is not supported by the server"
 msgstr "အခု protocol ဖ္ရင့္ chat room မ္ယားမခ္ယိတ္‌နုိင္‌ပာ။"
 
 #, fuzzy
-msgid "Error parsing HTTP."
+msgid "Error parsing HTTP"
 msgstr "Error displaying MOTD"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "You have signed on from another location."
 
 #, fuzzy
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "The service is temporarily unavailable."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "The MSN servers are going down temporarily."
 
 #, fuzzy, c-format
@@ -5854,10 +5696,6 @@ msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
-#, fuzzy
-msgid "Unknown error."
-msgstr "Unknown error"
-
 msgid "Handshaking"
 msgstr ""
 
@@ -5959,6 +5797,10 @@ msgstr "AIM/ICQ Protocol Plugin"
 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"
@@ -6077,13 +5919,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Invalid response from server."
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-#, fuzzy
-msgid "Connected"
-msgstr "Connect"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr ""
@@ -6107,18 +5942,6 @@ msgid "Invalid input condition"
 msgstr "Finalizing connection"
 
 #, fuzzy
-msgid "Read buffer full (2)"
-msgstr "Queue full"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "Unable to parse message"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Couldn't connect to host"
-
-#, fuzzy
 msgid "Failed to add buddy"
 msgstr "Failed to join buddy in chat"
 
@@ -6213,6 +6036,12 @@ msgstr ""
 msgid "Client Version"
 msgstr "Close conversation"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 #, fuzzy
 msgid "MySpaceIM - Username Available"
 msgstr "Service Unavailable"
@@ -6483,9 +6312,9 @@ msgstr "The user is either offline or you are blocked"
 msgid "Unknown error: 0x%X"
 msgstr "Unknown error: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Login failed (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Unable to ban user %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6587,9 +6416,6 @@ msgstr "GroupWise Conference %d"
 msgid "Authenticating..."
 msgstr "Authenticating..."
 
-msgid "Unable to connect to server."
-msgstr "Unable to connect to server."
-
 msgid "Waiting for response..."
 msgstr "Waiting for response..."
 
@@ -6613,9 +6439,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Would you like to join the conversation?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "You have been logged out because you logged in at another workstation."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6623,16 +6446,14 @@ msgstr ""
 "%s appears to be offline and did not receive the message that you have just "
 "sent."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 
-msgid "Error. SSL support is not installed."
-msgstr "Error: SSL support is not installed."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "This conference has been closed. No more messages can be sent."
 
@@ -6671,10 +6492,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, fuzzy
@@ -6686,17 +6504,7 @@ msgid "Invalid chat room name"
 msgstr "Invalid Room Name"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "Error creating connection"
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "You were disconnected from the server."
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "Unable to make SSL connection to server."
 
 #. *< type
@@ -6749,8 +6557,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Unable to make SSL connection to server."
 
 #, fuzzy
 msgid "Direct IM established"
@@ -6946,16 +6755,12 @@ msgid "Buddy Comment"
 msgstr "Buddy Comment"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "Could not connect for transfer."
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr "Unable to connect to server."
+msgid "Unable to connect to BOS server: %s"
+msgstr "Unable to connect to server"
 
 #, fuzzy
 msgid "Username sent"
@@ -6970,9 +6775,9 @@ msgstr "Finalizing connection"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Unable to login: Could not sign on as %s because the screen name is "
 "invalid.  Screen names must either start with a letter and contain only "
@@ -6988,30 +6793,23 @@ msgstr ""
 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
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "Invalid Username"
+msgid "Username does not exist"
+msgstr "User does not exist"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Your account is currently suspended."
 
 #. service temporarily unavailable
@@ -7031,8 +6829,9 @@ 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."
 
-msgid "The SecurID key entered is invalid."
-msgstr ""
+#, fuzzy
+msgid "The SecurID key entered is invalid"
+msgstr "The new formatting is invalid."
 
 msgid "Enter SecurID"
 msgstr ""
@@ -7203,6 +7002,9 @@ msgstr "Online Since"
 msgid "Member Since"
 msgstr "Member Since"
 
+msgid "Capabilities"
+msgstr "Capabilities"
+
 msgid "Profile"
 msgstr "Profile"
 
@@ -7387,7 +7189,7 @@ msgstr "Away message too long."
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7415,9 +7217,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Orphans"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7427,7 +7229,7 @@ msgid "(no name)"
 msgstr "(no name)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Your command failed for an unknown reason."
 
 #, fuzzy, c-format
@@ -8303,7 +8105,7 @@ msgid "Update interval (seconds)"
 msgstr "Read error"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Cannot get server information"
 
 #, c-format
@@ -8330,10 +8132,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Cannot get server information"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "Request ambiguous"
 
@@ -8369,26 +8167,11 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "Unable to connect."
-
 #, fuzzy
 msgid "Socket error"
 msgstr "Unknown Error"
 
 #, fuzzy
-msgid "Unable to read from socket"
-msgstr "Unable to read socket"
-
-#, fuzzy
-msgid "Write Error"
-msgstr "Write error"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "Connection Closed"
-
-#, fuzzy
 msgid "Getting server"
 msgstr "Set User Info..."
 
@@ -8397,8 +8180,8 @@ msgid "Requesting token"
 msgstr "Request denied"
 
 #, fuzzy
-msgid "Couldn't resolve host"
-msgstr "Couldn't connect to host"
+msgid "Unable to resolve hostname"
+msgstr "Unable to ping server"
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8449,7 +8232,7 @@ msgid "QQ Qun Command"
 msgstr "Command"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Cannot get server information"
 
 #, fuzzy
@@ -8472,10 +8255,6 @@ msgstr "File Send Failed"
 msgid "%d canceled the transfer of %s"
 msgstr "%s cancelled the transfer of %s"
 
-#, fuzzy
-msgid "Connection closed (writing)"
-msgstr "Connection Closed"
-
 #, fuzzy, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>User:</b> %s<br>"
@@ -8537,19 +8316,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#, fuzzy
-msgid "Connection reset"
-msgstr "Connection Closed"
-
-#, fuzzy, c-format
-msgid "Error reading from socket: %s"
-msgstr "Error while reading from socket."
-
-#. this is a regular connect, error out
-#, fuzzy
-msgid "Unable to connect to host"
-msgstr "Unable to connect to server"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -8577,6 +8343,10 @@ msgid "Video Camera"
 msgstr "Video Chat"
 
 #, fuzzy
+msgid "File Transfer"
+msgstr "ဖိုင္ အရ္ဝေ့အပ္ရောင္းမ္ယား"
+
+#, fuzzy
 msgid "Supports"
 msgstr "support"
 
@@ -9412,6 +9182,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Network Statistics"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping failed"
 
@@ -9477,7 +9250,8 @@ msgstr "Unsupported public key type"
 msgid "Disconnected by server"
 msgstr "Disconnected by server"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Error during connecting to SILC Server"
 
 msgid "Key Exchange failed"
@@ -9488,29 +9262,26 @@ msgid ""
 msgstr ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 
-msgid "Connection failed"
-msgstr "Connection failed"
-
 msgid "Performing key exchange"
 msgstr "Performing key exchange"
 
 #, fuzzy
-msgid "Unable to create connection"
-msgstr "Unable to create new connection."
-
-#, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "Could not load public key"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Connecting to SILC Server"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Could not load public key"
+
 msgid "Out of memory"
 msgstr "Out of memory"
 
 #, fuzzy
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "Cannot initialise SILC Client connection"
 
 #, fuzzy
@@ -9819,7 +9590,7 @@ msgid "Creating SILC key pair..."
 msgstr "Creating SILC key pair..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "Creating SILC key pair..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9913,6 +9684,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr "No server statistics available"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Error during connecting to SILC Server"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Failure: Version mismatch, upgrade your client"
@@ -9953,7 +9727,8 @@ msgstr "Failure: Invalid cookie"
 msgid "Failure: Authentication failed"
 msgstr "Failure: Authentication failed"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Cannot initialise SILC Client connection"
 
 #, fuzzy
@@ -9961,27 +9736,20 @@ msgid "John Noname"
 msgstr "Last name:"
 
 #, fuzzy, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "Could not load public key"
 
 #, fuzzy
-msgid "Could not write"
-msgstr "Could not send"
-
-msgid "Could not connect"
-msgstr "Could not connect"
+msgid "Unable to create connection"
+msgstr "Unable to create new connection."
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "Unknown error"
 
 #, fuzzy
-msgid "Could not create listen socket"
-msgstr "Couldn't create socket"
-
-#, fuzzy
-msgid "Could not resolve hostname"
-msgstr "Unable to resolve hostname."
+msgid "Unable to create listen socket"
+msgstr "Unable to create socket"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -10031,6 +9799,85 @@ msgstr "AP User"
 msgid "Auth Domain"
 msgstr "Automatic"
 
+#, fuzzy
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;room&gt; [server]:  Join a chat on this server."
+
+#, fuzzy
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  List channels on this network"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo Protocol Plugin"
+
+#, fuzzy
+msgid "Pager server"
+msgstr "Proxy Server"
+
+msgid "Pager port"
+msgstr "Pager port"
+
+#, fuzzy
+msgid "File transfer server"
+msgstr "File transfer host"
+
+msgid "File transfer port"
+msgstr "File transfer port"
+
+#, fuzzy
+msgid "Chat room locale"
+msgstr "Chat Room List Url"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
+
+#, fuzzy
+msgid "Chat room list URL"
+msgstr "Chat Room List Url"
+
+msgid "Yahoo Chat server"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo Chat port"
+msgstr "Yahoo Japan"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo Protocol Plugin"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -10061,28 +9908,18 @@ msgstr "Add buddy rejected"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  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
@@ -10121,11 +9958,12 @@ msgstr "Your account is locked, please log in to the Yahoo! website."
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "Could not add buddy %s to group %s to the server list on account %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Could not add buddy to server list"
 
 #, c-format
@@ -10133,23 +9971,16 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
 #, fuzzy
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "Invalid response from server."
 
-msgid "Connection problem"
-msgstr "Connection problem"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "Conversations with %s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Unable to make SSL connection to server."
 
 #, fuzzy
 msgid "Not at Home"
@@ -10220,83 +10051,15 @@ msgstr "Join user in chat..."
 msgid "Open Inbox"
 msgstr ""
 
-#, fuzzy
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;room&gt; [server]:  Join a chat on this server."
-
-#, fuzzy
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  List channels on this network"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo Protocol Plugin"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "Proxy Server"
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "Japan Pager host"
-
-msgid "Pager port"
-msgstr "Pager port"
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "File transfer host"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "Japan File transfer host"
-
-msgid "File transfer port"
-msgstr "File transfer port"
-
-#, fuzzy
-msgid "Chat room locale"
-msgstr "Chat Room List Url"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-#, fuzzy
-msgid "Chat room list URL"
-msgstr "Chat Room List Url"
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "Yahoo Japan"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "Unable to connect."
+
 msgid "Unable to establish file descriptor."
 msgstr "Unable to establish file descriptor."
 
@@ -10304,6 +10067,10 @@ msgstr "Unable to establish file descriptor."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "Offering to send %s to %s"
 
+#, fuzzy
+msgid "Write Error"
+msgstr "Write error"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan Profile"
 
@@ -10425,21 +10192,19 @@ msgstr "Voices"
 msgid "Webcams"
 msgstr "Webcams"
 
+msgid "Connection problem"
+msgstr "Connection problem"
+
 msgid "Unable to fetch room list."
 msgstr "Unable to fetch room list."
 
 msgid "User Rooms"
 msgstr "User Rooms"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Connection problem with the YCHT server."
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "You were disconnected from the server."
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10572,31 +10337,21 @@ msgid "Exposure"
 msgstr "Exposure"
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "Unable to create socket"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Unable to send message: %s"
 
 #, fuzzy, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Proxy connection error %d"
 
 #, fuzzy, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Access denied: proxy server forbids port %d tunnelling."
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr "Error joining chat %s"
 
-#, fuzzy
-msgid "Could not resolve host name"
-msgstr "Unable to resolve hostname."
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10808,12 +10563,6 @@ msgstr ""
 msgid "Unable to connect to %s: %s"
 msgstr "Unable to connect to %s server"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "Server requires SSL for login"
-
 #, c-format
 msgid " - %s"
 msgstr ""
@@ -11070,7 +10819,11 @@ msgid "View _Log"
 msgstr "(_L) log ကိုက္ရည့္မယ္‌"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "Not allowed when offline"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "Not allowed when offline"
 
 msgid "_Alias..."
@@ -11634,6 +11387,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "%s အတ္ဝက္‌ အခ္ယက္‌အလက္‌တ္ဝေကို ပ္ရောင္းမယ္‌"
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11685,7 +11441,7 @@ msgid "Get Away Message"
 msgstr "Away Message အသစ္‌"
 
 #, fuzzy
-msgid "Last said"
+msgid "Last Said"
 msgstr "Last name:"
 
 msgid "Unable to save icon file to disk."
@@ -12644,7 +12400,7 @@ msgid "Hyperlink visited color"
 msgstr "Hyperlink colour"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Colour to draw hyperlinks."
 
 #, fuzzy
@@ -12684,15 +12440,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "Notification Removal"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "Mail အသစ္‌ အခ္ယက္‌ေပးခ္ရင္း"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -13064,6 +12827,10 @@ msgstr ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 
 #, fuzzy
+msgid "No message"
+msgstr "(1 message)"
+
+#, fuzzy
 msgid "Open All Messages"
 msgstr "Send Message"
 
@@ -13088,10 +12855,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, fuzzy
-msgid "No message"
-msgstr "(1 message)"
-
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -13330,7 +13093,7 @@ msgid "On unread messages"
 msgstr "Send a _message"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "IM Conversation Windows"
 
 #, fuzzy
@@ -13340,6 +13103,10 @@ msgstr "Close conversation"
 msgid "When away"
 msgstr "When away"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "IM Conversation Windows"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -13404,10 +13171,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr "(_F) messages ရောက္‌လာက windows ကို‌ flash လုပ္‌ပ္ရပာ"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "IM Conversation Windows"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -13446,8 +13209,8 @@ msgstr "Cannot get user information"
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-#, fuzzy
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Autodetect IP Address"
 
 msgid "Public _IP:"
@@ -13842,34 +13605,18 @@ msgstr "(_v) သိမ္းမယ္။ ပ္ရီးရင္‌ သံု�
 msgid "Status for %s"
 msgstr "Status: %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "Insert smiley"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
 #, fuzzy
-msgid "Duplicate Shortcut"
-msgstr "Public key file"
+msgid "Custom Smiley"
+msgstr "Insert smiley"
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Please enter a new name for the selected group."
+msgid "Duplicate Shortcut"
+msgstr "Public key file"
 
 #, fuzzy
 msgid "Edit Smiley"
@@ -13992,8 +13739,8 @@ msgid "Cannot send launcher"
 msgstr "Cannot send file"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -14622,7 +14369,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -14899,7 +14646,7 @@ msgstr "IM Conversation Windows"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -15238,9 +14985,10 @@ msgstr "Login Options"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Options specific to Windows Pidgin."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "Options specific to Windows Pidgin."
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr ""
@@ -15282,6 +15030,285 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Cannot open socket"
+#~ msgstr "socket ဖ္ဝင့္လို့ မရပာ"
+
+#, fuzzy
+#~ msgid "Could not listen on socket"
+#~ msgstr "Couldn't create socket"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Unable to read socket"
+
+#, fuzzy
+#~ msgid "Connection failed."
+#~ msgstr "Connection failed"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Server has disconnected"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Couldn't create socket"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Couldn't connect to host"
+
+#~ msgid "Read error"
+#~ msgstr "Read error"
+
+#~ msgid "Write error"
+#~ msgstr "Write error"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "Set Dir Info"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Extended Address"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "Alias Chat"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "User has no directory information."
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Command"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "Registration Error"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "Location"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "ေဘာ္‌ဒာရဲ့ အခ္ရေအနေကို အသိပေးခ္ရင္း"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "Unsupported Version"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "Organisation"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "User Modes"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "User Limit"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "Capabilities"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "Username"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "IM with Key Exchange"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "Email Address"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "Set Profile"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "Ping"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "Nickname"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "Live Video"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "Message received"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "Public Key Babbleprint"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "User Options"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "User Modes"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "User Limit"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "User Limit"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Trillian Encryption"
+
+#~ msgid "Read Error"
+#~ msgstr "Read Error"
+
+#, fuzzy
+#~ msgid "Failed to connect to server."
+#~ msgstr "Unable to connect to server."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Queue full"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "Unable to parse message"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Couldn't connect to host"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Login failed (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Unable to connect to server."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "You have been logged out because you logged in at another workstation."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Error: SSL support is not installed."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Incorrect password."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "Unable to connect to server."
+
+#, fuzzy
+#~ 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."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Could Not Connect"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "Invalid Username"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Cannot get server information"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "Connection Closed"
+
+#, fuzzy
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Couldn't connect to host"
+
+#, fuzzy
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Connection Closed"
+
+#, fuzzy
+#~ msgid "Connection reset"
+#~ msgstr "Connection Closed"
+
+#, fuzzy
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Error while reading from socket."
+
+#, fuzzy
+#~ msgid "Unable to connect to host"
+#~ msgstr "Unable to connect to server"
+
+#, fuzzy
+#~ msgid "Could not write"
+#~ msgstr "Could not send"
+
+#~ msgid "Could not connect"
+#~ msgstr "Could not connect"
+
+#, fuzzy
+#~ msgid "Could not create listen socket"
+#~ msgstr "Couldn't create socket"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Unable to resolve hostname."
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Incorrect password."
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "Japan Pager host"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japan File transfer host"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "You were disconnected from the server."
+
+#, fuzzy
+#~ msgid "Could not resolve host name"
+#~ msgstr "Unable to resolve hostname."
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "Server requires SSL for login"
+
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "IM Conversation Windows"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Please enter a new name for the selected group."
+
+#, fuzzy
 #~ msgid "Activate which ID?"
 #~ msgstr "Active which ID?"
 
@@ -15907,10 +15934,6 @@ msgstr ""
 #~ msgstr "Currently on"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Unable to connect to server"
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_Message:"
 
diff --git a/po/nb.po b/po/nb.po
index 134cac42c8..18ba2820f7 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2009-02-24 18:47+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.ui.no>\n"
@@ -2585,9 +2585,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Inkluderer andre lynmeldingsklienters logger i logg-viseren."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2643,8 +2644,9 @@ msgstr "Emulering av avlogget-beskjed"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Lagre beskjeder sendt til en avlogget bruker som pounce."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Resten av beskjedene vil bli lagret som varsling. Du kan forandre/slette "
@@ -2897,14 +2899,16 @@ msgstr ""
 "Klarte ikke finne en ActiveTCL installasjon. Om du ønsker å bruke TCL "
 "tillegg, installer ActiveTCL fra http://www.activestate.com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Fant ikke verktøysamlingen til Apple Bonjour for Windows. Du finner flere "
 "opplysninger på adressa http://d.pidgin.im/BonjourWindows."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Klarte ikke lage ny tilkobling\n"
 
 msgid ""
@@ -2958,14 +2962,21 @@ msgstr "%s har lukket samtalen."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Klarte ikke sende beskjeden, samtalen kunne ikke startes."
 
-msgid "Cannot open socket"
-msgstr "Klarte ikke åpne endepunkt"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Klarte ikke lage endepunkt:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Klarte ikke binde endepunkt til port"
 
-msgid "Could not listen on socket"
-msgstr "Klarte ikke lytte på endepunkt"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Klarte ikke lage endepunkt:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Feil i kommunikasjonen med lokal mDNSResponder."
@@ -3012,13 +3023,16 @@ msgstr "Lagre kontaktliste ..."
 msgid "Load buddylist from file..."
 msgstr "Last inn kontaktliste fra fil..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Fyll inn registrerings feltene."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Passordene stemmer ikke overens."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Klarte ikke registere ny konto. En feil oppsto.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3030,14 +3044,15 @@ msgstr "Registreringen var vellykket!"
 msgid "Password"
 msgstr "Passord"
 
-msgid "Password (retype)"
-msgstr "Passord (gjenta)"
+msgid "Password (again)"
+msgstr "Passord (igjen)"
 
-msgid "Enter current token"
-msgstr "Skriv inn gjeldende symbol"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Gjeldende symbol"
+#, fuzzy
+msgid "Captcha"
+msgstr "Captcha-bilde"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrere ny Gadu-Gadu-konto"
@@ -3090,6 +3105,15 @@ msgstr "Endring av passord vellykket!"
 msgid "Current password"
 msgstr "Nåværende passord"
 
+msgid "Password (retype)"
+msgstr "Passord (gjenta)"
+
+msgid "Enter current token"
+msgstr "Skriv inn gjeldende symbol"
+
+msgid "Current token"
+msgstr "Gjeldende symbol"
+
 #
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Skriv inn ditt nåværende passord og ditt nye passord for UIN: "
@@ -3138,8 +3162,8 @@ msgstr "Ingen passende brukere funnet."
 msgid "There are no users matching your search criteria."
 msgstr "Skriv inn ditt nye passord."
 
-msgid "Unable to read socket"
-msgstr "Klarte ikke lese endepunkt"
+msgid "Unable to read from socket"
+msgstr "Klarte ikke lese fra endepunkt"
 
 msgid "Buddy list downloaded"
 msgstr "Kontaktliste nedlastet"
@@ -3153,8 +3177,14 @@ msgstr "Kontaktliste lastet opp"
 msgid "Your buddy list was stored on the server."
 msgstr "Kontaktlisten ble lagret på serveren."
 
-msgid "Connection failed."
-msgstr "Tilkobling feilet."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Koblet til"
+
+msgid "Connection failed"
+msgstr "Tilkobling feilet"
 
 msgid "Add to chat"
 msgstr "Legg til samtale"
@@ -3162,18 +3192,23 @@ msgstr "Legg til samtale"
 msgid "Chat _name:"
 msgstr "Samtale _navn:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Kan ikke koble til tjener."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Kobler til"
+
 msgid "Chat error"
 msgstr "Samtalefeil"
 
 msgid "This chat name is already in use"
 msgstr "Dette samtalenavnet er allerede i bruk"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Ikke koblet til tjeneren."
 
 msgid "Find buddies..."
@@ -3233,7 +3268,8 @@ msgstr "Intet tema for kanalen"
 msgid "File Transfer Failed"
 msgstr "Filoverføring feilet"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Klarte ikke åpne port for lytting."
 
 msgid "Error displaying MOTD"
@@ -3249,8 +3285,18 @@ msgstr "Det er ingen MOTD assosiert med denne tilkoblingen."
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-msgid "Server has disconnected"
-msgstr "Tjeneren har koplet fra"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Mistet forbindelse med server:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Vis MOTD"
@@ -3265,22 +3311,20 @@ msgstr "_Passord:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC-kallenavn kan ikke inneholde mellomrom"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Kobler til"
-
 msgid "SSL support unavailable"
 msgstr "SSL-støtte utilgjengelig"
 
-msgid "Couldn't create socket"
-msgstr "Klarte ikke opprette endepunkt"
-
-msgid "Couldn't connect to host"
+msgid "Unable to connect"
 msgstr "Klarte ikke koble til"
 
-msgid "Read error"
-msgstr "Lesefeil"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Kan ikke koble til %s"
+
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Tjeneren lukket forbindelsen."
 
 msgid "Users"
 msgstr "Brukere"
@@ -3705,12 +3749,14 @@ msgstr "Ad-hoc kommando feilet"
 msgid "execute"
 msgstr "utfør"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "Tjeneren krever TLS/SSL for å logge inn, men støtte for dette ble ikke "
 "funnet."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Du krever kryptering, men ingen støtte for TLS/SSL ble funnet."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3729,7 +3775,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Identitetsbekreftelse i ren tekst"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Autentisering feilet"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Ugyldig svar fra tjener."
 
 msgid "Server does not use any supported authentication method"
@@ -3742,7 +3793,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "Ugyldig utfordring fra tjener"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL-feil"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3762,10 +3814,8 @@ msgstr ""
 "Klarte ikke etablere kontakt med serveren:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Klarte ikke etablere kontakt med serveren:\n"
 "%s"
@@ -3774,12 +3824,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "Klarte ikke lage ny tilkobling"
 
-msgid "Unable to create socket"
-msgstr "Klarte ikke opprette endepunkt"
-
-msgid "Write error"
-msgstr "Feil ved skriving"
-
 msgid "Full Name"
 msgstr "Fullt navn"
 
@@ -3850,162 +3894,6 @@ msgstr "Operativsystem"
 msgid "Local Time"
 msgstr "Lokal fil:"
 
-msgid "Last Activity"
-msgstr "Siste aktivitet"
-
-msgid "Service Discovery Info"
-msgstr "Tjenesteoppdagingsinfo"
-
-msgid "Service Discovery Items"
-msgstr "Service Discovery Items"
-
-msgid "Extended Stanza Addressing"
-msgstr "Utvida Stanza-adressering"
-
-msgid "Multi-User Chat"
-msgstr "Flerbrukersamtale"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Brukeren har ingen kataloginformasjon"
-
-msgid "In-Band Bytestreams"
-msgstr "In-Band Bytestreams"
-
-msgid "Ad-Hoc Commands"
-msgstr "Ad-Hoc Kommandoer"
-
-msgid "PubSub Service"
-msgstr "PubSub Service"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 Bytestreams"
-
-msgid "Out of Band Data"
-msgstr "Out of Band Data"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-# må setjast om seinare
-msgid "In-Band Registration"
-msgstr "Samtidsegistrering"
-
-msgid "User Location"
-msgstr "Brukerens sted"
-
-msgid "User Avatar"
-msgstr "Bruker Avatar"
-
-msgid "Chat State Notifications"
-msgstr "Samtaletilstandsvarsling"
-
-msgid "Software Version"
-msgstr "Programvareversjon"
-
-msgid "Stream Initiation"
-msgstr "Strømoppstart"
-
-msgid "File Transfer"
-msgstr "Filoverføring"
-
-msgid "User Mood"
-msgstr "Brukerens tilstander"
-
-msgid "User Activity"
-msgstr "Brukerens aktivitet"
-
-msgid "Entity Capabilities"
-msgstr "Entitetsegenskaper"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Krypterte formidlinger av økt"
-
-msgid "User Tune"
-msgstr "Brukerens melodi"
-
-msgid "Roster Item Exchange"
-msgstr "Listeelement-utveksling"
-
-# Gjer betre
-msgid "Reachability Address"
-msgstr "Adresse en kan nåes på"
-
-msgid "User Profile"
-msgstr "Brukers profil"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle-audio"
-
-msgid "User Nickname"
-msgstr "Brukers kallenavn"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle Raw UDP"
-
-msgid "Jingle Video"
-msgstr "Jingle-video"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Beskjedkvitteringer"
-
-# Veldig, veldig fuzzy....
-msgid "Public Key Publishing"
-msgstr "Offentlig nøkkelpublisering"
-
-msgid "User Chatting"
-msgstr "Bruker som snakker"
-
-msgid "User Browsing"
-msgstr "Bruker som surfer"
-
-msgid "User Gaming"
-msgstr "Bruker som spiller"
-
-msgid "User Viewing"
-msgstr "Bruker som ser på"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Stanza-kryptering"
-
-msgid "Entity Time"
-msgstr "Enhetstid"
-
-msgid "Delayed Delivery"
-msgstr "Forsinket Levering"
-
-msgid "Collaborative Data Objects"
-msgstr "Samarbeidende Data Objekter"
-
-msgid "File Repository and Sharing"
-msgstr "Fil Oppbevaring og Deling"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "STUN Service Discovery for Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Forenklet formidling av kryptert økt"
-
-msgid "Hop Check"
-msgstr "Hop Sjekk"
-
-msgid "Capabilities"
-msgstr "Evner"
-
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -4017,7 +3905,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Logget inn"
 
 msgid "Middle Name"
@@ -4202,16 +4090,13 @@ msgstr "Ingen passende brukere funnet."
 msgid "Roles:"
 msgstr "Rolle"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Tidsavbrudd for ping"
 
-msgid "Read Error"
-msgstr "Lesefeil"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4390,9 +4275,6 @@ msgstr "Passordet ditt har blitt endret."
 msgid "Error changing password"
 msgstr "Feil ved endring av passord"
 
-msgid "Password (again)"
-msgstr "Passord (igjen)"
-
 msgid "Change XMPP Password"
 msgstr "Endre XMPP-passord"
 
@@ -4777,6 +4659,14 @@ msgstr "XML-parsefeil"
 msgid "Unknown Error in presence"
 msgstr "Ukjent feil i tilstedeværelse"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Klarte ikke bli med i gruppesamtale %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Feil i gruppesamtale %s"
+
 msgid "Create New Room"
 msgstr "Skap nytt samtalerom"
 
@@ -4793,16 +4683,20 @@ msgstr "_Konfigurer rom"
 msgid "_Accept Defaults"
 msgstr "_Aksepter standardinnstillinger"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Klarte ikke bli med i gruppesamtale %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Ingen grunn spesifisert"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Feil i gruppesamtale %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Du har blitt sparket ut fra %s: %s"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Sparket av %s: %s"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "En feil oppsto under åpningen av filen."
 
 #, fuzzy
@@ -5290,9 +5184,6 @@ msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "SSL-støtte kreves for MSN. Vennligst installer et støttet SSL-bibliotek."
 
-msgid "Failed to connect to server."
-msgstr "Klarte ikke koble til tjener."
-
 msgid "Error retrieving profile"
 msgstr "Klarte ikke hente profil"
 
@@ -5544,9 +5435,6 @@ msgstr "Meldingen ble ikke sendt fordi en ukjent kodingsfeil oppstod."
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Meldingen ble ikke sendt fordi en ukjent feil oppstod."
 
-msgid "Unable to connect"
-msgstr "Klarte ikke koble til"
-
 msgid "Writing error"
 msgstr "Feil ved skriving"
 
@@ -5561,20 +5449,24 @@ msgstr ""
 "Tilkoblingsfeil fra %s tjener:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Vår protokoll er ikke støttet av tjeneren."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Feil under tolkning av HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Du ble logget av fordi du har logget på et annet sted."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN-tjenerene er midlertidig utilgjengelig.Vennligst prøv igjen senere."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN-tjenerne vil bli utilgjengelig en liten stund."
 
 #, c-format
@@ -5587,9 +5479,6 @@ msgstr ""
 "Din MSN-kontaktliste er midlertidig utilgjengelig. Vennligst prøv igjen "
 "senere."
 
-msgid "Unknown error."
-msgstr "Ukjent feil."
-
 msgid "Handshaking"
 msgstr "Håndtrykk"
 
@@ -5689,6 +5578,9 @@ msgstr "MSN-protokolltillegg"
 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)"
@@ -5800,12 +5692,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Ugyldig svar fra tjener"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Koblet til"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protokoll feil, kode %d: %s"
@@ -5829,16 +5715,6 @@ msgstr "MySpaceIM-feil"
 msgid "Invalid input condition"
 msgstr "Ugyldig inndatabetingelse"
 
-msgid "Read buffer full (2)"
-msgstr "Lesemellomlager fullt (2)"
-
-msgid "Unparseable message"
-msgstr "Klarte ikke tolke beskjed"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Klarte ikke koble til vert: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Klarte ikke legge til kontakt"
 
@@ -5922,6 +5798,15 @@ msgstr "Antall venner"
 msgid "Client Version"
 msgstr "Klientversjon"
 
+#, fuzzy
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"Vennligst gå til http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username og velg et brukernavn og prøv å logge inn igjen."
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - brukernavn tilgjengelig"
 
@@ -6179,9 +6064,9 @@ msgstr "Brukeren er enten frakoplet, eller så er du blokkert"
 msgid "Unknown error: 0x%X"
 msgstr "Ukjent feil: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Pålogging feilet (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Klarte ikke pinge brukeren %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6285,9 +6170,6 @@ msgstr "GroupWise-konferanse %d"
 msgid "Authenticating..."
 msgstr "Autentiserer..."
 
-msgid "Unable to connect to server."
-msgstr "Kan ikke koble til tjener."
-
 msgid "Waiting for response..."
 msgstr "Venter på svar..."
 
@@ -6311,25 +6193,19 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Ønsker du å bli med i samtalen?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Du ble logget av fordi du har logget på med dette skjermnavnet et annet sted."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s ser ut til å være  frakoplet, og mottok ikke meldingen du sendte."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Klarte ikke kople til tjener, skriv inn adressen til tjeneren du ønsker å "
 "kople til."
 
-msgid "Error. SSL support is not installed."
-msgstr "Feil: SSL-støtte er ikke installert."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 "Denne konferansen har blitt stengt, ingen flere meldinger kan bli sendt."
@@ -6369,10 +6245,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6381,18 +6254,8 @@ msgstr "Klarte ikke ble med i samtalerom"
 msgid "Invalid chat room name"
 msgstr "Ugyldig samtaleromnavn"
 
-msgid "Server closed the connection."
-msgstr "Tjeneren lukket forbindelsen."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Mistet forbindelse med server:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Mottok ugyldige data over forbindelsen med tjeneren."
 
 #. *< type
@@ -6440,7 +6303,8 @@ msgstr "Mistet forbindelse til bruker:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Mottok ugyldig data på forbindelse med annen bruker."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Klarte ikke etablere en forbindelse med bruker."
 
 msgid "Direct IM established"
@@ -6640,21 +6504,15 @@ msgstr "Advarselsnivåer"
 msgid "Buddy Comment"
 msgstr "Kontakt Kommentar"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Klarte ikke koble til autentiseringstjener:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Klarte ikke koble til BOS server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Kan ikke koble til OIM server"
 
 msgid "Username sent"
 msgstr "Brukernavn sendt"
@@ -6666,11 +6524,11 @@ msgstr "Tilkoblet, informasjonskapsel sendt"
 msgid "Finalizing connection"
 msgstr "Fullfører tilkobling"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Får ikke til å logge inn: Klarte ikke logge på som %s fordi brukernavnet er "
 "ugyldig. Brukernavn må være en gyldig e-postadresse, eller begynna med en "
@@ -6686,26 +6544,22 @@ msgstr ""
 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."
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Brukeren eksisterer ikke"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Kontoen din er frosset."
 
 #. service temporarily unavailable
@@ -6725,7 +6579,8 @@ 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."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Den inntastede SecurID-nøkkelen er ugyldig."
 
 msgid "Enter SecurID"
@@ -6904,6 +6759,9 @@ msgstr "Pålogget siden"
 msgid "Member Since"
 msgstr "Medlem siden"
 
+msgid "Capabilities"
+msgstr "Evner"
+
 msgid "Profile"
 msgstr "Profil"
 
@@ -7085,9 +6943,9 @@ msgstr[1] ""
 msgid "Away message too long."
 msgstr "Fraværsbeskjeden er for lang."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7111,9 +6969,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Ugrupperte"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Klarte ikke legge til kontakten %s fordi du har for mange kontakter i "
@@ -7122,8 +6980,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(uten navn)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Klarte ikke legge til kontakten %s pga ukjent årsak."
 
 #, c-format
@@ -7901,7 +7759,8 @@ msgstr "Intervall vedlikeholdstilkobling (sekund)"
 msgid "Update interval (seconds)"
 msgstr "Oppdateringsintervall (sekund)"
 
-msgid "Cannot decrypt server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "Klarte ikke dekryptere tjenersvaret"
 
 #, c-format
@@ -7926,9 +7785,6 @@ msgstr "Aktivering kreves"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Ukjent svarkode under innlogging (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Klarte ikke dekryptere tjenersvaret"
-
 msgid "Requesting captcha"
 msgstr "Spør etter tastetest («captcha»)"
 
@@ -7962,29 +7818,18 @@ msgstr ""
 "Ukjent feilkode under innlogging (0x%02X):\n"
 "%s"
 
-msgid "Unable to connect."
-msgstr "Klarte ikke koble til."
-
 msgid "Socket error"
 msgstr "Endepunktfeil"
 
-msgid "Unable to read from socket"
-msgstr "Klarte ikke lese fra endepunkt"
-
-msgid "Write Error"
-msgstr "Feil ved skriving"
-
-msgid "Connection lost"
-msgstr "Tilkobling mistet"
-
 msgid "Getting server"
 msgstr "Henter tjener"
 
 msgid "Requesting token"
 msgstr "Spør etter symbol"
 
-msgid "Couldn't resolve host"
-msgstr "Vertsoppslaget feilet"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Kan ikke koble til tjener."
 
 msgid "Invalid server or port"
 msgstr "Ugyldig tjener eller port"
@@ -8040,7 +7885,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "QQ Qun-kommando"
 
-msgid "Could not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "Klarte ikke dekryptere innloggingssvaret"
 
 msgid "Unknown LOGIN CMD"
@@ -8060,9 +7906,6 @@ msgstr "Filsending"
 msgid "%d canceled the transfer of %s"
 msgstr "%d avbrøt overføringen av %s"
 
-msgid "Connection closed (writing)"
-msgstr "Tilkoblingen lukket (skriver)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Gruppetittel:</b> %s<br>"
@@ -8116,17 +7959,6 @@ msgstr "En Sametime administrator har satt følgende kunngjøring på tjeneren %
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime administratorkunngjøring"
 
-msgid "Connection reset"
-msgstr "Tilkobling nullstilt"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Feil ved lesing fra endepunkt: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Kan ikke koble til tjener"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Kunngjøring fra %s"
@@ -8149,6 +7981,9 @@ msgstr "Høytalere"
 msgid "Video Camera"
 msgstr "Videokamera"
 
+msgid "File Transfer"
+msgstr "Filoverføring"
+
 #
 msgid "Supports"
 msgstr "Støtter"
@@ -8968,6 +8803,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Nettverksstatistikk"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping mislyktes"
 
@@ -9031,7 +8869,8 @@ msgstr "Ustøttet offentlig nøkkeltype"
 msgid "Disconnected by server"
 msgstr "Frakoplet av tjener"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Feil under tilkobling til SILC-tjener"
 
 msgid "Key Exchange failed"
@@ -9044,26 +8883,26 @@ msgstr ""
 "Fortsettelse av løsnet økt misslyktes. Trykk Kople til på nytt for å lage en "
 "ny forbindelse."
 
-msgid "Connection failed"
-msgstr "Tilkobling feilet"
-
 msgid "Performing key exchange"
 msgstr "Gjennomfører nøkkelutveksling"
 
-msgid "Unable to create connection"
-msgstr "Klarte ikke lage ny tilkobling"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Klarte ikke laste SILC nøkkelpar"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Kobler til SILC-tjener"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Klarte ikke laste SILC nøkkelpar"
+
 msgid "Out of memory"
 msgstr "Tom for minne"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Klarte ikke kjøre SILC-protokollen"
 
 msgid "Error loading SILC key pair"
@@ -9360,7 +9199,8 @@ msgstr "Signer og verifiser alle meldinger digitalt"
 msgid "Creating SILC key pair..."
 msgstr "Genererer SILC-nøkkelpar..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Genererer SILC-nøkkelpar\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9454,6 +9294,9 @@ msgstr "Tavle"
 msgid "No server statistics available"
 msgstr "Ingen tjenerstatistikk tilgjengelig"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Feil under tilkobling til SILC-tjener"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Feil: Versjonskonflikt, oppgrader din klient"
@@ -9495,30 +9338,27 @@ msgstr "Ugyldig informasjonskapsel"
 msgid "Failure: Authentication failed"
 msgstr "Autentisering feilet"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Kan ikke klargjøre SILC klientforbindelse"
 
 msgid "John Noname"
 msgstr "Ola Normann"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Klarte ikke laste inn SILC nøkkelparet: %s"
 
-msgid "Could not write"
-msgstr "Klarte ikke skrive"
-
-msgid "Could not connect"
-msgstr "Klarte ikke koble til"
+msgid "Unable to create connection"
+msgstr "Klarte ikke lage ny tilkobling"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Ukjent tjenersvar"
 
-msgid "Could not create listen socket"
-msgstr "Klarte ikke opprette lytteendepunkt"
-
-msgid "Could not resolve hostname"
-msgstr "Kan ikke finne datamaskinnavnet"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Klarte ikke opprette endepunkt"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-brukernavn kan ikke inneholde mellomrom eller alfakrøll"
@@ -9559,6 +9399,77 @@ msgstr "Autentiser bruker"
 msgid "Auth Domain"
 msgstr "Autentiseringsdomene"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;rom&gt;:  Bli med i et samtalerom på Yahoo!-nettverket"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Vis rom på Yahoo!-nettverket"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Forespør en bruker om å starte en Doodle session"
+
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID ..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo-protokolltillegg"
+
+msgid "Pager server"
+msgstr "Søketjenestetjener"
+
+msgid "Pager port"
+msgstr "Personsøker-port"
+
+msgid "File transfer server"
+msgstr "Filoverføringstjener"
+
+msgid "File transfer port"
+msgstr "Filoverføringsport"
+
+msgid "Chat room locale"
+msgstr "Samtaleroms språk"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignorer konferanse og samtalerom invitasjoner"
+
+msgid "Chat room list URL"
+msgstr "Samtaleroms URL"
+
+msgid "Yahoo Chat server"
+msgstr "Yahoo Chat server"
+
+msgid "Yahoo Chat port"
+msgstr "Yahoo Chat port"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID ..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo-protokolltillegg"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9591,29 +9502,19 @@ msgstr "Legge til kontakt avslått"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 "Ukjent feilkode %d. Å logge inn på Yahoo!s nettside, kan kanskje løse dette."
 
@@ -9654,38 +9555,33 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Ukjent feilkode %d. Å logge inn på Yahoo!s nettside, kan kanskje løse dette."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Klarte ikke legge til kontakt %s i gruppen %s i tjenerlisten på konto %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Klarte ikke legge kontakt til tjenerens kontaktliste"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hørbar %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Mottok uventet HTTP-svar fra tjener."
 
-msgid "Connection problem"
-msgstr "Problem ved tilkobling"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Mistet forbindelse med %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Klarte ikke koble til med %s:\n"
+"Klarte ikke etablere kontakt med serveren:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9748,73 +9644,15 @@ msgstr "Bli med bruker i samtale ..."
 msgid "Open Inbox"
 msgstr "Åpne innboks"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;rom&gt;:  Bli med i et samtalerom på Yahoo!-nettverket"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Vis rom på Yahoo!-nettverket"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Forespør en bruker om å starte en Doodle session"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID ..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo-protokolltillegg"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-msgid "Pager server"
-msgstr "Søketjenestetjener"
-
-msgid "Japan Pager server"
-msgstr "Japansk Personsøker server"
-
-msgid "Pager port"
-msgstr "Personsøker-port"
-
-msgid "File transfer server"
-msgstr "Filoverføringstjener"
-
-msgid "Japan file transfer server"
-msgstr "Japansk filoverføringstjener"
-
-msgid "File transfer port"
-msgstr "Filoverføringsport"
-
-msgid "Chat room locale"
-msgstr "Samtaleroms språk"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignorer konferanse og samtalerom invitasjoner"
-
-msgid "Chat room list URL"
-msgstr "Samtaleroms URL"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo Chat server"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo Chat port"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Sendte Doodle forespørsel."
 
+msgid "Unable to connect."
+msgstr "Klarte ikke koble til."
+
 msgid "Unable to establish file descriptor."
 msgstr "Klarte ikke etablere fildeskriptor."
 
@@ -9822,6 +9660,9 @@ msgstr "Klarte ikke etablere fildeskriptor."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s prøver å sende deg en gruppe med %d filer.\n"
 
+msgid "Write Error"
+msgstr "Feil ved skriving"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan-profil"
 
@@ -9938,23 +9779,19 @@ msgstr "Stemmer"
 msgid "Webcams"
 msgstr "Webkameraer"
 
+msgid "Connection problem"
+msgstr "Problem ved tilkobling"
+
 msgid "Unable to fetch room list."
 msgstr "Klarte ikke hente ned romliste."
 
 msgid "User Rooms"
 msgstr "Brukerrom"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Problem ved tilkobling til YHCT-tjener."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Du har blitt koblet fra tjeneren\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10082,33 +9919,22 @@ msgstr "Domene"
 msgid "Exposure"
 msgstr "Eksponering"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Klarte ikke lage endepunkt:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Klarte ikke analysere syntaktisk respons fra HTTP proxy: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Feil %d i forbindelsen mot HTTP-mellomtjeneren"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Tilgang nektet: Mellomtjener nekter å formidle tunell for port %d."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Error resolving %s"
 
-msgid "Could not resolve host name"
-msgstr "Kan ikke finne datamaskinnavnet"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Forespør %s's oppmerksomhet..."
@@ -10310,14 +10136,6 @@ msgstr "Feil ved skriving til %s: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "Kan ikke koble til %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"Tjeneren krever TLS/SSL for å logge inn, men støtte for dette ble ikke "
-"funnet."
-
 #, c-format
 msgid " - %s"
 msgstr " - %s"
@@ -10566,9 +10384,14 @@ msgstr "Legg til _kontaktvarsling..."
 msgid "View _Log"
 msgstr "Vis _logg"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Skjul når avlogget"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Vis når avlogget"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
@@ -11067,6 +10890,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Endre brukerinformasjon for %s"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Skriv inn vertsnavnet som dette sertifikatet er for."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL-tjenere"
@@ -11114,7 +10941,8 @@ msgstr "Ignorer"
 msgid "Get Away Message"
 msgstr "Hent fraværsbeskjed"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Sa sist"
 
 msgid "Unable to save icon file to disk."
@@ -12008,7 +11836,8 @@ msgstr "Fargen som lenker skal ha."
 msgid "Hyperlink visited color"
 msgstr "Farge på besøkte lenker"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+#, fuzzy
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Lenkefarge etter at lenka er besøkt (eller tatt i bruk)."
 
 msgid "Hyperlink prelight color"
@@ -12045,13 +11874,22 @@ msgstr "Farge for å tegne navnet på en handlingsbeskjed."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Farge for navn på handlingsmelding for hviska beskjeder"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Farge for å tegne navnet på en handlingsbeskjed."
+
 msgid "Whisper Message Name Color"
 msgstr "Farge på navn på hviskebeskjed"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Farge for å tegne navnet på en handlingsbeskjed."
+
 msgid "Typing notification color"
 msgstr "Skrivevarslingsfarge"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "Skrifttypefargen som skal brukes ved skrivevarsling"
 
 msgid "Typing notification font"
@@ -12452,6 +12290,10 @@ msgstr ""
 "Klarte ikke å starte en nettleser fordi 'Manuell' nettleserkommando er "
 "valgt, men ingen kommando for denne har blitt satt."
 
+#, fuzzy
+msgid "No message"
+msgstr "Ukjent beskjed"
+
 msgid "Open All Messages"
 msgstr "Åpne alle beskjeder"
 
@@ -12469,10 +12311,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Du har fått e-post!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Ukjent beskjed"
-
 msgid "The following plugins will be unloaded."
 msgstr "Følgende tillegg kunne ikke losses."
 
@@ -12686,8 +12524,9 @@ msgstr "_Vis system tray ikon:"
 msgid "On unread messages"
 msgstr "Ved uleste beskjeder"
 
-msgid "Conversation Window Hiding"
-msgstr "Skjuling av samtalevindu"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Samtalevinduer for lynmeldinger"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Gjem nye lynmeldingssamtaler:"
@@ -12695,6 +12534,9 @@ msgstr "_Gjem nye lynmeldingssamtaler:"
 msgid "When away"
 msgstr "Når fraværende"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Mini_mer nye samtalevinduer"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Faner"
@@ -12753,9 +12595,6 @@ msgstr "Bruk behagelig scrolling"
 msgid "F_lash window when IMs are received"
 msgstr "B_link vinduet når nye lynmeldinger mottas"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Mini_mer nye samtalevinduer"
-
 msgid "Minimum input area height in lines:"
 msgstr "Minimum høyde for inntastingsområde i linjer:"
 
@@ -12790,7 +12629,8 @@ msgstr "Klarte ikke starte oppsettsprogram for nettleser."
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Eksempel: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "Finn IP-adresse _automatisk"
 
 msgid "Public _IP:"
@@ -13159,21 +12999,6 @@ msgstr "Lagre & bruk"
 msgid "Status for %s"
 msgstr "Status for %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "Tilpassede smilefjes"
-
-msgid "More Data needed"
-msgstr "Mer data trengs"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Oppgi en snarvei som skal forbindes med smilefjeset."
-
 #, fuzzy, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
@@ -13181,12 +13006,12 @@ msgstr ""
 "Et tilpasset smilefjes finnes allerede for den valgte snarveien. Oppgi en "
 "annen snarvei."
 
+msgid "Custom Smiley"
+msgstr "Tilpassede smilefjes"
+
 msgid "Duplicate Shortcut"
 msgstr "Duplikat snarvei"
 
-msgid "Please select an image for the smiley."
-msgstr "Velg et bilde for smilefjeset."
-
 msgid "Edit Smiley"
 msgstr "Endre smilefjes"
 
@@ -13298,9 +13123,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Klarte ikke sende lasteren"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Du dro en skrivebordstarter. Sannsynligvis ville du sende det som starteren "
 "peker til og ikke selve starteren."
@@ -13901,9 +13727,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Musikk Samtale Tillegg for samarbeids komposisjon."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Musikk Samtale Tillegg tillater flere brukere å arbeide på et stykke musikk "
 "samtidig ved å redigere et felles resultat i samtid."
@@ -14160,9 +13987,10 @@ msgid "Conversation Window Send Button."
 msgstr "Send-knapp i samtalevindu"
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Legg til en Send-knapp i samtalevinduet. Tenkt brukt når intet fysisk "
 "tastatur er tilgjengelig."
@@ -14492,8 +14320,9 @@ msgstr "Valg for Windows Pidgin"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Innstillinger som er spesifikke for Pidgin på Windows."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Gir spesifikke innstillinger for Pidgin på Windows, slik som skjuling av "
 "kontaktliste i systemstatusfeltet."
@@ -14536,6 +14365,319 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Dette tillegget er kjekt å ha for debugging av XMPP servere og klienter."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Klarte ikke åpne endepunkt"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Klarte ikke lytte på endepunkt"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Klarte ikke lese endepunkt"
+
+#~ msgid "Connection failed."
+#~ msgstr "Tilkobling feilet."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Tjeneren har koplet fra"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Klarte ikke opprette endepunkt"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Klarte ikke koble til"
+
+#~ msgid "Read error"
+#~ msgstr "Lesefeil"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Klarte ikke etablere kontakt med serveren:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Feil ved skriving"
+
+#~ msgid "Last Activity"
+#~ msgstr "Siste aktivitet"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Tjenesteoppdagingsinfo"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Service Discovery Items"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Utvida Stanza-adressering"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Flerbrukersamtale"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Brukeren har ingen kataloginformasjon"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "In-Band Bytestreams"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ad-Hoc Kommandoer"
+
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub Service"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5 Bytestreams"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Out of Band Data"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+# må setjast om seinare
+#~ msgid "In-Band Registration"
+#~ msgstr "Samtidsegistrering"
+
+#~ msgid "User Location"
+#~ msgstr "Brukerens sted"
+
+#~ msgid "User Avatar"
+#~ msgstr "Bruker Avatar"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Samtaletilstandsvarsling"
+
+#~ msgid "Software Version"
+#~ msgstr "Programvareversjon"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Strømoppstart"
+
+#~ msgid "User Mood"
+#~ msgstr "Brukerens tilstander"
+
+#~ msgid "User Activity"
+#~ msgstr "Brukerens aktivitet"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Entitetsegenskaper"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Krypterte formidlinger av økt"
+
+#~ msgid "User Tune"
+#~ msgstr "Brukerens melodi"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Listeelement-utveksling"
+
+# Gjer betre
+#~ msgid "Reachability Address"
+#~ msgstr "Adresse en kan nåes på"
+
+#~ msgid "User Profile"
+#~ msgstr "Brukers profil"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Jingle-audio"
+
+#~ msgid "User Nickname"
+#~ msgstr "Brukers kallenavn"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle Raw UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Jingle-video"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Beskjedkvitteringer"
+
+# Veldig, veldig fuzzy....
+#~ msgid "Public Key Publishing"
+#~ msgstr "Offentlig nøkkelpublisering"
+
+#~ msgid "User Chatting"
+#~ msgstr "Bruker som snakker"
+
+#~ msgid "User Browsing"
+#~ msgstr "Bruker som surfer"
+
+#~ msgid "User Gaming"
+#~ msgstr "Bruker som spiller"
+
+#~ msgid "User Viewing"
+#~ msgstr "Bruker som ser på"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Stanza-kryptering"
+
+#~ msgid "Entity Time"
+#~ msgstr "Enhetstid"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Forsinket Levering"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Samarbeidende Data Objekter"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Fil Oppbevaring og Deling"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "STUN Service Discovery for Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Forenklet formidling av kryptert økt"
+
+#~ msgid "Hop Check"
+#~ msgstr "Hop Sjekk"
+
+#~ msgid "Read Error"
+#~ msgstr "Lesefeil"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Klarte ikke koble til tjener."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Lesemellomlager fullt (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Klarte ikke tolke beskjed"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Klarte ikke koble til vert: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Pålogging feilet (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Kan ikke koble til tjener."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Du ble logget av fordi du har logget på med dette skjermnavnet et annet "
+#~ "sted."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Feil: SSL-støtte er ikke installert."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Feil passord."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Klarte ikke koble til BOS server:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Du kan bli frakoblet ganske snart. Sjekk %s for oppdateringer."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Klarte ikke koble til"
+
+#~ msgid "Invalid username."
+#~ msgstr "Ugyldig brukernavn."
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Klarte ikke dekryptere tjenersvaret"
+
+#~ msgid "Connection lost"
+#~ msgstr "Tilkobling mistet"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Vertsoppslaget feilet"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Tilkoblingen lukket (skriver)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Tilkobling nullstilt"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Feil ved lesing fra endepunkt: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Kan ikke koble til tjener"
+
+#~ msgid "Could not write"
+#~ msgstr "Klarte ikke skrive"
+
+#~ msgid "Could not connect"
+#~ msgstr "Klarte ikke koble til"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Klarte ikke opprette lytteendepunkt"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Kan ikke finne datamaskinnavnet"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Feil passord"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Klarte ikke koble til med %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Japansk Personsøker server"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japansk filoverføringstjener"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Du har blitt koblet fra tjeneren\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Kan ikke finne datamaskinnavnet"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Tjeneren krever TLS/SSL for å logge inn, men støtte for dette ble ikke "
+#~ "funnet."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Skjuling av samtalevindu"
+
+#~ msgid "More Data needed"
+#~ msgstr "Mer data trengs"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Oppgi en snarvei som skal forbindes med smilefjeset."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Velg et bilde for smilefjeset."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Aktiver hvilken ID?"
 
@@ -15017,14 +15159,6 @@ msgstr ""
 #~ "supported by MySpace."
 #~ msgstr "Sorry, passord over %d tegn (du har %d) er ikke støttet av MySpace."
 
-#~ msgid ""
-#~ "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username and choose a username and try to login again."
-#~ msgstr ""
-#~ "Vennligst gå til http://editprofile.myspace.com/index.cfm?"
-#~ "fuseaction=profile.username og velg et brukernavn og prøv å logge inn "
-#~ "igjen."
-
 #~ msgid "Too evil (sender)"
 #~ msgstr "Altfor ond (sender)"
 
@@ -15188,9 +15322,6 @@ msgstr ""
 #~ msgid "Unable to connect to contact server"
 #~ msgstr "Kan ikke koble til tjener"
 
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Kan ikke koble til OIM server"
-
 #~ msgid "Unable to make SSL connection to server."
 #~ msgstr "Klarte ikke opprette SSL-forbindelse med tjeneren."
 
diff --git a/po/ne.po b/po/ne.po
index ff87ec1fa9..281ce99421 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin.ne\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2006-06-27 21:08+0545\n"
 "Last-Translator: Shyam Krishna Bal <shyamkrishna_bal@yahoo.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
@@ -2662,7 +2662,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2714,7 +2714,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2961,12 +2961,12 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
 #, fuzzy
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr "नयाँ जडान सिर्जना गर्न अक्षम ।"
 
 msgid ""
@@ -3026,17 +3026,17 @@ msgstr "%s लाई यो वार्तालापमा निमन्त
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "सन्देश पठाउन अक्षम भयो । सन्देश अति ठूलो छ ।"
 
-#, fuzzy
-msgid "Cannot open socket"
-msgstr "सकेट खोल्न अक्षम भयो"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "सकेट सिर्जना गर्न अक्षम भयो"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "होस्टमा जडान गर्न सकिएन"
 
-#, fuzzy
-msgid "Could not listen on socket"
-msgstr "सकेट सिर्जना गर्न सकिएन"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "सकेट सिर्जना गर्न अक्षम भयो"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3093,15 +3093,15 @@ msgstr "साथी सूची पठाउनुहोस्"
 msgid "Load buddylist from file..."
 msgstr ""
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
 #, fuzzy
-msgid "Passwords do not match."
+msgid "Passwords do not match"
 msgstr "नयाँ पासवर्डहरू मेल खाएन ।"
 
 #, fuzzy
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "नयाँ जडान सिर्जना गर्न अक्षम ।"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3114,17 +3114,15 @@ msgstr "दर्ता सफल भयो"
 msgid "Password"
 msgstr "पासवर्ड"
 
-#, fuzzy
-msgid "Password (retype)"
-msgstr "पासवर्ड पठाइयो"
+msgid "Password (again)"
+msgstr "पासवर्ड(फेरि)"
 
-#, fuzzy
-msgid "Enter current token"
-msgstr "%s अहिले लगइन छैन ।"
+msgid "Enter captcha text"
+msgstr ""
 
 #, fuzzy
-msgid "Current token"
-msgstr "हालसालै"
+msgid "Captcha"
+msgstr "छवि बचत गर्नुहोस्"
 
 #, fuzzy
 msgid "Register New Gadu-Gadu Account"
@@ -3186,6 +3184,18 @@ msgid "Current password"
 msgstr "गलत पासवर्ड ।"
 
 #, fuzzy
+msgid "Password (retype)"
+msgstr "पासवर्ड पठाइयो"
+
+#, fuzzy
+msgid "Enter current token"
+msgstr "%s अहिले लगइन छैन ।"
+
+#, fuzzy
+msgid "Current token"
+msgstr "हालसालै"
+
+#, fuzzy
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "कृपया तपाईँको हालको पासवर्ड र तपाईँको नयाँ पासवर्ड प्रविष्टि गर्नुहोस् ।"
 
@@ -3238,7 +3248,8 @@ msgstr "अमिल्दा होस्टहरू"
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-msgid "Unable to read socket"
+#, fuzzy
+msgid "Unable to read from socket"
 msgstr "सकेट पढ्न अक्षम भयो"
 
 #, fuzzy
@@ -3257,8 +3268,14 @@ msgstr "साथी प्रदर्शन"
 msgid "Your buddy list was stored on the server."
 msgstr "त्यहाँ Gadu-Gadu सर्भरमा कुनै साथी सूची भण्डारण गरिएको छैन ।"
 
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
 #, fuzzy
-msgid "Connection failed."
+msgid "Connected"
+msgstr "जडान गर्नुहोस्"
+
+msgid "Connection failed"
 msgstr "जडान असफल भयो"
 
 #, fuzzy
@@ -3269,11 +3286,15 @@ msgstr "कुराकानी थप्नुहोस्"
 msgid "Chat _name:"
 msgstr "अन्तिम नाम:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "सर्भर पिङ्ग गर्न अक्षम"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "जडान"
+
 #, fuzzy
 msgid "Chat error"
 msgstr "त्रुटि पढ्नुहोस्"
@@ -3283,7 +3304,7 @@ msgid "This chat name is already in use"
 msgstr "त्यो फाइल पहिलेनै अवस्थित छ"
 
 #, fuzzy
-msgid "Not connected to the server."
+msgid "Not connected to the server"
 msgstr "तपाईँ सर्भरबाट बिच्छेदन हुनुभयो ।"
 
 #, fuzzy
@@ -3351,7 +3372,7 @@ msgid "File Transfer Failed"
 msgstr "फाइल स्थानान्तरण रद्द भयो"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "गाइमले सुन्ने पोर्ट खोल्न सकेन ।"
 
 msgid "Error displaying MOTD"
@@ -3367,8 +3388,16 @@ msgstr "त्यहाँ यो जडान सँग  MOTD संगठि�
 msgid "MOTD for %s"
 msgstr "%s का लागि MOTD"
 
-msgid "Server has disconnected"
-msgstr "सर्भर विच्छेद भएको छ"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "सर्भर सँग  संचार आदान प्रदानमा त्रुटि"
 
 msgid "View MOTD"
 msgstr "MOTD हेर्नुहोस्"
@@ -3383,22 +3412,20 @@ msgstr "पासवर्ड:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC उपनामहरुले सेतो खाली ठाउँ समाविष्ट नगर्न सक्छ"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "जडान"
-
 msgid "SSL support unavailable"
 msgstr "SSL समर्थन उपलब्ध छैन"
 
-msgid "Couldn't create socket"
-msgstr "सकेट सिर्जना गर्न सकिएन"
+msgid "Unable to connect"
+msgstr "जडान गर्न अक्षम छ"
 
-msgid "Couldn't connect to host"
-msgstr "होस्टमा जडान गर्न सकिएन"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "सर्भरमा जडान गर्न अक्षम ।"
 
-msgid "Read error"
-msgstr "त्रुटि पढ्नुहोस्"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "जडान सिर्जना गर्दा त्रुटि"
 
 msgid "Users"
 msgstr "प्रयोगकर्ताहरू"
@@ -3841,11 +3868,12 @@ msgstr "आदेश निस्क्रिय भयो"
 msgid "execute"
 msgstr "अपेक्षा गरिएको छैन"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "सर्भर लगइनका लागि TLS/SSL आवश्यकता पर्दछ । TLS/SSL समर्थन फेला परेन ।"
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "सर्भर लगइनका लागि TLS/SSL आवश्यकता पर्दछ । TLS/SSL समर्थन फेला परेन ।"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3862,7 +3890,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "खाली पाठ प्रमाणीकरण"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "प्रमाणीकरण असफल भयो"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "सर्भरबाट अवैध जवाफ ।"
 
 msgid "Server does not use any supported authentication method"
@@ -3874,8 +3907,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "सर्भर बाट अवैध चुनौती"
 
-#, fuzzy
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "त्रुटि पढ्नुहोस्"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3893,22 +3926,14 @@ msgstr "असमर्थित संस्करण"
 msgid "Unable to establish a connection with the server"
 msgstr "सर्भरमा SSL जडान बनाउन अक्षम छ ।"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "सर्भरमा SSL जडान बनाउन अक्षम छ ।"
 
 #, fuzzy
 msgid "Unable to establish SSL connection"
 msgstr "नयाँ जडान सिर्जना गर्न अक्षम ।"
 
-msgid "Unable to create socket"
-msgstr "सकेट सिर्जना गर्न अक्षम भयो"
-
-msgid "Write error"
-msgstr "त्रुटि लेख्नुहोस्"
-
 msgid "Full Name"
 msgstr "पूरा नाम"
 
@@ -3982,188 +4007,6 @@ msgstr "सञ्चालन प्रणाली लुकाउनुहो�
 msgid "Local Time"
 msgstr "स्थानीय फाइल:"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "डाइरेक्टरी सूचना सेट गर्नुहोस्"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "विस्तृत ठेगाना"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "कुराकानीलाई उपनाम दिनुहोस्"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "प्रयोगकर्ता सँग  डाइरेक्टरी सूचना छैन ।"
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "आदेश"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "एच टि एम एल"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "दर्ता त्रुटि"
-
-#, fuzzy
-msgid "User Location"
-msgstr "स्थान"
-
-msgid "User Avatar"
-msgstr ""
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "साथी स्थितिको सूचना"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "असमर्थित संस्करण"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "अभिमुखीकरण"
-
-#, fuzzy
-msgid "File Transfer"
-msgstr "फाइल स्थानान्तरणहरू"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "प्रयोगकर्ता मोडहरू"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "प्रयोगकर्ता सीमा"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "क्षमताहरू"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "प्रयोगकर्ता नाम"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "कुञ्जी साटासाटमा IM गर्नुहोस् "
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "इमेल ठेगाना"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "प्रोफाइल सेट गर्नुहोस्"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "पिङ्ग गर्नुहोस्"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "प्रयोगकर्ता नाम"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "प्रत्यक्ष भिडियो"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "सन्देश प्राप्त हुँदा"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "सार्वजनिक कुञ्जी ब्याबलप्रिन्ट"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "प्रयोगकर्ता विकल्पहरू"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "प्रयोगकर्ता मोडहरू"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "प्रयोगकर्ता सीमा"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "प्रयोगकर्ता सीमा"
-
-msgid "Ping"
-msgstr "पिङ्ग गर्नुहोस्"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "ट्रिलियन गुप्तिकरण"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "क्षमताहरू"
-
 #, fuzzy
 msgid "Priority"
 msgstr "सम्पर्क प्राथमिकता"
@@ -4176,7 +4019,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "लग बाहिरियो"
 
 msgid "Middle Name"
@@ -4366,16 +4209,12 @@ msgid "Roles:"
 msgstr "भूमिका"
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "सादा पाठ"
 
-msgid "Read Error"
-msgstr "त्रुटि पढ्नुहोस्"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 #, fuzzy
@@ -4566,9 +4405,6 @@ msgstr "तपाईँको पासवर्ड परिवर्तन भ
 msgid "Error changing password"
 msgstr "पासवर्ड परिवर्तन गर्दा त्रुटि"
 
-msgid "Password (again)"
-msgstr "पासवर्ड(फेरि)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "पासवर्ड परिवर्तन गर्नुहोस्"
@@ -4967,6 +4803,14 @@ msgstr "XML पद वर्णन त्रुटि"
 msgid "Unknown Error in presence"
 msgstr "उपस्थितिमा अज्ञात त्रुटि"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "%s कुराकानी जडान गर्दा त्रुटि"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "%s कुराकानीमा त्रुटि"
+
 msgid "Create New Room"
 msgstr "नयाँ कोठा सिर्जना गर्नुहोस्"
 
@@ -4985,16 +4829,20 @@ msgstr "कोठा कन्फिगर गर्नुहोस्"
 msgid "_Accept Defaults"
 msgstr "पूर्वनिर्धारणहरू स्विकार गर्नुहोस्"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "%s कुराकानी जडान गर्दा त्रुटि"
+#, fuzzy
+msgid "No reason"
+msgstr "कारण दिइएको छैन ।"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "%s कुराकानीमा त्रुटि"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "तपाईँ %s द्वारा बाहिरिनु भएको छ : (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s द्वारा फ्याँकिएको (%s)छ"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "फाइल खोलिरहेको बेलामा त्रुटि उत्पन्न भयो ।"
 
 #, fuzzy
@@ -5508,9 +5356,6 @@ msgstr ""
 "MSNका लागि SSL समर्थन आवश्यक पर्दछ । कृपया, SSL समर्थित लाइब्रेरि स्थापना गर्नुहोस् । "
 "धेरै जानकारीका लागि http://Pidgin.sf.net/faq-ssl.php हेर्नुहोस् ।"
 
-msgid "Failed to connect to server."
-msgstr "सर्भरमा जडान गर्न असफल भयो ।"
-
 msgid "Error retrieving profile"
 msgstr "प्रोफाइल पुन: प्राप्त गर्दा त्रुटि"
 
@@ -5792,9 +5637,6 @@ msgstr "सन्देश नगएको पनि हुनसक्छ क�
 msgid "Message was not sent because an unknown error occurred."
 msgstr "सन्देश नगएको पनि हुनसक्छ किनभने अज्ञात त्रुटि आएको छ :"
 
-msgid "Unable to connect"
-msgstr "जडान गर्न अक्षम छ"
-
 msgid "Writing error"
 msgstr "लेखन त्रुटि"
 
@@ -5809,20 +5651,24 @@ msgstr ""
 "%s बाट (%s) सर्भरमा जडान त्रुटि:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "सर्भरद्वारा हाम्रो प्रोटोकल समर्थन हुदैन ।"
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "HTTP पद वर्णन गर्दा त्रुटि ।"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "तपाईँले अर्को स्थानबाट साइनअन गर्नुभएको छ।"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN सर्भरहरू अस्थायी रुपमा उपलब्ध छैनन् । कृपया प्रतिक्षा गर्नुहोस् र फेरी प्रयास गर्नुहोस् ।"
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN सर्भरहरू अस्थायी रुपमा बन्द हुन लाग्दैछन् ।"
 
 #, c-format
@@ -5835,9 +5681,6 @@ msgstr ""
 "तपाईँको MSN साथी सूची अस्थायी रुपमा उपलब्ध छैन । कृपया, प्रतिक्षा गर्नुहोस् र फेरी प्रयास "
 "गर्नुहोस् ।"
 
-msgid "Unknown error."
-msgstr "अज्ञात त्रुटि"
-
 msgid "Handshaking"
 msgstr "ह्यान्डसेक गर्दैछ"
 
@@ -5937,6 +5780,9 @@ msgstr "AIM/ICQ प्रोटोकल प्लगइन"
 msgid "%s is not a valid group."
 msgstr "%s वैध समूह हैन ।"
 
+msgid "Unknown error."
+msgstr "अज्ञात त्रुटि"
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s (%s)मा%s"
@@ -6052,13 +5898,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "सर्भरबाट अवैध जवाफ ।"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-#, fuzzy
-msgid "Connected"
-msgstr "जडान गर्नुहोस्"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr ""
@@ -6082,18 +5921,6 @@ msgid "Invalid input condition"
 msgstr "जडानलाई अन्तिम रुप दिँदै"
 
 #, fuzzy
-msgid "Read buffer full (2)"
-msgstr "भरिएको लाम"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "यो सन्देश पद वर्णन गर्न अक्षम छ"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "होस्टमा जडान गर्न सकिएन"
-
-#, fuzzy
 msgid "Failed to add buddy"
 msgstr "कुराकानीमा साथी जडान गर्न असफल"
 
@@ -6187,6 +6014,12 @@ msgstr ""
 msgid "Client Version"
 msgstr "वार्तालाप बन्द गर्नुहोस्"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 #, fuzzy
 msgid "MySpaceIM - Username Available"
 msgstr "सेवा उपलब्ध छैन"
@@ -6454,9 +6287,9 @@ msgstr "या त प्रयोगकर्ता अफलाइनमा �
 msgid "Unknown error: 0x%X"
 msgstr "अज्ञात त्रुटि:0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "(%s)लगइन असफल भयो ।"
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "%s प्रयोगकर्तालाई रोक्न अक्षम भयो"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6557,9 +6390,6 @@ msgstr "समूहगत सम्मेलन %d"
 msgid "Authenticating..."
 msgstr "प्रमाणीकरण गर्दैछ..."
 
-msgid "Unable to connect to server."
-msgstr "सर्भरमा जडान गर्न अक्षम ।"
-
 msgid "Waiting for response..."
 msgstr "प्रतिक्रियाका लागि पर्खिदैछ..."
 
@@ -6583,25 +6413,19 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "के तपाईँ वार्तालाप जडान गर्न चाहानुहुन्छ ?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"तपाईँ लगआउट भइसक्नु भएको छ किनभने तपाईँले अर्को कार्यक्षेत्रमा लगइन गरिसक्नु भएको छ ।"
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s अफलाइन भएको देखिन्छ र तपाईँले पठाएको सन्देश प्राप्त गरेन ।"
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "सर्भरमा जडान गर्न अक्षम भयो । कृपया तपाईँले जडान गर्न चाहानु भएको सर्भरको ठेगाना "
 "प्रविष्टि गर्नुहोस् ।"
 
-msgid "Error. SSL support is not installed."
-msgstr "त्रुटि. SSL समर्थन स्थापित छैन ।"
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "यो सम्मेलन बन्द भयो । कुनै सन्देशहरू पठाउन सकिदैन ।"
 
@@ -6641,10 +6465,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "जडान सिर्जना गर्दा त्रुटि"
 
-msgid "Incorrect password."
-msgstr "गलत पासवर्ड ।"
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, fuzzy
@@ -6656,17 +6477,7 @@ msgid "Invalid chat room name"
 msgstr "अवैध कोठा नाम"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "जडान सिर्जना गर्दा त्रुटि"
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "सर्भर सँग  संचार आदान प्रदानमा त्रुटि"
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "सर्भरमा SSL जडान बनाउन अक्षम छ ।"
 
 #. *< type
@@ -6719,8 +6530,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "सर्भरमा SSL जडान बनाउन अक्षम छ ।"
 
 #, fuzzy
 msgid "Direct IM established"
@@ -6916,16 +6728,12 @@ msgid "Buddy Comment"
 msgstr "साथी टिप्पणी"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "स्थान्तरणका लागि जडान गर्न सकिएन"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr "सर्भरमा जडान गर्न असफल भयो ।"
+msgid "Unable to connect to BOS server: %s"
+msgstr "सर्भरमा जडान गर्न अक्षम ।"
 
 #, fuzzy
 msgid "Username sent"
@@ -6940,9 +6748,9 @@ msgstr "जडानलाई अन्तिम रुप दिँदै"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "लगइन गर्न अक्षम: %s को रुपमा साइनअन गर्न सकेन किनभने पर्दा नाम अवैध छ ।  पर्दा नामहरू "
 "एउटा अक्षरबाट सुरू हुनुपर्दछ र अक्षरहरू, संख्याहरू र खाली स्थानहरू समाहित गर्न सक्दछ, वा "
@@ -6958,30 +6766,23 @@ msgstr ""
 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
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "अवैध उपनाम"
+msgid "Username does not exist"
+msgstr "प्रयोगकर्ता अवस्थित छैन"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "तपाईँको खाता हाल बन्द गरिएको छ ।"
 
 #. service temporarily unavailable
@@ -7003,7 +6804,8 @@ msgstr ""
 "प्रयास गर्नुहोस् । यदि तपाईँंले प्रयास गर्न जारी राख्नुभयो भने, तपाईँले झन बढी प्रतिक्षा "
 "गर्नुपर्ने हुन्छ ।"
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "प्रविष्ट गरिएको सुरक्षित ID कुञ्जी अवैध छ ।"
 
 msgid "Enter SecurID"
@@ -7175,6 +6977,9 @@ msgstr "अनलाइन अवधि"
 msgid "Member Since"
 msgstr "सदस्य अवधि"
 
+msgid "Capabilities"
+msgstr "क्षमताहरू"
+
 msgid "Profile"
 msgstr "प्रोफाइल"
 
@@ -7352,7 +7157,7 @@ msgstr "टाढा सन्देश अति लामो भयो।"
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7379,9 +7184,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "अर्फन"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "साथी %s थप्न सकिएन किनभने तपाईँ सँग  साथी सूचिमा अति धेरै साथीहरू छन् । कृपया एउटा "
@@ -7391,7 +7196,7 @@ msgid "(no name)"
 msgstr "(नाम छैन)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "अज्ञात कारणका लागि तपाईँको आदेश असफल भयो ।"
 
 #, fuzzy, c-format
@@ -8268,7 +8073,7 @@ msgid "Update interval (seconds)"
 msgstr "पढाइ त्रुटि"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "सर्भर सूचना प्राप्त गर्न सक्दैन"
 
 #, c-format
@@ -8295,10 +8100,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "सर्भर सूचना प्राप्त गर्न सक्दैन"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "अनुरोध अस्पष्ट"
 
@@ -8334,26 +8135,11 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "जडान गर्न अक्षम ।"
-
 #, fuzzy
 msgid "Socket error"
 msgstr "त्रुटि पढ्नुहोस्"
 
 #, fuzzy
-msgid "Unable to read from socket"
-msgstr "सकेट पढ्न अक्षम भयो"
-
-#, fuzzy
-msgid "Write Error"
-msgstr "त्रुटि लेख्नुहोस्"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "जडान बन्द भयो"
-
-#, fuzzy
 msgid "Getting server"
 msgstr "प्रयोगकर्ता सूचना सेट गर्नुहोस्..."
 
@@ -8362,8 +8148,8 @@ msgid "Requesting token"
 msgstr "अनुरोध अस्वीकृत गरियो"
 
 #, fuzzy
-msgid "Couldn't resolve host"
-msgstr "होस्टमा जडान गर्न सकिएन"
+msgid "Unable to resolve hostname"
+msgstr "सर्भर पिङ्ग गर्न अक्षम"
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8414,7 +8200,7 @@ msgid "QQ Qun Command"
 msgstr "आदेश"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "सर्भर सूचना प्राप्त गर्न सक्दैन"
 
 #, fuzzy
@@ -8437,10 +8223,6 @@ msgstr "फाइल पठाउन असफल भयो"
 msgid "%d canceled the transfer of %s"
 msgstr "%s ले %s को स्थानान्तरण रद्द गर्यो"
 
-#, fuzzy
-msgid "Connection closed (writing)"
-msgstr "जडान बन्द भयो"
-
 #, fuzzy, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>प्रयोगकर्ता:</b> %s<br>"
@@ -8502,19 +8284,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#, fuzzy
-msgid "Connection reset"
-msgstr "जडान बन्द भयो"
-
-#, fuzzy, c-format
-msgid "Error reading from socket: %s"
-msgstr "सकेटबाट पढ्दा त्रुटि ।"
-
-#. this is a regular connect, error out
-#, fuzzy
-msgid "Unable to connect to host"
-msgstr "सर्भरमा जडान गर्न अक्षम ।"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -8542,6 +8311,10 @@ msgid "Video Camera"
 msgstr "भिडियो कुराकानी"
 
 #, fuzzy
+msgid "File Transfer"
+msgstr "फाइल स्थानान्तरणहरू"
+
+#, fuzzy
 msgid "Supports"
 msgstr "समर्थन"
 
@@ -9374,6 +9147,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "सञ्जाल तथ्याङ्क"
 
+msgid "Ping"
+msgstr "पिङ्ग गर्नुहोस्"
+
 msgid "Ping failed"
 msgstr "पिङ्ग असफल भयो"
 
@@ -9440,7 +9216,8 @@ msgstr "असमर्थित सार्वजनिक कुञ्जी
 msgid "Disconnected by server"
 msgstr "सर्भर बाट जडान विच्छेदन गरियो"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "SILC सर्भरमा जडान गर्दा त्रुटि"
 
 msgid "Key Exchange failed"
@@ -9451,29 +9228,26 @@ msgid ""
 msgstr ""
 "असंलग्न सत्रको पुन: निरन्तरता असफल भयो । नयाँ जडान सिर्जना गर्न 'पुन:जडान' थिच्नुहोस् ।"
 
-msgid "Connection failed"
-msgstr "जडान असफल भयो"
-
 msgid "Performing key exchange"
 msgstr "कुञ्जी साटासाट सम्पादन"
 
 #, fuzzy
-msgid "Unable to create connection"
-msgstr "नयाँ जडान सिर्जना गर्न अक्षम ।"
-
-#, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "सार्वजनिक कुञ्जी लोड गर्न सकिएन"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "SILC सर्भरमा जडान हुँदैछ"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "सार्वजनिक कुञ्जी लोड गर्न सकिएन"
+
 msgid "Out of memory"
 msgstr "स्मृती बाहिर"
 
 #, fuzzy
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "SILC ग्राहक जडान सुरू गर्न सक्दैन"
 
 #, fuzzy
@@ -9785,7 +9559,7 @@ msgid "Creating SILC key pair..."
 msgstr "SILC कुञ्जी जोडी सिर्जना गर्दैछ..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "SILC कुञ्जी जोडी सिर्जना गर्दैछ..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9879,6 +9653,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr "सर्भर तथ्याङ्क उपलब्ध छैन"
 
+msgid "Error during connecting to SILC Server"
+msgstr "SILC सर्भरमा जडान गर्दा त्रुटि"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "असफल:संस्करण मेल खाएन,तपाईँंको ग्राहक स्तरबृद्धि गर्नुहोस्"
@@ -9919,7 +9696,8 @@ msgstr "असफल: अवैध कुकी"
 msgid "Failure: Authentication failed"
 msgstr "असफल: प्रमाणीकरण असफल भयो"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "SILC ग्राहक जडान सुरू गर्न सक्दैन"
 
 #, fuzzy
@@ -9927,27 +9705,20 @@ msgid "John Noname"
 msgstr "(नाम छैन)"
 
 #, fuzzy, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "सार्वजनिक कुञ्जी लोड गर्न सकिएन"
 
 #, fuzzy
-msgid "Could not write"
-msgstr "पठाउन सकिएन"
-
-msgid "Could not connect"
-msgstr "जडान गर्न सकिएन"
+msgid "Unable to create connection"
+msgstr "नयाँ जडान सिर्जना गर्न अक्षम ।"
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "अज्ञात कारण ।"
 
 #, fuzzy
-msgid "Could not create listen socket"
-msgstr "सकेट सिर्जना गर्न सकिएन"
-
-#, fuzzy
-msgid "Could not resolve hostname"
-msgstr "होस्टनाम निश्चय गर्न अक्षम भयो ।"
+msgid "Unable to create listen socket"
+msgstr "सकेट सिर्जना गर्न अक्षम भयो"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -9997,6 +9768,84 @@ msgstr "AP प्रयोगकर्ता"
 msgid "Auth Domain"
 msgstr "स्वचालित"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;room&gt;:  याहू सञ्झ्यालमा कुराकानी कोठा जडान गर्नुहोस्"
+
+#, fuzzy
+msgid "list: List rooms on the Yahoo network"
+msgstr "सूची:  यो सञ्जालमा च्यानलहरू सूचीबद्ध गर्नुहोस्"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "याहू! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "याहू प्रोटोकल प्लगइन"
+
+#, fuzzy
+msgid "Pager server"
+msgstr "प्रोक्सि सर्भर"
+
+msgid "Pager port"
+msgstr "पेजर पोर्ट"
+
+#, fuzzy
+msgid "File transfer server"
+msgstr "फाइल स्थान्तरण होस्ट"
+
+msgid "File transfer port"
+msgstr "फाइल स्थान्तरण पोर्ट"
+
+#, fuzzy
+msgid "Chat room locale"
+msgstr "कुराकानी कोठा स्थानीयता"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
+
+#, fuzzy
+msgid "Chat room list URL"
+msgstr "कुराकानी कोठा सूची युआरएल"
+
+msgid "Yahoo Chat server"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo Chat port"
+msgstr "याहू जापान"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "याहू! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "याहू प्रोटोकल प्लगइन"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -10028,28 +9877,18 @@ msgstr "साथी थप्न अस्वीकार गरियो"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr "अज्ञात त्रुटि सङ्ख्या %d । याहू! वेबसाइटमा लगइन गर्नाले यसलाई स्थिर गर्न सक्छ ।"
 
 #. username or password missing
@@ -10087,11 +9926,12 @@ msgstr "तपाईँको खातामा ताल्चा लगाइ
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "अज्ञात त्रुटि सङ्ख्या %d । याहू! वेबसाइटमा लगइन गर्नाले यसलाई स्थिर गर्न सक्छ ।"
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "खाता %s को सर्भर सूचीमा समूह %s मा साथी %s थप्न सकेन ।"
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "सर्भर सूचीमा साथी थप्न सकेन"
 
 #, c-format
@@ -10099,23 +9939,16 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
 #, fuzzy
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "सर्भरबाट अवैध जवाफ ।"
 
-msgid "Connection problem"
-msgstr "जडान समस्या"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "%s सँग  वार्तालाप"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "सर्भरमा SSL जडान बनाउन अक्षम छ ।"
 
 #, fuzzy
 msgid "Not at Home"
@@ -10186,82 +10019,15 @@ msgstr "कुराकानीमा प्रयोगकर्ता जड�
 msgid "Open Inbox"
 msgstr ""
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;room&gt;:  याहू सञ्झ्यालमा कुराकानी कोठा जडान गर्नुहोस्"
-
-#, fuzzy
-msgid "list: List rooms on the Yahoo network"
-msgstr "सूची:  यो सञ्जालमा च्यानलहरू सूचीबद्ध गर्नुहोस्"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "याहू! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "याहू प्रोटोकल प्लगइन"
-
-msgid "Yahoo Japan"
-msgstr "याहू जापान"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "प्रोक्सि सर्भर"
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "जापान पेजर होस्ट"
-
-msgid "Pager port"
-msgstr "पेजर पोर्ट"
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "फाइल स्थान्तरण होस्ट"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "जापान फाइल स्थान्तरण होस्ट"
-
-msgid "File transfer port"
-msgstr "फाइल स्थान्तरण पोर्ट"
-
-#, fuzzy
-msgid "Chat room locale"
-msgstr "कुराकानी कोठा स्थानीयता"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-#, fuzzy
-msgid "Chat room list URL"
-msgstr "कुराकानी कोठा सूची युआरएल"
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "याहू जापान"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "जडान गर्न अक्षम ।"
+
 msgid "Unable to establish file descriptor."
 msgstr "फाइल वर्णनकर्ता स्थापना गर्न अक्षम ।"
 
@@ -10269,6 +10035,10 @@ msgstr "फाइल वर्णनकर्ता स्थापना गर
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s ले फाइल फठाउने प्रस्ताव गरिरहेको छ %s"
 
+#, fuzzy
+msgid "Write Error"
+msgstr "त्रुटि लेख्नुहोस्"
+
 msgid "Yahoo! Japan Profile"
 msgstr "याहू! जापान प्रोफाइल"
 
@@ -10387,21 +10157,19 @@ msgstr "स्वरहरू"
 msgid "Webcams"
 msgstr "वेबक्यामहरू"
 
+msgid "Connection problem"
+msgstr "जडान समस्या"
+
 msgid "Unable to fetch room list."
 msgstr "कोठा सूची तान्न अक्षम ।"
 
 msgid "User Rooms"
 msgstr "प्रयोगकर्ता कोठाहरू"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "YCHT सर्भरसँग  जडान समस्या छ ।"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "सर्भर सँग  संचार आदान प्रदानमा त्रुटि"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10534,21 +10302,15 @@ msgid "Exposure"
 msgstr "प्रदर्शक"
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "सकेट सिर्जना गर्न अक्षम भयो"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "सन्देश पठाउन अक्षम: %s"
 
 #, fuzzy, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "प्रोक्सी जडान त्रुटि %d"
 
 #, fuzzy, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "पहुँच अस्विकार: प्रोक्सी सर्भरले पोर्ट %d ट्युन्नेलिङ्ग रोकावट गर्दछ"
 
 #, fuzzy, c-format
@@ -10558,10 +10320,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, fuzzy
-msgid "Could not resolve host name"
-msgstr "होस्टनाम निश्चय गर्न अक्षम भयो ।"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10777,12 +10535,6 @@ msgstr ""
 msgid "Unable to connect to %s: %s"
 msgstr "सर्भरमा जडान गर्न अक्षम ।"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "सर्भर लगइनका लागि TLS/SSL आवश्यकता पर्दछ । TLS/SSL समर्थन फेला परेन ।"
-
 #, c-format
 msgid " - %s"
 msgstr ""
@@ -11039,7 +10791,11 @@ msgid "View _Log"
 msgstr "लग हेर्नुहोस्"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "जब अफ लाइन मा हुन्छ अनुमति दिइदैन"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "जब अफ लाइन मा हुन्छ अनुमति दिइदैन"
 
 msgid "_Alias..."
@@ -11602,6 +11358,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "%s का लागि प्रयोगकर्ता सूचना परिवर्तन गर्नुहोस्"
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11653,7 +11412,7 @@ msgid "Get Away Message"
 msgstr "नयाँ टाढा सन्देश"
 
 #, fuzzy
-msgid "Last said"
+msgid "Last Said"
 msgstr "अन्तिम नाम"
 
 msgid "Unable to save icon file to disk."
@@ -12600,7 +12359,7 @@ msgid "Hyperlink visited color"
 msgstr "हाईपरलिंक रङ"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "हाइपरलिङ्कहरू कोर्न रङ्"
 
 #, fuzzy
@@ -12640,15 +12399,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "हटाउन मिल्ने सूचना"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "नयाँ प्रत्र सूचनाहरू"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -13034,6 +12800,10 @@ msgid ""
 msgstr "'म्यानुअल' ब्राउजर आदेश रोजिएको छ, तर कुनै आदेश सेट गरिएको छैन ।"
 
 #, fuzzy
+msgid "No message"
+msgstr "(१ सन्देश)"
+
+#, fuzzy
 msgid "Open All Messages"
 msgstr "सन्देश पठाउनुहोस्"
 
@@ -13058,10 +12828,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, fuzzy
-msgid "No message"
-msgstr "(१ सन्देश)"
-
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -13305,7 +13071,7 @@ msgid "On unread messages"
 msgstr "सन्देश पठाउनुहोस्"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "IM वार्तालाप सञ्झ्यालहरू"
 
 #, fuzzy
@@ -13315,6 +13081,10 @@ msgstr "वार्तालाप बन्द गर्नुहोस्"
 msgid "When away"
 msgstr "टाढा गएको बेला"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "IM वार्तालाप सञ्झ्यालहरू"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -13379,10 +13149,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr "सन्देशहरू प्राप्त गरिसके पछि सञ्झ्याल फ्ल्यास गर्नुहोस्"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "IM वार्तालाप सञ्झ्यालहरू"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -13421,8 +13187,8 @@ msgstr "प्रयोगकर्ता जानकारी प्राप�
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-#, fuzzy
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "IP ठेगाना स्वत:पत्ता लागाउनुहोस्"
 
 msgid "Public _IP:"
@@ -13816,34 +13582,18 @@ msgstr "बचत गर्नुहोस् र प्रयोग गर्�
 msgid "Status for %s"
 msgstr "वस्तुस्थिति: %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "स्माइली घुसाउनुहोस्"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
 #, fuzzy
-msgid "Duplicate Shortcut"
-msgstr "सार्वजनिक कुञ्जी फाइल"
+msgid "Custom Smiley"
+msgstr "स्माइली घुसाउनुहोस्"
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "चयन गरिएको समूहका लागि एउटा नयाँ नाम प्रविष्टि गर्नुहोस् ।"
+msgid "Duplicate Shortcut"
+msgstr "सार्वजनिक कुञ्जी फाइल"
 
 #, fuzzy
 msgid "Edit Smiley"
@@ -13965,8 +13715,8 @@ msgid "Cannot send launcher"
 msgstr "फाइल पठाउन सकिएन"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -14595,7 +14345,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -14869,7 +14619,7 @@ msgstr "IM वार्तालाप सञ्झ्यालहरू"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -15204,9 +14954,10 @@ msgstr "लगइन विकल्पहरू"
 msgid "Options specific to Pidgin for Windows."
 msgstr "सञ्झ्यालको गाइममा विशेष विकल्पहरू"
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "सञ्झ्यालको गाइममा विशेष विकल्पहरू"
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr ""
@@ -15248,6 +14999,284 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Cannot open socket"
+#~ msgstr "सकेट खोल्न अक्षम भयो"
+
+#, fuzzy
+#~ msgid "Could not listen on socket"
+#~ msgstr "सकेट सिर्जना गर्न सकिएन"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "सकेट पढ्न अक्षम भयो"
+
+#, fuzzy
+#~ msgid "Connection failed."
+#~ msgstr "जडान असफल भयो"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "सर्भर विच्छेद भएको छ"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "सकेट सिर्जना गर्न सकिएन"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "होस्टमा जडान गर्न सकिएन"
+
+#~ msgid "Read error"
+#~ msgstr "त्रुटि पढ्नुहोस्"
+
+#~ msgid "Write error"
+#~ msgstr "त्रुटि लेख्नुहोस्"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "डाइरेक्टरी सूचना सेट गर्नुहोस्"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "विस्तृत ठेगाना"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "कुराकानीलाई उपनाम दिनुहोस्"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "प्रयोगकर्ता सँग  डाइरेक्टरी सूचना छैन ।"
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "आदेश"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "एच टि एम एल"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "दर्ता त्रुटि"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "स्थान"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "साथी स्थितिको सूचना"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "असमर्थित संस्करण"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "अभिमुखीकरण"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "प्रयोगकर्ता मोडहरू"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "प्रयोगकर्ता सीमा"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "क्षमताहरू"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "प्रयोगकर्ता नाम"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "कुञ्जी साटासाटमा IM गर्नुहोस् "
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "इमेल ठेगाना"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "प्रोफाइल सेट गर्नुहोस्"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "पिङ्ग गर्नुहोस्"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "प्रयोगकर्ता नाम"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "प्रत्यक्ष भिडियो"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "सन्देश प्राप्त हुँदा"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "सार्वजनिक कुञ्जी ब्याबलप्रिन्ट"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "प्रयोगकर्ता विकल्पहरू"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "प्रयोगकर्ता मोडहरू"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "प्रयोगकर्ता सीमा"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "प्रयोगकर्ता सीमा"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "ट्रिलियन गुप्तिकरण"
+
+#~ msgid "Read Error"
+#~ msgstr "त्रुटि पढ्नुहोस्"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "सर्भरमा जडान गर्न असफल भयो ।"
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "भरिएको लाम"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "यो सन्देश पद वर्णन गर्न अक्षम छ"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "होस्टमा जडान गर्न सकिएन"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "(%s)लगइन असफल भयो ।"
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "सर्भरमा जडान गर्न अक्षम ।"
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "तपाईँ लगआउट भइसक्नु भएको छ किनभने तपाईँले अर्को कार्यक्षेत्रमा लगइन गरिसक्नु भएको छ ।"
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "त्रुटि. SSL समर्थन स्थापित छैन ।"
+
+#~ msgid "Incorrect password."
+#~ msgstr "गलत पासवर्ड ।"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "सर्भरमा जडान गर्न असफल भयो ।"
+
+#, fuzzy
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "तपाईँले क्रमबद्धरूपले जडान विच्छेद गर्न सक्नुहुन्छ ।  तपाईँं यो स्थिर TOC इकाइ प्रयोग गर्न "
+#~ "चाहानुहुन्छ ।   अद्यावधिकका लागि %s जाँच गर्नुहोस् ।"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "जडान गर्न सकेन"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "अवैध उपनाम"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "सर्भर सूचना प्राप्त गर्न सक्दैन"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "जडान बन्द भयो"
+
+#, fuzzy
+#~ msgid "Couldn't resolve host"
+#~ msgstr "होस्टमा जडान गर्न सकिएन"
+
+#, fuzzy
+#~ msgid "Connection closed (writing)"
+#~ msgstr "जडान बन्द भयो"
+
+#, fuzzy
+#~ msgid "Connection reset"
+#~ msgstr "जडान बन्द भयो"
+
+#, fuzzy
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "सकेटबाट पढ्दा त्रुटि ।"
+
+#, fuzzy
+#~ msgid "Unable to connect to host"
+#~ msgstr "सर्भरमा जडान गर्न अक्षम ।"
+
+#, fuzzy
+#~ msgid "Could not write"
+#~ msgstr "पठाउन सकिएन"
+
+#~ msgid "Could not connect"
+#~ msgstr "जडान गर्न सकिएन"
+
+#, fuzzy
+#~ msgid "Could not create listen socket"
+#~ msgstr "सकेट सिर्जना गर्न सकिएन"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "होस्टनाम निश्चय गर्न अक्षम भयो ।"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "गलत पासवर्ड ।"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "याहू जापान"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "जापान पेजर होस्ट"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "जापान फाइल स्थान्तरण होस्ट"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "सर्भर सँग  संचार आदान प्रदानमा त्रुटि"
+
+#, fuzzy
+#~ msgid "Could not resolve host name"
+#~ msgstr "होस्टनाम निश्चय गर्न अक्षम भयो ।"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "सर्भर लगइनका लागि TLS/SSL आवश्यकता पर्दछ । TLS/SSL समर्थन फेला परेन ।"
+
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "IM वार्तालाप सञ्झ्यालहरू"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "चयन गरिएको समूहका लागि एउटा नयाँ नाम प्रविष्टि गर्नुहोस् ।"
+
+#, fuzzy
 #~ msgid "Activate which ID?"
 #~ msgstr "कुन ID सक्रिय गर्ने?"
 
@@ -15869,10 +15898,6 @@ msgstr ""
 #~ msgstr "हालसालै"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "सर्भरमा जडान गर्न अक्षम ।"
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "सन्देश:"
 
diff --git a/po/nl.po b/po/nl.po
index 31ae91f708..98ad6a2769 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2009-01-06 17:27+0100\n"
 "Last-Translator: Daniël Heres <danielheres@gmail.com>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -2630,9 +2630,10 @@ msgstr "Logboeken van andere clients tonen in ons logboek."
 
 #  * description
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2687,8 +2688,9 @@ msgstr "Offline berichten emulatie"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Berichten aan een offline gebruiker opslaan in alarm"
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr "De rest van de berichten zal in het alarm worden opgeslagen. Je kan"
 
@@ -2939,14 +2941,16 @@ msgstr ""
 "te maken van TCL-plug-ins, installeer ActiveTCL vanaf http://www.activestate."
 "com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "De Apple Bonjour For Windows toolkit is niet geconden, bekijk de FAQ op "
 "http://d.pidgin.im/BonjourWindow voor meer informatie."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Kan niet luisteren naar binnenkomende gespreksverzoeken\n"
 
 msgid ""
@@ -3000,14 +3004,21 @@ msgstr "%s heeft het gesprek gesloten."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Kan het bericht niet verzenden. Kan geen gesprek starten."
 
-msgid "Cannot open socket"
-msgstr "Kan socket niet openen"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Kan geen socket aanmaken:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Kan socket niet koppelen aan poort"
 
-msgid "Could not listen on socket"
-msgstr "Kan niet luisteren naar socket"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Kan geen socket aanmaken:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Fout bij het communiceren met lokale mDNSResponder"
@@ -3054,13 +3065,16 @@ msgstr "Contactenlijst opslaan..."
 msgid "Load buddylist from file..."
 msgstr "Contactenlijst laden uit bestand..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Registratievelden invullen."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Wachtwoorden komen niet overeen."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Kan geen nieuw account registreren. Er is een fout opgetreden.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3072,14 +3086,15 @@ msgstr "Registratie voltooid."
 msgid "Password"
 msgstr "Wachtwoord"
 
-msgid "Password (retype)"
-msgstr "Wachtwoord (nogmaals)"
+msgid "Password (again)"
+msgstr "Nieuw wachtwoord (herhalen)"
 
-msgid "Enter current token"
-msgstr "Geef huidige teken"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Huidige teken"
+#, fuzzy
+msgid "Captcha"
+msgstr "Captcha afbeelding"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Nieuw Gadu-gadu-account registreren"
@@ -3132,6 +3147,15 @@ msgstr "Wachtwoord gewijzigd."
 msgid "Current password"
 msgstr "Huidige wachtwoord"
 
+msgid "Password (retype)"
+msgstr "Wachtwoord (nogmaals)"
+
+msgid "Enter current token"
+msgstr "Geef huidige teken"
+
+msgid "Current token"
+msgstr "Huidige teken"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Geef je huidige wachtwoord en nieuwe wachtwoord voor UIN: "
 
@@ -3179,8 +3203,8 @@ msgstr "Niet overeenkomende gebruikers gevonden"
 msgid "There are no users matching your search criteria."
 msgstr "Er zijn geen overeenkomende gebruikers voor uw zoekcriteria"
 
-msgid "Unable to read socket"
-msgstr "Kan niet lezen van socket."
+msgid "Unable to read from socket"
+msgstr "Kan niet lezen van socket"
 
 msgid "Buddy list downloaded"
 msgstr "Contactenlijst gedownload"
@@ -3194,8 +3218,14 @@ msgstr "Contactenlijst verzonden"
 msgid "Your buddy list was stored on the server."
 msgstr "Uw contactenlijst is opgeslagen op de server."
 
-msgid "Connection failed."
-msgstr "Verbinding mislukt."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Verbonden"
+
+msgid "Connection failed"
+msgstr "Verbinding mislukt"
 
 msgid "Add to chat"
 msgstr "Toevoegen aan chatgesprek"
@@ -3203,18 +3233,23 @@ msgstr "Toevoegen aan chatgesprek"
 msgid "Chat _name:"
 msgstr "_Naam chatgesprek:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Kan geen verbinding maken met de computer."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Verbinding wordt gemaakt"
+
 msgid "Chat error"
 msgstr "Chatfout"
 
 msgid "This chat name is already in use"
 msgstr "De naam bestaat reeds"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Niet verbonden met de server."
 
 msgid "Find buddies..."
@@ -3275,7 +3310,8 @@ msgstr "Geen onderwerp ingesteld"
 msgid "File Transfer Failed"
 msgstr "Bestandsoverdracht mislukt"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Kon geen poort openen om te luisteren."
 
 msgid "Error displaying MOTD"
@@ -3291,8 +3327,18 @@ msgstr "Er is geen MOTD geassocieerd met deze verbinding."
 msgid "MOTD for %s"
 msgstr "MOTD voor %s"
 
-msgid "Server has disconnected"
-msgstr "Server heeft verbinding verbroken"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Verbinding verloren met server:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "MOTD weergeven"
@@ -3307,22 +3353,20 @@ msgstr "_Wachtwoord:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC-bijnamen mogen geen spaties bevatten"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Verbinding wordt gemaakt"
-
 msgid "SSL support unavailable"
 msgstr "SSL niet beschikbaar"
 
-msgid "Couldn't create socket"
-msgstr "Kan geen socket aanmaken"
+msgid "Unable to connect"
+msgstr "Kan geen verbinding maken"
 
-msgid "Couldn't connect to host"
-msgstr "Kan geen verbinding maken met host"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Kan geen verbinding maken met %s"
 
-msgid "Read error"
-msgstr "Leesfout"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Server heeft de verbinding verbroken."
 
 msgid "Users"
 msgstr "Gebruikers"
@@ -3755,12 +3799,14 @@ msgstr "Ad-Hoc opdracht mislukt"
 msgid "execute"
 msgstr "uitvoeren"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "Server vereist TLS/SSL voor aanmelding. Geen ondersteuning voor TLS/SSL "
 "gevonden."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "Server vereist versleuteling, maar er is geen ondersteuning voor TLS/SSL "
 "gevonden."
@@ -3781,7 +3827,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Tekstaanmelding"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Identificatie mislukt"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Ongeldig antwoord van server"
 
 msgid "Server does not use any supported authentication method"
@@ -3793,7 +3844,8 @@ msgstr "Je hebt encryptie nodig, maar het is niet mogelijk op deze server."
 msgid "Invalid challenge from server"
 msgstr "Ongeldige vraag van server"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL-fout"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3813,10 +3865,8 @@ msgstr ""
 "Kan geen verbinding maken met de server:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Kan geen verbinding maken met de server:\n"
 "%s"
@@ -3825,12 +3875,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "Kan verbinding niet initialiseren"
 
-msgid "Unable to create socket"
-msgstr "Kan geen socket aanmaken"
-
-msgid "Write error"
-msgstr "Schrijffout"
-
 msgid "Full Name"
 msgstr "Volledige naam"
 
@@ -3901,163 +3945,6 @@ msgstr "Besturingssysteem"
 msgid "Local Time"
 msgstr "Lokaal bestand:"
 
-msgid "Last Activity"
-msgstr "Laatste activiteit"
-
-msgid "Service Discovery Info"
-msgstr "Directory info instellen"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-msgid "Extended Stanza Addressing"
-msgstr "Stanza adresbijvoeging"
-
-msgid "Multi-User Chat"
-msgstr "Groepsgesprek"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Deze gebruiker heeft geen profiel."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr "Ad-Hoc opdrachten"
-
-msgid "PubSub Service"
-msgstr "PubSub dienst"
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "Registratiefout"
-
-msgid "User Location"
-msgstr "Gebruikerslocatie"
-
-msgid "User Avatar"
-msgstr "Avatar"
-
-msgid "Chat State Notifications"
-msgstr "Contactstatusmelding"
-
-msgid "Software Version"
-msgstr "Software versie"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "Oriëntatie"
-
-msgid "File Transfer"
-msgstr "Bestandsoverdracht"
-
-msgid "User Mood"
-msgstr "Humeur gebruiker"
-
-msgid "User Activity"
-msgstr "Activiteit gebruiker"
-
-msgid "Entity Capabilities"
-msgstr "Entiteit mogelijkheden"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Gecodeerde sessie onderhandelingen"
-
-msgid "User Tune"
-msgstr "Gebruikers tune"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "IM met sleuteluitwisseling"
-
-msgid "Reachability Address"
-msgstr "Beschikbaarheid adres"
-
-msgid "User Profile"
-msgstr "Profiel"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Geluid jingle"
-
-msgid "User Nickname"
-msgstr "Gebruikersnaam"
-
-msgid "Jingle ICE UDP"
-msgstr "ICE UDP Jingle"
-
-msgid "Jingle ICE TCP"
-msgstr "ICE TCP Jingle"
-
-msgid "Jingle Raw UDP"
-msgstr "Raw UDP Raw UDP"
-
-msgid "Jingle Video"
-msgstr "Jingle Video"
-
-msgid "Jingle DTMF"
-msgstr "DTMF DTMF"
-
-msgid "Message Receipts"
-msgstr "Bericht ontvangen"
-
-msgid "Public Key Publishing"
-msgstr "Openbare sleutel openbaren"
-
-msgid "User Chatting"
-msgstr "Chattende gebruiker"
-
-msgid "User Browsing"
-msgstr "Browsende gebruiker"
-
-msgid "User Gaming"
-msgstr "Gamende gebruiker"
-
-msgid "User Viewing"
-msgstr "Kijkende gebruiker"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Stanza codering"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr "Vertraagde afgifte"
-
-msgid "Collaborative Data Objects"
-msgstr "Samenwerkende data-objecten"
-
-msgid "File Repository and Sharing"
-msgstr "Bestandsbronnen en delen"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr "Hop-controle"
-
-msgid "Capabilities"
-msgstr "Mogelijkheden"
-
 msgid "Priority"
 msgstr "Prioriteit"
 
@@ -4069,7 +3956,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Ingelogd"
 
 msgid "Middle Name"
@@ -4250,16 +4137,13 @@ msgstr "Niet overeenkomende gebruikers gevonden"
 msgid "Roles:"
 msgstr "Rol"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Ping Verlopen"
 
-msgid "Read Error"
-msgstr "Leesfout"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4435,9 +4319,6 @@ msgstr "Wachtwoord is veranderd"
 msgid "Error changing password"
 msgstr "Fout bij veranderen van wachtwoord"
 
-msgid "Password (again)"
-msgstr "Nieuw wachtwoord (herhalen)"
-
 msgid "Change XMPP Password"
 msgstr "Veranderen XMPP-wachtwoord"
 
@@ -4826,6 +4707,14 @@ msgstr "XML analysefout"
 msgid "Unknown Error in presence"
 msgstr "Onbekende fout in aanwezigheid"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Fout bij meedoen aan chat: %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Fout in chat: %s"
+
 msgid "Create New Room"
 msgstr "Nieuwe ruimte maken"
 
@@ -4842,16 +4731,20 @@ msgstr "Ruimte _instellen"
 msgid "_Accept Defaults"
 msgstr "_Standaardinstellingen gebruiken"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Fout bij meedoen aan chat: %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Geen reden gegeven"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Fout in chat: %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Je bent weggeschopt door %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Weggeschopt door %s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Er is een fout opgetreden bij het openen van het bestand."
 
 #, fuzzy
@@ -5344,9 +5237,6 @@ msgstr "_Chat starten"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "SSL-ondersteuning is vereist voor MSN. Installeer een SSL-bibliotheek."
 
-msgid "Failed to connect to server."
-msgstr "Kan geen verbinding maken met de server."
-
 msgid "Error retrieving profile"
 msgstr "Fout bij ophalen van profiel"
 
@@ -5600,9 +5490,6 @@ msgstr "Bericht is niet verstuurd wegens een onbekende coderingsfout:"
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Bericht is niet verstuurd wegens een onbekende fout:"
 
-msgid "Unable to connect"
-msgstr "Kan geen verbinding maken"
-
 msgid "Writing error"
 msgstr "Schrijffout"
 
@@ -5617,13 +5504,16 @@ msgstr ""
 "Verbindingsfout van %s-server: \n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Ons protocol wordt niet ondersteund door de server."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Fout bij analyseren HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Je hebt jezelf aangemeld vanaf een andere locatie."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5631,7 +5521,8 @@ msgstr ""
 "De MSN-servers zijn op dit moment niet beschikbaar. Probeer het later nog "
 "eens."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "De MSN-servers worden tijdelijk uitgeschakeld."
 
 #, c-format
@@ -5644,9 +5535,6 @@ 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"
 
@@ -5753,6 +5641,9 @@ msgstr "MSN-protocol-plug-in"
 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)"
@@ -5866,12 +5757,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Contacten toevoegen van de server"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Verbonden"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protocol fout, code %d: %s"
@@ -5896,16 +5781,6 @@ msgstr "MySpaceIM-fout"
 msgid "Invalid input condition"
 msgstr "Ongeldige invoer voorwaarde"
 
-msgid "Read buffer full (2)"
-msgstr "Wachtrij vol (2)"
-
-msgid "Unparseable message"
-msgstr "Kan het bericht niet analyseren"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Kan geen verbinding maken met host: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Contact toevoegen mislukt"
 
@@ -5992,6 +5867,12 @@ msgstr "Totaal aantal vrienden"
 msgid "Client Version"
 msgstr "Client-versie"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Gebruikersnaam Beschikbaar"
 
@@ -6251,9 +6132,9 @@ msgstr "De gebruiker is off-line of heeft u geblokkeerd"
 msgid "Unknown error: 0x%X"
 msgstr "Onbekende fout: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Aanmelden mislukt (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Kan gebruiker %s niet pingen"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6359,9 +6240,6 @@ msgstr "Groupwise bijeenkomst %d"
 msgid "Authenticating..."
 msgstr "Identificatie..."
 
-msgid "Unable to connect to server."
-msgstr "Kan geen verbinding maken met de computer."
-
 msgid "Waiting for response..."
 msgstr "Wacht op antwoord..."
 
@@ -6385,26 +6263,19 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Wilt u het gesprek bijwonen?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"De verbinding is verbroken omdat u zich heeft aangemeld op een andere "
-"computer."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s lijkt niet aangemeld te zijn en heeft uw bericht niet ontvangen."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Kan geen verbinding makenmet server. Geef de naam op van de server waarmee u "
 "contact wilt maken."
 
-msgid "Error. SSL support is not installed."
-msgstr "Fout! Geen SSL-ondersteuning geïnstalleerd."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 "Deze bijeenkomst is afgesloten. Er kunnen geen nieuwe berichten verzonden "
@@ -6445,10 +6316,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6457,18 +6325,8 @@ msgstr "Kon gesprek-ruimte niet binnenkomen"
 msgid "Invalid chat room name"
 msgstr "Ongeldige naam voor ruimte"
 
-msgid "Server closed the connection."
-msgstr "Server heeft de verbinding verbroken."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Verbinding verloren met server:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Ongeldige data ontvangen van server."
 
 #. *< type
@@ -6516,7 +6374,8 @@ msgstr "De verbinding is verbroken met de volgende gebruiker:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Ongeldige data ontvangen via directe verbinding."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Kan geen verbinding maken met de andere gebruiker."
 
 msgid "Direct IM established"
@@ -6721,21 +6580,15 @@ msgstr "Waarschuwingsniveau"
 msgid "Buddy Comment"
 msgstr "Contactopmerking"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Kan niet verbinden met identificatieserver:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Kan niet verbinden met BOS-server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Kan geen verbinding maken met de computer."
 
 msgid "Username sent"
 msgstr "Gebruikersnaam verzonden"
@@ -6747,11 +6600,11 @@ msgstr "Verbinding hersteld, Cookie verzonden"
 msgid "Finalizing connection"
 msgstr "Afronden van verbinding"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Kan niet aanmelden: Kan niet aanmelden als %s omdat de gebruikersnaam "
 "ongeldig is. Gebruikersnamen moeten een geldig e-mailadres zijn, of beginnen "
@@ -6766,27 +6619,22 @@ msgstr ""
 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."
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Gebruiker bestaat niet"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Uw Account is momenteel afgesloten"
 
 #. service temporarily unavailable
@@ -6807,7 +6655,8 @@ 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 "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Ingevoerde SecurID sleutel is ongeldig."
 
 msgid "Enter SecurID"
@@ -6987,6 +6836,9 @@ msgstr "Online sinds"
 msgid "Member Since"
 msgstr "Lid sinds"
 
+msgid "Capabilities"
+msgstr "Mogelijkheden"
+
 msgid "Profile"
 msgstr "Profiel"
 
@@ -7166,9 +7018,9 @@ msgstr[1] ""
 msgid "Away message too long."
 msgstr "Afwezigheidsbericht te lang."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7193,9 +7045,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Wezen"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Kon %s niet als contact toevoegen omdat u te veel contacten in uw lijst "
@@ -7204,8 +7056,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(naamloos)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Kan contact %s niet toevoegen voor een onbekende reden."
 
 #, c-format
@@ -8002,7 +7854,7 @@ msgid "Update interval (seconds)"
 msgstr "Vernieuw-interval (in seconden)"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Kan login-antwoord niet decoderen"
 
 #, c-format
@@ -8027,10 +7879,6 @@ msgstr "Activatie vereist"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Ongeldig antwoord-code, 0x%02X"
 
-#, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Kan login-antwoord niet decoderen"
-
 msgid "Requesting captcha"
 msgstr "Captcha aanvragen"
 
@@ -8063,29 +7911,18 @@ msgid ""
 "%s"
 msgstr "Ongeldig antwoord-code, 0x%02X"
 
-msgid "Unable to connect."
-msgstr "Kan geen verbinding maken."
-
 msgid "Socket error"
 msgstr "Socketfout"
 
-msgid "Unable to read from socket"
-msgstr "Kan niet lezen van socket"
-
-msgid "Write Error"
-msgstr "Schrijffout"
-
-msgid "Connection lost"
-msgstr "Verbinding verbroken"
-
 msgid "Getting server"
 msgstr "Server verkrijgen"
 
 msgid "Requesting token"
 msgstr "Tekenreeks aanvragen"
 
-msgid "Couldn't resolve host"
-msgstr "Kan host niet vinden"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Kan geen verbinding maken met de computer."
 
 msgid "Invalid server or port"
 msgstr "Ongeldige server of poort"
@@ -8137,7 +7974,7 @@ msgid "QQ Qun Command"
 msgstr "QQ Qun-opdracht"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Kan login-antwoord niet decoderen"
 
 #, fuzzy
@@ -8159,9 +7996,6 @@ msgstr "Bestanden sturen"
 msgid "%d canceled the transfer of %s"
 msgstr "%d heeft de overdracht van %s afgebroken"
 
-msgid "Connection closed (writing)"
-msgstr "Verbinding verbroken (schrijven)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Groepstitel:</b> %s<br>"
@@ -8216,17 +8050,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Aankondiging sametime-beheerder"
 
-msgid "Connection reset"
-msgstr "Verbindingsfout"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Er is een fout opgetreden bij het lezen van de socket: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Kan geen verbinding maken met de computer"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Aankondiging van %s"
@@ -8249,6 +8072,9 @@ msgstr "Speakers"
 msgid "Video Camera"
 msgstr "Videocamera"
 
+msgid "File Transfer"
+msgstr "Bestandsoverdracht"
+
 msgid "Supports"
 msgstr "Ondersteuning"
 
@@ -9066,6 +8892,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Netwerkstatistieken"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping mislukt"
 
@@ -9130,7 +8959,8 @@ msgstr "Type openbare sleutel niet ondersteund"
 msgid "Disconnected by server"
 msgstr "Verbinding verbroken door server"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Fout bij verbinden met SILC-server"
 
 msgid "Key Exchange failed"
@@ -9142,26 +8972,26 @@ msgstr ""
 "Hervatten van losgekoppelde sessie mislukt. Klik op \"Opnieuw verbinden\" om "
 "een nieuwe verbinding te maken."
 
-msgid "Connection failed"
-msgstr "Verbinding mislukt"
-
 msgid "Performing key exchange"
 msgstr "Bezig met sleuteluitwisseling"
 
-msgid "Unable to create connection"
-msgstr "Kan geen nieuwe verbinding maken"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Kan SILC sleutelpaar niet laden"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Verbinden met SILC-server"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Kan SILC sleutelpaar niet laden"
+
 msgid "Out of memory"
 msgstr "Te weinig geheugen"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Kan SILC-protocol niet starten"
 
 msgid "Error loading SILC key pair"
@@ -9466,7 +9296,8 @@ msgstr "Alle berichten ondertekenen en controleren"
 msgid "Creating SILC key pair..."
 msgstr "Aanmaken van SILC sleutelpaar..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Kan geen SILC sleutelpaar aanmaken\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9563,6 +9394,9 @@ msgstr "Whiteboard"
 msgid "No server statistics available"
 msgstr "Geen serverstatistieken beschikbaar"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Fout bij verbinden met SILC-server"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -9605,30 +9439,27 @@ msgstr "Mislukt: Ongeldig cookie"
 msgid "Failure: Authentication failed"
 msgstr "Mislukt: Certificering mislukt"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Kan SILC-verbinding niet starten"
 
 msgid "John Noname"
 msgstr "John Zondernaam"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "kan SILC sleutelpaar niet laden: %s"
 
-msgid "Could not write"
-msgstr "Kan niet schrijven"
-
-msgid "Could not connect"
-msgstr "Kon geen verbinding maken"
+msgid "Unable to create connection"
+msgstr "Kan geen nieuwe verbinding maken"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Onbekend server-antwoord."
 
-msgid "Could not create listen socket"
-msgstr "Kan geen socket aanmaken om te luisteren"
-
-msgid "Could not resolve hostname"
-msgstr "Kan hostnaam niet vinden"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Kan geen socket aanmaken"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-bijnamen mogen geen spaties of @-tekens bevatten"
@@ -9670,6 +9501,78 @@ msgstr "Gebruiker"
 msgid "Auth Domain"
 msgstr "Domein"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr ""
+"join: &lt;ruimte&gt;:  Meedoen aan een chatruimte op het Yahoo-netwerk."
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Lijst van kanalen op dit netwerk"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo-protocol-plug-in"
+
+msgid "Pager server"
+msgstr "Semafoonserver"
+
+msgid "Pager port"
+msgstr "Semafoon-poort"
+
+msgid "File transfer server"
+msgstr "Server voor bestandsoverdrachten"
+
+msgid "File transfer port"
+msgstr "Bestandsoverdracht poortnummer"
+
+msgid "Chat room locale"
+msgstr "Taal van chatruimte"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Conferentie- en chatruimteverzoeken negeren"
+
+msgid "Chat room list URL"
+msgstr "URL voor lijst van ruimtes"
+
+msgid "Yahoo Chat server"
+msgstr "Yahoo chatserver"
+
+msgid "Yahoo Chat port"
+msgstr "Chatpoort Yahoo"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo-protocol-plug-in"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9702,30 +9605,20 @@ msgstr "Contact toevoegen geweigerd"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 "Onbekende fout %d. Aanmelden via de Yahoo! website zou dit probleem op "
 "kunnen lossen."
@@ -9769,39 +9662,34 @@ msgstr ""
 "Onbekende fout %d. Aanmelden via de Yahoo! website zou dit probleem op "
 "kunnen lossen."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Kan contact %s niet toevoegen aan de groep %s in de server-lijst van account "
 "%s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Kan contact niet toevoegen aan serverlijst"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hoorbaar %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Onverwacht HTTP-antwoord van de server ontvangen"
 
-msgid "Connection problem"
-msgstr "Verbindingprobleem"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Verbinding met %s:\n"
 "%s verloren"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Kan geen verbinding maken met %s:\n"
+"Kan geen verbinding maken met de server:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9864,74 +9752,15 @@ msgstr "Deelnemen aan chat van gebruiker..."
 msgid "Open Inbox"
 msgstr "Iinbox Openen"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-"join: &lt;ruimte&gt;:  Meedoen aan een chatruimte op het Yahoo-netwerk."
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Lijst van kanalen op dit netwerk"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo-protocol-plug-in"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-msgid "Pager server"
-msgstr "Semafoonserver"
-
-msgid "Japan Pager server"
-msgstr "Japanse semafoonserver"
-
-msgid "Pager port"
-msgstr "Semafoon-poort"
-
-msgid "File transfer server"
-msgstr "Server voor bestandsoverdrachten"
-
-msgid "Japan file transfer server"
-msgstr "Japanse server voor bestandsoverdrachten"
-
-msgid "File transfer port"
-msgstr "Bestandsoverdracht poortnummer"
-
-msgid "Chat room locale"
-msgstr "Taal van chatruimte"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Conferentie- en chatruimteverzoeken negeren"
-
-msgid "Chat room list URL"
-msgstr "URL voor lijst van ruimtes"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo chatserver"
-
-msgid "Yahoo Chat port"
-msgstr "Chatpoort Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "Kan geen verbinding maken."
+
 msgid "Unable to establish file descriptor."
 msgstr "Kan geen bestandsbeschrijving aanmaken."
 
@@ -9939,6 +9768,9 @@ msgstr "Kan geen bestandsbeschrijving aanmaken."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s biedt u een collectie van %d bestanden aan.\n"
 
+msgid "Write Error"
+msgstr "Schrijffout"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Profiel van Yahoo! Japan"
 
@@ -10058,23 +9890,19 @@ msgstr "Stemmen"
 msgid "Webcams"
 msgstr "Webcams"
 
+msgid "Connection problem"
+msgstr "Verbindingprobleem"
+
 msgid "Unable to fetch room list."
 msgstr "Kan lijst van ruimtes niet opvragen."
 
 msgid "User Rooms"
 msgstr "Ruimtes van gebruiker"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Verbindingprobleem met de YCHT-server."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Verbinding met de server \n"
-"%s verloren"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10200,33 +10028,22 @@ msgstr ""
 msgid "Exposure"
 msgstr "Ontmaskering"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Kan geen socket aanmaken:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Kan antwoord van HTTP-proxy niet parsen: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP-proxy verbindingsfout %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Toegang geweigerd: HTTP-proxy-server verbied tunnelen op poort %d."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Fout oplossing %s"
 
-msgid "Could not resolve host name"
-msgstr "Kan host niet vinden"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "%s's aandacht vragen..."
@@ -10428,14 +10245,6 @@ msgstr "Fout bij schrijven naar %s: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "Kan geen verbinding maken met %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"Server vereist TLS/SSL voor aanmelding. Geen ondersteuning voor TLS/SSL "
-"gevonden."
-
 #, c-format
 msgid " - %s"
 msgstr " - %s"
@@ -10685,9 +10494,14 @@ msgstr "_Contactalarm toevoegen"
 msgid "View _Log"
 msgstr "_Logboek"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Verberg tijdens offline zijn"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Weergeven tijdens offline zijn"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
@@ -11194,6 +11008,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Gebruikersinformatie aanpassen voor %s"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Geef de computernaam waar dit certificaat voor is."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL Servers"
@@ -11242,7 +11060,8 @@ msgstr "Negeren"
 msgid "Get Away Message"
 msgstr "Afwezigheidsbericht"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Laatst gezegd"
 
 msgid "Unable to save icon file to disk."
@@ -12141,7 +11960,7 @@ msgid "Hyperlink visited color"
 msgstr "Kleur van reeds bezochte verwijzing"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Kleur van de verwijzingen wanneer muis erboven hangt"
 
 msgid "Hyperlink prelight color"
@@ -12178,13 +11997,22 @@ msgstr "De kleur van een naam van een melding."
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "De kleur van een naam van een melding."
+
 msgid "Whisper Message Name Color"
 msgstr "Fluisterend berichtkleur"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "De kleur van een naam van een melding."
+
 msgid "Typing notification color"
 msgstr "Kleur van melding van typen"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "De kleur die gebruikt wordt voor het lettertype van de typmelding"
 
 msgid "Typing notification font"
@@ -12584,6 +12412,10 @@ msgstr ""
 "Kan handmatige browser niet starten omdat er geen correcte opdracht is "
 "ingesteld."
 
+#, fuzzy
+msgid "No message"
+msgstr "Onbekend bericht"
+
 msgid "Open All Messages"
 msgstr "Alle berichten openen"
 
@@ -12601,10 +12433,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Je hebt postl!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Onbekend bericht"
-
 msgid "The following plugins will be unloaded."
 msgstr "De volgende plug-ins zullen uitgeschakeld worden"
 
@@ -12820,8 +12648,9 @@ msgstr "_Systeemvakpictogram weergeven:"
 msgid "On unread messages"
 msgstr "Bij ongelezen berichten"
 
-msgid "Conversation Window Hiding"
-msgstr "Gespreksvenster verbergen"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "IM gespreksvensters"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Nieuwe gesprekken verbergen:"
@@ -12829,6 +12658,9 @@ msgstr "_Nieuwe gesprekken verbergen:"
 msgid "When away"
 msgstr "Bij afwezigheid"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Minimalizeer nieuwe gespreksvensters "
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Tabs"
@@ -12887,9 +12719,6 @@ msgstr "Vloeiend schuiven"
 msgid "F_lash window when IMs are received"
 msgstr "Venster laten _knipperen wanneer gespreksberichten worden ontvangen"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Minimalizeer nieuwe gespreksvensters "
-
 msgid "Minimum input area height in lines:"
 msgstr "Minimale invoerhoogte in regels:"
 
@@ -12924,7 +12753,8 @@ msgstr "Kan het programma voor browser-instellingen niet starten."
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Bijvoorbeeld: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "IP-adres _automatisch bepalen"
 
 msgid "Public _IP:"
@@ -13294,21 +13124,6 @@ msgstr "Op_slaan & gebruiken"
 msgid "Status for %s"
 msgstr "Status van %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "Eigen smiley"
-
-msgid "More Data needed"
-msgstr "Meer gegevens vereist"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Geef een snelkoppeling om te associëren met de smiley."
-
 #, fuzzy, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
@@ -13316,12 +13131,12 @@ msgstr ""
 "Een eigen smiley voor de geselecteerde snelkoppeling bestaat al reeds. Geef "
 "alsjeblieft een andere snelkoppeling."
 
+msgid "Custom Smiley"
+msgstr "Eigen smiley"
+
 msgid "Duplicate Shortcut"
 msgstr "Dubbele snelkoppeling"
 
-msgid "Please select an image for the smiley."
-msgstr "Selecteer een afbeelding uit de lijst voor de smiley"
-
 msgid "Edit Smiley"
 msgstr "Smiley bewerken"
 
@@ -13435,9 +13250,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Kan starter niet sturen"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Je hebt een starter hierheen gesleept. Waarschijnlijk wil je het waar deze "
 "starter naar verwijst sturen."
@@ -14054,9 +13870,10 @@ msgstr "Muzieksessie-plug-in voor gezamenlijk componeren."
 
 #  *  summary
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "De muzieksessie-plug-in geeft enkele gebruikers de mogelijkheid om "
 "tegelijkertijd gezamenlijk aan een muziekstuk te werken."
@@ -14315,9 +14132,10 @@ msgid "Conversation Window Send Button."
 msgstr "Gespreksvenser verzendknop"
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Voegt een verzendknop toe bij de invoerruimte van het gespreksvenster. Dit "
 "is bedoeld wanneer er geen fysiek keyboard aanwezig is."
@@ -14657,8 +14475,9 @@ msgstr "Windows pidgin opties"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opties van Pidgin voor Windows."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "Specifieke Windows-opties voor Pidgin, zoals contactenlijst."
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14698,6 +14517,299 @@ msgstr "Verstuur en ontvang ruwe XMPP stanza's."
 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 "Cannot open socket"
+#~ msgstr "Kan socket niet openen"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Kan niet luisteren naar socket"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Kan niet lezen van socket."
+
+#~ msgid "Connection failed."
+#~ msgstr "Verbinding mislukt."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Server heeft verbinding verbroken"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Kan geen socket aanmaken"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Kan geen verbinding maken met host"
+
+#~ msgid "Read error"
+#~ msgstr "Leesfout"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan geen verbinding maken met de server:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Schrijffout"
+
+#~ msgid "Last Activity"
+#~ msgstr "Laatste activiteit"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Directory info instellen"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Stanza adresbijvoeging"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Groepsgesprek"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Deze gebruiker heeft geen profiel."
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ad-Hoc opdrachten"
+
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub dienst"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "Registratiefout"
+
+#~ msgid "User Location"
+#~ msgstr "Gebruikerslocatie"
+
+#~ msgid "User Avatar"
+#~ msgstr "Avatar"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Contactstatusmelding"
+
+#~ msgid "Software Version"
+#~ msgstr "Software versie"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "Oriëntatie"
+
+#~ msgid "User Mood"
+#~ msgstr "Humeur gebruiker"
+
+#~ msgid "User Activity"
+#~ msgstr "Activiteit gebruiker"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Entiteit mogelijkheden"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Gecodeerde sessie onderhandelingen"
+
+#~ msgid "User Tune"
+#~ msgstr "Gebruikers tune"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "IM met sleuteluitwisseling"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Beschikbaarheid adres"
+
+#~ msgid "User Profile"
+#~ msgstr "Profiel"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Geluid jingle"
+
+#~ msgid "User Nickname"
+#~ msgstr "Gebruikersnaam"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "ICE UDP Jingle"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "ICE TCP Jingle"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Raw UDP Raw UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Jingle Video"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "DTMF DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Bericht ontvangen"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Openbare sleutel openbaren"
+
+#~ msgid "User Chatting"
+#~ msgstr "Chattende gebruiker"
+
+#~ msgid "User Browsing"
+#~ msgstr "Browsende gebruiker"
+
+#~ msgid "User Gaming"
+#~ msgstr "Gamende gebruiker"
+
+#~ msgid "User Viewing"
+#~ msgstr "Kijkende gebruiker"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Stanza codering"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Vertraagde afgifte"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Samenwerkende data-objecten"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Bestandsbronnen en delen"
+
+#~ msgid "Hop Check"
+#~ msgstr "Hop-controle"
+
+#~ msgid "Read Error"
+#~ msgstr "Leesfout"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Kan geen verbinding maken met de server."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Wachtrij vol (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Kan het bericht niet analyseren"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Kan geen verbinding maken met host: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Aanmelden mislukt (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "De verbinding is verbroken omdat u zich heeft aangemeld op een andere "
+#~ "computer."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Fout! Geen SSL-ondersteuning geïnstalleerd."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Ongeldig wachtwoord."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan niet verbinden met BOS-server:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "U wordt waarschijnlijk binnenkort afgemeld. Kijk op %s voor nieuwe "
+#~ "versies."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Kan geen verbinding maken"
+
+#~ msgid "Invalid username."
+#~ msgstr "Ongeldige gebruikersnaam."
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Kan login-antwoord niet decoderen"
+
+#~ msgid "Connection lost"
+#~ msgstr "Verbinding verbroken"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Kan host niet vinden"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Verbinding verbroken (schrijven)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Verbindingsfout"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Er is een fout opgetreden bij het lezen van de socket: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Kan geen verbinding maken met de computer"
+
+#~ msgid "Could not write"
+#~ msgstr "Kan niet schrijven"
+
+#~ msgid "Could not connect"
+#~ msgstr "Kon geen verbinding maken"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Kan geen socket aanmaken om te luisteren"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Kan hostnaam niet vinden"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Ongeldig wachtwoord"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan geen verbinding maken met %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Japanse semafoonserver"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japanse server voor bestandsoverdrachten"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Verbinding met de server \n"
+#~ "%s verloren"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Kan host niet vinden"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Server vereist TLS/SSL voor aanmelding. Geen ondersteuning voor TLS/SSL "
+#~ "gevonden."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Gespreksvenster verbergen"
+
+#~ msgid "More Data needed"
+#~ msgstr "Meer gegevens vereist"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Geef een snelkoppeling om te associëren met de smiley."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Selecteer een afbeelding uit de lijst voor de smiley"
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Welk ID activeren?"
 
diff --git a/po/nn.po b/po/nn.po
index 89a93d87ea..dc76b57e9d 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2009-02-20 23:45+0100\n"
 "Last-Translator: YS Landro <nynorsk@strilen.net>\n"
 "Language-Team: \n"
@@ -2568,9 +2568,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Tek med loggar frå andre lynmeldingsklientar i loggvisaren."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2624,8 +2625,9 @@ msgstr "Emulering av fråkopla meldingar"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Lagra meldingar som er sende til ein fråkopla brukar som varsel."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Resten av meldingane vil bli lagra som eit varsel. Du kan endra/sletta "
@@ -2875,14 +2877,16 @@ msgstr ""
 "Klarer ikkje å sjå at ActiveTCL er installert. Om du ønskjer å nytta TCL-"
 "tillegg må du installera ActiveTCL frå http://www.activestate.com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Fann ikkje verktøysamlinga til Apple Bonjour for Windows. Du finn fleire "
 "opplysningar på adressa http://d.pidgin.im/BonjourWindows."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Klarer ikkje å lytta etter innkomande meldingstilkoplingar\n"
 
 msgid ""
@@ -2935,14 +2939,21 @@ msgstr "%s har lukka samtala."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Klarte ikkje å senda meldinga. Samtala kunne ikkje startast."
 
-msgid "Cannot open socket"
-msgstr "Klarte ikkje å opna endepunkt"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Klarte ikkje å laga endepunkt:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Klarte ikkje å binda endepunktet til port"
 
-msgid "Could not listen on socket"
-msgstr "Klarte ikkje å lytta til endepunktet"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Klarte ikkje å laga endepunkt:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Feil i sambandet med lokal mDNSResponder."
@@ -2990,13 +3001,16 @@ msgstr "Lagra venneliste…"
 msgid "Load buddylist from file..."
 msgstr "Hent vennelista frå fil…"
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Fyll ut registreringsfelta."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Passorda samsvarer ikkje."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Klarer ikkje å registrera ny konto. Det oppstod ein feil.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3008,14 +3022,15 @@ msgstr "Registreringa er ferdig."
 msgid "Password"
 msgstr "Passord"
 
-msgid "Password (retype)"
-msgstr "Passord (éin gong til)"
+msgid "Password (again)"
+msgstr "Passord (om att)"
 
-msgid "Enter current token"
-msgstr "Skriv inn noverande markør"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Noverande markør"
+#, fuzzy
+msgid "Captcha"
+msgstr "Tastetestbilete"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrera ny Gadu-Gadu-konto"
@@ -3068,6 +3083,15 @@ msgstr "Passordet blei endra."
 msgid "Current password"
 msgstr "Noverande passord"
 
+msgid "Password (retype)"
+msgstr "Passord (éin gong til)"
+
+msgid "Enter current token"
+msgstr "Skriv inn noverande markør"
+
+msgid "Current token"
+msgstr "Noverande markør"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Skriv inn det noverande og det nye passordet til UIN:"
 
@@ -3115,8 +3139,8 @@ msgstr "Fann ingen brukarar"
 msgid "There are no users matching your search criteria."
 msgstr "Det er ingen brukarar som høver til søkjekriteria dine."
 
-msgid "Unable to read socket"
-msgstr "Klarte ikkje å lesa endepunkt"
+msgid "Unable to read from socket"
+msgstr "Klarte ikkje å lesa frå endepunktet"
 
 msgid "Buddy list downloaded"
 msgstr "Lasta ned venneliste"
@@ -3130,8 +3154,14 @@ msgstr "Vennelista blei lasta opp"
 msgid "Your buddy list was stored on the server."
 msgstr "Vennelista di blei lagra på tenaren."
 
-msgid "Connection failed."
-msgstr "Tilkoplinga feila."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Tilkopla"
+
+msgid "Connection failed"
+msgstr "Tilkoplinga feila"
 
 msgid "Add to chat"
 msgstr "Legg til praterom"
@@ -3139,18 +3169,23 @@ msgstr "Legg til praterom"
 msgid "Chat _name:"
 msgstr "Prate_namn:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Klarer ikkje å kopla til tenaren."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Koplar til"
+
 msgid "Chat error"
 msgstr "Prateromsfeil"
 
 msgid "This chat name is already in use"
 msgstr "Prateromsnamnet er allereie i bruk"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Ikkje tilkopla tenaren."
 
 msgid "Find buddies..."
@@ -3210,7 +3245,8 @@ msgstr "Emne er ikkje vald"
 msgid "File Transfer Failed"
 msgstr "Filoverføringa feila"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Klarte ikkje å opna ein lytteport."
 
 msgid "Error displaying MOTD"
@@ -3226,8 +3262,18 @@ msgstr "Inga \"Dagens melding\" er knytt til denne tilkoplinga."
 msgid "MOTD for %s"
 msgstr "\"Dagens melding\" frå %s"
 
-msgid "Server has disconnected"
-msgstr "Tenaren har kopla frå"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Mista sambandet med tenaren:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Vis \"Dagens melding\""
@@ -3242,22 +3288,20 @@ msgstr "_Passord:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC-kallenamn kan ikkje innehalda mellomrom"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Koplar til"
-
 msgid "SSL support unavailable"
 msgstr "SSL-støtte er ikkje tilgjengeleg"
 
-msgid "Couldn't create socket"
-msgstr "Klarte ikkje å laga endepunkt"
+msgid "Unable to connect"
+msgstr "Klarte ikkje å kopla til"
 
-msgid "Couldn't connect to host"
-msgstr "Klarte ikkje å kopla til verten"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Klarte ikkje å kopla til %s"
 
-msgid "Read error"
-msgstr "Lesefeil"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Tenaren lukka tilkoplinga."
 
 msgid "Users"
 msgstr "Brukarar"
@@ -3686,10 +3730,12 @@ msgstr "Ad hoc-kommandoen feila"
 msgid "execute"
 msgstr "utfør"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Tenaren krev TLS/SSL for pålogging. Fann inga TLS/SSL-støtte."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Du krev kryptering, men TLS/SSL-støtte blei ikkje funne."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3706,7 +3752,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Autentisering i klartekst"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Autentiseringa feila"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Ugyldig svar frå tenaren."
 
 msgid "Server does not use any supported authentication method"
@@ -3718,7 +3769,8 @@ msgstr "Du krev kryptering som ikkje er tilgjengeleg på denne tenaren."
 msgid "Invalid challenge from server"
 msgstr "Ugyldig utfordring frå tenaren"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL-feil"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3738,10 +3790,8 @@ msgstr ""
 "Klarte ikkje å laga eit samband til tenaren:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Klarte ikkje å laga eit samband til tenaren:\n"
 "%s"
@@ -3750,12 +3800,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "Klarte ikkje å setja i gang sambandet"
 
-msgid "Unable to create socket"
-msgstr "Klarte ikkje å laga endepunkt"
-
-msgid "Write error"
-msgstr "Skrivefeil"
-
 msgid "Full Name"
 msgstr "Fullt namn"
 
@@ -3826,161 +3870,6 @@ msgstr "Operativsystem"
 msgid "Local Time"
 msgstr "Lokalfil:"
 
-msgid "Last Activity"
-msgstr "Siste aktivitet"
-
-msgid "Service Discovery Info"
-msgstr "Tenesteoppdagingsinfo"
-
-msgid "Service Discovery Items"
-msgstr "Tenesteoppdagingselement"
-
-msgid "Extended Stanza Addressing"
-msgstr "Utvida blokkadressering"
-
-msgid "Multi-User Chat"
-msgstr "Fleirbrukarprat"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Utvida nærvereopplysningar fleirbrukarsamtale"
-
-msgid "In-Band Bytestreams"
-msgstr "Samtidssamband"
-
-msgid "Ad-Hoc Commands"
-msgstr "Ad hoc-kommandoar"
-
-msgid "PubSub Service"
-msgstr "PubSub-teneste"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 bytesamband"
-
-msgid "Out of Band Data"
-msgstr "Eksterne data"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-# må setjast om seinare
-msgid "In-Band Registration"
-msgstr "Samtidsegistrering"
-
-msgid "User Location"
-msgstr "Brukarstad"
-
-msgid "User Avatar"
-msgstr "Brukaravatar"
-
-msgid "Chat State Notifications"
-msgstr "Pratetilstandsvarsel"
-
-msgid "Software Version"
-msgstr "Programvareversjon"
-
-msgid "Stream Initiation"
-msgstr "Straumoppstart"
-
-msgid "File Transfer"
-msgstr "Filoverføring"
-
-msgid "User Mood"
-msgstr "Brukarsinnsstemning"
-
-msgid "User Activity"
-msgstr "Brukaraktivitet"
-
-msgid "Entity Capabilities"
-msgstr "Entitetseigenskapar"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Krypterte øktforhandlingar"
-
-msgid "User Tune"
-msgstr "Brukarlåt"
-
-msgid "Roster Item Exchange"
-msgstr "Listeelement-utveksling"
-
-# Gjer betre
-msgid "Reachability Address"
-msgstr "Adresse ein kan nåast på"
-
-msgid "User Profile"
-msgstr "Brukarprofil"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle-lyd"
-
-msgid "User Nickname"
-msgstr "Brukarkallenamn"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle rein UDP"
-
-msgid "Jingle Video"
-msgstr "Jingle Video"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Meldingskvitteringar"
-
-msgid "Public Key Publishing"
-msgstr "Offentleg nøkkel-publisering"
-
-msgid "User Chatting"
-msgstr "Brukar pratar"
-
-msgid "User Browsing"
-msgstr "Brukar er på Internett"
-
-msgid "User Gaming"
-msgstr "Brukar speler"
-
-msgid "User Viewing"
-msgstr "Brukar ser på"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Blokkryptering"
-
-msgid "Entity Time"
-msgstr "Entitetstid"
-
-msgid "Delayed Delivery"
-msgstr "Forseinka levering"
-
-msgid "Collaborative Data Objects"
-msgstr "Samarbeidsdataobjekt"
-
-msgid "File Repository and Sharing"
-msgstr "Fillager og -deling"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "STUN-tenesteoppdaging for Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Forenkla  Encrypted Session Negotiation"
-
-msgid "Hop Check"
-msgstr "Hoppkontroll"
-
-msgid "Capabilities"
-msgstr "Evner"
-
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -3992,7 +3881,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Pålogga"
 
 msgid "Middle Name"
@@ -4174,16 +4063,13 @@ msgstr "Fann ingen brukarar"
 msgid "Roles:"
 msgstr "Stilling"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Tidsavbrot ping"
 
-msgid "Read Error"
-msgstr "Lesefeil"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4359,9 +4245,6 @@ msgstr "Passordet ditt er blitt endra"
 msgid "Error changing password"
 msgstr "Feil under  endringa av passordet"
 
-msgid "Password (again)"
-msgstr "Passord (om att)"
-
 msgid "Change XMPP Password"
 msgstr "Endra XMPP-passord"
 
@@ -4744,6 +4627,14 @@ msgstr "Feil i XML-tolkinga"
 msgid "Unknown Error in presence"
 msgstr "Ukjend feil til stades"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Klarte ikkje å kopla til praterommet %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Feil i praterommet %s"
+
 msgid "Create New Room"
 msgstr "Lag eit nytt rom"
 
@@ -4760,16 +4651,20 @@ msgstr "Endra rom_innstillingane"
 msgid "_Accept Defaults"
 msgstr "_Godta standardinnstillingane"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Klarte ikkje å kopla til praterommet %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Gav ingen årsak"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Feil i praterommet %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Du er blitt sparka ut av %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Sparka ut av %s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Fekk ikkje opna fila grunna feil."
 
 #, fuzzy
@@ -5259,9 +5154,6 @@ msgstr "Start ein _prat"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN krev bruk av SSL. Last ned eit støtta SSL-bibliotek. "
 
-msgid "Failed to connect to server."
-msgstr "Klarte ikkje å kopla til tenaren."
-
 msgid "Error retrieving profile"
 msgstr "Klarte ikkje å henta profilen"
 
@@ -5513,9 +5405,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Meldinga blei ikkje sendt sidan det oppstod ein ukjend feil."
 
-msgid "Unable to connect"
-msgstr "Klarte ikkje å kopla til"
-
 msgid "Writing error"
 msgstr "Skrivefeil"
 
@@ -5530,20 +5419,24 @@ msgstr ""
 "Tilkoplingsfeil frå %s-tenaren:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Protokollen vår er ikkje støtta av tenaren."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Feil i HTTP-tolkinga."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Du har logga på frå ein annan stad."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN-tenarane er mellombels utilgjengelege. Vent ei stund og prøv igjen."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN-tenarane vil vera mellombels nede."
 
 #, c-format
@@ -5555,9 +5448,6 @@ msgid ""
 msgstr ""
 "MSN-vennelista di er mellombels utilgjengeleg. Vent ei stund og prøv igjen."
 
-msgid "Unknown error."
-msgstr "Ukjend feil."
-
 msgid "Handshaking"
 msgstr "Protokollsjekk"
 
@@ -5659,6 +5549,9 @@ msgstr "MSN-protokolltillegg"
 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)"
@@ -5769,12 +5662,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Legg til kontaktar frå tenaren"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Tilkopla"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protokollfeil, kode %d: %s"
@@ -5798,16 +5685,6 @@ msgstr "MySpaceIM-feil"
 msgid "Invalid input condition"
 msgstr "Ugyldig inndatavilkår"
 
-msgid "Read buffer full (2)"
-msgstr "Fullt lesemellomlager (2)"
-
-msgid "Unparseable message"
-msgstr "Meldinga kan ikkje tolkast"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Klarte ikkje å kopla til verten: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Klarte ikkje å leggja til venn"
 
@@ -5891,6 +5768,12 @@ msgstr "Tal på venner totalt"
 msgid "Client Version"
 msgstr "Klientversjon"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - brukarnamnet er tilgjengeleg"
 
@@ -6146,9 +6029,9 @@ msgstr "Brukaren er anten fråkopla eller du er blokkert"
 msgid "Unknown error: 0x%X"
 msgstr "Ukjend feil: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Pålogginga feila (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Klarer ikkje å pinga brukaren %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6250,9 +6133,6 @@ msgstr "GroupWise-konferanse %d"
 msgid "Authenticating..."
 msgstr "Autentiserer…"
 
-msgid "Unable to connect to server."
-msgstr "Klarer ikkje å kopla til tenaren."
-
 msgid "Waiting for response..."
 msgstr "Venatr på svar…"
 
@@ -6276,24 +6156,19 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Vil du bli med i praten?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Du er blitt logga ut fordi du logga deg på frå ei anna maskin."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s verkar vera fråkopla. Brukaren fekk ikkje meldinga du nett sendte."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Klarer ikkje å kopla til tenaren. Skriv inn adressa til tenaren du vil kopla "
 "deg til."
 
-msgid "Error. SSL support is not installed."
-msgstr "Feil. SSL-støtte er ikkje installert."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Denne konferanse er blitt lukka. Kan ikkje senda fleire meldingar."
 
@@ -6332,10 +6207,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6344,18 +6216,8 @@ msgstr "Klarte ikkje å bli med i praterommet"
 msgid "Invalid chat room name"
 msgstr "Ugyldig prateromsnamn"
 
-msgid "Server closed the connection."
-msgstr "Tenaren lukka tilkoplinga."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Mista sambandet med tenaren:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Det kom ugyldige data frå sambandet med tenaren."
 
 #. *< type
@@ -6403,7 +6265,8 @@ msgstr "Mista sambandet til fjernbrukaren:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Det kom ugyldige data ved tilkoplinga til fjerntenaren."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Klarer ikkje å laga til eit samband med fjernbrukaren."
 
 msgid "Direct IM established"
@@ -6602,21 +6465,15 @@ msgstr "Åtvaringsnivå"
 msgid "Buddy Comment"
 msgstr "Vennenotat"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Klarte ikkje å kopla opp mot autentiseringstenaren:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Klarte ikkje å kopla til BOS-tenaren:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Klarer ikkje å kopla til tenaren."
 
 msgid "Username sent"
 msgstr "Finch"
@@ -6628,11 +6485,11 @@ msgstr "Oppretta samband, sendt informasjonskapsel"
 msgid "Finalizing connection"
 msgstr "Fullfører tilkoplinga"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Får ikkje til å logga på: klarer ikkje å logga på som %s fordi brukarnamnet "
 "er ugyldig. Brukarnamn må vera ei gyldig e-postadresse, eller begynna med "
@@ -6647,26 +6504,22 @@ msgstr ""
 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."
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Brukaren finst ikkje"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Kontoen din er for tida sperra for bruk."
 
 #. service temporarily unavailable
@@ -6686,7 +6539,8 @@ 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."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Den innskrivne SecurID-nøkkelen er ugyldig."
 
 msgid "Enter SecurID"
@@ -6859,6 +6713,9 @@ msgstr "Tilkopla sidan"
 msgid "Member Since"
 msgstr "Medlem sidan"
 
+msgid "Capabilities"
+msgstr "Evner"
+
 msgid "Profile"
 msgstr "Profil"
 
@@ -7039,9 +6896,9 @@ msgstr[1] ""
 msgid "Away message too long."
 msgstr "Fråværsmeldinga er for lang."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7065,9 +6922,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Foreldrelause"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Kan ikkje leggja til vennen %s sidan vennelista er full. Slett ein venn frå "
@@ -7076,8 +6933,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(ikkje noko namn)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Klarte ikkje av ukjend årsak å leggja til vennen %s."
 
 #, c-format
@@ -7856,7 +7713,8 @@ msgstr "Intervall vedlikehaldstilkopling (sekund)"
 msgid "Update interval (seconds)"
 msgstr "Oppdateringsintervall (sekund)"
 
-msgid "Cannot decrypt server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "Klarer ikkje å dekryptera tenarsvaret"
 
 #, c-format
@@ -7881,9 +7739,6 @@ msgstr "Må slåast på"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Får ikkje logga på. Ukjend svarkode (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Klarte ikkje å dekryptera tenarsvaret"
-
 msgid "Requesting captcha"
 msgstr "Spør etter tastetest (\"captcha\")"
 
@@ -7917,29 +7772,18 @@ msgstr ""
 "Pålogginga gav ukjend feilkode (0x%02X):\n"
 "%s"
 
-msgid "Unable to connect."
-msgstr "Klarte ikkje å kopla til."
-
 msgid "Socket error"
 msgstr "Endepunktsfeil"
 
-msgid "Unable to read from socket"
-msgstr "Klarte ikkje å lesa frå endepunktet"
-
-msgid "Write Error"
-msgstr "Skrivefeil"
-
-msgid "Connection lost"
-msgstr "Tapt tilkopling"
-
 msgid "Getting server"
 msgstr "Hentar tenar"
 
 msgid "Requesting token"
 msgstr "Spør etter symbol"
 
-msgid "Couldn't resolve host"
-msgstr "Vertsoppslaget feila"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Klarer ikkje å kopla til tenaren."
 
 msgid "Invalid server or port"
 msgstr "Ugyldig tenar eller port"
@@ -7994,7 +7838,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "QQ-gruppekommando"
 
-msgid "Could not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "Klarte ikkje å dekryptera påloggingssvaret"
 
 msgid "Unknown LOGIN CMD"
@@ -8014,9 +7859,6 @@ msgstr "Filsending"
 msgid "%d canceled the transfer of %s"
 msgstr "%d avbraut overføringa av %s"
 
-msgid "Connection closed (writing)"
-msgstr "Tilkoplinga er lukka (skrivande)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Gruppetittel</b> %s<br>"
@@ -8070,17 +7912,6 @@ msgstr "Ein Sametime-administrator har sendt ut denne meldinga på tenaren %s"
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime-administratormelding"
 
-msgid "Connection reset"
-msgstr "Tilkoplinga tilbakestilt"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Feil under lesing frå endepunkt: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Klarer ikkje å kopla til tenaren"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Melding frå %s"
@@ -8103,6 +7934,9 @@ msgstr "Høgtalarar"
 msgid "Video Camera"
 msgstr "Videokamera"
 
+msgid "File Transfer"
+msgstr "Filoverføring"
+
 msgid "Supports"
 msgstr "Støttar"
 
@@ -8918,6 +8752,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Nettverkstatistikk"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping feila"
 
@@ -8981,7 +8818,8 @@ msgstr "Denne offentlege nøkkel-typen er ikkje støtta"
 msgid "Disconnected by server"
 msgstr "Fråkopla av tenaren"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Feil under tilkopling mot SILC-tenaren"
 
 msgid "Key Exchange failed"
@@ -8993,26 +8831,26 @@ msgstr ""
 "Klarte ikkje å ta opp att den fråkopla økta. Trykk Kopla til att for å laga "
 "ei ny tilkopling."
 
-msgid "Connection failed"
-msgstr "Tilkoplinga feila"
-
 msgid "Performing key exchange"
 msgstr "Utfører nøkkelutveksling"
 
-msgid "Unable to create connection"
-msgstr "Klarte ikkje å oppretta samband"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Klarte ikkje å lasta SILC nøkkelpar"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Koplar til SILC-tenar"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Klarte ikkje å lasta SILC nøkkelpar"
+
 msgid "Out of memory"
 msgstr "Ikkje nok minne"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Klarer ikkje å kjøra SILC-protokollen"
 
 msgid "Error loading SILC key pair"
@@ -9312,7 +9150,8 @@ msgstr "Skriv under digitalt og stadfest alle meldingar"
 msgid "Creating SILC key pair..."
 msgstr "Lagar SILC nøkkelpar…"
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Klarer ikkje å laga SILC nøkkelpar\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9406,6 +9245,9 @@ msgstr "Tavle"
 msgid "No server statistics available"
 msgstr "Ingen tilgjengelege tenarstatistikkar"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Feil under tilkopling mot SILC-tenaren"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Feil: versjonsfeil - oppgrader klienten din"
@@ -9454,30 +9296,27 @@ msgstr "Feil: ugyldig informasjonskapsel"
 msgid "Failure: Authentication failed"
 msgstr "Feil: autentiseringa feila"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Klarer ikkje å oppretta eit SILC klientsamband"
 
 msgid "John Noname"
 msgstr "Utan namn"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Klarte ikkje å lasta SILC nøkkelparet: %s"
 
-msgid "Could not write"
-msgstr "Klarte ikkje å lagra"
-
-msgid "Could not connect"
-msgstr "Klarte ikkje å kopla til"
+msgid "Unable to create connection"
+msgstr "Klarte ikkje å oppretta samband"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Ukjent tenarsvar."
 
-msgid "Could not create listen socket"
-msgstr "Klarte ikkje å laga lytte-endepunkt"
-
-msgid "Could not resolve hostname"
-msgstr "Vertsnamnoppslaget feila"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Klarte ikkje å laga endepunkt"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-brukarnamn kan ikkje innehalda mellomrom eller @-teikn"
@@ -9518,6 +9357,77 @@ msgstr "Autentiser brukar"
 msgid "Auth Domain"
 msgstr "Autentiseringsdomene"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;rom&gt;: bli med i eit praterom på Yahoo-nettverket"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: list romma på Yahoo-nettverket"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: spør ein brukar om å starta ei teikneøkt"
+
+msgid "Yahoo ID..."
+msgstr "Yahoo-ID …"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo-protokolltillegg"
+
+msgid "Pager server"
+msgstr "Søkjetenestetenar"
+
+msgid "Pager port"
+msgstr "S_økjeport"
+
+msgid "File transfer server"
+msgstr "Filoverføringstenar"
+
+msgid "File transfer port"
+msgstr "Filoverførings_port"
+
+msgid "Chat room locale"
+msgstr "Pratero_mslokalitet"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "_Ignorer konferanse- og prateromsinvitasjonar"
+
+msgid "Chat room list URL"
+msgstr "Prateromslisteadresse"
+
+msgid "Yahoo Chat server"
+msgstr "Yahoo pratetenar"
+
+msgid "Yahoo Chat port"
+msgstr "Yahoo prateport"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo-ID …"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo-protokolltillegg"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9550,30 +9460,20 @@ msgstr "Er blitt nekta å leggja til venn"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  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å."
@@ -9616,38 +9516,33 @@ msgstr ""
 "Ukjent feilnummer %d. Du kan kanskje løysa problemet ved å nytta Yahoo! sin "
 "nettstad for å logga deg på."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Klarte ikkje å leggja til vennen %s i gruppa %s i tenarlista til kontoen %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Klarte ikkje å leggja til vennen i tenarlista"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hørleg %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Fekk uventa HTTP-svar frå tenar."
 
-msgid "Connection problem"
-msgstr "Tilkoplingsproblem"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Mista sambandet med %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Klaret ikkje å få til samband med %s:\n"
+"Klarte ikkje å laga eit samband til tenaren:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9710,73 +9605,15 @@ msgstr "Bli med brukaren i praterommet…"
 msgid "Open Inbox"
 msgstr "Opna innkorga"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;rom&gt;: bli med i eit praterom på Yahoo-nettverket"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: list romma på Yahoo-nettverket"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: spør ein brukar om å starta ei teikneøkt"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo-ID …"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo-protokolltillegg"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-msgid "Pager server"
-msgstr "Søkjetenestetenar"
-
-msgid "Japan Pager server"
-msgstr "Søkjetenestetenar (_Japan)"
-
-msgid "Pager port"
-msgstr "S_økjeport"
-
-msgid "File transfer server"
-msgstr "Filoverføringstenar"
-
-msgid "Japan file transfer server"
-msgstr "Filoverføringstenar (Japa_n)"
-
-msgid "File transfer port"
-msgstr "Filoverførings_port"
-
-msgid "Chat room locale"
-msgstr "Pratero_mslokalitet"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "_Ignorer konferanse- og prateromsinvitasjonar"
-
-msgid "Chat room list URL"
-msgstr "Prateromslisteadresse"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo pratetenar"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo prateport"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Sendt teikneførespurnad."
 
+msgid "Unable to connect."
+msgstr "Klarte ikkje å kopla til."
+
 msgid "Unable to establish file descriptor."
 msgstr "Klarer ikkje å laga filskildring."
 
@@ -9784,6 +9621,9 @@ msgstr "Klarer ikkje å laga filskildring."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s prøver å senda deg ei gruppe med %d-filer.\n"
 
+msgid "Write Error"
+msgstr "Skrivefeil"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan-profil"
 
@@ -9899,23 +9739,19 @@ msgstr "Stemmer"
 msgid "Webcams"
 msgstr "Nettkamera"
 
+msgid "Connection problem"
+msgstr "Tilkoplingsproblem"
+
 msgid "Unable to fetch room list."
 msgstr "Klarer ikkje å henta romlista."
 
 msgid "User Rooms"
 msgstr "Brukarrom"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Tilkoplingsproblem med YCHT-tenaren."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Mista sambandet med tenar\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10044,33 +9880,22 @@ msgstr "Domene"
 msgid "Exposure"
 msgstr "Framvising"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Klarte ikkje å laga endepunkt:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Klarer ikkje å tolka svaret frå HTTP-mellomtenaren: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Feil i ambandet mot HTTP-mellomtenaren: %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Tilgang avvist: HTTP-mellomtenaren tillèt ikkje tunnel over port %d."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Klarte ikkje å slå opp %s"
 
-msgid "Could not resolve host name"
-msgstr "Klarte ikkje å slå opp vertsnamnet"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Ber om merksemda til %s…"
@@ -10272,12 +10097,6 @@ msgstr "Klarte ikkje å skriva frå %s: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "Klarte ikkje å kopla til %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "Tenaren krev TLS/SSL for pålogging. Fann inga TLS/SSL-støtte."
-
 #, c-format
 msgid " - %s"
 msgstr " - %s"
@@ -10528,9 +10347,14 @@ msgstr "Legg til _vennevarsling…"
 msgid "View _Log"
 msgstr "Vis l_ogg"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Skjul  når du er fråkopla"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Vis når du er fråkopla"
+
 msgid "_Alias..."
 msgstr "Ka_llenamn…"
 
@@ -11030,6 +10854,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Endra brukaropplysningane til %s"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Skriv inn vertsnamnet dette sertifikatet er til."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL-tenarar"
@@ -11076,7 +10904,8 @@ msgstr "Blokker"
 msgid "Get Away Message"
 msgstr "Hent fråværsmelding"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Sist sagt"
 
 msgid "Unable to save icon file to disk."
@@ -11969,7 +11798,8 @@ msgstr "Farge til å teikna lenkje."
 msgid "Hyperlink visited color"
 msgstr "Farge på besøkte lenkjer"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+#, fuzzy
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Lenkjefarge etter at lenkja er besøkt (eller teken i bruk)."
 
 msgid "Hyperlink prelight color"
@@ -12006,13 +11836,22 @@ msgstr "Farge for å teikna namnet til ei handlingsmelding."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Handlingsmeldingsfarge for kviskra melding"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Farge for å teikna namnet til ei handlingsmelding."
+
 msgid "Whisper Message Name Color"
 msgstr "Fargenamn kviskremelding"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Farge for å teikna namnet til ei handlingsmelding."
+
 msgid "Typing notification color"
 msgstr "Skrivevarselfarge"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "Skrifttypefarge som skal nyttast ved skrivevarsel"
 
 msgid "Typing notification font"
@@ -12408,6 +12247,10 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "'Manuell' nettlesarkommando er vald, men ingen kommando er brukt."
 
+#, fuzzy
+msgid "No message"
+msgstr "Ukjend melding"
+
 msgid "Open All Messages"
 msgstr "Opna alle meldingar"
 
@@ -12427,10 +12270,6 @@ msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">Du har fått e-postmeldingar</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Ukjend melding"
-
 msgid "The following plugins will be unloaded."
 msgstr "Dei følgjande programtillegga vil bli lasta ut."
 
@@ -12646,8 +12485,9 @@ msgstr "Vis systempanel_ikon:"
 msgid "On unread messages"
 msgstr "Ved ulesne meldingar"
 
-msgid "Conversation Window Hiding"
-msgstr "Skjul samtalevindauget"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Samtalevindauge for lynmeldingar"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Skjul  nye lynmeldingssamtaler:"
@@ -12655,6 +12495,9 @@ msgstr "_Skjul  nye lynmeldingssamtaler:"
 msgid "When away"
 msgstr "Når vekke"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Mi_nimer nye pratevindauge"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Faner"
@@ -12713,9 +12556,6 @@ msgstr "Bruk jamn rulling"
 msgid "F_lash window when IMs are received"
 msgstr "La vindauget _blinka når nye lynmmeldingar kjem"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Mi_nimer nye pratevindauge"
-
 msgid "Minimum input area height in lines:"
 msgstr "Minimumshøgda til inndataområdet (i linjer):"
 
@@ -12750,7 +12590,8 @@ msgstr "Klarer ikkje å starta nettlesaren sitt innstillingsprogram."
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Døme: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "Finn IP-adressa _automatisk"
 
 msgid "Public _IP:"
@@ -13118,21 +12959,6 @@ msgstr "L_agra og bruk"
 msgid "Status for %s"
 msgstr "Status for %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "Tilpassa smilefjes"
-
-msgid "More Data needed"
-msgstr "Treng fleire opplysningar"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Før opp ein snarveg knytt til smilefjeset."
-
 #, fuzzy, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
@@ -13140,12 +12966,12 @@ msgstr ""
 "Det finst allereie eit tilpassa smilefjes til denne snarvegen. Vel ein annan "
 "snarveg."
 
+msgid "Custom Smiley"
+msgstr "Tilpassa smilefjes"
+
 msgid "Duplicate Shortcut"
 msgstr "Duplisert snarveg"
 
-msgid "Please select an image for the smiley."
-msgstr "Vel eit bilete til smilefjeset."
-
 msgid "Edit Smiley"
 msgstr "Endra smilefjes"
 
@@ -13258,9 +13084,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Klarer ikkje å senda lastaren"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Du drog ein arbeidsflatestartar. Truleg ønskte du å senda det oppstartaren "
 "peiker mot i staden for oppstartaren sjølv."
@@ -13854,9 +13681,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Musikkmeldingstillegg for samkomponering."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Musikkmeldingstillegget tillèt fleire brukarar å arbeida samstundes på eit "
 "musikkstykke ved å endra eit felles noteark i sanntid."
@@ -14111,9 +13939,10 @@ msgid "Conversation Window Send Button."
 msgstr "Send-knapp samtalevindauge."
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Legg til ein sendeknapp på inntastingsområdet i samtalevindauget. Tenkt for "
 "dei tilfella der ein ikkje har eit fysisk tastatur."
@@ -14445,8 +14274,9 @@ msgstr "Windows Pidgin-val"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Innstillingar som berre gjeld Pidgin under Windows."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Tilbyr val som berre gjeld Pidgin under Windows, som til dømes festing av "
 "vennelista."
@@ -14489,6 +14319,311 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Dette programtillegget er nyttig ved feilsøking av XMPP-tenarar og -klientar."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Klarte ikkje å opna endepunkt"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Klarte ikkje å lytta til endepunktet"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Klarte ikkje å lesa endepunkt"
+
+#~ msgid "Connection failed."
+#~ msgstr "Tilkoplinga feila."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Tenaren har kopla frå"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Klarte ikkje å laga endepunkt"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Klarte ikkje å kopla til verten"
+
+#~ msgid "Read error"
+#~ msgstr "Lesefeil"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Klarte ikkje å laga eit samband til tenaren:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Skrivefeil"
+
+#~ msgid "Last Activity"
+#~ msgstr "Siste aktivitet"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Tenesteoppdagingsinfo"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Tenesteoppdagingselement"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Utvida blokkadressering"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Fleirbrukarprat"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Utvida nærvereopplysningar fleirbrukarsamtale"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "Samtidssamband"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ad hoc-kommandoar"
+
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub-teneste"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5 bytesamband"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Eksterne data"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+# må setjast om seinare
+#~ msgid "In-Band Registration"
+#~ msgstr "Samtidsegistrering"
+
+#~ msgid "User Location"
+#~ msgstr "Brukarstad"
+
+#~ msgid "User Avatar"
+#~ msgstr "Brukaravatar"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Pratetilstandsvarsel"
+
+#~ msgid "Software Version"
+#~ msgstr "Programvareversjon"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Straumoppstart"
+
+#~ msgid "User Mood"
+#~ msgstr "Brukarsinnsstemning"
+
+#~ msgid "User Activity"
+#~ msgstr "Brukaraktivitet"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Entitetseigenskapar"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Krypterte øktforhandlingar"
+
+#~ msgid "User Tune"
+#~ msgstr "Brukarlåt"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Listeelement-utveksling"
+
+# Gjer betre
+#~ msgid "Reachability Address"
+#~ msgstr "Adresse ein kan nåast på"
+
+#~ msgid "User Profile"
+#~ msgstr "Brukarprofil"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Jingle-lyd"
+
+#~ msgid "User Nickname"
+#~ msgstr "Brukarkallenamn"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle rein UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Jingle Video"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Meldingskvitteringar"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Offentleg nøkkel-publisering"
+
+#~ msgid "User Chatting"
+#~ msgstr "Brukar pratar"
+
+#~ msgid "User Browsing"
+#~ msgstr "Brukar er på Internett"
+
+#~ msgid "User Gaming"
+#~ msgstr "Brukar speler"
+
+#~ msgid "User Viewing"
+#~ msgstr "Brukar ser på"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Blokkryptering"
+
+#~ msgid "Entity Time"
+#~ msgstr "Entitetstid"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Forseinka levering"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Samarbeidsdataobjekt"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Fillager og -deling"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "STUN-tenesteoppdaging for Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Forenkla  Encrypted Session Negotiation"
+
+#~ msgid "Hop Check"
+#~ msgstr "Hoppkontroll"
+
+#~ msgid "Read Error"
+#~ msgstr "Lesefeil"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Klarte ikkje å kopla til tenaren."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Fullt lesemellomlager (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Meldinga kan ikkje tolkast"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Klarte ikkje å kopla til verten: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Pålogginga feila (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Du er blitt logga ut fordi du logga deg på frå ei anna maskin."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Feil. SSL-støtte er ikkje installert."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Feil passord."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Klarte ikkje å kopla til BOS-tenaren:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Du kan bli fråkopla snart. Sjå etter oppdateringar på %s."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Klarte ikkje å kopla til"
+
+#~ msgid "Invalid username."
+#~ msgstr "Ugyldig rukarnamn."
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Klarte ikkje å dekryptera tenarsvaret"
+
+#~ msgid "Connection lost"
+#~ msgstr "Tapt tilkopling"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Vertsoppslaget feila"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Tilkoplinga er lukka (skrivande)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Tilkoplinga tilbakestilt"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Feil under lesing frå endepunkt: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Klarer ikkje å kopla til tenaren"
+
+#~ msgid "Could not write"
+#~ msgstr "Klarte ikkje å lagra"
+
+#~ msgid "Could not connect"
+#~ msgstr "Klarte ikkje å kopla til"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Klarte ikkje å laga lytte-endepunkt"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Vertsnamnoppslaget feila"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Feil passord"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Klaret ikkje å få til samband med %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Søkjetenestetenar (_Japan)"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Filoverføringstenar (Japa_n)"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Mista sambandet med tenar\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Klarte ikkje å slå opp vertsnamnet"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "Tenaren krev TLS/SSL for pålogging. Fann inga TLS/SSL-støtte."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Skjul samtalevindauget"
+
+#~ msgid "More Data needed"
+#~ msgstr "Treng fleire opplysningar"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Før opp ein snarveg knytt til smilefjeset."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Vel eit bilete til smilefjeset."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Kva ID skal takast i bruk?"
 
diff --git a/po/oc.po b/po/oc.po
index 210b5b25da..3c620a2b0d 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2008-05-09 01:31+0200\n"
 "Last-Translator: Éric Boumaour <zongo_fr@users.sourceforge.net>\n"
 "Language-Team: fr <fr@li.org>\n"
@@ -2441,7 +2441,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2489,7 +2489,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2730,11 +2730,11 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr ""
 
 msgid ""
@@ -2786,13 +2786,16 @@ msgstr ""
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-msgid "Cannot open socket"
+#, c-format
+msgid "Unable to create socket: %s"
 msgstr ""
 
-msgid "Could not bind socket to port"
+#, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr ""
 
-msgid "Could not listen on socket"
+#, c-format
+msgid "Unable to listen on socket: %s"
 msgstr ""
 
 msgid "Error communicating with local mDNSResponder."
@@ -2840,13 +2843,14 @@ msgstr ""
 msgid "Load buddylist from file..."
 msgstr ""
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Los mots de pas son pas los meteisses."
 
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr ""
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2858,14 +2862,15 @@ msgstr ""
 msgid "Password"
 msgstr "Mot de pas"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr ""
 
-msgid "Enter current token"
+msgid "Enter captcha text"
 msgstr ""
 
-msgid "Current token"
-msgstr ""
+#, fuzzy
+msgid "Captcha"
+msgstr "Enregistrar l'imatge"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr ""
@@ -2918,6 +2923,15 @@ msgstr ""
 msgid "Current password"
 msgstr ""
 
+msgid "Password (retype)"
+msgstr ""
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
@@ -2965,7 +2979,7 @@ msgstr ""
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr ""
 
 msgid "Buddy list downloaded"
@@ -2980,7 +2994,13 @@ msgstr ""
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
-msgid "Connection failed."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Connectat"
+
+msgid "Connection failed"
 msgstr ""
 
 msgid "Add to chat"
@@ -2989,9 +3009,14 @@ msgstr ""
 msgid "Chat _name:"
 msgstr ""
 
-#. should this be a settings error?
-msgid "Unable to resolve server"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "Impossible de dobrir le fichièr '%s' : %s"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Connexion"
 
 msgid "Chat error"
 msgstr ""
@@ -2999,8 +3024,9 @@ msgstr ""
 msgid "This chat name is already in use"
 msgstr ""
 
-msgid "Not connected to the server."
-msgstr ""
+#, fuzzy
+msgid "Not connected to the server"
+msgstr "Connectat"
 
 msgid "Find buddies..."
 msgstr ""
@@ -3059,7 +3085,7 @@ msgstr ""
 msgid "File Transfer Failed"
 msgstr ""
 
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr ""
 
 msgid "Error displaying MOTD"
@@ -3075,8 +3101,16 @@ msgstr ""
 msgid "MOTD for %s"
 msgstr ""
 
-msgid "Server has disconnected"
-msgstr ""
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "Connectat"
 
 msgid "View MOTD"
 msgstr ""
@@ -3090,21 +3124,19 @@ msgstr "Mot de _pas :"
 msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Connexion"
-
 msgid "SSL support unavailable"
 msgstr ""
 
-msgid "Couldn't create socket"
+msgid "Unable to connect"
 msgstr ""
 
-msgid "Couldn't connect to host"
+#. this is a regular connect, error out
+#, c-format
+msgid "Unable to connect: %s"
 msgstr ""
 
-msgid "Read error"
+#, c-format
+msgid "Server closed the connection"
 msgstr ""
 
 msgid "Users"
@@ -3491,10 +3523,10 @@ msgstr ""
 msgid "execute"
 msgstr "executar"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3509,7 +3541,11 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "L'autentificacion a abocat"
+
+msgid "Invalid response from server"
 msgstr ""
 
 msgid "Server does not use any supported authentication method"
@@ -3521,7 +3557,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr ""
 
-msgid "SASL error"
+#, c-format
+msgid "SASL error: %s"
 msgstr ""
 
 msgid "The BOSH connection manager terminated your session."
@@ -3536,21 +3573,13 @@ msgstr ""
 msgid "Unable to establish a connection with the server"
 msgstr ""
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Connectat"
 
 msgid "Unable to establish SSL connection"
 msgstr ""
 
-msgid "Unable to create socket"
-msgstr ""
-
-msgid "Write error"
-msgstr ""
-
 msgid "Full Name"
 msgstr "Nom complet"
 
@@ -3619,159 +3648,6 @@ msgstr "Sistèma d'explotacion"
 msgid "Local Time"
 msgstr "Fichièr local :"
 
-msgid "Last Activity"
-msgstr ""
-
-msgid "Service Discovery Info"
-msgstr ""
-
-msgid "Service Discovery Items"
-msgstr ""
-
-msgid "Extended Stanza Addressing"
-msgstr ""
-
-msgid "Multi-User Chat"
-msgstr ""
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr ""
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr ""
-
-msgid "User Location"
-msgstr ""
-
-msgid "User Avatar"
-msgstr ""
-
-msgid "Chat State Notifications"
-msgstr ""
-
-msgid "Software Version"
-msgstr ""
-
-msgid "Stream Initiation"
-msgstr ""
-
-msgid "File Transfer"
-msgstr "Transferiment de fichièr"
-
-msgid "User Mood"
-msgstr ""
-
-msgid "User Activity"
-msgstr ""
-
-msgid "Entity Capabilities"
-msgstr ""
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-msgid "User Tune"
-msgstr ""
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-msgid "Reachability Address"
-msgstr ""
-
-msgid "User Profile"
-msgstr ""
-
-msgid "Jingle"
-msgstr ""
-
-msgid "Jingle Audio"
-msgstr ""
-
-msgid "User Nickname"
-msgstr ""
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr ""
-
-msgid "Jingle DTMF"
-msgstr ""
-
-msgid "Message Receipts"
-msgstr ""
-
-msgid "Public Key Publishing"
-msgstr ""
-
-msgid "User Chatting"
-msgstr ""
-
-msgid "User Browsing"
-msgstr ""
-
-msgid "User Gaming"
-msgstr ""
-
-msgid "User Viewing"
-msgstr ""
-
-msgid "Ping"
-msgstr "Ajuston"
-
-msgid "Stanza Encryption"
-msgstr ""
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr ""
-
 msgid "Priority"
 msgstr "Prioritat"
 
@@ -3782,7 +3658,7 @@ msgstr "Ressorga"
 msgid "%s ago"
 msgstr ""
 
-msgid "Logged off"
+msgid "Logged Off"
 msgstr ""
 
 msgid "Middle Name"
@@ -3962,16 +3838,13 @@ msgstr "Utilizaire pas trobat"
 msgid "Roles:"
 msgstr "Ròtle"
 
-msgid "Ping timeout"
-msgstr ""
-
-msgid "Read Error"
-msgstr ""
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Connectat"
 
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4145,9 +4018,6 @@ msgstr "Vòstre mot de pas es estat modificat."
 msgid "Error changing password"
 msgstr ""
 
-msgid "Password (again)"
-msgstr ""
-
 msgid "Change XMPP Password"
 msgstr ""
 
@@ -4521,6 +4391,14 @@ msgstr ""
 msgid "Unknown Error in presence"
 msgstr ""
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr ""
+
+#, c-format
+msgid "Error in chat %s"
+msgstr ""
+
 msgid "Create New Room"
 msgstr ""
 
@@ -4535,15 +4413,19 @@ msgstr ""
 msgid "_Accept Defaults"
 msgstr ""
 
+#, fuzzy
+msgid "No reason"
+msgstr "Rason desconeguda"
+
 #, c-format
-msgid "Error joining chat %s"
+msgid "You have been kicked: (%s)"
 msgstr ""
 
 #, c-format
-msgid "Error in chat %s"
+msgid "Kicked (%s)"
 msgstr ""
 
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr ""
 
 msgid "Transfer was closed."
@@ -5024,9 +4906,6 @@ msgstr ""
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-msgid "Failed to connect to server."
-msgstr ""
-
 msgid "Error retrieving profile"
 msgstr ""
 
@@ -5263,9 +5142,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 
-msgid "Unable to connect"
-msgstr ""
-
 msgid "Writing error"
 msgstr ""
 
@@ -5278,19 +5154,19 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Our protocol is not supported by the server."
+msgid "Our protocol is not supported by the server"
 msgstr ""
 
-msgid "Error parsing HTTP."
+msgid "Error parsing HTTP"
 msgstr ""
 
-msgid "You have signed on from another location."
+msgid "You have signed on from another location"
 msgstr ""
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr ""
 
 #, c-format
@@ -5301,9 +5177,6 @@ msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "Unknown error."
-msgstr "Error desconeguda."
-
 msgid "Handshaking"
 msgstr ""
 
@@ -5398,6 +5271,9 @@ msgstr ""
 msgid "%s is not a valid group."
 msgstr ""
 
+msgid "Unknown error."
+msgstr "Error desconeguda."
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr ""
@@ -5505,12 +5381,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Connectat"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr ""
@@ -5531,16 +5401,6 @@ msgstr ""
 msgid "Invalid input condition"
 msgstr ""
 
-msgid "Read buffer full (2)"
-msgstr ""
-
-msgid "Unparseable message"
-msgstr ""
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr ""
-
 msgid "Failed to add buddy"
 msgstr ""
 
@@ -5622,6 +5482,12 @@ msgstr ""
 msgid "Client Version"
 msgstr ""
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr ""
 
@@ -5876,9 +5742,9 @@ msgstr ""
 msgid "Unknown error: 0x%X"
 msgstr ""
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Activat"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -5976,9 +5842,6 @@ msgstr ""
 msgid "Authenticating..."
 msgstr ""
 
-msgid "Unable to connect to server."
-msgstr ""
-
 msgid "Waiting for response..."
 msgstr ""
 
@@ -5999,20 +5862,14 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr ""
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-
-msgid "Error. SSL support is not installed."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 
 msgid "This conference has been closed. No more messages can be sent."
@@ -6050,10 +5907,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr ""
 
-msgid "Incorrect password."
-msgstr ""
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6062,17 +5916,9 @@ msgstr ""
 msgid "Invalid chat room name"
 msgstr ""
 
-msgid "Server closed the connection."
-msgstr ""
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-
-msgid "Received invalid data on connection with server."
-msgstr ""
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "Connectat"
 
 #. *< type
 #. *< ui_requirement
@@ -6119,7 +5965,7 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr ""
 
 msgid "Direct IM established"
@@ -6313,15 +6159,11 @@ msgid "Buddy Comment"
 msgstr ""
 
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 
 #, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
 msgstr ""
 
 msgid "Username sent"
@@ -6336,9 +6178,9 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 
 #, c-format
@@ -6348,26 +6190,20 @@ 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."
+#. the username does not exist
+msgid "Username does not exist"
 msgstr ""
 
 #. Suspended account
-msgid "Your account is currently suspended."
+msgid "Your account is currently suspended"
 msgstr ""
 
 #. service temporarily unavailable
@@ -6384,7 +6220,7 @@ msgid ""
 "try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
-msgid "The SecurID key entered is invalid."
+msgid "The SecurID key entered is invalid"
 msgstr ""
 
 msgid "Enter SecurID"
@@ -6535,6 +6371,9 @@ msgstr ""
 msgid "Member Since"
 msgstr ""
 
+msgid "Capabilities"
+msgstr ""
+
 msgid "Profile"
 msgstr "Perfil"
 
@@ -6691,7 +6530,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6713,7 +6552,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
@@ -6721,7 +6560,7 @@ msgid "(no name)"
 msgstr ""
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr ""
 
 #, c-format
@@ -7514,7 +7353,7 @@ msgstr ""
 msgid "Update interval (seconds)"
 msgstr "Entresenhas sus l'utilizaire"
 
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr ""
 
 #, c-format
@@ -7540,9 +7379,6 @@ msgstr "L'autentificacion a abocat"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
-msgid "Could not decrypt server reply"
-msgstr ""
-
 msgid "Requesting captcha"
 msgstr ""
 
@@ -7576,21 +7412,9 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr ""
-
 msgid "Socket error"
 msgstr ""
 
-msgid "Unable to read from socket"
-msgstr ""
-
-msgid "Write Error"
-msgstr ""
-
-msgid "Connection lost"
-msgstr "Connexion perduda"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "Connectat"
@@ -7598,7 +7422,7 @@ msgstr "Connectat"
 msgid "Requesting token"
 msgstr ""
 
-msgid "Couldn't resolve host"
+msgid "Unable to resolve hostname"
 msgstr ""
 
 #, fuzzy
@@ -7649,7 +7473,7 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "Comanda"
 
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr ""
 
 #, fuzzy
@@ -7671,9 +7495,6 @@ msgstr ""
 msgid "%d canceled the transfer of %s"
 msgstr ""
 
-msgid "Connection closed (writing)"
-msgstr ""
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr ""
@@ -7727,17 +7548,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-msgid "Connection reset"
-msgstr ""
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr ""
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr ""
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -7760,6 +7570,9 @@ msgstr ""
 msgid "Video Camera"
 msgstr ""
 
+msgid "File Transfer"
+msgstr "Transferiment de fichièr"
+
 msgid "Supports"
 msgstr ""
 
@@ -8516,6 +8329,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr ""
 
+msgid "Ping"
+msgstr "Ajuston"
+
 msgid "Ping failed"
 msgstr ""
 
@@ -8573,8 +8389,9 @@ msgstr ""
 msgid "Disconnected by server"
 msgstr ""
 
-msgid "Error during connecting to SILC Server"
-msgstr ""
+#, fuzzy
+msgid "Error connecting to SILC Server"
+msgstr "Connectat"
 
 msgid "Key Exchange failed"
 msgstr ""
@@ -8583,26 +8400,23 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-msgid "Connection failed"
-msgstr ""
-
 msgid "Performing key exchange"
 msgstr ""
 
-msgid "Unable to create connection"
-msgstr ""
-
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr ""
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr ""
 
+msgid "Unable to not load SILC key pair"
+msgstr ""
+
 msgid "Out of memory"
 msgstr "Pas pro de memòria"
 
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr ""
 
 msgid "Error loading SILC key pair"
@@ -8879,7 +8693,7 @@ msgstr ""
 msgid "Creating SILC key pair..."
 msgstr ""
 
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr ""
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -8968,6 +8782,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr ""
 
+msgid "Error during connecting to SILC Server"
+msgstr ""
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -9008,29 +8825,24 @@ msgstr ""
 msgid "Failure: Authentication failed"
 msgstr ""
 
-msgid "Cannot initialize SILC Client connection"
+msgid "Unable to initialize SILC Client connection"
 msgstr ""
 
 msgid "John Noname"
 msgstr ""
 
 #, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr ""
-
-msgid "Could not write"
-msgstr ""
-
-msgid "Could not connect"
+msgid "Unable to load SILC key pair: %s"
 msgstr ""
 
-msgid "Unknown server response."
+msgid "Unable to create connection"
 msgstr ""
 
-msgid "Could not create listen socket"
-msgstr ""
+#, fuzzy
+msgid "Unknown server response"
+msgstr "Rason desconeguda"
 
-msgid "Could not resolve hostname"
+msgid "Unable to create listen socket"
 msgstr ""
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -9073,6 +8885,76 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr ""
+
+msgid "list: List rooms on the Yahoo network"
+msgstr ""
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+msgid "Yahoo ID..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Protocòl"
+
+msgid "Pager server"
+msgstr ""
+
+msgid "Pager port"
+msgstr ""
+
+msgid "File transfer server"
+msgstr ""
+
+msgid "File transfer port"
+msgstr ""
+
+msgid "Chat room locale"
+msgstr ""
+
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
+
+msgid "Chat room list URL"
+msgstr ""
+
+msgid "Yahoo Chat server"
+msgstr ""
+
+msgid "Yahoo Chat port"
+msgstr ""
+
+msgid "Yahoo JAPAN ID..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Protocòl"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9100,25 +8982,16 @@ msgstr ""
 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"
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
 msgstr ""
 
 #. indicates a lock of some description
 msgid ""
-"Account locked: Unknown reason.\n"
-"Logging into the Yahoo! website may fix this."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 
 #. username or password missing
@@ -9153,32 +9026,25 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-msgid "Could not add buddy to server list"
+msgid "Unable to add buddy to server list"
 msgstr ""
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-msgid "Received unexpected HTTP response from server."
-msgstr ""
-
-msgid "Connection problem"
+msgid "Received unexpected HTTP response from server"
 msgstr ""
 
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
+msgstr "Connectat"
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
 
 msgid "Not at Home"
@@ -9241,73 +9107,15 @@ msgstr ""
 msgid "Open Inbox"
 msgstr ""
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-
-msgid "list: List rooms on the Yahoo network"
-msgstr ""
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-msgid "Yahoo ID..."
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr ""
-
-msgid "Yahoo Japan"
-msgstr ""
-
-msgid "Pager server"
-msgstr ""
-
-msgid "Japan Pager server"
-msgstr ""
-
-msgid "Pager port"
-msgstr ""
-
-msgid "File transfer server"
-msgstr ""
-
-msgid "Japan file transfer server"
-msgstr ""
-
-msgid "File transfer port"
-msgstr ""
-
-msgid "Chat room locale"
-msgstr ""
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-msgid "Chat room list URL"
-msgstr ""
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-msgid "Yahoo Chat port"
-msgstr ""
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr ""
+
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -9315,6 +9123,9 @@ msgstr ""
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr ""
 
+msgid "Write Error"
+msgstr ""
+
 msgid "Yahoo! Japan Profile"
 msgstr ""
 
@@ -9419,20 +9230,18 @@ msgstr ""
 msgid "Webcams"
 msgstr ""
 
-msgid "Unable to fetch room list."
+msgid "Connection problem"
 msgstr ""
 
-msgid "User Rooms"
+msgid "Unable to fetch room list."
 msgstr ""
 
-msgid "Connection problem with the YCHT server."
+msgid "User Rooms"
 msgstr ""
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Connection problem with the YCHT server"
+msgstr "Connectat"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9550,13 +9359,7 @@ msgid "Exposure"
 msgstr ""
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
 
 #, c-format
@@ -9564,16 +9367,13 @@ msgid "HTTP proxy connection error %d"
 msgstr ""
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
 #, c-format
 msgid "Error resolving %s"
 msgstr ""
 
-msgid "Could not resolve host name"
-msgstr ""
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -9774,12 +9574,6 @@ msgid "Unable to connect to %s: %s"
 msgstr ""
 
 #, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-
-#, c-format
 msgid " - %s"
 msgstr ""
 
@@ -10011,7 +9805,10 @@ msgstr ""
 msgid "View _Log"
 msgstr ""
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr ""
+
+msgid "Show When Offline"
 msgstr ""
 
 msgid "_Alias..."
@@ -10499,6 +10296,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr ""
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr ""
@@ -10544,8 +10344,9 @@ msgstr "Ignorar"
 msgid "Get Away Message"
 msgstr ""
 
-msgid "Last said"
-msgstr ""
+#, fuzzy
+msgid "Last Said"
+msgstr "Nom"
 
 msgid "Unable to save icon file to disk."
 msgstr ""
@@ -11414,7 +11215,7 @@ msgstr ""
 msgid "Hyperlink visited color"
 msgstr ""
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 
 msgid "Hyperlink prelight color"
@@ -11450,13 +11251,19 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 msgid "Typing notification color"
 msgstr ""
 
-msgid "The color to use for the typing notification font"
+msgid "The color to use for the typing notification"
 msgstr ""
 
 msgid "Typing notification font"
@@ -11792,6 +11599,10 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
+#, fuzzy
+msgid "No message"
+msgstr "Messatge"
+
 msgid "Open All Messages"
 msgstr ""
 
@@ -11807,10 +11618,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr ""
 
-#, fuzzy
-msgid "No message"
-msgstr "Messatge"
-
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -12018,8 +11825,9 @@ msgstr ""
 msgid "On unread messages"
 msgstr ""
 
-msgid "Conversation Window Hiding"
-msgstr ""
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Connectat"
 
 msgid "_Hide new IM conversations:"
 msgstr ""
@@ -12027,6 +11835,9 @@ msgstr ""
 msgid "When away"
 msgstr ""
 
+msgid "Minimi_ze new conversation windows"
+msgstr ""
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Onglets"
@@ -12085,9 +11896,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr ""
 
-msgid "Minimi_ze new conversation windows"
-msgstr ""
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12120,7 +11928,8 @@ msgstr ""
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-msgid "_Autodetect IP address"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr ""
 
 msgid "Public _IP:"
@@ -12486,30 +12295,15 @@ msgstr ""
 msgid "Status for %s"
 msgstr ""
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr ""
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
-msgid "Duplicate Shortcut"
+msgid "Custom Smiley"
 msgstr ""
 
-msgid "Please select an image for the smiley."
+msgid "Duplicate Shortcut"
 msgstr ""
 
 msgid "Edit Smiley"
@@ -12619,8 +12413,8 @@ msgid "Cannot send launcher"
 msgstr ""
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -13185,7 +12979,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -13430,7 +13224,7 @@ msgstr "Connectat"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -13742,7 +13536,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr ""
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -13782,6 +13576,16 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "Connection lost"
+#~ msgstr "Connexion perduda"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Picatz lo mot de pas"
+
 #, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "Messatges enviats"
diff --git a/po/pa.po b/po/pa.po
index 526e0dabb7..1069a2f29b 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2009-02-26 22:23+0530\n"
 "Last-Translator: Amanpreet Singh Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-users@lists.sf.net>\n"
@@ -2528,9 +2528,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "ਲਾਗ ਦਰਸ਼ਕ ਵਿੱਚ ਹੋਰ IM ਕਲਾਇਟ ਲਾਗ ਸ਼ਾਮਲ"
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2582,8 +2583,9 @@ msgstr "ਆਫਲਾਈਨ ਸੁਨੇਹਾ ਸਮਰੂਪ"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "ਇੱਕ ਆਫਲਾਈਨ ਯੂਜ਼ਰ ਨੂੰ ਭੇਜੇ ਸੁਨੇਹੇ ਪਉਨਸ ਵਾਂਗ ਸੰਭਾਲੋ।"
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr "ਬਾਕੀ ਸੁਨੇਹੇ ਪਉਨਸ ਵਾਂਗ ਸੰਭਾਲੋ। ਤੁਸੀਂ `ਬੱਡੀ ਪਉਨਸ' ਡਾਈਲਾਗ ਤੋਂ ਪਉਨਸ ਨੂੰ ਸੋਧ/ਹਟਾ ਸਕਦੇ ਹੋ।"
 
@@ -2829,14 +2831,16 @@ msgstr ""
 "ActiveTCL ਇੰਸਟਾਲੇਸ਼ਨ ਖੋਜਣ ਲਈ ਅਸਮਰੱਥ ਹੈ। ਜੇ ਤੁਸੀਂ TCL ਪਲੱਗਇਨ ਵਰਤਣੀਆਂ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ http://"
 "www.activestate.com ਤੋਂ ActiveTCL ਇੰਸਟਾਲ ਕਰੋ।\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Windows ਟੂਲਕਿੱਟ ਲਈ ਐਪਸ ਬੋਨਜੋਉਰ ਨਹੀਂ ਲੱਭਿਆ ਸਵਾਲ-ਜਵਾਬ ਵੇਖੋ: ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ http://d."
 "pidgin.im/BonjourWindows ਵੇਖੋ।"
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "ਆ ਰਹੇ IM ਕੁਨੈਕਸ਼ਨ ਸੁਣਨ ਤੋਂ ਅਸਮੱਰਥ ਹੈ\n"
 
 msgid ""
@@ -2888,14 +2892,21 @@ msgstr "%s ਨੇ ਗੱਲਬਾਤ ਬੰਦ ਕਰ ਦਿੱਤੀ।"
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "ਸੁਨੇਹਾ ਭੇਜਣ ਲਈ ਅਸਮਰੱਥ ਹੈ, ਗੱਲਬਾਤ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ।"
 
-msgid "Cannot open socket"
-msgstr "ਸਾਕਟ ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"ਸਾਕਟ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "ਸਾਕਟ ਪੋਰਟ ਨਾਲ ਜੋੜੀ ਨਹੀਂ ਜਾ ਸਕੀ"
 
-msgid "Could not listen on socket"
-msgstr "ਸਾਕਟ ਉੱਤੇ ਸੁਣਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"ਸਾਕਟ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "mDNSResponder ਨਾਲ ਸੰਚਾਰ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"
@@ -2943,13 +2954,16 @@ msgstr "ਬੱਡੀ-ਲਿਸਟ ਸੰਭਾਲੋ..."
 msgid "Load buddylist from file..."
 msgstr "ਫਾਇਲ ਤੋਂ ਬੱਡੀ ਲਿਸਟ ਲੋਡ ਕਰੋ..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "ਰਜਿਸਟਰੇਸ਼ਨ ਖੇਤਰ ਭਰੋ।"
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "ਪਾਸਵਰਡ ਮਿਲਦਾ ਨਹੀਂ ਹੈ।"
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "ਨਵਾਂ ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਲਈ ਅਸਫਲ ਹੈ। ਗਲਤੀ ਆਈ ਹੈ।\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2961,14 +2975,15 @@ msgstr "ਰਜਿਸਟਰੇਸ਼ਨ ਠੀਕ ਤਰ੍ਹਾਂ ਪੂਰੀ
 msgid "Password"
 msgstr "ਪਾਸਵਰਡ"
 
-msgid "Password (retype)"
-msgstr "ਪਾਸਵਰਡ (ਮੁੜ-ਲਿਖੋ)"
+msgid "Password (again)"
+msgstr "ਪਾਸਵਰਡ (ਮੁੜ)"
 
-msgid "Enter current token"
-msgstr "ਮੌਜੂਦਾ ਟੋਕਨ ਦਿਓ"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "ਮੌਜੂਦਾ ਟੋਕਨ"
+#, fuzzy
+msgid "Captcha"
+msgstr "ਕੈਪਟਚਾ ਚਿੱਤਰ"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "ਨਵਾਂ ਗਡੂ-ਗਡੂ ਅਕਾਊਟ ਰਜਿਸਟਰ ਕਰੋ"
@@ -3021,6 +3036,15 @@ msgstr "ਪਾਸਵਰਡ ਸਫਲਤਾਪੂਰਕ ਤਬਦੀਲ ਕੀਤ
 msgid "Current password"
 msgstr "ਮੌਜੂਦਾ ਪਾਸਵਰਡ"
 
+msgid "Password (retype)"
+msgstr "ਪਾਸਵਰਡ (ਮੁੜ-ਲਿਖੋ)"
+
+msgid "Enter current token"
+msgstr "ਮੌਜੂਦਾ ਟੋਕਨ ਦਿਓ"
+
+msgid "Current token"
+msgstr "ਮੌਜੂਦਾ ਟੋਕਨ"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "ਆਪਣਾ ਮੌਜੂਦਾ ਪਾਸਵਰਡ ਅਤੇ ਨਵਾਂ ਪਾਸਵਰਡ ਦਿਓ ਜੀ।"
 
@@ -3068,8 +3092,8 @@ msgstr "ਕੋਈ ਮਿਲਦਾ ਯੂਜ਼ਰ ਨਹੀਂ ਮਿਲਿਆ"
 msgid "There are no users matching your search criteria."
 msgstr "ਤੁਹਾਡੀ ਖੋਜ ਸੀਮਾ ਨਾਲ ਮਿਲਦਾ ਕੋਈ ਯੂਜ਼ਰ ਨਹੀਂ ਲੱਭਿਆ।"
 
-msgid "Unable to read socket"
-msgstr "ਸਾਕਟ ਪੜ੍ਹਨ ਵਿੱਚ ਅਸਫਲ"
+msgid "Unable to read from socket"
+msgstr "ਸਾਕਟ ਤੋਂ ਤਾਜ਼ਾ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
 msgid "Buddy list downloaded"
 msgstr "ਬੱਡੀ ਲਿਸਟ ਡਾਊਨਲੋਡ ਕੀਤੀ ਗਈ"
@@ -3083,8 +3107,14 @@ msgstr "ਬੱਡੀ ਲਿਸਟ ਅੱਪਲੋਡ ਕੀਤੀ ਗਈ"
 msgid "Your buddy list was stored on the server."
 msgstr "ਤੁਹਾਡੀ ਬੱਡੀ ਲਿਸਟ ਸਰਵਰ ਉੱਤੇ ਅੱਪਲੋਡ ਕੀਤੀ ਗਈ ਹੈ।"
 
-msgid "Connection failed."
-msgstr "ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੋਇਆ।"
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "ਜੁੜਿਆ"
+
+msgid "Connection failed"
+msgstr "ਸੰਬੰਧ ਅਸਫਲ"
 
 msgid "Add to chat"
 msgstr "ਗੱਲਾਂ 'ਚ ਸ਼ਾਮਿਲ"
@@ -3092,18 +3122,23 @@ msgstr "ਗੱਲਾਂ 'ਚ ਸ਼ਾਮਿਲ"
 msgid "Chat _name:"
 msgstr "ਗੱਲ ਨਾਂ(_n):"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਫਲ ਹੈ।"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "ਜੁੜ ਰਿਹਾ ਹੈ"
+
 msgid "Chat error"
 msgstr "ਗੱਲ ਗਲਤੀ"
 
 msgid "This chat name is already in use"
 msgstr "ਇਹ ਗੱਲ ਨਾਂ ਪਹਿਲਾਂ ਹੀ ਵਰਤੋਂ 'ਚ ਹੈ"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "ਸਰਵਰ ਨਾਲ ਜੁੜਿਆ ਨਹੀਂ ਹੈ।"
 
 msgid "Find buddies..."
@@ -3163,7 +3198,8 @@ msgstr "ਕੋਈ ਵਿਸ਼ਾ ਨਹੀਂ ਦਿੱਤਾ ਹੈ"
 msgid "File Transfer Failed"
 msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ ਫੇਲ੍ਹ"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "ਇੱਕ ਸੁਣਨ ਪੋਰਟ ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕੀ।"
 
 msgid "Error displaying MOTD"
@@ -3179,8 +3215,18 @@ msgstr "ਇਹ ਕੁਨੈਕਸ਼ਨ ਨਾਲ ਕੋਈ MOTD ਸਬੰਧਿ
 msgid "MOTD for %s"
 msgstr "%s ਵਲੋਂ MOTD"
 
-msgid "Server has disconnected"
-msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ ਗਿਆ"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"ਸਰਵਰ ਨਾਲ ਆਖਰੀ ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "MOTD ਵੇਖੋ"
@@ -3195,22 +3241,20 @@ msgstr "ਪਾਸਵਰਡ(_P):"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC ਨਾਂਵਾਂ 'ਚ ਖਾਲੀ ਥਾਂ ਨਹੀਂ ਹੋ ਸਕਦੀ ਹੈ"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "ਜੁੜ ਰਿਹਾ ਹੈ"
-
 msgid "SSL support unavailable"
 msgstr "SSL ਸਹਿਯੋਗ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ"
 
-msgid "Couldn't create socket"
-msgstr "ਸਾਕਟ ਬਣ ਨਹੀਂ ਸਕੀ ਹੈ"
+msgid "Unable to connect"
+msgstr "ਕੁਨੈਕਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
-msgid "Couldn't connect to host"
-msgstr "ਹੋਸਟ ਨਾਲ ਜੁੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "%s ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਮਰੱਥ"
 
-msgid "Read error"
-msgstr "ਪੜਨ ਗਲਤੀ"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "ਸਰਵਰ ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ ਗਿਆ ਹੈ।"
 
 msgid "Users"
 msgstr "ਯੂਜ਼ਰ"
@@ -3633,10 +3677,12 @@ msgstr "ਐਡ-ਹਾਕ ਕਮਾਂਡ ਫੇਲ੍ਹ ਹੋਈ"
 msgid "execute"
 msgstr "ਚਲਾਓ"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "ਲਾਗਇਨ ਲਈ ਸਰਵਰ ਨੂੰ TLS/SSL ਲੋੜੀਦਾ ਹੈ। ਕੋਈ TLS/SSL ਸਹਿਯੋਗ ਨਹੀਂ ਹੈ।"
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "ਤੁਹਾਨੂੰ ਇੰਕ੍ਰਿਪਸ਼ਨ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਕੋਈ TLS/SSL ਸਹਿਯੋਗ ਨਹੀਂ ਲੱਭਿਆ।"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3653,7 +3699,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "ਪਲੇਨ-ਟੈਕਸਟ ਪਰਮਾਣਕਿਤਾ"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "ਪ੍ਰਮਾਣਿਕਤਾ ਅਸਫਲ"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "ਸਰਵਰ ਵਲੋਂ ਗਲਤ ਜਵਾਬ ਹੈ।"
 
 msgid "Server does not use any supported authentication method"
@@ -3665,7 +3716,8 @@ msgstr "ਤੁਹਾਨੂੰ ਇੰਕ੍ਰਿਪਸ਼ਨ ਦੀ ਲੋੜ �
 msgid "Invalid challenge from server"
 msgstr "ਸਰਵਰ ਤੋਂ ਗਲਤ ਚੈਲੰਜ਼"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL ਗਲਤੀ"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3685,10 +3737,8 @@ msgstr ""
 "ਸਰਵਰ ਨਾਲ ਇੱਕ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "ਸਰਵਰ ਨਾਲ ਇੱਕ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ:\n"
 "%s"
@@ -3697,12 +3747,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਸ਼ੁਰੂ ਲਈ ਅਸਫ਼ਲ।"
 
-msgid "Unable to create socket"
-msgstr "ਸਾਕਟ ਬਣਾਉਣ ਲਈ ਅਸਫਲ"
-
-msgid "Write error"
-msgstr "ਲਿਖਣ ਵਿੱਚ ਗਲਤੀ"
-
 msgid "Full Name"
 msgstr "ਪੂਰਾ ਨਾਂ"
 
@@ -3771,159 +3815,6 @@ msgstr "ਓਪਰੇਟਿੰਗ ਸਿਸਟਮ"
 msgid "Local Time"
 msgstr "ਲੋਕਲ ਫਾਇਲ:"
 
-msgid "Last Activity"
-msgstr "ਆਖਰੀ ਐਕਟੀਵਿਟੀ"
-
-msgid "Service Discovery Info"
-msgstr "ਸਰਵਿਸ ਡਾਇਰੈਕਟਰੀ ਜਾਣਕਾਰੀ"
-
-msgid "Service Discovery Items"
-msgstr "ਸਰਵਰ ਖੋਜ ਆਈਟਮਾਂ"
-
-msgid "Extended Stanza Addressing"
-msgstr "ਵਾਧੂ ਪ੍ਹੈਰਾ ਐਡਰੈੱਸਿੰਗ"
-
-msgid "Multi-User Chat"
-msgstr "ਮਲਟੀ-ਯੂਜ਼ਰ ਚੈਟ"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "ਮਲਟੀ-ਯੂਜ਼ਰ ਚੈਟ ਵਾਧੂ ਮੌਜੂਦਗੀ ਜਾਣਕਾਰੀ"
-
-msgid "In-Band Bytestreams"
-msgstr "ਇਨ-ਬੈਂਡ ਬਾਇਟ-ਸਟਰੀਮ"
-
-msgid "Ad-Hoc Commands"
-msgstr "ਐਡ-ਹਾਕ ਕਮਾਂਡ"
-
-msgid "PubSub Service"
-msgstr "PubSub ਸਰਵਿਸ"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 Bytestreams"
-
-msgid "Out of Band Data"
-msgstr "ਆਉਟ ਆਫ਼ ਬੈਂਡ ਡਾਟਾ"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "ਇਨ-ਬੈਂਡ ਰਜਿਸਟਰੇਸ਼ਨ"
-
-msgid "User Location"
-msgstr "ਯੂਜ਼ਰ ਟਿਕਾਣਾ"
-
-msgid "User Avatar"
-msgstr "ਯੂਜ਼ਰ ਅਵਤਾਰ"
-
-msgid "Chat State Notifications"
-msgstr "ਚੈਟ ਹਾਲਤ ਨੋਟੀਫਿਕੇਸ਼ਨ"
-
-msgid "Software Version"
-msgstr "ਸਾਫਟਵੇਅਰ ਵਰਜਨ"
-
-msgid "Stream Initiation"
-msgstr "ਸਟਰੀਮ ਸ਼ੁਰੂਆਤ"
-
-msgid "File Transfer"
-msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ"
-
-msgid "User Mood"
-msgstr "ਯੂਜ਼ਰ ਮੂਡ"
-
-msgid "User Activity"
-msgstr "ਯੂਜ਼ਰ ਸਰਗਰਮੀ"
-
-msgid "Entity Capabilities"
-msgstr "ਐਂਟਟੀ ਸਮੱਰਥਾ"
-
-msgid "Encrypted Session Negotiations"
-msgstr "ਇੰਕ੍ਰਿਪਟਡ ਸ਼ੈਸ਼ਨ ਸਾਂਝ"
-
-msgid "User Tune"
-msgstr "ਯੂਜ਼ਰ ਟਿਊਨ"
-
-msgid "Roster Item Exchange"
-msgstr "ਰੋਸਟਰ ਆਈਟਮ ਐਕਸ਼ਚੇਜ਼"
-
-msgid "Reachability Address"
-msgstr "ਪਹੁੰਚਯੋਗ ਐਡਰੈੱਸ"
-
-msgid "User Profile"
-msgstr "ਯੂਜ਼ਰ ਪ੍ਰੋਫਾਇਲ"
-
-msgid "Jingle"
-msgstr "ਜਿਙਗਲ"
-
-msgid "Jingle Audio"
-msgstr "ਜਿਙਗਲ ਆਡਿਓ"
-
-msgid "User Nickname"
-msgstr "ਯੂਜ਼ਰ ਨਾਂ"
-
-msgid "Jingle ICE UDP"
-msgstr "ਜਿਙਗਲ ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "ਜਿਙਗਲ ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "ਜਿਙਗਲ ਰਾਅ UDP"
-
-msgid "Jingle Video"
-msgstr "ਜਿਙਗਲ ਵਿਡੀਓ"
-
-msgid "Jingle DTMF"
-msgstr "ਜਿਙਗਲ DTMF"
-
-msgid "Message Receipts"
-msgstr "ਸੁਨੇਹਾ ਮਿਲਿਆ"
-
-msgid "Public Key Publishing"
-msgstr "ਪਬਲਿਕ ਕੁੰਜੀ ਪਬਲਿਕੇਸ਼ਨ"
-
-msgid "User Chatting"
-msgstr "ਯੂਜ਼ਰ ਚੈਟਿੰਗ"
-
-msgid "User Browsing"
-msgstr "ਯੂਜ਼ਰ ਬਰਾਊਜ਼ਿੰਗ"
-
-msgid "User Gaming"
-msgstr "ਯੂਜ਼ਰ ਗੇਮ"
-
-msgid "User Viewing"
-msgstr "ਯੂਜ਼ਰ ਝਲਕ"
-
-msgid "Ping"
-msgstr "ਪਿੰਗ"
-
-msgid "Stanza Encryption"
-msgstr "ਪ੍ਹੈਰਾ ਇੰਕ੍ਰਿਪਸ਼ਨ"
-
-msgid "Entity Time"
-msgstr "ਐਂਟਟੀ ਟਾਈਮ"
-
-msgid "Delayed Delivery"
-msgstr "ਡਿਲਵਰੀ ਦੇਰੀ"
-
-msgid "Collaborative Data Objects"
-msgstr "ਸਾਂਝੇ ਡਾਟਾ ਆਬਜੈਕਟ"
-
-msgid "File Repository and Sharing"
-msgstr "ਫਾਇਲ ਰਿਪੋਜ਼ਟਰੀ ਅਤੇ ਸ਼ੇਅਰਿੰਗ"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "ਜਿਙਗਲ ਲਈ STUN ਸਰਵਿਸ ਖੋਜ"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "ਸਧਾਰਨ ਇੰਕ੍ਰਿਪਟਡ ਸ਼ੈਸ਼ਨ ਸਾਂਝ"
-
-msgid "Hop Check"
-msgstr "ਹੋਪ ਚੈਕ"
-
-msgid "Capabilities"
-msgstr "ਯੋਗਤਾ"
-
 msgid "Priority"
 msgstr "ਤਰਜੀਹ"
 
@@ -3935,7 +3826,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "ਲਾਗਇਨ ਹੈ"
 
 msgid "Middle Name"
@@ -4116,16 +4007,13 @@ msgstr "ਕੋਈ ਮਿਲਦਾ ਯੂਜ਼ਰ ਨਹੀਂ ਮਿਲਿਆ"
 msgid "Roles:"
 msgstr "ਕੰਮ"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "ਪਿੰਗ ਟਾਈਮ-ਆਉਟ"
 
-msgid "Read Error"
-msgstr "ਪੜ੍ਹਨ ਗਲਤੀ"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4301,9 +4189,6 @@ msgstr "ਤੁਹਾਡਾ ਪਾਸਵਰਡ ਤਬਦੀਲ ਹੋ ਗਿਆ �
 msgid "Error changing password"
 msgstr "ਪਾਸਵਰਡ ਬਦਲਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-msgid "Password (again)"
-msgstr "ਪਾਸਵਰਡ (ਮੁੜ)"
-
 msgid "Change XMPP Password"
 msgstr "XMPP ਪਾਸਵਰਡ ਬਦਲੋ"
 
@@ -4686,6 +4571,14 @@ msgstr "XML ਪਾਰਸ ਗਲਤੀ"
 msgid "Unknown Error in presence"
 msgstr "ਮੌਜੂਦਗੀ ਵਿੱਚ ਅਣਜਾਣੀ ਗਲਤੀ"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "ਗੱਲ %s 'ਚ ਦਾਖਲ ਹੋਣ ਲਈ ਗਲਤੀ"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "ਗੱਲ %s 'ਚ ਗਲਤੀ"
+
 msgid "Create New Room"
 msgstr "ਨਵਾਂ ਰੂਮ ਬਣਾਓ"
 
@@ -4702,16 +4595,20 @@ msgstr "ਰੂਮ ਸੰਰਚਨਾ(_C)"
 msgid "_Accept Defaults"
 msgstr "ਮੂਲ ਮਨਜ਼ੂਰ ਕਰੋ(_A)"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "ਗੱਲ %s 'ਚ ਦਾਖਲ ਹੋਣ ਲਈ ਗਲਤੀ"
+#, fuzzy
+msgid "No reason"
+msgstr "ਕੋਈ ਕਾਰਨ ਨਹੀਂ ਦਿੱਤਾ ਹੈ।"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "ਗੱਲ %s 'ਚ ਗਲਤੀ"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "ਤੁਹਾਨੂੰ %s ਨੇ ਠੁੱਡਾ ਮਾਰਿਆ: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s (%s) ਨੇ ਸੁੱਟਿਆ"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "ਫਾਇਲ ਖੋਲਣ ਲਈ ਗਲਤੀ ਆਈ ਹੈ।"
 
 #, fuzzy
@@ -5198,9 +5095,6 @@ msgstr "ਗੱਲਬਾਤ ਚਾਲੂ(_C)"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "SSL ਸਹਿਯੋਗ MSN ਲਈ ਲੋੜੀਦਾ ਹੈ। ਇੱਕ ਸਹਾਇਕ SSL ਲਾਇਬਰੇਰੀ ਇੰਸਟਾਲ ਕਰੋ ਜੀ।"
 
-msgid "Failed to connect to server."
-msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਦੌਰਨ ਗਲਤੀ"
-
 msgid "Error retrieving profile"
 msgstr "ਪ੍ਰੋਫਾਇਲ ਪ੍ਰਾਪਤ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
 
@@ -5449,9 +5343,6 @@ msgstr "ਇੱਕ ਅਣਜਾਣੀ ਇੰਕੋਡਿੰਗ ਗਲਤੀ ਆ�
 msgid "Message was not sent because an unknown error occurred."
 msgstr "ਇੱਕ ਅਣਜਾਣੀ ਗਲਤੀ ਆਉਣ ਕਰਕੇ ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ।"
 
-msgid "Unable to connect"
-msgstr "ਕੁਨੈਕਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
-
 msgid "Writing error"
 msgstr "ਲਿਖਣ ਗਲਤੀ"
 
@@ -5466,19 +5357,23 @@ msgstr ""
 "ਸਰਵਰ (%s) ਵਲੋਂ ਕੁਨੈਕਸ਼ਨ ਗਲਤੀ:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "ਸਾਡੇ ਪ੍ਰੋਟੋਕਾਲ ਲਈ ਸਰਵਰ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "HTTP ਪਾਰਸ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "ਤੁਸੀਂ ਕਿਸੇ ਹੋਰ ਥਾਂ ਤੋਂ ਲਾਗਇਨ ਹੋਏ"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "MSN ਸਰਵਰ ਆਰਜ਼ੀ ਤੌਰ ਤੇ ਬੰਦ ਹੋ ਰਿਹਾ ਹੈ। ਉਡੀਕ ਕਰਨ ਉਪਰੰਤ ਕੋਸ਼ਿਸ ਕਰੋ ਜੀ।"
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN ਸਰਵਰ ਆਰਜ਼ੀ ਤੌਰ ਤੇ ਬੰਦ ਹੋ ਰਿਹਾ ਹੈ।"
 
 #, c-format
@@ -5489,9 +5384,6 @@ msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "ਤੁਹਾਡਾ MSN ਬੱਡੀ ਆਰਜ਼ੀ ਤੌਰ ਉੱਤੇ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ। ਉਡੀਕ ਕਰਕੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ ਜੀ।"
 
-msgid "Unknown error."
-msgstr "ਅਣਜਾਣ ਗਲਤੀ"
-
 msgid "Handshaking"
 msgstr "ਹੈਂਡਸੇਕ"
 
@@ -5588,6 +5480,9 @@ msgstr "MSN ਪਰੋਟੋਕਾਲ ਪਲੱਗਇਨ"
 msgid "%s is not a valid group."
 msgstr "%s ਠੀਕ ਗਰੁੱਪ ਨਹੀਂ ਹੈ।"
 
+msgid "Unknown error."
+msgstr "ਅਣਜਾਣ ਗਲਤੀ"
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s 'ਤੇ %s (%s)"
@@ -5698,12 +5593,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "ਸਰਵਰ ਤੋਂ ਸੰਪਰਕ ਸ਼ਾਮਲ ਕਰੋ"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "ਜੁੜਿਆ"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "ਪਰੋਟੋਕਾਲ ਗਲਤੀ, ਕੋਡ %d: %s"
@@ -5727,16 +5616,6 @@ msgstr "MySpaceIM ਗਲਤੀ"
 msgid "Invalid input condition"
 msgstr "ਗਲਤ ਇੰਪੁੱਟ ਹਾਲਤ"
 
-msgid "Read buffer full (2)"
-msgstr "ਪੜ੍ਹਨ ਬਫ਼ਰ ਭਰਿਆ (2)"
-
-msgid "Unparseable message"
-msgstr "ਨਾ-ਪਾਰਸਯੋਗ ਸੁਨੇਹਾ"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "ਹੋਸਟ ਨਾਲ ਕੁਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "ਬੱਡੀ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
 
@@ -5820,6 +5699,12 @@ msgstr "ਕੁੱਲ ਦੋਸਤ"
 msgid "Client Version"
 msgstr "ਕਲਾਇਟ ਵਰਜਨ"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - ਯੂਜ਼ਰ ਨਾਂ ਉਪਲੱਬਧ ਹੈ"
 
@@ -6074,9 +5959,9 @@ msgstr "ਯੂਜ਼ਰ ਆਫਲਾਇਨ ਹੈ ਜਾਂ ਤੁਸੀਂ ਪ�
 msgid "Unknown error: 0x%X"
 msgstr "ਅਣਜਾਣ ਗਲਤੀ: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "ਦਾਖਲਾ ਅਸਫਲ (%s)"
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "ਯੂਜ਼ਰ %s ਪਿੰਗ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6178,9 +6063,6 @@ msgstr "GroupWise ਕਾਨਫਰੰਸ %d"
 msgid "Authenticating..."
 msgstr "ਪ੍ਰਮਾਣਕਿਤਾ ਜਾਰੀ..."
 
-msgid "Unable to connect to server."
-msgstr "ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਫਲ ਹੈ।"
-
 msgid "Waiting for response..."
 msgstr "ਜਵਾਬ ਲਈ ਉਡੀਕ ਹੈ..."
 
@@ -6204,22 +6086,17 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "ਕੀ ਤੁਸੀਂ ਗੱਲਬਾਤ ਵਿੱਚ ਸ਼ਾਮਿਲ ਹੋਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "ਤੁਸੀਂ ਲਾਗ ਆਉਟ ਹੋ ਗਏ ਹੋ, ਕਿਉਕਿ ਤੁਸੀਂ ਕਿਸੇ ਹੋਰ ਵਰਕਸਟੇਸ਼ਨ ਉੱਤੇ ਲਾਗਇਨ ਹੋ ਗਏ ਹੋ।"
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s ਮੌਜੂਦ ਨਹੀਂ (ਆਫਲਾਇਨ) ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਰਾਹੀਂ ਭੇਜੇ ਸੁਨੇਹੇ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕੇਗਾ।"
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr "ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਫਲ ਹੈ। ਜੁੜਨ ਵਾਲੇ ਸਰਵਰ ਦਾ ਐਡਰੈੱਸ ਦਿਓ ਜੀ।"
 
-msgid "Error. SSL support is not installed."
-msgstr "ਗਲਤੀ ਹੈ। SSL ਸਹਿਯੋਗ ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ।"
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "ਇਹ ਕਾਨਫਰੰਸ ਬੰਦ ਕਰ ਦਿੱਤੀ ਗਈ ਹੈ। ਕੋਈ ਹੋਰ ਸੁਨੇਹਾ ਨਹੀਂ ਭੇਜਿਆ ਜਾ ਸਕਦਾ ਹੈ।"
 
@@ -6258,10 +6135,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "%s ਹੱਲ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
 
-msgid "Incorrect password."
-msgstr "ਗਲਤ ਪਾਸਵਰਡ ਹੈ।"
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6270,18 +6144,8 @@ msgstr "ਚੈਟ ਰੂਮ ਵਿੱਚ ਦਾਖਲ ਨਹੀਂ ਹੋਇਆ
 msgid "Invalid chat room name"
 msgstr "ਗਲਤ ਚੈਟ ਰੂਮ ਨਾਂ"
 
-msgid "Server closed the connection."
-msgstr "ਸਰਵਰ ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ ਗਿਆ ਹੈ।"
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"ਸਰਵਰ ਨਾਲ ਆਖਰੀ ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਉੱਤੇ ਗਲਤ ਡਾਟਾ ਮਿਲਿਆ ਹੈ।"
 
 #. *< type
@@ -6329,7 +6193,8 @@ msgstr "ਰਿਮੋਟ ਯੂਜ਼ਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਖ�
 msgid "Received invalid data on connection with remote user."
 msgstr "ਰਿਮੋਟ ਯੂਜ਼ਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਉੱਤੇ ਗਲਤ ਡਾਟਾ ਮਿਲਿਆ ਹੈ।"
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "ਰਿਮੋਟ ਯੂਜ਼ਰ ਨਾਲ ਇੱਕ ਕੁਨੈਕਸ਼ਨ ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਿਆ ਹੈ।"
 
 msgid "Direct IM established"
@@ -6528,21 +6393,15 @@ msgstr "ਚੇਤਾਵਨੀ ਪੱਧਰ"
 msgid "Buddy Comment"
 msgstr "ਸੁਨੇਹੀ ਟਿੱਪਣੀ"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "ਪਰਮਾਣਕਿਤਾ ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"BOS ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਨਹੀਂ ਸਕਿਆ:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਫਲ ਹੈ।"
 
 msgid "Username sent"
 msgstr "ਯੂਜ਼ਰ ਨਾਂ ਭੇਜਿਆ"
@@ -6554,11 +6413,11 @@ msgstr "ਕੁਨੈਕਸ਼ਨ ਬਣ ਗਿਆ ਹੈ, ਕੂਕੀ ਭੇਜ
 msgid "Finalizing connection"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਤਿਆਰ"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "ਲਾਗਇਨ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s ਵਾਂਗ ਲਾਗਇਨ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ, ਕਿਉਂਕਿ ਯੂਜ਼ਰ-ਨਾਂ ਗਲਤ ਹੈ। ਯੂਜ਼ਰ "
 "ਨਾਂ ਇੱਕ ਵੈਧ ਈਮੇਲ ਐਡਰੈੱਸ ਚਾਹੀਦਾ ਹੈ, ਜਾਂ ਇੱਕ ਅੱਖਰ ਨਾਲ ਸ਼ੁਰੂ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ, ਜਿਸ ਵਿੱਚ ਕੇਵਲ ਅੱਖਰ, "
@@ -6571,26 +6430,22 @@ msgstr "ਤੁਹਾਡਾ ਕੁਨੈਕਸ਼ਨ ਛੇਤੀ ਹੀ ਬੰ�
 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 "ਗਲਤ ਯੂਜ਼ਰ-ਨਾਂ ਹੈ।"
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "ਯੂਜ਼ਰ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "ਤੁਹਾਡਾ ਅਕਾਊਂਟ ਇਸ ਸਮੇਂ ਮੁਅੱਤਲ ਕੀਤਾ ਗਿਆ ਹੈ।"
 
 #. service temporarily unavailable
@@ -6610,7 +6465,8 @@ msgstr ""
 "ਤੁਹਾਡਾ ਕੁਨੈਕਸ਼ਨ ਬੜੀ ਛੇਤੀ ਨਾਲ ਜੁੜ ਅਤੇ ਟੁੱਟ ਰਿਹਾ ਹੈ। 10 ਮਿੰਟ ਲਈ ਉਡੀਕ ਕਰਕੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ। ਜੇਕਰ "
 "ਤੁਸੀਂ ਕੋਸ਼ਿਸ ਜਾਰੀ ਰੱਖੀ ਤਾਂ ਤੁਹਾਨੂੰ ਹੋਰ ਵੀ ਉਡੀਕ ਕਰਨੀ ਪਵੇਗੀ।"
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "ਦਿੱਤੀ SecurID ਕੁੰਜੀ ਗਲਤ ਹੈ।"
 
 msgid "Enter SecurID"
@@ -6775,6 +6631,9 @@ msgstr "ਆਨਲਾਇਨ ਹੈ"
 msgid "Member Since"
 msgstr "ਮੈਂਬਰ ਹੈ"
 
+msgid "Capabilities"
+msgstr "ਯੋਗਤਾ"
+
 msgid "Profile"
 msgstr "ਪ੍ਰੋਫਾਇਲ"
 
@@ -6943,9 +6802,9 @@ msgstr[1] ""
 msgid "Away message too long."
 msgstr "ਦੂਰ ਸੁਨੇਹਾ ਬਹੁਤ ਲੰਮਾ ਹੈ।"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6969,9 +6828,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "ਅਰਫਨ"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "ਬੱਡੀ %s ਨੂੰ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਪਹਿਲਾਂ ਹੀ ਬਹੁਤ ਜਿਆਦਾ ਬੱਡੀ ਤੁਹਾਡੀ ਲਿਸਟ "
@@ -6980,8 +6839,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(ਨਾਂ ਨਹੀਂ)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "ਅਣਜਾਣੇ ਕਾਰਨ ਕਰਨੇ ਬੱਡੀ %s ਨੂੰ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
 #, c-format
@@ -7752,7 +7611,8 @@ msgstr "ਚਾਲੂ ਅੰਤਰਾਲ ਰੱਖੋ (ਸਕਿੰਟ)"
 msgid "Update interval (seconds)"
 msgstr "ਅੱਪਡੇਟ ਅੰਤਰਾਲ (ਸਕਿੰਟ)"
 
-msgid "Cannot decrypt server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "ਸਰਵਰ ਜਵਾਬ ਡਿਕ੍ਰਿਪਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
 
 #, c-format
@@ -7777,9 +7637,6 @@ msgstr "ਐਕਟੀਵੇਸ਼ਨ ਲੋੜੀਦੀ"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "ਲਾਗਇਨ ਕਰਨ ਦੌਰਾਨ ਅਣਜਾਣ ਜਵਾਬ ਕੋਡ (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "ਸਰਵਰ ਜਵਾਬ ਡਿਕ੍ਰਿਪਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
-
 msgid "Requesting captcha"
 msgstr "ਕੈਪਟਚਾ ਦੀ ਮੰਗ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
@@ -7813,29 +7670,18 @@ msgstr ""
 "ਲਾਗਇਨ ਕਰਨ ਦੌਰਾਨ ਅਣਜਾਣ ਜਵਾਬ ਕੋਡ (0x%02X):\n"
 "%s"
 
-msgid "Unable to connect."
-msgstr "ਕੁਨੈਕਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਹੈ।"
-
 msgid "Socket error"
 msgstr "ਸਾਕਟ ਗਲਤੀ"
 
-msgid "Unable to read from socket"
-msgstr "ਸਾਕਟ ਤੋਂ ਤਾਜ਼ਾ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
-
-msgid "Write Error"
-msgstr "ਲਿਖਣ ਗਲਤੀ"
-
-msgid "Connection lost"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਖਤਮ ਹੋਇਆ"
-
 msgid "Getting server"
 msgstr "ਸਰਵਰ ਜਾਣਕਾਰੀ ਲਈ ਜਾ ਰਹੀ ਹੈ"
 
 msgid "Requesting token"
 msgstr "ਟੋਕਨ ਲਈ ਮੰਗ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-msgid "Couldn't resolve host"
-msgstr "ਹੋਸਟ ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਫਲ ਹੈ।"
 
 msgid "Invalid server or port"
 msgstr "ਗਲਤ ਸਰਵਰ ਜਾਂ ਪੋਰਟ"
@@ -7888,7 +7734,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "QQ ਕਿਉਨ ਕਮਾਂਡ"
 
-msgid "Could not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "ਲਾਗਇਨ ਜਵਾਬ ਡਿਕ੍ਰਿਪਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 
 msgid "Unknown LOGIN CMD"
@@ -7908,9 +7755,6 @@ msgstr "ਫਾਇਲ ਭੇਜੋ"
 msgid "%d canceled the transfer of %s"
 msgstr "%d ਨੇ %s ਦੇ ਟਰਾਂਸਫਰ ਨੂੰ ਰੱਦ ਕੀਤਾ"
 
-msgid "Connection closed (writing)"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ (ਲਿਖਿਆ ਜਾ ਰਿਹਾ ਹੈ)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>ਗਰੁੱਪ ਟਾਇਟਲ:</b> %s<br>"
@@ -7964,17 +7808,6 @@ msgstr "ਇੱਕ ਸੇਮ-ਟਾਈਮ ਐਡਮਿਨਸਟੇਟਰ ਨੇ %
 msgid "Sametime Administrator Announcement"
 msgstr "ਸੇਮ-ਟਾਈਮ ਐਡਮਿਨਸਟੇਟਰ ਐਲਾਨ"
 
-msgid "Connection reset"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਮੁੜ-ਸੈੱਟ ਕੀਤਾ ਗਿਆ"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "ਸਾਕਟ ਤੋਂ ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "ਹੋਸਟ ਨਾਲ ਕੁਨੈਕਟ ਹੋਣ ਲਈ ਅਸਮਰੱਥ"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "%s ਵਲੋਂ ਐਲਾਨ"
@@ -7997,6 +7830,9 @@ msgstr "ਸਪੀਕਰ"
 msgid "Video Camera"
 msgstr "ਵੀਡਿਓ ਕੈਮਰਾ"
 
+msgid "File Transfer"
+msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ"
+
 msgid "Supports"
 msgstr "ਸਹਿਯੋਗ"
 
@@ -8797,6 +8633,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "ਨੈੱਟਵਰਕ ਅੰਕੜੇ"
 
+msgid "Ping"
+msgstr "ਪਿੰਗ"
+
 msgid "Ping failed"
 msgstr "ਪਿੰਗ ਅਸਫਲ"
 
@@ -8860,7 +8699,8 @@ msgstr "ਨਾ ਸਹਾਇਕ ਪਬਲਿਕ ਕੁੰਜੀ ਕਿਸਮ"
 msgid "Disconnected by server"
 msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਖਤਮ"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "SILC ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਲਈ ਸਮੱਸਿਆ ਹੈ"
 
 msgid "Key Exchange failed"
@@ -8870,26 +8710,26 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "ਮੁੜ-ਜੁੜਨ ਸਮੇਂ ਸ਼ੈਸ਼ਨ ਅਸਫਲ ਹੈ। ਨਵਾਂ ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਲਈ ਮੁੜ-ਜੁੜੋ ਨੂੰ ਦਬਾਓ।"
 
-msgid "Connection failed"
-msgstr "ਸੰਬੰਧ ਅਸਫਲ"
-
 msgid "Performing key exchange"
 msgstr "ਕੁੰਜੀ ਤਬਾਦਲਾ ਜਾਰੀ"
 
-msgid "Unable to create connection"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਲਈ ਅਸਫਲ ਹੈ।"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "SILC ਕੁੰਜੀ ਜੋੜਾ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "SILC ਸਰਵਰ ਨਾਲ ਜੁੜ ਰਿਹਾ ਹੈ"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "SILC ਕੁੰਜੀ ਜੋੜਾ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
+
 msgid "Out of memory"
 msgstr "ਮੈਮੋਰੀ ਤੋਂ ਬਾਹਰ"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "SILC ਪਰੋਟੋਕਾਲ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
 
 msgid "Error loading SILC key pair"
@@ -9179,7 +9019,8 @@ msgstr "ਡਿਜ਼ੀਟਲ ਦਸਤਖਤ ਅਤੇ ਸਭ ਸੁਨੇਹ�
 msgid "Creating SILC key pair..."
 msgstr "SILC ਕੁੰਜੀ ਜੋੜਾ ਬਣਾਇਆ ਜਾ ਰਿਹਾ ਹੈ..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "SILC ਕੁੰਜੀ ਜੋੜਾ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9273,6 +9114,9 @@ msgstr "ਵਾਇਟਬੋਰਡ"
 msgid "No server statistics available"
 msgstr "ਕੋਈ ਸਰਵਰ ਅੰਕੜੇ ਉਪਲੱਬਧ ਨਹੀਂ"
 
+msgid "Error during connecting to SILC Server"
+msgstr "SILC ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਲਈ ਸਮੱਸਿਆ ਹੈ"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "ਅਸਫਲ: ਵਰਜਨ ਮੇਲ ਨਹੀਂ ਖਾਂਦਾ ਹੈ, ਤੁਹਾਨੂੰ ਨਵੇਂ ਕਲਾਇਟ ਦੀ ਲੋੜ ਹੈ"
@@ -9313,30 +9157,27 @@ msgstr "ਅਸਫਲ: ਗਲਤ ਕੂਕੀ"
 msgid "Failure: Authentication failed"
 msgstr "ਅਸਫ਼ਲ: ਪ੍ਰਮਾਣਕਿਤਾ ਅਸਫ਼ਲ"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "SILC ਕਲਾਇਟ ਕੁਨੈਕਸ਼ਨ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"
 
 msgid "John Noname"
 msgstr "ਜਾਨ ਬਿਨ-ਨਾਂ"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "SILC ਕੁੰਜੀ ਜੋੜਾ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s"
 
-msgid "Could not write"
-msgstr "ਲਿਖਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
-
-msgid "Could not connect"
-msgstr "ਜੁੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+msgid "Unable to create connection"
+msgstr "ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਲਈ ਅਸਫਲ ਹੈ।"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "ਅਣਜਾਣ ਸਰਵਰ ਜਵਾਬ ਹੈ।"
 
-msgid "Could not create listen socket"
-msgstr "ਸੁਣਨ ਸਾਕਟ ਬਣ ਨਹੀਂ ਸਕੀ ਹੈ"
-
-msgid "Could not resolve hostname"
-msgstr "ਹੋਸਟ-ਨਾਂ ਹੱਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "ਸਾਕਟ ਬਣਾਉਣ ਲਈ ਅਸਫਲ"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP ਸਕਰੀਨ ਨਾਂ ਵਿੱਚ ਖਾਲੀ ਥਾਂ ਜਾਂ @ ਨਿਸ਼ਾਨ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ"
@@ -9377,6 +9218,77 @@ msgstr "ਪਰਮਾਣਿਤ ਯੂਜ਼ਰ"
 msgid "Auth Domain"
 msgstr "ਪਰਮਾਣਿਤ ਡੋਮੇਨ"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;room&gt;:  ਯਾਹੂ ਨੈੱਟਵਰਕ ਉੱਤੇ ਇੱਕ ਚੈਟ ਰੂਮ ਜੁਆਇੰਨ ਕਰੋ"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: ਯਾਹੂ ਨੈੱਟਵਰਕ ਉੱਤੇ ਰੂਮ ਲਿਸਟ ਵੇਖੋ"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "ਡੂਡਲ: ਯੂਜ਼ਰ ਨੂੰ ਇੱਕ ਘੁੱਗੂ ਘਾਂਘੜੇ (ਡੂਡਲ) ਸ਼ੈਸ਼ਨ ਸ਼ੁਰੂ ਕਰਨ ਦੀ ਮੰਗ"
+
+msgid "Yahoo ID..."
+msgstr "Yahoo ID..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo ਪਰੋਟੋਕਾਲ ਪਲੱਗਇਨ"
+
+msgid "Pager server"
+msgstr "ਪੇਜ਼ਰ ਸਰਵਰ"
+
+msgid "Pager port"
+msgstr "ਪੇਜ਼ਰ ਪੋਰਟ"
+
+msgid "File transfer server"
+msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ ਸਰਵਰ"
+
+msgid "File transfer port"
+msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ ਪੋਰਟ"
+
+msgid "Chat room locale"
+msgstr "ਚੈਟ ਰੂਮ ਭਾਸ਼ਾ"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "ਕਨਫਰੰਸ ਅਤੇ ਚੈਟ-ਰੂਮ ਸੱਦੇ ਅਣਡਿੱਠੇ ਕਰੋ"
+
+msgid "Chat room list URL"
+msgstr "ਗੱਲਬਾਤ ਰੂਮ ਲਿਸਟ Url"
+
+msgid "Yahoo Chat server"
+msgstr "ਯਾਹੂ ਚੈਟ ਸਰਵਰ"
+
+msgid "Yahoo Chat port"
+msgstr "Yahoo ਚੈਟ ਪੋਰਟ"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo ID..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo ਪਰੋਟੋਕਾਲ ਪਲੱਗਇਨ"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9407,29 +9319,19 @@ msgstr "ਬੱਡੀ ਸ਼ਾਮਿਲ ਕਰਨਾ ਠੁਕਰਾਇਆ"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 "ਅਣਜਾਣੀ ਗਲਤੀ ਨੰਬਰ %d ਹੈ। Yahoo! ਵੈਬਸਾਇਟ ਉੱਤੇ ਲਾਗਇਨ ਕਰਨ ਨਾਲ ਸਮੱਸਿਆ ਹੱਲ ਹੋ ਸਕਦੀ ਹੈ।"
 
@@ -9469,38 +9371,33 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "ਅਣਜਾਣੀ ਗਲਤੀ ਨੰਬਰ %d ਹੈ। Yahoo! ਵੈਬਸਾਇਟ ਉੱਤੇ ਲਾਗਇਨ ਕਰਨ ਨਾਲ ਸਮੱਸਿਆ ਹੱਲ ਹੋ ਸਕਦੀ ਹੈ।"
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "ਸੁਨੇਹੀ %s ਨੂੰ ਗਰੁੱਪ %s ਵਿੱਚ ਸਰਵਰ ਲਿਸਟ ਉੱਤੇ ਅਕਾਊਂਟ %s ਲਈ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।"
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "ਸਰਵਰ ਲਿਸਟ ਵਿੱਚ ਬੱਡੀ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ ਸੁਣਨਯੋਗ %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "ਸਰਵਰ ਤੋਂ ਅਚਾਨਕ HTTP ਜਵਾਬ ਮਿਲਿਆ ਹੈ।"
 
-msgid "Connection problem"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਸਮੱਸਿਆ"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "%s ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਟੁੱਟ ਗਿਆ ਹੈ:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"%s ਨਾਲ ਕੁਨੈਕਸਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ:\n"
+"ਸਰਵਰ ਨਾਲ ਇੱਕ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9563,73 +9460,15 @@ msgstr "ਚੈਟ ਵਿੱਚ ਯੂਜ਼ਰ ਜੁਆਇੰਨ..."
 msgid "Open Inbox"
 msgstr "ਇਨ-ਬਾਕਸ ਖੋਲ੍ਹੋ"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;room&gt;:  ਯਾਹੂ ਨੈੱਟਵਰਕ ਉੱਤੇ ਇੱਕ ਚੈਟ ਰੂਮ ਜੁਆਇੰਨ ਕਰੋ"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: ਯਾਹੂ ਨੈੱਟਵਰਕ ਉੱਤੇ ਰੂਮ ਲਿਸਟ ਵੇਖੋ"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "ਡੂਡਲ: ਯੂਜ਼ਰ ਨੂੰ ਇੱਕ ਘੁੱਗੂ ਘਾਂਘੜੇ (ਡੂਡਲ) ਸ਼ੈਸ਼ਨ ਸ਼ੁਰੂ ਕਰਨ ਦੀ ਮੰਗ"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo ID..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo ਪਰੋਟੋਕਾਲ ਪਲੱਗਇਨ"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo ਜਾਪਾਨ"
-
-msgid "Pager server"
-msgstr "ਪੇਜ਼ਰ ਸਰਵਰ"
-
-msgid "Japan Pager server"
-msgstr "ਜਾਪਾਨ ਪੇਜ਼ਰ ਸਰਵਰ"
-
-msgid "Pager port"
-msgstr "ਪੇਜ਼ਰ ਪੋਰਟ"
-
-msgid "File transfer server"
-msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ ਸਰਵਰ"
-
-msgid "Japan file transfer server"
-msgstr "ਜਾਪਾਨ ਫਾਇਲ ਟਰਾਂਸਫਰ ਸਰਵਰ"
-
-msgid "File transfer port"
-msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ ਪੋਰਟ"
-
-msgid "Chat room locale"
-msgstr "ਚੈਟ ਰੂਮ ਭਾਸ਼ਾ"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "ਕਨਫਰੰਸ ਅਤੇ ਚੈਟ-ਰੂਮ ਸੱਦੇ ਅਣਡਿੱਠੇ ਕਰੋ"
-
-msgid "Chat room list URL"
-msgstr "ਗੱਲਬਾਤ ਰੂਮ ਲਿਸਟ Url"
-
-msgid "Yahoo Chat server"
-msgstr "ਯਾਹੂ ਚੈਟ ਸਰਵਰ"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo ਚੈਟ ਪੋਰਟ"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "ਘੁੱਗੂ ਘਾਂਘੜੇ (ਡੂਡਲ) ਮੰਗ ਭੇਜੋ।"
 
+msgid "Unable to connect."
+msgstr "ਕੁਨੈਕਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਹੈ।"
+
 msgid "Unable to establish file descriptor."
 msgstr "ਫਾਇਲ ਵੇਰਵਾ ਬਣਾਉਣ ਲਈ ਅਸਫਲ ਹੈ।"
 
@@ -9637,6 +9476,9 @@ msgstr "ਫਾਇਲ ਵੇਰਵਾ ਬਣਾਉਣ ਲਈ ਅਸਫਲ ਹੈ�
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s ਤੁਹਾਨੂੰ %d ਫਾਇਲਾਂ ਦਾ ਗਰੁੱਪ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰ ਰਿਹਾ ਹੈ।।\n"
 
+msgid "Write Error"
+msgstr "ਲਿਖਣ ਗਲਤੀ"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! ਜਾਪਾਨ ਪ੍ਰੋਫਾਇਲ"
 
@@ -9750,23 +9592,19 @@ msgstr "ਆਵਾਜ਼"
 msgid "Webcams"
 msgstr "ਵੈਬਕੈਮ"
 
+msgid "Connection problem"
+msgstr "ਕੁਨੈਕਸ਼ਨ ਸਮੱਸਿਆ"
+
 msgid "Unable to fetch room list."
 msgstr "ਰੂਮ ਲਿਸਟ ਪ੍ਰਾਪਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"
 
 msgid "User Rooms"
 msgstr "ਯੂਜਰ ਰੂਮ"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "YCHT ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਸਮੱਸਿਆ ਹੈ।"
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਖਤਮ ਹੋਇਆ\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -9889,33 +9727,22 @@ msgstr "ਰੀਲੇਮ"
 msgid "Exposure"
 msgstr "Exposure"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"ਸਾਕਟ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "HTTP ਪਰਾਕਸੀ ਤੋਂ ਜਵਾਬ ਪਾਰਸ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP ਪਰਾਕਸੀ ਕੁਨੈਕਸ਼ਨ ਗਲਤੀ %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "ਪਹੁੰਚ ਪਾਬੰਦੀ ਹੈ: HTTP ਪਰਾਕਸੀ ਸਰਵਰ ਨੇ ਪੋਰਟ %d ਟਨਲਿੰਗ ਓਹਲੇ ਰੱਖੀ ਹੈ।"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "%s ਹੱਲ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
 
-msgid "Could not resolve host name"
-msgstr "ਹੋਸਟ ਨਾਂ ਹੱਲ਼ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "%s ਦੇ ਧਿਆਨ ਦੀ ਮੰਗ ਕੀਤੀ ਗਈ ਹੈ..."
@@ -10117,12 +9944,6 @@ msgstr "%s ਲਈ ਲਿਖਣ ਦੌਰਾਨ ਗਲਤੀ: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "%s ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਮਰੱਥ: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "ਲਾਗਇਨ ਲਈ ਸਰਵਰ ਨੂੰ TLS/SSL ਲੋੜੀਦਾ ਹੈ। ਕੋਈ TLS/SSL ਸਹਿਯੋਗ ਨਹੀਂ ਹੈ।"
-
 #, c-format
 msgid " - %s"
 msgstr " - %s"
@@ -10370,9 +10191,14 @@ msgstr "ਪਉਨਸ ਬੱਡੀ ਸ਼ਾਮਿਲ(_P)"
 msgid "View _Log"
 msgstr "ਲਾਗ ਵੇਖੋ(_L)"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "ਜਦੋਂ ਆਫਲਾਇਨ ਹੋਵੇ ਤਾਂ ਓਹਲੇ"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "ਜਦੋਂ ਆਫਲਾਇਨ ਹੋਵੇ ਤਾਂ ਵੇਖੋ"
+
 msgid "_Alias..."
 msgstr "ਏਲੀਆਸ(_A)..."
 
@@ -10870,6 +10696,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "%s ਲਈ ਯੂਜ਼ਰ ਸੁਨੇਹਾ ਤਬਦੀਲ"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "ਇਹ ਸਰਟੀਫਿਕੇਟ ਲਈ ਹੋਸਟ ਨਾਂ ਦਿਓ"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL ਸਰਵਰ"
@@ -10915,7 +10745,8 @@ msgstr "ਅਣਡਿੱਠਾ"
 msgid "Get Away Message"
 msgstr "ਦੂਰ ਸੁਨੇਹਾ ਲਵੋ"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "ਆਖਰੀ ਵਾਰ ਕਿਹਾ"
 
 msgid "Unable to save icon file to disk."
@@ -11799,7 +11630,8 @@ msgstr "ਹਾਈਪਰਲਿੰਕ ਲਈ ਰੰਗ ਦਿਓ।"
 msgid "Hyperlink visited color"
 msgstr "ਖੋਲ੍ਹੋ ਹਾਈਪਰਲਿੰਕ ਰੰਗ"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+#, fuzzy
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "ਹਾਈਪਰਲਿੰਕ ਖੋਲ੍ਹਣ ਤੋਂ ਬਾਅਦ ਵਰਤਣ ਲਈ ਰੰਗ (ਜਾਂ ਐਕਟੀਵੇਟ ਹੋਣ ਤੋਂ ਬਾਅਦ)"
 
 msgid "Hyperlink prelight color"
@@ -11835,13 +11667,22 @@ msgstr "ਇੱਕ ਕਾਰਵਾਈ ਸੁਨੇਹੇ ਲਈ ਨਾਂ ਲਿ�
 msgid "Action Message Name Color for Whispered Message"
 msgstr "ਘੁਸਰ-ਮੁਸਰ ਸੁਨੇਹੇ ਲਈ ਐਕਟਿਵ ਸੁਨੇਹਾ ਨਾਂ ਰੰਗ"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "ਇੱਕ ਕਾਰਵਾਈ ਸੁਨੇਹੇ ਲਈ ਨਾਂ ਲਿਖਣ ਲਈ ਰੰਗ ਹੈ।"
+
 msgid "Whisper Message Name Color"
 msgstr "ਘੁਸਰ-ਮੁਸਰ ਸੁਨੇਹਾ ਨਾਂ ਰੰਗ"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "ਇੱਕ ਕਾਰਵਾਈ ਸੁਨੇਹੇ ਲਈ ਨਾਂ ਲਿਖਣ ਲਈ ਰੰਗ ਹੈ।"
+
 msgid "Typing notification color"
 msgstr "ਟਾਈਪ ਕਰਨ ਸੂਚਨਾ ਰੰਗ"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "ਟਾਈਪ ਕਰਨ ਸੂਚਨਾ ਲਈ ਫੋਂਟ ਵਾਸਤੇ ਵਰਤਣ ਲਈ ਰੰਗ"
 
 msgid "Typing notification font"
@@ -12228,6 +12069,10 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "'ਦਸਤੀ' ਝਲਕਾਰਾ ਕਮਾਂਡ ਚੁਣੀ ਗਈ ਹੈ, ਪਰ ਕੋਈ ਕਮਾਂਡ ਨਹੀਂ ਦਿੱਤੀ ਗਈ ਹੈ।"
 
+#, fuzzy
+msgid "No message"
+msgstr "ਅਣਜਾਣ ਸੁਨੇਹਾ"
+
 msgid "Open All Messages"
 msgstr "ਸਭ ਸੁਨੇਹੇ ਖੋਲ੍ਹੋ"
 
@@ -12245,10 +12090,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">ਤੁਹਾਨੂੰ ਚਿੱਠੀ ਆਈ ਹੈ!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "ਅਣਜਾਣ ਸੁਨੇਹਾ"
-
 msgid "The following plugins will be unloaded."
 msgstr "ਹੇਠ ਦਿੱਤੀਆਂ ਪਲੱਗਇਨਾਂ ਨੂੰ ਅਣ-ਲੋਡ ਕੀਤਾ ਜਾਵੇਗਾ।"
 
@@ -12463,8 +12304,9 @@ msgstr "ਸਿਸਟਮ ਟਰੇ ਆਈਕਾਨ ਵੇਖੋ(_S):"
 msgid "On unread messages"
 msgstr "ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ ਉੱਤੇ"
 
-msgid "Conversation Window Hiding"
-msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਓਹਲੇ"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "IM ਗੱਲਬਾਤ ਵਿੰਡੋ"
 
 msgid "_Hide new IM conversations:"
 msgstr "ਨਵੀਆਂ IM ਗੱਲਬਾਤਾਂ ਓਹਲੇ(_H):"
@@ -12472,6 +12314,9 @@ msgstr "ਨਵੀਆਂ IM ਗੱਲਬਾਤਾਂ ਓਹਲੇ(_H):"
 msgid "When away"
 msgstr "ਜਦੋਂ ਦੂਰ"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "ਨਵੀਆਂ ਗੱਲਬਾਤ ਵਿੰਡੋਜ਼ ਘੱਟੋ-ਘੱਟ(_z)"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "ਟੈਬਾਂ"
@@ -12530,9 +12375,6 @@ msgstr "ਸਮੂਥਿੰਗ-ਸਕੋਰਿੰਗ ਵਰਤੋਂ"
 msgid "F_lash window when IMs are received"
 msgstr "IM ਪ੍ਰਾਪਤ ਹੋਣ ਉੱਤੇ ਵਿੰਡੋ ਝਲਕਾਓ(_l)"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "ਨਵੀਆਂ ਗੱਲਬਾਤ ਵਿੰਡੋਜ਼ ਘੱਟੋ-ਘੱਟ(_z)"
-
 msgid "Minimum input area height in lines:"
 msgstr "ਲਾਈਨਾਂ ਵਿੱਚ ਘੱਟੋ-ਘੱਟੋ ਇੰਪੁੱਟ ਏਰੀਆ ਹਾਈਲਾਈਟ:"
 
@@ -12567,7 +12409,8 @@ msgstr "ਬਰਾਊਜ਼ਰ ਸੰਰਚਨਾ ਪਰੋਗਾਰਮ ਸਟਾ
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">ਜਿਵੇਂ: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "ਆਟੋ-ਖੋਜਿਆ IP ਐਡਰੈੱਸ(_A)"
 
 msgid "Public _IP:"
@@ -12935,32 +12778,17 @@ msgstr "ਸੰਭਾਲੋ ਅਤੇ ਵਰਤੋਂ(_v)"
 msgid "Status for %s"
 msgstr "%s ਲਈ ਹਾਲਤ"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "ਪਸੰਦੀਦਾ ਸਮਾਈਲੀ"
-
-msgid "More Data needed"
-msgstr "ਹੋਰ ਡਾਟਾ ਚਾਹੀਦਾ ਹੈ"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "ਸਮਾਈਲੀ ਨਾਲ ਸਬੰਧਿਤ ਸ਼ਾਰਟਕੱਟ ਦਿਓ ਜੀ।"
-
 #, fuzzy, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr "ਚੁਣੇ ਸ਼ਾਰਟਕੱਟ ਲਈ ਪਹਿਲਾਂ ਹੀ ਇੱਕ ਕਸਟਮ ਸਮਾਈਲੀ ਮੌਜੂਦ ਹੈ। ਵੱਖਰੇ ਸ਼ਾਰਟਕੱਟ ਨਾਲ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
 
+msgid "Custom Smiley"
+msgstr "ਪਸੰਦੀਦਾ ਸਮਾਈਲੀ"
+
 msgid "Duplicate Shortcut"
 msgstr "ਡੁਪਲੀਕੇਟ ਸ਼ਾਰਟਕੱਟ"
 
-msgid "Please select an image for the smiley."
-msgstr "ਸਮਾਈਲੀ ਲਈ ਚਿੱਤਰ ਚੁਣੋ ਜੀ।"
-
 msgid "Edit Smiley"
 msgstr "ਸਮਾਈਲੀ ਸੋਧ"
 
@@ -13071,9 +12899,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "ਲਾਂਚਰ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "ਤੁਸੀਂ ਇੱਕ ਡੈਸਕਟਾਪ ਲਾਂਚਰ ਡਰੈਗ ਕੀਤਾ ਹੈ। ਸੰਭਵ ਤੌਰ ਉੱਤੇ ਤੁਸੀਂ ਲਾਂਚਰ ਦੀ ਬਜਾਏ ਉਹ ਭੇਜਣਾ ਚਾਹੁੰਦੇ ਹੋ, ਜੋ "
 "ਕਿ ਇਹ ਲਾਂਚਰ ਰਾਹੀਂ ਪੁਆਇੰਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।"
@@ -13655,9 +13484,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "ਸਾਂਝੀ ਕੰਪੋਜ਼ੀਸ਼ਨ ਵਾਸਤੇ ਸੰਗੀਤ ਸੁਨੇਹਾ ਪਲੱਗਇਨ ਹੈ।"
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "ਸੰਗੀਤ ਸੁਨੇਹਾ ਪਲੱਗਇਨ ਨਾਲ ਕਈ ਯੂਜ਼ਰ ਇੱਕੋ ਸਮੇਂ ਇੱਕ ਸੰਗੀਤ ਭਾਗ ਉੱਤੇ ਰੀਅਲ ਟਾਈਮ ਵਿੱਚ ਇੱਕ ਆਮ ਸਕੋਰ ਸੋਧਣ "
 "ਨਾਲ ਕੰਮ ਕਰ ਸਕਦੇ ਹਨ।"
@@ -13909,9 +13739,10 @@ msgid "Conversation Window Send Button."
 msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਭੇਜੋ ਬਟਨ ਹੈ।"
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "ਗੱਲਬਾਤ ਵਿੰਡੋ ਦੇ ਲਿਖਣ ਖੇਤਰ ਵਿੱਚ ਭੇਜੋ ਬਟਨ ਸ਼ਾਮਲ ਕਰੋ। ਇਹ ਕੋਈ ਅਸਲ ਕੀਬੋਰਡ ਨਾ ਹੋਣ ਦੀ ਹਾਲਤ ਲਈ ਹੈ।"
 
@@ -14235,8 +14066,9 @@ msgstr "ਵਿੰਡੋ ਪਿਡਗਿਨ ਚੋਣਾਂ"
 msgid "Options specific to Pidgin for Windows."
 msgstr "ਵਿੰਡੋ ਲਈ ਪਿਡਗਿਨ ਖਾਸ ਚੋਣਾਂ"
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "ਵਿੰਡੋ ਲਈ ਪਿਡਗਿਨ ਲਈ ਖਾਸ ਚੋਣ ਹੈ, ਜਿਵੇਂ ਕਿ ਬੱਡੀ ਲਿਸਟ ਡੌਕਿੰਗ।"
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14276,6 +14108,309 @@ msgstr "ਰਾਅ XMPP ਪ੍ਹੈਰਾ ਭੇਜੋ ਅਤੇ ਲਵੋ"
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "ਇਹ ਪਲੱਗਇਨ XMPP ਸਰਵਰ ਜਾਂ ਕਲਾਇਟ ਡੀਬੱਗ ਲਈ ਫਾਇਦੇਮੰਦ ਹੈ।"
 
+#~ msgid "Cannot open socket"
+#~ msgstr "ਸਾਕਟ ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "ਸਾਕਟ ਉੱਤੇ ਸੁਣਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "ਸਾਕਟ ਪੜ੍ਹਨ ਵਿੱਚ ਅਸਫਲ"
+
+#~ msgid "Connection failed."
+#~ msgstr "ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੋਇਆ।"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ ਗਿਆ"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "ਸਾਕਟ ਬਣ ਨਹੀਂ ਸਕੀ ਹੈ"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "ਹੋਸਟ ਨਾਲ ਜੁੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+
+#~ msgid "Read error"
+#~ msgstr "ਪੜਨ ਗਲਤੀ"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "ਸਰਵਰ ਨਾਲ ਇੱਕ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "ਲਿਖਣ ਵਿੱਚ ਗਲਤੀ"
+
+#~ msgid "Last Activity"
+#~ msgstr "ਆਖਰੀ ਐਕਟੀਵਿਟੀ"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "ਸਰਵਿਸ ਡਾਇਰੈਕਟਰੀ ਜਾਣਕਾਰੀ"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "ਸਰਵਰ ਖੋਜ ਆਈਟਮਾਂ"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "ਵਾਧੂ ਪ੍ਹੈਰਾ ਐਡਰੈੱਸਿੰਗ"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "ਮਲਟੀ-ਯੂਜ਼ਰ ਚੈਟ"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "ਮਲਟੀ-ਯੂਜ਼ਰ ਚੈਟ ਵਾਧੂ ਮੌਜੂਦਗੀ ਜਾਣਕਾਰੀ"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "ਇਨ-ਬੈਂਡ ਬਾਇਟ-ਸਟਰੀਮ"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "ਐਡ-ਹਾਕ ਕਮਾਂਡ"
+
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub ਸਰਵਿਸ"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5 Bytestreams"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "ਆਉਟ ਆਫ਼ ਬੈਂਡ ਡਾਟਾ"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "ਇਨ-ਬੈਂਡ ਰਜਿਸਟਰੇਸ਼ਨ"
+
+#~ msgid "User Location"
+#~ msgstr "ਯੂਜ਼ਰ ਟਿਕਾਣਾ"
+
+#~ msgid "User Avatar"
+#~ msgstr "ਯੂਜ਼ਰ ਅਵਤਾਰ"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "ਚੈਟ ਹਾਲਤ ਨੋਟੀਫਿਕੇਸ਼ਨ"
+
+#~ msgid "Software Version"
+#~ msgstr "ਸਾਫਟਵੇਅਰ ਵਰਜਨ"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "ਸਟਰੀਮ ਸ਼ੁਰੂਆਤ"
+
+#~ msgid "User Mood"
+#~ msgstr "ਯੂਜ਼ਰ ਮੂਡ"
+
+#~ msgid "User Activity"
+#~ msgstr "ਯੂਜ਼ਰ ਸਰਗਰਮੀ"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "ਐਂਟਟੀ ਸਮੱਰਥਾ"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "ਇੰਕ੍ਰਿਪਟਡ ਸ਼ੈਸ਼ਨ ਸਾਂਝ"
+
+#~ msgid "User Tune"
+#~ msgstr "ਯੂਜ਼ਰ ਟਿਊਨ"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "ਰੋਸਟਰ ਆਈਟਮ ਐਕਸ਼ਚੇਜ਼"
+
+#~ msgid "Reachability Address"
+#~ msgstr "ਪਹੁੰਚਯੋਗ ਐਡਰੈੱਸ"
+
+#~ msgid "User Profile"
+#~ msgstr "ਯੂਜ਼ਰ ਪ੍ਰੋਫਾਇਲ"
+
+#~ msgid "Jingle"
+#~ msgstr "ਜਿਙਗਲ"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "ਜਿਙਗਲ ਆਡਿਓ"
+
+#~ msgid "User Nickname"
+#~ msgstr "ਯੂਜ਼ਰ ਨਾਂ"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "ਜਿਙਗਲ ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "ਜਿਙਗਲ ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "ਜਿਙਗਲ ਰਾਅ UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "ਜਿਙਗਲ ਵਿਡੀਓ"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "ਜਿਙਗਲ DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "ਸੁਨੇਹਾ ਮਿਲਿਆ"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "ਪਬਲਿਕ ਕੁੰਜੀ ਪਬਲਿਕੇਸ਼ਨ"
+
+#~ msgid "User Chatting"
+#~ msgstr "ਯੂਜ਼ਰ ਚੈਟਿੰਗ"
+
+#~ msgid "User Browsing"
+#~ msgstr "ਯੂਜ਼ਰ ਬਰਾਊਜ਼ਿੰਗ"
+
+#~ msgid "User Gaming"
+#~ msgstr "ਯੂਜ਼ਰ ਗੇਮ"
+
+#~ msgid "User Viewing"
+#~ msgstr "ਯੂਜ਼ਰ ਝਲਕ"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "ਪ੍ਹੈਰਾ ਇੰਕ੍ਰਿਪਸ਼ਨ"
+
+#~ msgid "Entity Time"
+#~ msgstr "ਐਂਟਟੀ ਟਾਈਮ"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "ਡਿਲਵਰੀ ਦੇਰੀ"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "ਸਾਂਝੇ ਡਾਟਾ ਆਬਜੈਕਟ"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "ਫਾਇਲ ਰਿਪੋਜ਼ਟਰੀ ਅਤੇ ਸ਼ੇਅਰਿੰਗ"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "ਜਿਙਗਲ ਲਈ STUN ਸਰਵਿਸ ਖੋਜ"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "ਸਧਾਰਨ ਇੰਕ੍ਰਿਪਟਡ ਸ਼ੈਸ਼ਨ ਸਾਂਝ"
+
+#~ msgid "Hop Check"
+#~ msgstr "ਹੋਪ ਚੈਕ"
+
+#~ msgid "Read Error"
+#~ msgstr "ਪੜ੍ਹਨ ਗਲਤੀ"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਦੌਰਨ ਗਲਤੀ"
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "ਪੜ੍ਹਨ ਬਫ਼ਰ ਭਰਿਆ (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "ਨਾ-ਪਾਰਸਯੋਗ ਸੁਨੇਹਾ"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "ਹੋਸਟ ਨਾਲ ਕੁਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "ਦਾਖਲਾ ਅਸਫਲ (%s)"
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "ਤੁਸੀਂ ਲਾਗ ਆਉਟ ਹੋ ਗਏ ਹੋ, ਕਿਉਕਿ ਤੁਸੀਂ ਕਿਸੇ ਹੋਰ ਵਰਕਸਟੇਸ਼ਨ ਉੱਤੇ ਲਾਗਇਨ ਹੋ ਗਏ ਹੋ।"
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "ਗਲਤੀ ਹੈ। SSL ਸਹਿਯੋਗ ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ।"
+
+#~ msgid "Incorrect password."
+#~ msgstr "ਗਲਤ ਪਾਸਵਰਡ ਹੈ।"
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "BOS ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਨਹੀਂ ਸਕਿਆ:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "ਤੁਹਾਡਾ ਕੁਨੈਕਸ਼ਨ ਛੇਤੀ ਹੀ ਬੰਦ ਹੋ ਸਕਦਾ ਹੈ। ਅੱਪਡੇਟ ਲਈ %s ਵੇਖੋ।"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "ਜੁੜਿਆ ਨਹਾਂ ਜਾ ਸਕਦਾ ਹੈ।"
+
+#~ msgid "Invalid username."
+#~ msgstr "ਗਲਤ ਯੂਜ਼ਰ-ਨਾਂ ਹੈ।"
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "ਸਰਵਰ ਜਵਾਬ ਡਿਕ੍ਰਿਪਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
+
+#~ msgid "Connection lost"
+#~ msgstr "ਕੁਨੈਕਸ਼ਨ ਖਤਮ ਹੋਇਆ"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "ਹੋਸਟ ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ (ਲਿਖਿਆ ਜਾ ਰਿਹਾ ਹੈ)"
+
+#~ msgid "Connection reset"
+#~ msgstr "ਕੁਨੈਕਸ਼ਨ ਮੁੜ-ਸੈੱਟ ਕੀਤਾ ਗਿਆ"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "ਸਾਕਟ ਤੋਂ ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "ਹੋਸਟ ਨਾਲ ਕੁਨੈਕਟ ਹੋਣ ਲਈ ਅਸਮਰੱਥ"
+
+#~ msgid "Could not write"
+#~ msgstr "ਲਿਖਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+
+#~ msgid "Could not connect"
+#~ msgstr "ਜੁੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "ਸੁਣਨ ਸਾਕਟ ਬਣ ਨਹੀਂ ਸਕੀ ਹੈ"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "ਹੋਸਟ-ਨਾਂ ਹੱਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "ਗਲਤ ਪਾਸਵਰਡ"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s ਨਾਲ ਕੁਨੈਕਸਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo ਜਾਪਾਨ"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "ਜਾਪਾਨ ਪੇਜ਼ਰ ਸਰਵਰ"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "ਜਾਪਾਨ ਫਾਇਲ ਟਰਾਂਸਫਰ ਸਰਵਰ"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਖਤਮ ਹੋਇਆ\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "ਹੋਸਟ ਨਾਂ ਹੱਲ਼ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "ਲਾਗਇਨ ਲਈ ਸਰਵਰ ਨੂੰ TLS/SSL ਲੋੜੀਦਾ ਹੈ। ਕੋਈ TLS/SSL ਸਹਿਯੋਗ ਨਹੀਂ ਹੈ।"
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਓਹਲੇ"
+
+#~ msgid "More Data needed"
+#~ msgstr "ਹੋਰ ਡਾਟਾ ਚਾਹੀਦਾ ਹੈ"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "ਸਮਾਈਲੀ ਨਾਲ ਸਬੰਧਿਤ ਸ਼ਾਰਟਕੱਟ ਦਿਓ ਜੀ।"
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "ਸਮਾਈਲੀ ਲਈ ਚਿੱਤਰ ਚੁਣੋ ਜੀ।"
+
 #~ msgid "Activate which ID?"
 #~ msgstr "ਕਿਹੜਾ ID ਐਕਟੀਵੇਟ ਕਰਨਾ ਹੈ?"
 
diff --git a/po/pl.po b/po/pl.po
index 4ff498a493..3f38208225 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin polish translation\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2008-12-29 17:50+0100\n"
 "Last-Translator: Piotr Makowski (Aviary.pl) <pmakowski@aviary.pl>\n"
 "Language-Team: Piotr Makowski (Aviary.pl) <pmakowski@aviary.pl>\n"
@@ -2643,9 +2643,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Dodaje możliwość przeglądania dziennika rozmów z innych komunikatorów."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2701,8 +2702,9 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 "Zapisuje wiadomości wysłane do niedostępnego użytkownika jako powiadomienie."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Reszta wiadomości zostanie zapisana jako powiadomienie. Możesz edytować/"
@@ -2950,12 +2952,12 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
 #, fuzzy
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr "Nie można zainicjować połączenia"
 
 msgid ""
@@ -3011,15 +3013,21 @@ msgstr "%s zamknęła/zamknął rozmowę."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Nie można wysłać wiadomości, rozmowa nie może zostać rozpoczęta."
 
-msgid "Cannot open socket"
-msgstr "Nie można otworzyć gniazda"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Nie można utworzyć gniazda:\n"
+"%s"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Nie można nasłuchiwać na danym gnieździe"
 
-msgid "Could not listen on socket"
-msgstr "Nie można nasłuchiwać na danym gnieździe"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Nie można utworzyć gniazda:\n"
+"%s"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3069,13 +3077,16 @@ msgstr "Zapis listy znajomych..."
 msgid "Load buddylist from file..."
 msgstr "Wczytaj listę kontaktów z pliku..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Wypełnij pola wymagane do rejestracji."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Wprowadzone hasła nie są ze sobą zgodne."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Nie można zarejestrować nowego konta. Nastąpił błąd.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3087,14 +3098,15 @@ msgstr "Rejestracja zakończona pomyślnie!"
 msgid "Password"
 msgstr "Hasło"
 
-msgid "Password (retype)"
-msgstr "Powtórz hasło:"
+msgid "Password (again)"
+msgstr "Hasło (ponownie)"
 
-msgid "Enter current token"
-msgstr "Wprowadź tekst z obrazka"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Obrazek (token)"
+#, fuzzy
+msgid "Captcha"
+msgstr "Zapis obrazu"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Zarejestruj nowe konto Gadu-Gadu"
@@ -3147,6 +3159,15 @@ msgstr "Hasło zostało zmienione!"
 msgid "Current password"
 msgstr "Aktualne hasło"
 
+msgid "Password (retype)"
+msgstr "Powtórz hasło:"
+
+msgid "Enter current token"
+msgstr "Wprowadź tekst z obrazka"
+
+msgid "Current token"
+msgstr "Obrazek (token)"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Wpisz swoje bieżące hasło oraz nowe hasło dla numeru:"
 
@@ -3194,7 +3215,8 @@ msgstr "Nie znaleziono żadnego użytkownika"
 msgid "There are no users matching your search criteria."
 msgstr "Nie ma użytkowników spełniających Twoje kryteria wyszukiwania."
 
-msgid "Unable to read socket"
+#, fuzzy
+msgid "Unable to read from socket"
 msgstr "Nie można czytać z gniazda"
 
 msgid "Buddy list downloaded"
@@ -3209,8 +3231,14 @@ msgstr "Wysłano listę kontaktów"
 msgid "Your buddy list was stored on the server."
 msgstr "Twoja lista kontaktów została wysłana na serwer."
 
-msgid "Connection failed."
-msgstr "Błąd połączenia."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Połączono"
+
+msgid "Connection failed"
+msgstr "Błąd połączenia"
 
 msgid "Add to chat"
 msgstr "Dodaj do konferencji"
@@ -3218,18 +3246,23 @@ msgstr "Dodaj do konferencji"
 msgid "Chat _name:"
 msgstr "Nazwa ko_nferencji:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Nie można połączyć się z serwerem."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "łączenie"
+
 msgid "Chat error"
 msgstr "Błąd konferencji"
 
 msgid "This chat name is already in use"
 msgstr "Nazwa konferencji jest aktualnie używana"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Nie jesteś połączony z serwerem."
 
 msgid "Find buddies..."
@@ -3289,7 +3322,8 @@ msgstr "Brak ustawionego tematu"
 msgid "File Transfer Failed"
 msgstr "Przesyłanie plików zakończyło się niepowowdzeniem"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Nie można otworzyć portu do nasłuchu."
 
 msgid "Error displaying MOTD"
@@ -3305,8 +3339,18 @@ msgstr "Brak wiadomości dnia (MOTD) powiązanej z tym połączeniem."
 msgid "MOTD for %s"
 msgstr "Wiadomość dnia (MOTD) dla %s"
 
-msgid "Server has disconnected"
-msgstr "Serwer został rozłączony"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Utracono połączenie z serwerem:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Wyświetlanie wiadomości dnia (MOTD)"
@@ -3321,22 +3365,20 @@ msgstr "_Hasło:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "Pseudonimy IRC nie mogą zawierać pustych znaków"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "łączenie"
-
 msgid "SSL support unavailable"
 msgstr "Brak obsługi SSL"
 
-msgid "Couldn't create socket"
-msgstr "Nie można utworzyć gniazda"
+msgid "Unable to connect"
+msgstr "Nie można się połączyć"
 
-msgid "Couldn't connect to host"
-msgstr "Nie można połączyć się z serwerem"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Nie można połączyć się z %s"
 
-msgid "Read error"
-msgstr "Błąd oczytu"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Połączenie zostało zamknięte przez serwer."
 
 msgid "Users"
 msgstr "Użytkownicy"
@@ -3775,13 +3817,14 @@ msgstr "Polecenie wyłączone"
 msgid "execute"
 msgstr "Nie oczekiwano"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "Serwer wymaga TLS/SSL do zalogowania. Jednak Twój Pidgin nie posiada obsługi "
 "TLS/SSL."
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "Serwer wymaga TLS/SSL do zalogowania. Jednak Twój Pidgin nie posiada obsługi "
 "TLS/SSL."
@@ -3803,7 +3846,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Uwierzytelniania w czystym tekście"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Autoryzacja nie powiodła się"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Nieprawidłowa odpowiedź z serwera."
 
 msgid "Server does not use any supported authentication method"
@@ -3815,7 +3863,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "Nieprawidłowe żądanie od serwera"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Błąd SASL"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3835,10 +3884,8 @@ msgstr ""
 "Nie można nawiązać połączenia z serwerem:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Nie można nawiązać połączenia z serwerem:\n"
 "%s"
@@ -3847,12 +3894,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "Nie można zainicjować połączenia"
 
-msgid "Unable to create socket"
-msgstr "Nie można utworzyć gniazda"
-
-msgid "Write error"
-msgstr "Błąd zapisu"
-
 msgid "Full Name"
 msgstr "Imię i nazwisko"
 
@@ -3923,187 +3964,6 @@ msgstr "System operacyjny"
 msgid "Local Time"
 msgstr "Lokalna nazwa pliku:"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "Ustaw informację katalogu"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "Rozszerzony adres"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "Alias konferencji"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Użytkownik nie posiada informacji w katalogu."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "Polecenie"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "Błąd podczas rejestracji"
-
-#, fuzzy
-msgid "User Location"
-msgstr "Położenie"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "Wyszukiwanie użytkownika"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "Powiadamianie o stanie znajomych"
-
-msgid "Software Version"
-msgstr "Wersja oprogramowania"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "Ułożenie"
-
-msgid "File Transfer"
-msgstr "Przesyłanie pliku ukończone"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "Tryby użytkownika"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "Ograniczenie użytkowników"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "Funkcje klienta"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "Użytkownik"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "Wiadomość z wymianą kluczy"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "Adres email"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "Profil"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "Przyłącz się"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "Nazwa użytkownika"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "Wideo na żywo"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "Odebrano wiadomość"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "Plik z kluczem publicznym"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "Opcje użytkownika"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "Tryby użytkownika"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "Nazwa użytkownika"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "Ograniczenie użytkowników"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Szyfrowanie Trillian"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Funkcje klienta"
-
 msgid "Priority"
 msgstr "Priorytet"
 
@@ -4115,7 +3975,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Zalogowany"
 
 msgid "Middle Name"
@@ -4297,16 +4157,12 @@ msgid "Roles:"
 msgstr "Rola"
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "Zwykły tekst"
 
-msgid "Read Error"
-msgstr "Błąd oczytu"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4493,9 +4349,6 @@ msgstr "Hasło zostało zmienione."
 msgid "Error changing password"
 msgstr "Błąd przy zmianie hasła"
 
-msgid "Password (again)"
-msgstr "Hasło (ponownie)"
-
 msgid "Change XMPP Password"
 msgstr "Zmień hasło XMPP"
 
@@ -4895,6 +4748,14 @@ msgstr "Błąd przetwarzania XML"
 msgid "Unknown Error in presence"
 msgstr "Nieznany błąd obecności"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Błąd przyłączania się do konferencji %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Błąd w konferencji %s"
+
 msgid "Create New Room"
 msgstr "Utworzenie nowego pokoju"
 
@@ -4911,16 +4772,20 @@ msgstr "_Konfiguruj pokój"
 msgid "_Accept Defaults"
 msgstr "_Akceptuj domyślne"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Błąd przyłączania się do konferencji %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Nie podano powodu."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Błąd w konferencji %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Zostałeś wykopany przez %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Wykopany przez %s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Wystąpił błąd podczas otwierania pliku."
 
 #, fuzzy
@@ -5418,9 +5283,6 @@ msgstr "Rozpocznij _konferencję"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN wymaga obsługi SSL. Zainstaluj obsługiwaną bibliotekę SSL."
 
-msgid "Failed to connect to server."
-msgstr "Nie udało się połączyć z serwerem."
-
 msgid "Error retrieving profile"
 msgstr "Błąd podczas pobierania profilu"
 
@@ -5686,9 +5548,6 @@ msgstr "Wiadomość nie została wysłana ponieważ nastąpił nieznany błąd:"
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Wiadomość nie została wysłana ponieważ nastąpił nieznany błąd:"
 
-msgid "Unable to connect"
-msgstr "Nie można się połączyć"
-
 msgid "Writing error"
 msgstr "Błąd zapisu"
 
@@ -5703,20 +5562,24 @@ msgstr ""
 "Błąd połączenia od %s serwer:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Nasz protokół nie jest obsługiwany przez serwer."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Błąd przetwarzania HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Zalogowano się z innego komputera."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Serwery MSN są tymczasowo niedostępne. Odczekaj trochę i spróbuj ponownie."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Serwery MSN są właśnie tymczasowo wyłączane."
 
 #, c-format
@@ -5729,9 +5592,6 @@ 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 ""
 
@@ -5834,6 +5694,9 @@ msgstr "Wtyczka protokołu MSN"
 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)"
@@ -5949,12 +5812,6 @@ msgstr[2] ""
 msgid "Add contacts from server"
 msgstr "Nieprawidłowa odpowiedź z serwera."
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Połączono"
-
 #, fuzzy, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Proces zwrócił kod błędu %d"
@@ -5978,18 +5835,6 @@ msgid "Invalid input condition"
 msgstr "Finalizowanie połączenia"
 
 #, fuzzy
-msgid "Read buffer full (2)"
-msgstr "Kolejka jest pełna"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "Nie udało się przetworzyć wiadomości."
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Nie można połączyć się z serwerem"
-
-#, fuzzy
 msgid "Failed to add buddy"
 msgstr "Nie można przyłączyć znajomego do konferencji"
 
@@ -6077,6 +5922,12 @@ msgstr ""
 msgid "Client Version"
 msgstr "Wersja klienta"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 #, fuzzy
 msgid "MySpaceIM - Username Available"
 msgstr "Usługa niedostępna"
@@ -6345,9 +6196,9 @@ msgstr ""
 msgid "Unknown error: 0x%X"
 msgstr "Nieznany błąd: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Logowanie zakończyło się niepowodzeniem (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Nie można zbanować użytkownika %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6453,9 +6304,6 @@ msgstr "Konferencja GrupWise %d"
 msgid "Authenticating..."
 msgstr "Uwierzytelnianie..."
 
-msgid "Unable to connect to server."
-msgstr "Nie można połączyć się z serwerem."
-
 msgid "Waiting for response..."
 msgstr "Oczekiwanie na odpowiedź..."
 
@@ -6479,26 +6327,20 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Czy chcesz przyłączyć się do konwersacji?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Wylogowano, ponieważ zalogowano się na to samo konto z innego komputera."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 "%s zdaje się być rozłączony i nie odebrał wiadomości którą właśnie wysłano."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Nie można połączyć się z serwerem. Podaj adres serwera z którym chcesz się "
 "połączyć."
 
-msgid "Error. SSL support is not installed."
-msgstr "Błąd. Obsługa SSL nie jest zainstalowana."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Ta konferencja została zamknięta. Nie można wysyłać na nią wiadomości."
 
@@ -6540,10 +6382,7 @@ 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, fuzzy
@@ -6554,19 +6393,8 @@ msgstr "Nie można połączyć"
 msgid "Invalid chat room name"
 msgstr "Niepoprawna nazwa pokoju"
 
-msgid "Server closed the connection."
-msgstr "Połączenie zostało zamknięte przez serwer."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Utracono połączenie z serwerem:\n"
-"%s"
-
 #, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "Nie udało się połączyć z serwerem."
 
 #. *< type
@@ -6618,7 +6446,7 @@ msgid "Received invalid data on connection with remote user."
 msgstr ""
 
 #, fuzzy
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr ""
 "Nie można nawiązać połączenia z serwerem:\n"
 "%s"
@@ -6820,20 +6648,14 @@ msgid "Buddy Comment"
 msgstr "Komentarz dot. znajomego"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Nie udało się połączyć z serwerem BOS:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Nie udało się połączyć z serwerem BOS:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Nie można połączyć się z serwerem."
 
 #, fuzzy
 msgid "Username sent"
@@ -6848,9 +6670,9 @@ msgstr "Finalizowanie połączenia"
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 
 #, fuzzy, c-format
@@ -6863,29 +6685,22 @@ 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
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "Niewłaściwa ksywka"
+msgid "Username does not exist"
+msgstr "Użytkownik nie istnieje"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Twoje konto jest w tej chwili zawieszone."
 
 #. service temporarily unavailable
@@ -6906,8 +6721,9 @@ msgstr ""
 "ponownie. Jeśli próba zostanie podjęta teraz, czas oczekiwania jeszcze się "
 "wydłuży."
 
-msgid "The SecurID key entered is invalid."
-msgstr ""
+#, fuzzy
+msgid "The SecurID key entered is invalid"
+msgstr "Nowe formatowanie nie jest poprawne."
 
 msgid "Enter SecurID"
 msgstr ""
@@ -7083,6 +6899,9 @@ msgstr "Zalogowany od"
 msgid "Member Since"
 msgstr "Zapisany od"
 
+msgid "Capabilities"
+msgstr "Funkcje klienta"
+
 msgid "Profile"
 msgstr "Profil"
 
@@ -7275,7 +7094,7 @@ msgstr "Zbyt długi komunikat nieobecności."
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7296,9 +7115,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Osieroceni"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Nie udało się dodać kontaktu %s, ponieważ jest za dużo osób na liście. Usuń "
@@ -7308,7 +7127,7 @@ msgid "(no name)"
 msgstr "(bez nazwy)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Wykonanie polecenia zakończyło się niepowodzeniem z nieznanego powodu."
 
 #, fuzzy, c-format
@@ -8162,7 +7981,7 @@ msgid "Update interval (seconds)"
 msgstr "Niepoprawny błąd"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Nie można pobrać informacji o serwerze"
 
 #, c-format
@@ -8189,10 +8008,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Nie można pobrać informacji o serwerze"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "Żądanie uwagi od %s..."
 
@@ -8230,25 +8045,11 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "Nie można się połączyć."
-
 #, fuzzy
 msgid "Socket error"
 msgstr "Błąd tokena"
 
 #, fuzzy
-msgid "Unable to read from socket"
-msgstr "Nie można czytać z gniazda"
-
-msgid "Write Error"
-msgstr "Błąd zapisu"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "Połączenie zamknięte"
-
-#, fuzzy
 msgid "Getting server"
 msgstr "Ustaw dane użytkownika..."
 
@@ -8256,8 +8057,9 @@ msgstr "Ustaw dane użytkownika..."
 msgid "Requesting token"
 msgstr "Odmowa realizacji żądania"
 
-msgid "Couldn't resolve host"
-msgstr "Nie można przetłumaczyć nazwy hosta"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Nie można połączyć się z serwerem."
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8308,7 +8110,7 @@ msgid "QQ Qun Command"
 msgstr "Polecenie"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Nie można pobrać informacji o serwerze"
 
 #, fuzzy
@@ -8331,9 +8133,6 @@ msgstr "Przesyłanie plików nie powiodło się"
 msgid "%d canceled the transfer of %s"
 msgstr "%d anulowała/anulował przesyłanie pliku %s"
 
-msgid "Connection closed (writing)"
-msgstr "Połączenie zamknięte (zapisywanie)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Tytuł grupy:</b> %s<br>"
@@ -8390,17 +8189,6 @@ msgstr "Administrator Sametime zostawił następujący komunikat na serwerze %s"
 msgid "Sametime Administrator Announcement"
 msgstr "Ogłoszenie administratora Sametime"
 
-msgid "Connection reset"
-msgstr "Reset połączenia"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Błąd odczytu z gniazda: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Nie można połączyć się ze zdalnym komputerem"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Powiadomienie od %s"
@@ -8423,6 +8211,9 @@ msgstr "Głośniki"
 msgid "Video Camera"
 msgstr "Kamera video"
 
+msgid "File Transfer"
+msgstr "Przesyłanie pliku ukończone"
+
 #, fuzzy
 msgid "Supports"
 msgstr "wsparcie"
@@ -9236,6 +9027,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Statystyki sieci"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Wykonanie polecenia ping nie powiodło się"
 
@@ -9296,7 +9090,8 @@ msgstr "Nieobsługiwany rodzaj klucza publicznego"
 msgid "Disconnected by server"
 msgstr "Rozłączenie przez serwer"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Błąd podczas nawiązywania połączenia z serwerem SILC"
 
 msgid "Key Exchange failed"
@@ -9308,27 +9103,26 @@ msgstr ""
 "Wznowienie odłączonej sesji zakończyło się niepowodzeniem. Należy połączyć "
 "się ponownie aby nawiązać nowe połączenie."
 
-msgid "Connection failed"
-msgstr "Błąd połączenia"
-
 msgid "Performing key exchange"
 msgstr "Wymiana kluczy"
 
-msgid "Unable to create connection"
-msgstr "Nie można utworzyć połączenia"
-
 #, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "Nie można wczytać pary kluczy SILC: %s"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Łączenie z serwerem SILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Nie można wczytać pary kluczy SILC: %s"
+
 msgid "Out of memory"
 msgstr "Brak pamięci"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Nie można zainicjować protokołu SILC"
 
 #, fuzzy
@@ -9636,7 +9430,7 @@ msgid "Creating SILC key pair..."
 msgstr "Tworzenie pary kluczy SILC..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "Tworzenie pary kluczy SILC..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9732,6 +9526,9 @@ msgstr "Tablica do rysowania"
 msgid "No server statistics available"
 msgstr "Serwer nie posiada statystyk"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Błąd podczas nawiązywania połączenia z serwerem SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Błąd: Niezgodność wersji, należy zaktualizować oprogramowanie klienta"
@@ -9773,33 +9570,28 @@ msgstr "Błąd: Niewłaściwe ciasteczko (cookie)"
 msgid "Failure: Authentication failed"
 msgstr "Błąd: Uwierzytelnianie nie powiodło się"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Nie można zainicjować połączenia klienta SILC"
 
 #, fuzzy
 msgid "John Noname"
 msgstr "Brak nazwy"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Nie można wczytać pary kluczy SILC: %s"
 
-msgid "Could not write"
-msgstr "Nie można zapisywać"
-
-msgid "Could not connect"
-msgstr "Nie można połączyć"
+msgid "Unable to create connection"
+msgstr "Nie można utworzyć połączenia"
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "Nieznany powód."
 
-msgid "Could not create listen socket"
-msgstr "Nie można otworzyć gniazd do nasłuchiwania"
-
 #, fuzzy
-msgid "Could not resolve hostname"
-msgstr "Nie można odnaleźć adresu hosta"
+msgid "Unable to create listen socket"
+msgstr "Nie można utworzyć gniazda"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -9843,6 +9635,80 @@ msgstr "Użytkownik do autoryzacji"
 msgid "Auth Domain"
 msgstr "Domena do autoryzacji"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;pokój&gt;:  Przyłącza do pokoju konferencyjnego w sieci Yahoo"
+
+#, fuzzy
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Wyświetla listę kanałów w tej sieci"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Identyfikator Yahoo!"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Wtyczka protokołu Yahoo"
+
+msgid "Pager server"
+msgstr "Serwer pagera"
+
+msgid "Pager port"
+msgstr "Port pagera"
+
+msgid "File transfer server"
+msgstr "Serwer do przesyłania plików"
+
+msgid "File transfer port"
+msgstr "Port do przesyłania plików"
+
+msgid "Chat room locale"
+msgstr "Ustawienia lokalne pokoju konferencyjnego"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignorowanie zaproszeń do pokojów konferencyjnych"
+
+msgid "Chat room list URL"
+msgstr "URL z listą pokoi konferencyjnych"
+
+msgid "Yahoo Chat server"
+msgstr "Serwer konferencji Yahoo"
+
+#, fuzzy
+msgid "Yahoo Chat port"
+msgstr "Serwer konferencji Yahoo"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Identyfikator Yahoo!"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Wtyczka protokołu Yahoo"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9873,30 +9739,20 @@ msgstr "Dodanie znajomego zostało odrzucone"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  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."
@@ -9940,37 +9796,32 @@ msgstr ""
 "Nieznany błąd numer %d. Zalogowanie przez stronę WWW Yahoo! może rozwiązać "
 "ten problem."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Nie można dodać znajomego %s do grupy %s na liście serwerowej związanej z "
 "kontem %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Nie można dołączyć znajomego do listy serwerowej"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Nieprawidłowa odpowiedź z serwera HTTP."
 
-msgid "Connection problem"
-msgstr "Błąd połączenia"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Utracono połączenie z serwerem:\n"
 "%s"
 
 #, fuzzy, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
 "Nie można nawiązać połączenia z serwerem:\n"
 "%s"
@@ -10042,76 +9893,15 @@ msgstr "Przyłącz do konferencji..."
 msgid "Open Inbox"
 msgstr "Otwórz skrzynkę Hotmail"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;pokój&gt;:  Przyłącza do pokoju konferencyjnego w sieci Yahoo"
-
-#, fuzzy
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Wyświetla listę kanałów w tej sieci"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Identyfikator Yahoo!"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Wtyczka protokołu Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japonia"
-
-msgid "Pager server"
-msgstr "Serwer pagera"
-
-msgid "Japan Pager server"
-msgstr "Japoński serwer pagera"
-
-msgid "Pager port"
-msgstr "Port pagera"
-
-msgid "File transfer server"
-msgstr "Serwer do przesyłania plików"
-
-msgid "Japan file transfer server"
-msgstr "Japoński serwer do przesyłania plików"
-
-msgid "File transfer port"
-msgstr "Port do przesyłania plików"
-
-msgid "Chat room locale"
-msgstr "Ustawienia lokalne pokoju konferencyjnego"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignorowanie zaproszeń do pokojów konferencyjnych"
-
-msgid "Chat room list URL"
-msgstr "URL z listą pokoi konferencyjnych"
-
-msgid "Yahoo Chat server"
-msgstr "Serwer konferencji Yahoo"
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "Serwer konferencji Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "Nie można się połączyć."
+
 msgid "Unable to establish file descriptor."
 msgstr "Nie można ustanowić deskryptora pliku."
 
@@ -10119,6 +9909,9 @@ msgstr "Nie można ustanowić deskryptora pliku."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s chce przesłać Tobie plik %s"
 
+msgid "Write Error"
+msgstr "Błąd zapisu"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Profil Yahoo! Japonia"
 
@@ -10240,23 +10033,19 @@ msgstr "Rozmowy głosowe"
 msgid "Webcams"
 msgstr "Kamery internetowe"
 
+msgid "Connection problem"
+msgstr "Błąd połączenia"
+
 msgid "Unable to fetch room list."
 msgstr "Nie można pobrać listy pokoi."
 
 msgid "User Rooms"
 msgstr "Pokoje użytkowników"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Wystąpiły problemy przy połączeniu z serwerem YCHT."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Utracono połączenie z serwerem\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10384,16 +10173,8 @@ msgstr "Kraina"
 msgid "Exposure"
 msgstr "Ekspozycja"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Nie można utworzyć gniazda:\n"
-"%s"
-
 #, fuzzy, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Nie można ustawić roli \"%s\" dla użytkownika: %s"
 
 #, c-format
@@ -10401,7 +10182,7 @@ msgid "HTTP proxy connection error %d"
 msgstr "Błąd połączenia z serwerem pośredniczącym (HTTP proxy) %d"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
 #, fuzzy, c-format
@@ -10410,9 +10191,6 @@ msgstr ""
 "Błąd tłumaczenia nazwy %s na adres IP: \n"
 "%s"
 
-msgid "Could not resolve host name"
-msgstr "Nie można odnaleźć adresu hosta"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Żądanie uwagi od %s..."
@@ -10625,14 +10403,6 @@ msgstr "Błąd zapisu do %s: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "Nie można połączyć się z %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"Serwer wymaga TLS/SSL do zalogowania. Jednak Twój Pidgin nie posiada obsługi "
-"TLS/SSL."
-
 #, c-format
 msgid " - %s"
 msgstr ""
@@ -10883,9 +10653,14 @@ msgstr "Dodaj przechwytywanie zdarzeń"
 msgid "View _Log"
 msgstr "Wyświetl _dziennik rozmów"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Ukryj, gdy rozłączony"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Wyświetlaj, gdy rozłączony"
+
 msgid "_Alias..."
 msgstr "_Zmień nazwę..."
 
@@ -11404,6 +11179,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Zmiana informacji o użytkowniku dla %s"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Wpisz nazwę hosta dla tego certyfikatu."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Serwery SSL"
@@ -11452,7 +11231,8 @@ msgstr "Ignorowanie"
 msgid "Get Away Message"
 msgstr "Wysyłane wiadomości"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Ostatnio powiedziane"
 
 msgid "Unable to save icon file to disk."
@@ -12360,7 +12140,7 @@ msgid "Hyperlink visited color"
 msgstr "Kolor odnośnika"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Kolor odnośników pod kursorem myszki."
 
 msgid "Hyperlink prelight color"
@@ -12398,15 +12178,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "Likwidowanie powiadomienia"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "Powiadamianie o nowej poczcie"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12784,6 +12571,10 @@ msgid ""
 msgstr ""
 "Wybrano \"ręczne\" polecenie przeglądarki, lecz nie ustawiono polecenia."
 
+#, fuzzy
+msgid "No message"
+msgstr "Nieznany komunikat"
+
 msgid "Open All Messages"
 msgstr "Otwórz wszystkie wiadomości"
 
@@ -12801,10 +12592,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Masz wiadomość email!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Nieznany komunikat"
-
 msgid "The following plugins will be unloaded."
 msgstr "Następujące wtyczki zostaną wyłączone."
 
@@ -13025,8 +12812,9 @@ msgstr "Wyświetlaj ikonę obszaru powiadamiania:"
 msgid "On unread messages"
 msgstr "Gdy są nieprzeczytane wiadomości"
 
-msgid "Conversation Window Hiding"
-msgstr "Ukrywanie okien rozmów"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Okna rozmów"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Ukrywanie nowych rozmów:"
@@ -13034,6 +12822,10 @@ msgstr "_Ukrywanie nowych rozmów:"
 msgid "When away"
 msgstr "Podczas nieobecności"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "Przeniesienia okna rozmów na _wierzch"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Karty"
@@ -13092,10 +12884,6 @@ msgstr "Płynne przewijanie"
 msgid "F_lash window when IMs are received"
 msgstr "_Migotanie okna po odebraniu wiadomości"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "Przeniesienia okna rozmów na _wierzch"
-
 msgid "Minimum input area height in lines:"
 msgstr "Minimalna wysokość pola tekstowego w liniach:"
 
@@ -13132,7 +12920,8 @@ msgstr "Nie można uruchomić aplikacji konfigurującej proxy."
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Przykład: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Automatyczne wykrywanie adresu IP"
 
 msgid "Public _IP:"
@@ -13504,33 +13293,18 @@ msgstr "Z_apisz i użyj"
 msgid "Status for %s"
 msgstr "Status dla %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "Niestandardowa emotikona"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Proszę wprowadzić dowiązanie do emotikony."
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
+msgid "Custom Smiley"
+msgstr "Niestandardowa emotikona"
+
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "Poprawianie duplikatów"
 
-msgid "Please select an image for the smiley."
-msgstr "Proszę wybrać obraz emotikony."
-
 msgid "Edit Smiley"
 msgstr "Modyfikuj emotikonę"
 
@@ -13646,9 +13420,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Nie można wysłać odnośnika z pulpitu"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Upuściłaś/Upuściłeś element pulpitu. Prawdopodobnie zamierzałaś/zamierzałeś "
 "przesłać obiekt na, który wskazuje ten element."
@@ -14250,9 +14025,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Wtyczka do grupowego komponowania utworów muzycznych."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Wtyczka wiadomości muzycznych pozwala kilku osobom na pracowanie nad utworem "
 "muzycznym poprzez edycję nut w czasie rzeczywistym."
@@ -14519,7 +14295,7 @@ msgstr "Ukrywanie okien rozmów"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14846,8 +14622,9 @@ msgstr "Pidgwin - Opcje "
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opcje specyficzne dla wersji dla Windows."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Umożliwia kontrolę nad parametrami specyficznymi dla Windows jak np. "
 "dokowanie listy znajomych."
@@ -14890,6 +14667,292 @@ msgstr "Wysyłaj i odbieraj surowe stanzy XMPP"
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Ta wtyczka jest przydatna do debugowania klientów i serwerów XMPP."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Nie można otworzyć gniazda"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Nie można nasłuchiwać na danym gnieździe"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Nie można czytać z gniazda"
+
+#~ msgid "Connection failed."
+#~ msgstr "Błąd połączenia."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Serwer został rozłączony"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Nie można utworzyć gniazda"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Nie można połączyć się z serwerem"
+
+#~ msgid "Read error"
+#~ msgstr "Błąd oczytu"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nie można nawiązać połączenia z serwerem:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Błąd zapisu"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "Ustaw informację katalogu"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Rozszerzony adres"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "Alias konferencji"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Użytkownik nie posiada informacji w katalogu."
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Polecenie"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "Błąd podczas rejestracji"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "Położenie"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "Wyszukiwanie użytkownika"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "Powiadamianie o stanie znajomych"
+
+#~ msgid "Software Version"
+#~ msgstr "Wersja oprogramowania"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "Ułożenie"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "Tryby użytkownika"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "Ograniczenie użytkowników"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "Funkcje klienta"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "Użytkownik"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Wiadomość z wymianą kluczy"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "Adres email"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "Profil"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "Przyłącz się"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "Nazwa użytkownika"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "Wideo na żywo"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "Odebrano wiadomość"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "Plik z kluczem publicznym"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "Opcje użytkownika"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "Tryby użytkownika"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "Nazwa użytkownika"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "Ograniczenie użytkowników"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Szyfrowanie Trillian"
+
+#~ msgid "Read Error"
+#~ msgstr "Błąd oczytu"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Nie udało się połączyć z serwerem."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Kolejka jest pełna"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "Nie udało się przetworzyć wiadomości."
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Nie można połączyć się z serwerem"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Logowanie zakończyło się niepowodzeniem (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Wylogowano, ponieważ zalogowano się na to samo konto z innego komputera."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Błąd. Obsługa SSL nie jest zainstalowana."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Niepoprawne hasło."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nie udało się połączyć z serwerem BOS:\n"
+#~ "%s"
+
+#, fuzzy
+#~ 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 "Could Not Connect"
+#~ msgstr "Nie można się połączyć"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "Niewłaściwa ksywka"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Nie można pobrać informacji o serwerze"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "Połączenie zamknięte"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Nie można przetłumaczyć nazwy hosta"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Połączenie zamknięte (zapisywanie)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Reset połączenia"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Błąd odczytu z gniazda: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Nie można połączyć się ze zdalnym komputerem"
+
+#~ msgid "Could not write"
+#~ msgstr "Nie można zapisywać"
+
+#~ msgid "Could not connect"
+#~ msgstr "Nie można połączyć"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Nie można otworzyć gniazd do nasłuchiwania"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Nie można odnaleźć adresu hosta"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Niepoprawne hasło"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nie można nawiązać połączenia z serwerem:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japonia"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Japoński serwer pagera"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japoński serwer do przesyłania plików"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Utracono połączenie z serwerem\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Nie można odnaleźć adresu hosta"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Serwer wymaga TLS/SSL do zalogowania. Jednak Twój Pidgin nie posiada "
+#~ "obsługi TLS/SSL."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Ukrywanie okien rozmów"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Proszę wprowadzić dowiązanie do emotikony."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Proszę wybrać obraz emotikony."
+
 #, fuzzy
 #~ msgid "Activate which ID?"
 #~ msgstr "Aktywacja ID..."
diff --git a/po/ps.po b/po/ps.po
index 594e68da88..cbd1d466c3 100644
--- a/po/ps.po
+++ b/po/ps.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0beta6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2007-03-14 13:08+0500\n"
 "Last-Translator: Kashif Masood <masudmails@yahoo.com>\n"
 "Language-Team: Pashto\n"
@@ -2514,7 +2514,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2563,7 +2563,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2804,12 +2804,13 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
+msgstr "رابطه نه و شوه"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2862,14 +2863,17 @@ msgstr ""
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-msgid "Cannot open socket"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "د %s سره رابطه نه و شوه"
 
-msgid "Could not bind socket to port"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "د %s سره رابطه نه و شوه: %s"
 
-msgid "Could not listen on socket"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "کاروونکی نه شه شامل"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -2917,13 +2921,13 @@ msgstr "ملګری فهرست ساتل..."
 msgid "Load buddylist from file..."
 msgstr ""
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
-msgid "Passwords do not match."
+msgid "Passwords do not match"
 msgstr ""
 
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr ""
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2935,15 +2939,16 @@ msgstr ""
 msgid "Password"
 msgstr "پټ ټکی"
 
-msgid "Password (retype)"
-msgstr "پټ ټکی (بیا ورکه)"
-
-msgid "Enter current token"
+msgid "Password (again)"
 msgstr ""
 
-msgid "Current token"
+msgid "Enter captcha text"
 msgstr ""
 
+#, fuzzy
+msgid "Captcha"
+msgstr "انځور و ساته"
+
 msgid "Register New Gadu-Gadu Account"
 msgstr ""
 
@@ -2995,6 +3000,15 @@ msgstr ""
 msgid "Current password"
 msgstr "اوسنی پټ ټکی"
 
+msgid "Password (retype)"
+msgstr "پټ ټکی (بیا ورکه)"
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
@@ -3042,7 +3056,7 @@ msgstr ""
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr ""
 
 msgid "Buddy list downloaded"
@@ -3057,8 +3071,14 @@ msgstr ""
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
-msgid "Connection failed."
-msgstr "رابطه ناکامه شوه."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "رابطه و شوه"
+
+msgid "Connection failed"
+msgstr "رابطه ناکامه شوه"
 
 msgid "Add to chat"
 msgstr "ګپ شپ ته جمع که"
@@ -3066,19 +3086,26 @@ msgstr "ګپ شپ ته جمع که"
 msgid "Chat _name:"
 msgstr "ګپ شپ نوم:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "د %s سره رابطه نه و شوه"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr ""
+
 msgid "Chat error"
 msgstr "ګپ شپ خطا"
 
 msgid "This chat name is already in use"
 msgstr ""
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr ""
+"د خادم سره رابطه قطع شوه:\n"
+"%s"
 
 msgid "Find buddies..."
 msgstr "ملګري پیداکول..."
@@ -3137,8 +3164,9 @@ msgstr "عنوان مقرر نه دی"
 msgid "File Transfer Failed"
 msgstr "دوسیه بدلونه ناکام شوه"
 
-msgid "Could not open a listening port."
-msgstr ""
+#, fuzzy
+msgid "Unable to open a listening port."
+msgstr "د دوسیه %s ویل نه و شول."
 
 msgid "Error displaying MOTD"
 msgstr ""
@@ -3153,8 +3181,18 @@ msgstr ""
 msgid "MOTD for %s"
 msgstr ""
 
-msgid "Server has disconnected"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
 msgstr ""
+"د خادم سره رابطه قطع شوه:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "د نن پيغام لیدل"
@@ -3168,22 +3206,20 @@ msgstr "پټ ټکی:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr ""
-
 msgid "SSL support unavailable"
 msgstr ""
 
-msgid "Couldn't create socket"
-msgstr ""
+msgid "Unable to connect"
+msgstr "رابطه نه و شوه"
 
-msgid "Couldn't connect to host"
-msgstr ""
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "د %s سره رابطه نه و شوه"
 
-msgid "Read error"
-msgstr ""
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "خادم رابطه قطع کړه."
 
 msgid "Users"
 msgstr "کاروونکي"
@@ -3570,10 +3606,10 @@ msgstr ""
 msgid "execute"
 msgstr "اوبسه"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3588,8 +3624,13 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
-msgid "Invalid response from server."
-msgstr ""
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "کره کول ناکام شو"
+
+#, fuzzy
+msgid "Invalid response from server"
+msgstr "د خادم سره رابطه کول ناکامه شوه."
 
 msgid "Server does not use any supported authentication method"
 msgstr ""
@@ -3600,8 +3641,9 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr ""
 
-msgid "SASL error"
-msgstr ""
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "خادم"
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -3618,10 +3660,8 @@ msgstr ""
 "د خادم سره رابطه نه و شوه:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "د خادم سره رابطه نه و شوه:\n"
 "%s"
@@ -3630,12 +3670,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "رابطه نه و شوه"
 
-msgid "Unable to create socket"
-msgstr ""
-
-msgid "Write error"
-msgstr ""
-
 msgid "Full Name"
 msgstr ""
 
@@ -3704,181 +3738,6 @@ msgstr ""
 msgid "Local Time"
 msgstr "دلتنی دوسیه:"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "په ياداشت کتابچه ته معلومات ورکه"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-msgid "Extended Stanza Addressing"
-msgstr ""
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "ګپ شپ بل نوم"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "د کاروونکی په ياداشت کتابچه کی معلومات نشته."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr ""
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "اچټیمل"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "ثبت کولو شی خطا"
-
-#, fuzzy
-msgid "User Location"
-msgstr "ځای"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "کاروونکی نوم"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "د نوی برېشناليک خبرتيا"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "مرکه یاد ساتل"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "د خادم معلومات"
-
-msgid "File Transfer"
-msgstr "دوسیه بدلونه"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "د کاروونکی حالتونه"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "کاروونکی حد"
-
-msgid "Entity Capabilities"
-msgstr ""
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "کاروونکی نوم"
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "برېښنالیک پته"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "د پېزندنې څېره"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "نښلول"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "کاروونکی نوم"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr ""
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "پیغام: %s"
-
-msgid "Public Key Publishing"
-msgstr ""
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "کارکوونکی ټاکل"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "د کاروونکی حالتونه"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "کاروونکی نوم"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "کاروونکی حد"
-
-msgid "Ping"
-msgstr "پینګ"
-
-msgid "Stanza Encryption"
-msgstr ""
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr ""
-
 msgid "Priority"
 msgstr ""
 
@@ -3890,7 +3749,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "ننوتی د"
 
 msgid "Middle Name"
@@ -4072,16 +3931,12 @@ msgid "Roles:"
 msgstr ""
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "رابطه ناکامه شوه"
 
-msgid "Read Error"
-msgstr ""
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 #, fuzzy
@@ -4267,9 +4122,6 @@ msgstr ""
 msgid "Error changing password"
 msgstr ""
 
-msgid "Password (again)"
-msgstr ""
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "پټ ټکی بدلول"
@@ -4650,6 +4502,14 @@ msgstr ""
 msgid "Unknown Error in presence"
 msgstr ""
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr ""
+
+#, c-format
+msgid "Error in chat %s"
+msgstr ""
+
 msgid "Create New Room"
 msgstr ""
 
@@ -4664,15 +4524,19 @@ msgstr ""
 msgid "_Accept Defaults"
 msgstr ""
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr ""
+#, fuzzy
+msgid "No reason"
+msgstr "کوریایی"
 
 #, c-format
-msgid "Error in chat %s"
+msgid "You have been kicked: (%s)"
 msgstr ""
 
-msgid "An error occured on the in-band bytestream transfer\n"
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "‫%s وژللو (%s)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr ""
 
 #, fuzzy
@@ -5170,9 +5034,6 @@ msgstr "ګپ شپ پیل کول"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-msgid "Failed to connect to server."
-msgstr "د خادم سره رابطه کول ناکامه شوه."
-
 msgid "Error retrieving profile"
 msgstr ""
 
@@ -5414,9 +5275,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 
-msgid "Unable to connect"
-msgstr "رابطه نه و شوه"
-
 msgid "Writing error"
 msgstr ""
 
@@ -5431,19 +5289,21 @@ msgstr ""
 "د %s خادم څخه د ارتباط خطا:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+msgid "Our protocol is not supported by the server"
 msgstr ""
 
-msgid "Error parsing HTTP."
-msgstr ""
+#, fuzzy
+msgid "Error parsing HTTP"
+msgstr "پاتی دی"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "تا د بل ځای نه را ننوتلی یی."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr ""
 
 #, c-format
@@ -5454,9 +5314,6 @@ msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "Unknown error."
-msgstr ""
-
 msgid "Handshaking"
 msgstr ""
 
@@ -5552,6 +5409,9 @@ msgstr "د أېم پروتوکول نښلولی"
 msgid "%s is not a valid group."
 msgstr ""
 
+msgid "Unknown error."
+msgstr ""
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr ""
@@ -5667,12 +5527,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "د خادم سره رابطه کول ناکامه شوه."
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "رابطه و شوه"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr ""
@@ -5693,19 +5547,6 @@ msgstr ""
 msgid "Invalid input condition"
 msgstr ""
 
-msgid "Read buffer full (2)"
-msgstr ""
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "نه وېللي پېغامونه"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr ""
-"د بیوس خادم سره رابطه نه و شوه:\n"
-"%s"
-
 #, fuzzy
 msgid "Failed to add buddy"
 msgstr "کاروونکی نه شه شامل"
@@ -5794,6 +5635,12 @@ msgstr ""
 msgid "Client Version"
 msgstr ""
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr ""
 
@@ -6053,9 +5900,9 @@ msgstr ""
 msgid "Unknown error: 0x%X"
 msgstr ""
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "کاروونکی نه شه شامل"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6153,9 +6000,6 @@ msgstr ""
 msgid "Authenticating..."
 msgstr ""
 
-msgid "Unable to connect to server."
-msgstr ""
-
 msgid "Waiting for response..."
 msgstr ""
 
@@ -6176,20 +6020,14 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr ""
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-
-msgid "Error. SSL support is not installed."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 
 msgid "This conference has been closed. No more messages can be sent."
@@ -6227,10 +6065,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "پاتی دی"
 
-msgid "Incorrect password."
-msgstr ""
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, fuzzy
@@ -6241,20 +6076,12 @@ msgstr "ګپ شپ نښلول ناکام شو"
 msgid "Invalid chat room name"
 msgstr "باطل کوټه نوم"
 
-msgid "Server closed the connection."
-msgstr "خادم رابطه قطع کړه."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr ""
 "د خادم سره رابطه قطع شوه:\n"
 "%s"
 
-msgid "Received invalid data on connection with server."
-msgstr ""
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6300,8 +6127,11 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr ""
+"د خادم سره رابطه نه و شوه:\n"
+"%s"
 
 msgid "Direct IM established"
 msgstr ""
@@ -6492,21 +6322,15 @@ msgstr ""
 msgid "Buddy Comment"
 msgstr ""
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "د کره کولو خادم سره رابطه نه و شوه\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"د بیوس خادم سره رابطه نه و شوه:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "د %s سره رابطه نه و شوه: %s"
 
 #, fuzzy
 msgid "Username sent"
@@ -6521,9 +6345,9 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 
 #, c-format
@@ -6534,28 +6358,22 @@ 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 "د دوسیه %s ویل نه و شول."
 
-msgid "Could Not Connect"
-msgstr ""
-
 msgid "Received authorization"
 msgstr ""
 
 #. Unregistered username
 #. uid is not exist
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "باطل نوم"
+msgid "Username does not exist"
+msgstr "بې نوم"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+msgid "Your account is currently suspended"
 msgstr ""
 
 #. service temporarily unavailable
@@ -6572,7 +6390,7 @@ msgid ""
 "try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
-msgid "The SecurID key entered is invalid."
+msgid "The SecurID key entered is invalid"
 msgstr ""
 
 msgid "Enter SecurID"
@@ -6723,6 +6541,9 @@ msgstr "په ليکه د"
 msgid "Member Since"
 msgstr ""
 
+msgid "Capabilities"
+msgstr ""
+
 msgid "Profile"
 msgstr "د پېزندنې څېره"
 
@@ -6879,7 +6700,7 @@ msgstr "د ليرېتوب پېغام ډېر اوژد دی."
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6902,7 +6723,7 @@ msgstr "یتیمان"
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
@@ -6910,7 +6731,7 @@ msgid "(no name)"
 msgstr "(بي نوم)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr ""
 
 #, c-format
@@ -7717,7 +7538,7 @@ msgid "Update interval (seconds)"
 msgstr "کاروونکی معلومات"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "د رابطه خادم"
 
 #, c-format
@@ -7744,10 +7565,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "د رابطه خادم"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "پاتی دی"
 
@@ -7782,21 +7599,9 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "رابطه نه و شوه."
-
 msgid "Socket error"
 msgstr ""
 
-msgid "Unable to read from socket"
-msgstr ""
-
-msgid "Write Error"
-msgstr "لیک کولو خطا"
-
-msgid "Connection lost"
-msgstr "رابطه قطع شوه"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "کاروونکی معلومات ورکه..."
@@ -7805,8 +7610,9 @@ msgstr "کاروونکی معلومات ورکه..."
 msgid "Requesting token"
 msgstr "پاتی دی"
 
-msgid "Couldn't resolve host"
-msgstr ""
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "د %s سره رابطه نه و شوه"
 
 msgid "Invalid server or port"
 msgstr ""
@@ -7855,7 +7661,7 @@ msgid "QQ Qun Command"
 msgstr "د ملګری تبصره:"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "د رابطه خادم"
 
 msgid "Unknown LOGIN CMD"
@@ -7875,9 +7681,6 @@ msgstr "دوسیه استول"
 msgid "%d canceled the transfer of %s"
 msgstr ""
 
-msgid "Connection closed (writing)"
-msgstr ""
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr ""
@@ -7931,17 +7734,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-msgid "Connection reset"
-msgstr ""
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr ""
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr ""
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -7964,6 +7756,9 @@ msgstr ""
 msgid "Video Camera"
 msgstr ""
 
+msgid "File Transfer"
+msgstr "دوسیه بدلونه"
+
 msgid "Supports"
 msgstr "ملاتړلی"
 
@@ -8726,6 +8521,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr ""
 
+msgid "Ping"
+msgstr "پینګ"
+
 msgid "Ping failed"
 msgstr "پینګ ناکام شو"
 
@@ -8783,8 +8581,9 @@ msgstr ""
 msgid "Disconnected by server"
 msgstr "خادم رابطه قطع کړه."
 
-msgid "Error during connecting to SILC Server"
-msgstr ""
+#, fuzzy
+msgid "Error connecting to SILC Server"
+msgstr "د خادم سره رابطه کول ناکامه شوه"
 
 msgid "Key Exchange failed"
 msgstr ""
@@ -8793,27 +8592,27 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-msgid "Connection failed"
-msgstr "رابطه ناکامه شوه"
-
 msgid "Performing key exchange"
 msgstr ""
 
-msgid "Unable to create connection"
-msgstr ""
-
-msgid "Could not load SILC key pair"
-msgstr ""
+#, fuzzy
+msgid "Unable to load SILC key pair"
+msgstr "کاروونکی نه شه شامل"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr ""
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "کاروونکی نه شه شامل"
+
 msgid "Out of memory"
 msgstr ""
 
-msgid "Cannot initialize SILC protocol"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
+msgstr "رابطه نه و شوه"
 
 msgid "Error loading SILC key pair"
 msgstr ""
@@ -9089,8 +8888,9 @@ msgstr ""
 msgid "Creating SILC key pair..."
 msgstr ""
 
-msgid "Cannot create SILC key pair\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to create SILC key pair"
+msgstr "د أېم د پېزندنې څېره مقرر نه شوه."
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9178,6 +8978,9 @@ msgstr "سپینه تخته"
 msgid "No server statistics available"
 msgstr ""
 
+msgid "Error during connecting to SILC Server"
+msgstr ""
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -9218,31 +9021,28 @@ msgstr ""
 msgid "Failure: Authentication failed"
 msgstr ""
 
-msgid "Cannot initialize SILC Client connection"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
+msgstr "رابطه نه و شوه"
 
 #, fuzzy
 msgid "John Noname"
 msgstr "بې نوم"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr ""
-
-msgid "Could not write"
-msgstr ""
-
-msgid "Could not connect"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
+msgstr "کاروونکی نه شه شامل"
 
-msgid "Unknown server response."
+msgid "Unable to create connection"
 msgstr ""
 
-msgid "Could not create listen socket"
-msgstr ""
+#, fuzzy
+msgid "Unknown server response"
+msgstr "خادم پته"
 
-msgid "Could not resolve hostname"
-msgstr ""
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "د دوسیه %s ویل نه و شول."
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
@@ -9284,6 +9084,79 @@ msgstr "کاروونکی کره کول"
 msgid "Auth Domain"
 msgstr ""
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr ""
+
+msgid "list: List rooms on the Yahoo network"
+msgstr ""
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+"بې فکره خاکه جوړول: کاروونکی ته د بې فکره خاکه جوړولو غونډه پیل کولو عرض و که"
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "د یاهو هویت"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "د بانجوړ نښلولي"
+
+msgid "Pager server"
+msgstr ""
+
+msgid "Pager port"
+msgstr ""
+
+msgid "File transfer server"
+msgstr "دوسیه بدلولو خادم"
+
+msgid "File transfer port"
+msgstr ""
+
+msgid "Chat room locale"
+msgstr ""
+
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
+
+msgid "Chat room list URL"
+msgstr "د ګپ شپو کوټی فهرست ارل"
+
+msgid "Yahoo Chat server"
+msgstr "د ياهو د ګپ شپ خادم"
+
+msgid "Yahoo Chat port"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "د یاهو هویت"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "د أېم پروتوکول نښلولی"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9311,26 +9184,16 @@ msgstr "ماګری زیاتول رد کړي شول"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 
 #. username or password missing
@@ -9365,34 +9228,28 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-msgid "Could not add buddy to server list"
-msgstr ""
+#, fuzzy
+msgid "Unable to add buddy to server list"
+msgstr "کاروونکی نه شه شامل"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr ""
 
-msgid "Connection problem"
-msgstr "ارتباط مساله"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr ""
 "د خادم سره رابطه قطع شوه:\n"
 "%s"
 
 #, fuzzy, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
 "د خادم سره رابطه نه و شوه:\n"
 "%s"
@@ -9458,75 +9315,15 @@ msgstr "کاروونکی سره ګپ شپ..."
 msgid "Open Inbox"
 msgstr "ګړندې بریښنالیک راتګوطاق خلاص کا"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-
-msgid "list: List rooms on the Yahoo network"
-msgstr ""
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-"بې فکره خاکه جوړول: کاروونکی ته د بې فکره خاکه جوړولو غونډه پیل کولو عرض و که"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "د یاهو هویت"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr ""
-
-msgid "Yahoo Japan"
-msgstr "یاهو جاپان"
-
-msgid "Pager server"
-msgstr ""
-
-msgid "Japan Pager server"
-msgstr ""
-
-msgid "Pager port"
-msgstr ""
-
-msgid "File transfer server"
-msgstr "دوسیه بدلولو خادم"
-
-msgid "Japan file transfer server"
-msgstr "جاپانی دوسیه بدلولو خادم"
-
-msgid "File transfer port"
-msgstr ""
-
-msgid "Chat room locale"
-msgstr ""
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-msgid "Chat room list URL"
-msgstr "د ګپ شپو کوټی فهرست ارل"
-
-msgid "Yahoo Chat server"
-msgstr "د ياهو د ګپ شپ خادم"
-
-msgid "Yahoo Chat port"
-msgstr ""
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "د بې فکره خاکه جوړولو عرض و استول شو."
 
+msgid "Unable to connect."
+msgstr "رابطه نه و شوه."
+
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -9534,6 +9331,9 @@ msgstr ""
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr ""
 
+msgid "Write Error"
+msgstr "لیک کولو خطا"
+
 msgid "Yahoo! Japan Profile"
 msgstr "د جاپانی یاهو پېزندنې څېره"
 
@@ -9638,20 +9438,20 @@ msgstr "غږونه"
 msgid "Webcams"
 msgstr ""
 
+msgid "Connection problem"
+msgstr "ارتباط مساله"
+
 msgid "Unable to fetch room list."
 msgstr ""
 
 msgid "User Rooms"
 msgstr "کاروونکی کوټی"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr ""
-
-#, c-format
-msgid ""
-"Lost connection with server\n"
+"د خادم سره رابطه قطع شوه:\n"
 "%s"
-msgstr ""
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9769,13 +9569,7 @@ msgid "Exposure"
 msgstr ""
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
 
 #, c-format
@@ -9783,16 +9577,13 @@ msgid "HTTP proxy connection error %d"
 msgstr "د هېټیټیپي وکیل ارتباط خطا %d"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
 #, c-format
 msgid "Error resolving %s"
 msgstr ""
 
-msgid "Could not resolve host name"
-msgstr ""
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -9996,12 +9787,6 @@ msgid "Unable to connect to %s: %s"
 msgstr "د %s سره رابطه نه و شوه: %s"
 
 #, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-
-#, c-format
 msgid " - %s"
 msgstr ""
 
@@ -10245,7 +10030,11 @@ msgid "View _Log"
 msgstr "د یاداشت لیک لیدل"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "ملګری ليکه نه لرې دی"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "ملګری ليکه نه لرې دی"
 
 msgid "_Alias..."
@@ -10761,6 +10550,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "د %s کاروونکی معلومات بدلون"
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -10808,8 +10600,9 @@ msgstr ""
 msgid "Get Away Message"
 msgstr "د ليرېتوب پیغام خیستل"
 
-msgid "Last said"
-msgstr ""
+#, fuzzy
+msgid "Last Said"
+msgstr "اخری نوم"
 
 msgid "Unable to save icon file to disk."
 msgstr ""
@@ -11693,7 +11486,7 @@ msgstr ""
 msgid "Hyperlink visited color"
 msgstr ""
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 
 msgid "Hyperlink prelight color"
@@ -11731,15 +11524,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "د نوی برېشناليک خبرتيا"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "د نوی برېشناليک خبرتيا"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12094,6 +11894,10 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
+#, fuzzy
+msgid "No message"
+msgstr "پیغام"
+
 msgid "Open All Messages"
 msgstr "ټول پیغامونه ښکاره که"
 
@@ -12111,10 +11915,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "تا ته برېښناليک راغلی دي!"
 
-#, fuzzy
-msgid "No message"
-msgstr "پیغام"
-
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -12329,8 +12129,9 @@ msgstr "د سیستم مجمی تمثال ښکاره که:"
 msgid "On unread messages"
 msgstr "په نه وېللي پېغامونه باندې"
 
-msgid "Conversation Window Hiding"
-msgstr ""
+#, fuzzy
+msgid "Conversation Window"
+msgstr "مرکې"
 
 msgid "_Hide new IM conversations:"
 msgstr ""
@@ -12338,6 +12139,10 @@ msgstr ""
 msgid "When away"
 msgstr "چه کله لیرې وی"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "نوی مرکی:"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -12397,10 +12202,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr ""
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "نوی مرکی:"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12435,7 +12236,8 @@ msgstr ""
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">مثال ‫: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr ""
 
 msgid "Public _IP:"
@@ -12805,31 +12607,16 @@ msgstr "و ساته او په کار که"
 msgid "Status for %s"
 msgstr "د %s موقعیت"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "انځور وراچول"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
-msgid "Duplicate Shortcut"
-msgstr ""
+#, fuzzy
+msgid "Custom Smiley"
+msgstr "انځور وراچول"
 
-msgid "Please select an image for the smiley."
+msgid "Duplicate Shortcut"
 msgstr ""
 
 #, fuzzy
@@ -12946,8 +12733,8 @@ msgid "Cannot send launcher"
 msgstr ""
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -13516,7 +13303,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -13766,7 +13553,7 @@ msgstr "مرکې"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14084,7 +13871,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr ""
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14124,6 +13911,153 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
+#~ msgid "Connection failed."
+#~ msgstr "رابطه ناکامه شوه."
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "د خادم سره رابطه نه و شوه:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "په ياداشت کتابچه ته معلومات ورکه"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "ګپ شپ بل نوم"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "د کاروونکی په ياداشت کتابچه کی معلومات نشته."
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "اچټیمل"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "ثبت کولو شی خطا"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "ځای"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "کاروونکی نوم"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "د نوی برېشناليک خبرتيا"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "مرکه یاد ساتل"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "د خادم معلومات"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "د کاروونکی حالتونه"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "کاروونکی حد"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "کاروونکی نوم"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "برېښنالیک پته"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "د پېزندنې څېره"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "نښلول"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "کاروونکی نوم"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "پیغام: %s"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "کارکوونکی ټاکل"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "د کاروونکی حالتونه"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "کاروونکی نوم"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "کاروونکی حد"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "د خادم سره رابطه کول ناکامه شوه."
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "نه وېللي پېغامونه"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr ""
+#~ "د بیوس خادم سره رابطه نه و شوه:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "د بیوس خادم سره رابطه نه و شوه:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "باطل نوم"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "د رابطه خادم"
+
+#~ msgid "Connection lost"
+#~ msgstr "رابطه قطع شوه"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "اوسنی پټ ټکی"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "د خادم سره رابطه نه و شوه:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "یاهو جاپان"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "جاپانی دوسیه بدلولو خادم"
+
 #, fuzzy
 #~ msgid "Activate which ID?"
 #~ msgstr "هویت فعال کول..."
@@ -14151,9 +14085,6 @@ msgstr ""
 #~ msgid "Unable to write file %s."
 #~ msgstr "په دوسیه %s باندی لیک نه و شول."
 
-#~ msgid "Unable to read file %s."
-#~ msgstr "د دوسیه %s ویل نه و شول."
-
 #~ msgid "Chat in %s is not available."
 #~ msgstr "په %s کی ګپ شپ نشی کولی."
 
diff --git a/po/pt.po b/po/pt.po
index c3cbb22114..e54ea8127f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2005-03-14 17:23+0000\n"
 "Last-Translator: Duarte Henriques <duarte.henriques@gmail.com>\n"
 "Language-Team: \n"
@@ -2688,7 +2688,7 @@ msgstr "Inclui os registos de outros clientes de MI no leitor de registo."
 #, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2742,7 +2742,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2991,11 +2991,12 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Impossível ouvir ligações MI\n"
 
 msgid ""
@@ -3052,16 +3053,17 @@ msgstr "%s fechou a conversa."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Impossível enviar mensagem, a conversa não pôde ser iniciada."
 
-msgid "Cannot open socket"
-msgstr "Impossível abrir socket"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Impossível criar socket"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Impossível associar a socket a um porto"
 
-#, fuzzy
-msgid "Could not listen on socket"
-msgstr "Impossível ouvir na socket"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Impossível criar socket"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3111,13 +3113,16 @@ msgstr "Guardar listadecontactos..."
 msgid "Load buddylist from file..."
 msgstr "Importar lista de contactos de um ficheiro..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Preencha os campos de registo."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Senhas não conferem."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Impossível registar nova conta. Ocorreu um erro\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3129,14 +3134,15 @@ msgstr "Registo efectuado com sucesso!"
 msgid "Password"
 msgstr "Senha"
 
-msgid "Password (retype)"
-msgstr "Senha (re-escreva)"
+msgid "Password (again)"
+msgstr "Senha (novamente)"
 
-msgid "Enter current token"
-msgstr "Introduza o token actual"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Token actual"
+#, fuzzy
+msgid "Captcha"
+msgstr "Guardar imagem"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registar Nova Conta Gadu-Gadu"
@@ -3190,6 +3196,15 @@ msgstr "Senha alterada com sucesso!"
 msgid "Current password"
 msgstr "Senha actual"
 
+msgid "Password (retype)"
+msgstr "Senha (re-escreva)"
+
+msgid "Enter current token"
+msgstr "Introduza o token actual"
+
+msgid "Current token"
+msgstr "Token actual"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Por favor introduza a sua senha actual e a sua nova senha para UIN: "
 
@@ -3238,7 +3253,8 @@ msgstr "Não foi encontrado nenhum utilizador"
 msgid "There are no users matching your search criteria."
 msgstr "Não há utilizadores que correspondam aos critérios de procura."
 
-msgid "Unable to read socket"
+#, fuzzy
+msgid "Unable to read from socket"
 msgstr "Impossível ler do socket"
 
 msgid "Buddy list downloaded"
@@ -3253,8 +3269,14 @@ msgstr "Lista de contactos carregada"
 msgid "Your buddy list was stored on the server."
 msgstr "A sua lista de contactos foi guardada no servidor."
 
-msgid "Connection failed."
-msgstr "Ligação falhou."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Ligado"
+
+msgid "Connection failed"
+msgstr "Ligação falhou"
 
 msgid "Add to chat"
 msgstr "Adicionar ao chat"
@@ -3262,18 +3284,23 @@ msgstr "Adicionar ao chat"
 msgid "Chat _name:"
 msgstr "_nome de chat:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Impossível ligar ao servidor."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Ligando"
+
 msgid "Chat error"
 msgstr "Erro de chat"
 
 msgid "This chat name is already in use"
 msgstr "Este nome de chat já está a ser utilizado"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Não está ligado ao servidor."
 
 msgid "Find buddies..."
@@ -3334,7 +3361,7 @@ msgid "File Transfer Failed"
 msgstr "Transferência de Ficheiro Falhou"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "O Pidgin não conseguiu abrir um porto de leitura."
 
 msgid "Error displaying MOTD"
@@ -3350,8 +3377,16 @@ msgstr "Não há nenhum MOTD associado a esta ligação."
 msgid "MOTD for %s"
 msgstr "MOTD de %s"
 
-msgid "Server has disconnected"
-msgstr "O servidor desligou"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "Não está ligado ao servidor."
 
 msgid "View MOTD"
 msgstr "Ver MOTD"
@@ -3366,22 +3401,20 @@ msgstr "_Senha:"
 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
-#. connect to the server
-msgid "Connecting"
-msgstr "Ligando"
-
 msgid "SSL support unavailable"
 msgstr "Suporte SSL não está disponível"
 
-msgid "Couldn't create socket"
-msgstr "Impossível criar socket"
+msgid "Unable to connect"
+msgstr "Incapaz de ligar"
 
-msgid "Couldn't connect to host"
-msgstr "Não foi possível ligar ao host"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Impossível ligar ao servidor"
 
-msgid "Read error"
-msgstr "Erro de leitura"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "%s fechou a conversa."
 
 msgid "Users"
 msgstr "Utilizadores"
@@ -3820,13 +3853,14 @@ msgstr "Comando desactivado"
 msgid "execute"
 msgstr "Inesperado"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "O servidor precisa de TLS/SSL para o login.  Suporte TLS/SSL não foi "
 "encontrado."
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "O servidor precisa de TLS/SSL para o login.  Suporte TLS/SSL não foi "
 "encontrado."
@@ -3847,7 +3881,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Autenticação por Texto Simples"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Autenticação falhada"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "O servidor retornou uma resposta inválida."
 
 msgid "Server does not use any supported authentication method"
@@ -3859,7 +3898,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "Pedido de acesso do servidor inválido"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Erro SASL"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3879,9 +3919,7 @@ msgstr ""
 "Impossível estabelecer ligação com o servidor mDNS local.  Está a correr?"
 
 #, fuzzy, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Impossível estabelecer ligação com o servidor mDNS local.  Está a correr?"
 
@@ -3889,12 +3927,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "Impossível criar ligação"
 
-msgid "Unable to create socket"
-msgstr "Impossível criar socket"
-
-msgid "Write error"
-msgstr "Erro ao enviar"
-
 msgid "Full Name"
 msgstr "Nome completo"
 
@@ -3967,188 +3999,6 @@ msgstr ""
 msgid "Local Time"
 msgstr "Ficheiro Local:"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "Definir informações de directório"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "Endereço (Complemento)"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "Renomear Chat"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Utilizador não tem informação de directório."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "Comando"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "Erro ao registar"
-
-#, fuzzy
-msgid "User Location"
-msgstr "Localização"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "Pesquisa de Utilizadores"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "Notificação do Estado do Contacto"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "Versão Não Suportada"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "Orientação"
-
-msgid "File Transfer"
-msgstr "Transferência de Ficheiro"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "Modos de Utilizador"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "Limite de Utilizadores"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "Recursos"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "Nome do utilizador"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "MI com Troca de Chave"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "Endereço de email"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "Perfil MSN"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "Ping"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "Nome de Utilizador"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "Vídeo ao Vivo"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "Mensagem recebida"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "Babbleprint da Chave Pública"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "Opções de utilizador"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "Modos de Utilizador"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "Nome de Utilizador"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "Limite de Utilizadores"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Criptografia do Trillian"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Recursos"
-
 msgid "Priority"
 msgstr "Prioridade"
 
@@ -4160,7 +4010,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Já Está Ligado"
 
 msgid "Middle Name"
@@ -4348,16 +4198,12 @@ msgid "Roles:"
 msgstr "Função"
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "Texto simples"
 
-msgid "Read Error"
-msgstr "Erro de Leitura"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 #, fuzzy
@@ -4549,9 +4395,6 @@ msgstr "A sua senha foi alterada."
 msgid "Error changing password"
 msgstr "Erro ao mudar senha"
 
-msgid "Password (again)"
-msgstr "Senha (novamente)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "Alterar senha"
@@ -4954,6 +4797,14 @@ msgstr "Erro de Leitura XML"
 msgid "Unknown Error in presence"
 msgstr "Erro desconhecido na presença"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Erro ao entrar no chat %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Erro no chat %s"
+
 msgid "Create New Room"
 msgstr "Criar Nova Sala"
 
@@ -4970,16 +4821,20 @@ msgstr "_Configurar Sala"
 msgid "_Accept Defaults"
 msgstr "_Aceitar Padrões"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Erro ao entrar no chat %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Nenhum motivo foi dado."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Erro no chat %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Foi expulso por %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Kickado por %s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Ocorreu um erro ao abrir o ficheiro."
 
 #, fuzzy
@@ -5496,9 +5351,6 @@ msgstr ""
 "É necessário suporte SSL para o MSN. Por favor instale uma biblioteca de "
 "SSL. Veja http://Pidgin.sf.net/faq-ssl.php para mais informações."
 
-msgid "Failed to connect to server."
-msgstr "Impossível ligar ao servidor."
-
 msgid "Error retrieving profile"
 msgstr "Erro ao buscar o perfil"
 
@@ -5784,9 +5636,6 @@ msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 "A mensagem pode não ter sido enviada porque ocorreu um erro desconhecido:"
 
-msgid "Unable to connect"
-msgstr "Incapaz de ligar"
-
 msgid "Writing error"
 msgstr "Erro de escrita"
 
@@ -5801,13 +5650,16 @@ msgstr ""
 "Erro de ligação do servidor %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "O nosso protocolo não é suportado pelo servidor."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Erro ao processar HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Ligou-se de outro local."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5815,7 +5667,8 @@ msgstr ""
 "Os servidores MSN estão temporariamente indisponíveis. Por favor espere e "
 "tente novamente."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Os servidores MSN vão desligar-se temporariamente."
 
 #, c-format
@@ -5828,9 +5681,6 @@ 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"
 
@@ -5934,6 +5784,9 @@ msgstr "Plugin do Protocolo AIM/ICQ"
 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)"
@@ -6049,12 +5902,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "O servidor retornou uma resposta inválida."
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Ligado"
-
 #, fuzzy, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "O processo retornou o código de erro %d"
@@ -6078,18 +5925,6 @@ msgid "Invalid input condition"
 msgstr "Terminando ligação"
 
 #, fuzzy
-msgid "Read buffer full (2)"
-msgstr "Fila cheia"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "Impossível processar mensagem"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Não foi possível ligar ao host"
-
-#, fuzzy
 msgid "Failed to add buddy"
 msgstr "Impossível entrar na conversa do contacto"
 
@@ -6185,6 +6020,12 @@ msgstr ""
 msgid "Client Version"
 msgstr "Fechar conversa"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 #, fuzzy
 msgid "MySpaceIM - Username Available"
 msgstr "Serviço Indisponível"
@@ -6454,9 +6295,9 @@ msgstr "O utilizador está desligado ou bloqueou-o"
 msgid "Unknown error: 0x%X"
 msgstr "Erro desconhecido: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Login falhou (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Incapaz de banir utilizador %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6560,9 +6401,6 @@ msgstr "Conferência GroupWise %d"
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-msgid "Unable to connect to server."
-msgstr "Impossível ligar ao servidor."
-
 msgid "Waiting for response..."
 msgstr "Esperando resposta..."
 
@@ -6586,9 +6424,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Gostaria de se juntar à conversa?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Foi desligado porque se ligou a partir de outra estação de trabalho."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6596,16 +6431,14 @@ msgstr ""
 "Parece que %s está desligado e não recebeu a mensagem que acabou de lhe "
 "enviar."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Impossível ligar ao servidor. Por favor introduza a morada do servidor a que "
 "se deseja ligar."
 
-msgid "Error. SSL support is not installed."
-msgstr "Erro. Suporte SSL não está instalado."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Esta conferência foi fechada. Não podem ser enviadas mais mensagens."
 
@@ -6644,10 +6477,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, fuzzy
@@ -6659,17 +6489,7 @@ msgid "Invalid chat room name"
 msgstr "Nome de Sala Inválido"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "%s fechou a conversa."
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "Não está ligado ao servidor."
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "Impossível criar ligação SSL ao servidor."
 
 #. *< type
@@ -6722,7 +6542,7 @@ msgid "Received invalid data on connection with remote user."
 msgstr ""
 
 #, fuzzy
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr ""
 "Impossível estabelecer ligação com o servidor mDNS local.  Está a correr?"
 
@@ -6920,15 +6740,11 @@ msgid "Buddy Comment"
 msgstr "Comentário de Contacto"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "Não foi possível ligar para transferência."
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
 msgstr "Impossível ligar ao servidor."
 
 #, fuzzy
@@ -6944,9 +6760,9 @@ msgstr "Terminando ligação"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Incapaz de ligar: Não foi possível ligar-se como %s porque o nome de "
 "utilizador é inválido.  Nomes de utilizador têem que começar com uma letra e "
@@ -6962,30 +6778,23 @@ msgstr ""
 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
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "Nome inválido"
+msgid "Username does not exist"
+msgstr "Utilizador não existe"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "A sua conta está suspensa neste momento."
 
 #. service temporarily unavailable
@@ -7006,7 +6815,8 @@ 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 "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "A chave SecurID inserida é inválida."
 
 msgid "Enter SecurID"
@@ -7179,6 +6989,9 @@ msgstr "Desligado Desde"
 msgid "Member Since"
 msgstr "Membro Desde"
 
+msgid "Capabilities"
+msgstr "Recursos"
+
 #, fuzzy
 msgid "Profile"
 msgstr "Perfil MSN"
@@ -7362,7 +7175,7 @@ msgstr "Mensagem de ausência muito extensa."
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7390,9 +7203,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Órfãos"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Não foi possível adicionar o contacto %s porque tem muitos contactos na sua "
@@ -7402,7 +7215,7 @@ msgid "(no name)"
 msgstr "(sem nome)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "O seu comando falhou por um motivo desconhecido."
 
 #, fuzzy, c-format
@@ -8283,7 +8096,7 @@ msgid "Update interval (seconds)"
 msgstr "Erro de leitura"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Incapaz de obter informação do servidor"
 
 #, c-format
@@ -8310,10 +8123,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Incapaz de obter informação do servidor"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "Diálogo De Pedido"
 
@@ -8349,25 +8158,11 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "Impossível ligar."
-
 #, fuzzy
 msgid "Socket error"
 msgstr "Erro de Token"
 
 #, fuzzy
-msgid "Unable to read from socket"
-msgstr "Impossível ler do socket"
-
-msgid "Write Error"
-msgstr "Erro de Escrita"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "Ligação fechada"
-
-#, fuzzy
 msgid "Getting server"
 msgstr "Definir Informações de Utilizador..."
 
@@ -8375,8 +8170,9 @@ msgstr "Definir Informações de Utilizador..."
 msgid "Requesting token"
 msgstr "Requisição negada"
 
-msgid "Couldn't resolve host"
-msgstr "Impossível resolver o host"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Impossível ligar ao servidor."
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8427,7 +8223,7 @@ msgid "QQ Qun Command"
 msgstr "Comando"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Incapaz de obter informação do servidor"
 
 #, fuzzy
@@ -8450,9 +8246,6 @@ msgstr "Falha Ao Enviar Ficheiro"
 msgid "%d canceled the transfer of %s"
 msgstr "%s cancelou a transferência de %s"
 
-msgid "Connection closed (writing)"
-msgstr "Ligação fechada (escrevendo)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Título de Grupo:</b> %s<br>"
@@ -8506,17 +8299,6 @@ msgstr "Um administrador Sametime publicou o seguinte anúncio no servidor %s"
 msgid "Sametime Administrator Announcement"
 msgstr "Anúncio de Administrador do Sametime"
 
-msgid "Connection reset"
-msgstr "Ligação fechada"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Erro ao ler do socket: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Impossível ligar ao servidor"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Anúncio de %s"
@@ -8539,6 +8321,9 @@ msgstr "Altifalantes"
 msgid "Video Camera"
 msgstr "Camâra de Vídeo"
 
+msgid "File Transfer"
+msgstr "Transferência de Ficheiro"
+
 #, fuzzy
 msgid "Supports"
 msgstr "suporte"
@@ -9368,6 +9153,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Estatísticas da Rede"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping falhou"
 
@@ -9433,7 +9221,8 @@ msgstr "Tipo de chave pública não suportado"
 msgid "Disconnected by server"
 msgstr "Desligado pelo servidor"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Erro durante a ligação ao servidor SILC"
 
 msgid "Key Exchange failed"
@@ -9445,27 +9234,26 @@ msgstr ""
 "O resumo da sessão desligada falhou. Carregue em Re-ligar para criar uma "
 "nova ligação."
 
-msgid "Connection failed"
-msgstr "Ligação falhou"
-
 msgid "Performing key exchange"
 msgstr "Efectuando a troca de chaves"
 
-msgid "Unable to create connection"
-msgstr "Impossível criar ligação"
-
 #, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "Não foi possível carregar par de chaves SILC: %s"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Ligando ao Servidor SILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Não foi possível carregar par de chaves SILC: %s"
+
 msgid "Out of memory"
 msgstr "Sem memória"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Não é possível inicializar protocolo SILC"
 
 #, fuzzy
@@ -9768,7 +9556,7 @@ msgid "Creating SILC key pair..."
 msgstr "Criando o par de chaves SILC..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "Criando o par de chaves SILC..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9863,6 +9651,9 @@ msgstr "Quadro"
 msgid "No server statistics available"
 msgstr "Não há estatísticas de servidor disponíveis"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Erro durante a ligação ao servidor SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Falha: Versão difere, actualize o seu cliente"
@@ -9903,33 +9694,28 @@ msgstr "Falha: Cookie inválido"
 msgid "Failure: Authentication failed"
 msgstr "Falha: Autenticação falhada"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Incapaz de iniciar ligaçao de cliente SILC"
 
 #, fuzzy
 msgid "John Noname"
 msgstr "Sem nome"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Não foi possível carregar par de chaves SILC: %s"
 
-msgid "Could not write"
-msgstr "Não foi possível escrever"
-
-msgid "Could not connect"
-msgstr "Não foi possível ligar"
+msgid "Unable to create connection"
+msgstr "Impossível criar ligação"
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "Erro desconhecido do servidor."
 
-msgid "Could not create listen socket"
-msgstr "Impossível criar socket de escuta"
-
 #, fuzzy
-msgid "Could not resolve hostname"
-msgstr "Impossível resolver o host"
+msgid "Unable to create listen socket"
+msgstr "Impossível criar socket"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -9972,6 +9758,81 @@ msgstr "Utilizador Auth"
 msgid "Auth Domain"
 msgstr "Domínio Auth"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;sala&gt;:  Entrar numa sala de chat da rede Yahoo."
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Listar salas na rede Yahoo"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Pedir ao utilizador para começar uma sessão Doodle"
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "ID do Yahoo!"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Plugin do protocolo Yahoo"
+
+#, fuzzy
+msgid "Pager server"
+msgstr "Servidor proxy"
+
+msgid "Pager port"
+msgstr "Porto do pager"
+
+#, fuzzy
+msgid "File transfer server"
+msgstr "Servidor de transferências de ficheiros"
+
+msgid "File transfer port"
+msgstr "Porto de transferências de ficheiros"
+
+msgid "Chat room locale"
+msgstr "Língua da sala de chat"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignorar convites para conferências e salas de chat"
+
+msgid "Chat room list URL"
+msgstr "URL da lista de salas de chat"
+
+msgid "Yahoo Chat server"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo Chat port"
+msgstr "Yahoo Japão"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "ID do Yahoo!"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Plugin do protocolo Yahoo"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -10003,30 +9864,20 @@ msgstr "Adicionar Contacto rejeitado"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 "Erro desconhecido número %d. Ligar-se ao website da Yahoo! pode corrigir "
 "isto."
@@ -10069,12 +9920,13 @@ msgstr ""
 "Erro desconhecido número %d. Ligar-se ao website da Yahoo! pode corrigir "
 "isto."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Impossível adicionar contacto %s ao grupo %s à lista do servidor da conta %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Impossível adicionar contacto à lista do servidor"
 
 #, c-format
@@ -10082,23 +9934,17 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audível %s/%s/%s.swf ] %s"
 
 #, fuzzy
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "O servidor retornou uma resposta inválida."
 
-msgid "Connection problem"
-msgstr "Problema na ligação"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "Conversações com %s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
+"Impossível estabelecer ligação com o servidor mDNS local.  Está a correr?"
 
 msgid "Not at Home"
 msgstr "Fora de Casa"
@@ -10161,79 +10007,15 @@ msgstr "Juntar-se a um Utilizador num Chat..."
 msgid "Open Inbox"
 msgstr "Abrir Caixa de Entrada do Hotmail"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;sala&gt;:  Entrar numa sala de chat da rede Yahoo."
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Listar salas na rede Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Pedir ao utilizador para começar uma sessão Doodle"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "ID do Yahoo!"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Plugin do protocolo Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japão"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "Servidor proxy"
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "Host do Pager Japão"
-
-msgid "Pager port"
-msgstr "Porto do pager"
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "Servidor de transferências de ficheiros"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "Servidor de transferências de ficheiros do Japão"
-
-msgid "File transfer port"
-msgstr "Porto de transferências de ficheiros"
-
-msgid "Chat room locale"
-msgstr "Língua da sala de chat"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignorar convites para conferências e salas de chat"
-
-msgid "Chat room list URL"
-msgstr "URL da lista de salas de chat"
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "Yahoo Japão"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Pedido de Doodle enviado."
 
+msgid "Unable to connect."
+msgstr "Impossível ligar."
+
 msgid "Unable to establish file descriptor."
 msgstr "Impossível estabelecer descritor de ficheiro."
 
@@ -10241,6 +10023,9 @@ msgstr "Impossível estabelecer descritor de ficheiro."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s quer enviar-lhe o ficheiro %s"
 
+msgid "Write Error"
+msgstr "Erro de Escrita"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Perfil Yahoo! Japão"
 
@@ -10360,21 +10145,19 @@ msgstr "Vozes"
 msgid "Webcams"
 msgstr "Webcams"
 
+msgid "Connection problem"
+msgstr "Problema na ligação"
+
 msgid "Unable to fetch room list."
 msgstr "Incapaz de obter a lista de salas."
 
 msgid "User Rooms"
 msgstr "Salas do Utilizador"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Problema na ligação com o servidor YCHT."
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "Não está ligado ao servidor."
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10507,13 +10290,7 @@ msgid "Exposure"
 msgstr "Exposição"
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "Impossível criar socket"
-
-#, fuzzy, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Impossível definir papel \"%s\" para o utilizador: %s"
 
 #, fuzzy, c-format
@@ -10521,17 +10298,13 @@ msgid "HTTP proxy connection error %d"
 msgstr "Erro de ligação de proxy %d"
 
 #, fuzzy, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Acesso negado: servidor proxy proíbe túneis no porto %d."
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr "Erro ao executar %s"
 
-#, fuzzy
-msgid "Could not resolve host name"
-msgstr "Impossível resolver o host"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10744,14 +10517,6 @@ msgstr ""
 msgid "Unable to connect to %s: %s"
 msgstr "Impossível ligar ao servidor"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"O servidor precisa de TLS/SSL para o login.  Suporte TLS/SSL não foi "
-"encontrado."
-
 #, c-format
 msgid " - %s"
 msgstr ""
@@ -11002,7 +10767,11 @@ msgid "View _Log"
 msgstr "Ver _Registo"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "Não permitido enquanto desligado"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "Não permitido enquanto desligado"
 
 msgid "_Alias..."
@@ -11540,6 +11309,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Mudar informações do utilizador %s"
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11587,7 +11359,8 @@ msgstr "Ignorar"
 msgid "Get Away Message"
 msgstr "Obter Mensagem de Ausência"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Dito por último"
 
 msgid "Unable to save icon file to disk."
@@ -12524,7 +12297,7 @@ msgid "Hyperlink visited color"
 msgstr "Cor do elo"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Cor para desenhar elos quando o rato está sobre eles."
 
 msgid "Hyperlink prelight color"
@@ -12562,15 +12335,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "Remoção de notificação"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "Novas notificações de email"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12988,6 +12768,10 @@ msgstr ""
 "Foi escolhido o comando 'Manual' do navegador, mas nenhum comando foi "
 "definido."
 
+#, fuzzy
+msgid "No message"
+msgstr "Mensagem desconhecida"
+
 msgid "Open All Messages"
 msgstr "Abrir Todas as Mensagens"
 
@@ -13005,10 +12789,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Tem Correio!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Mensagem desconhecida"
-
 msgid "The following plugins will be unloaded."
 msgstr "Os pluins seguintes serão descarregados."
 
@@ -13233,7 +13013,7 @@ msgid "On unread messages"
 msgstr "Mensagens Por Ler"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "Janelas de Conversa MI"
 
 #, fuzzy
@@ -13243,6 +13023,10 @@ msgstr "_Esconder novas conversas IM"
 msgid "When away"
 msgstr "Quando ausente"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "Mostr_ar janela de conversa"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -13303,10 +13087,6 @@ msgstr "Usar smooth-scrolling"
 msgid "F_lash window when IMs are received"
 msgstr "_Piscar a janela quando forem recebidas mensagens"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "Mostr_ar janela de conversa"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -13346,7 +13126,8 @@ msgstr "Incapaz de obter informação do utilizador"
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "Detectar IP _Automaticamente"
 
 msgid "Public _IP:"
@@ -13732,34 +13513,18 @@ msgstr "Guar_dar e Usar"
 msgid "Status for %s"
 msgstr "Estado para %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "Inserir smiley"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
 #, fuzzy
-msgid "Duplicate Shortcut"
-msgstr "Correcção Duplicada"
+msgid "Custom Smiley"
+msgstr "Inserir smiley"
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Usar um estado _diferente para algumas contas"
+msgid "Duplicate Shortcut"
+msgstr "Correcção Duplicada"
 
 #, fuzzy
 msgid "Edit Smiley"
@@ -13882,9 +13647,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Impossível enviar iniciador"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Arrastou um iniciador. Provavelmente queria enviar o que quer que este "
 "iniciador aponta em vez do próprio iniciador."
@@ -14511,9 +14277,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Plugin Music Messaging para composição colaborativa."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "O Plugin Music Messaging permite que vários utilizadores trabalhem "
 "simultaneamente numa peça de música editando uma partitura comum em tempo "
@@ -14786,7 +14553,7 @@ msgstr "Janelas de Conversa MI"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -15125,7 +14892,7 @@ msgstr "Opções específicas do Pidgin para Windows."
 
 #, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Fornece opções específicas ao Windows Pidgin ,tais como docking da lista de "
 "contactos e flashing das conversas."
@@ -15169,6 +14936,288 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Impossível abrir socket"
+
+#, fuzzy
+#~ msgid "Could not listen on socket"
+#~ msgstr "Impossível ouvir na socket"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Impossível ler do socket"
+
+#~ msgid "Connection failed."
+#~ msgstr "Ligação falhou."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "O servidor desligou"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Impossível criar socket"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Não foi possível ligar ao host"
+
+#~ msgid "Read error"
+#~ msgstr "Erro de leitura"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Impossível estabelecer ligação com o servidor mDNS local.  Está a correr?"
+
+#~ msgid "Write error"
+#~ msgstr "Erro ao enviar"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "Definir informações de directório"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Endereço (Complemento)"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "Renomear Chat"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Utilizador não tem informação de directório."
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Comando"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "Erro ao registar"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "Localização"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "Pesquisa de Utilizadores"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "Notificação do Estado do Contacto"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "Versão Não Suportada"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "Orientação"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "Modos de Utilizador"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "Limite de Utilizadores"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "Recursos"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "Nome do utilizador"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "MI com Troca de Chave"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "Endereço de email"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "Perfil MSN"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "Ping"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "Nome de Utilizador"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "Vídeo ao Vivo"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "Mensagem recebida"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "Babbleprint da Chave Pública"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "Opções de utilizador"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "Modos de Utilizador"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "Nome de Utilizador"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "Limite de Utilizadores"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Criptografia do Trillian"
+
+#~ msgid "Read Error"
+#~ msgstr "Erro de Leitura"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Impossível ligar ao servidor."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Fila cheia"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "Impossível processar mensagem"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Não foi possível ligar ao host"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Login falhou (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Impossível ligar ao servidor."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Foi desligado porque se ligou a partir de outra estação de trabalho."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Erro. Suporte SSL não está instalado."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Senha incorrecta."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "Impossível ligar ao servidor."
+
+#, fuzzy
+#~ 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."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Não foi possível ligar"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "Nome inválido"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Incapaz de obter informação do servidor"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "Ligação fechada"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Impossível resolver o host"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Ligação fechada (escrevendo)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Ligação fechada"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Erro ao ler do socket: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Impossível ligar ao servidor"
+
+#~ msgid "Could not write"
+#~ msgstr "Não foi possível escrever"
+
+#~ msgid "Could not connect"
+#~ msgstr "Não foi possível ligar"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Impossível criar socket de escuta"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Impossível resolver o host"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Senha incorrecta."
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japão"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "Host do Pager Japão"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "Servidor de transferências de ficheiros do Japão"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "Não está ligado ao servidor."
+
+#, fuzzy
+#~ msgid "Could not resolve host name"
+#~ msgstr "Impossível resolver o host"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "O servidor precisa de TLS/SSL para o login.  Suporte TLS/SSL não foi "
+#~ "encontrado."
+
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Janelas de Conversa MI"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Usar um estado _diferente para algumas contas"
+
 #, fuzzy
 #~ msgid "Activate which ID?"
 #~ msgstr "Activar qual ID?"
@@ -15797,10 +15846,6 @@ msgstr ""
 #~ msgstr "Token actual"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Impossível ligar ao servidor."
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_Mensagem:"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4ff29b2118..45cfa516be 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2009-02-24 22:11-0300\n"
 "Last-Translator: Rodrigo Luiz Marques Flores <mail@rodrigoflores.org>\n"
 "Language-Team: Rodrigo Luiz Marques Flores <mail@rodrigoflores.org>\n"
@@ -2599,9 +2599,10 @@ msgstr ""
 "históricos."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2656,8 +2657,9 @@ msgstr "Emulação de mensagens desconectadas"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Salva mensagens enviadas para um usuário desconectado numa ação."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "O resto das mensagens será salvo como ações. Você pode alterar/remover as "
@@ -2910,14 +2912,16 @@ msgstr ""
 "Não foi possível detectar uma instalação do ActiveTCL. Se você deseja usar "
 "plug-ins TCL, instale o ActiveTCL de http://www.activestate.com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "O Kit de Ferramentas do Apple Bonjour para Windows não foi encontrado, veja "
 "o FAQ no: http://d.pidgin.im/BonjourWindows para mais informações."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Não foi possível escutar por conexões de mensagens instantâneas\n"
 
 msgid ""
@@ -2971,14 +2975,21 @@ msgstr "%s fechou a conversa."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Não foi possível enviar mensagem: a conversa não pôde ser iniciada."
 
-msgid "Cannot open socket"
-msgstr "Não foi possível abrir socket"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Não foi possível criar socket\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Não foi possível vincular socket à porta"
 
-msgid "Could not listen on socket"
-msgstr "Não foi possível escutar no socket"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Não foi possível criar socket\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Erro comunicando com o mDNSResponder local."
@@ -3027,13 +3038,16 @@ msgstr "Salvar lista de amigos..."
 msgid "Load buddylist from file..."
 msgstr "Carregar lista de amigos do arquivo.."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Preencha os campos de registro."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "As senhas não conferem."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Não foi possível registrar uma nova conta. Ocorreu um erro.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3045,14 +3059,15 @@ msgstr "O registro foi concluído com sucesso!"
 msgid "Password"
 msgstr "Senha"
 
-msgid "Password (retype)"
-msgstr "Senha (redigitar)"
+msgid "Password (again)"
+msgstr "Senha (novamente)"
 
-msgid "Enter current token"
-msgstr "Digite o token atual"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Token atual"
+#, fuzzy
+msgid "Captcha"
+msgstr "Imagem do captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrar nova conta do Gadu-Gadu"
@@ -3105,6 +3120,15 @@ msgstr "Senha alterada com sucesso!"
 msgid "Current password"
 msgstr "Senha atual"
 
+msgid "Password (retype)"
+msgstr "Senha (redigitar)"
+
+msgid "Enter current token"
+msgstr "Digite o token atual"
+
+msgid "Current token"
+msgstr "Token atual"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Favor digitar sua senha atual e sua nova senha do UIN: "
 
@@ -3152,7 +3176,7 @@ msgstr "Nenhum usuário compatível encontrado"
 msgid "There are no users matching your search criteria."
 msgstr "Não existem usuários que satisfaçam seu critério de busca"
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "Não foi possível ler do socket"
 
 msgid "Buddy list downloaded"
@@ -3167,8 +3191,14 @@ msgstr "Lista de amigos enviada"
 msgid "Your buddy list was stored on the server."
 msgstr "Sua lista de amigos foi guardada no servidor."
 
-msgid "Connection failed."
-msgstr "Falha na conexão."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Conectado"
+
+msgid "Connection failed"
+msgstr "Falha na conexão"
 
 msgid "Add to chat"
 msgstr "Adicionar ao bate-papo"
@@ -3176,18 +3206,23 @@ msgstr "Adicionar ao bate-papo"
 msgid "Chat _name:"
 msgstr "_Nome do bate-papo:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Não foi possível conectar ao servidor."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Conectando"
+
 msgid "Chat error"
 msgstr "Erro no bate-papo"
 
 msgid "This chat name is already in use"
 msgstr "Este nome de bate-papo já está sendo utilizado"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Não conectado ao servidor."
 
 msgid "Find buddies..."
@@ -3247,7 +3282,8 @@ msgstr "Nenhum tópico foi definido"
 msgid "File Transfer Failed"
 msgstr "Transferência de arquivo falhou"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Não foi possível abrir uma porta para escuta."
 
 msgid "Error displaying MOTD"
@@ -3263,8 +3299,18 @@ msgstr "Não há mensagem do dia (MOTD) associada com esta conexão."
 msgid "MOTD for %s"
 msgstr "Mensagem do dia (MOTD) para %s"
 
-msgid "Server has disconnected"
-msgstr "O servidor desconectou"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"A conexão com o servidor foi perdida: \n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Ver mensagem do dia (MOTD)"
@@ -3279,22 +3325,20 @@ msgstr "_Senha:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "Apelidos do IRC não podem conter espaços"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Conectando"
-
 msgid "SSL support unavailable"
 msgstr "Suporte a SSL indisponível"
 
-msgid "Couldn't create socket"
-msgstr "Não foi possível criar socket"
+msgid "Unable to connect"
+msgstr "Não foi possível conectar"
 
-msgid "Couldn't connect to host"
-msgstr "Não foi possível conectar ao host"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Não foi possível conectar a %s"
 
-msgid "Read error"
-msgstr "Erro de leitura"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "O servidor encerrou a conexão."
 
 msgid "Users"
 msgstr "Usuários"
@@ -3725,12 +3769,14 @@ msgstr "Comando ad-hoc falhou"
 msgid "execute"
 msgstr "execute"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "O servidor requer TLS/SSL para conexão. Nenhum suporte a TLS/SSL foi "
 "encontrado."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Você requer TLS/SSL, mas nenhum suporte a TLS/SSL foi encontrado. "
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3748,7 +3794,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Autenticação via texto puro"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Autenticação mal sucedida"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "O servidor retornou uma resposta inválida."
 
 msgid "Server does not use any supported authentication method"
@@ -3760,7 +3811,8 @@ 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"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Erro de SASL"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3780,10 +3832,8 @@ msgstr ""
 "Não foi possível estabelecer conexão com o servidor:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Não foi possível estabelecer conexão com o servidor:\n"
 "%s"
@@ -3792,12 +3842,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "Não foi possível inicializar conexão"
 
-msgid "Unable to create socket"
-msgstr "Não foi possível criar socket"
-
-msgid "Write error"
-msgstr "Erro ao enviar"
-
 msgid "Full Name"
 msgstr "Nome completo"
 
@@ -3868,159 +3912,6 @@ msgstr "Sistema operacional"
 msgid "Local Time"
 msgstr "Arquivo local:"
 
-msgid "Last Activity"
-msgstr "Última atividade"
-
-msgid "Service Discovery Info"
-msgstr "Informações da localização de serviços"
-
-msgid "Service Discovery Items"
-msgstr "Itens da localização de serviços"
-
-msgid "Extended Stanza Addressing"
-msgstr "Endereçamento de Stanza estendido"
-
-msgid "Multi-User Chat"
-msgstr "Bate-papo multiusuário"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Informações estendidas de presença em bate-papos multiusuário"
-
-msgid "In-Band Bytestreams"
-msgstr "Bytestreams In-Band"
-
-msgid "Ad-Hoc Commands"
-msgstr "Comandos ad-hoc"
-
-msgid "PubSub Service"
-msgstr "Serviço PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "Bytestreams via SOCKS5"
-
-msgid "Out of Band Data"
-msgstr "Suporte a dados 'out of band'"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "Registro 'In-Band'"
-
-msgid "User Location"
-msgstr "Localização do usuário"
-
-msgid "User Avatar"
-msgstr "Imagem de exibição do usuário"
-
-msgid "Chat State Notifications"
-msgstr "Notificações do status do bate-papo"
-
-msgid "Software Version"
-msgstr "Versão do software"
-
-msgid "Stream Initiation"
-msgstr "Inicialização de fluxoOrientação"
-
-msgid "File Transfer"
-msgstr "Transferência de arquivo"
-
-msgid "User Mood"
-msgstr "Humor do usuário"
-
-msgid "User Activity"
-msgstr "Atividade do usuário"
-
-msgid "Entity Capabilities"
-msgstr "Recursos do usuário"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Negociação de sessão criptografada"
-
-msgid "User Tune"
-msgstr "Música do usuário"
-
-msgid "Roster Item Exchange"
-msgstr "Troca de itens da lista de amigos"
-
-msgid "Reachability Address"
-msgstr "Endereço de contato"
-
-msgid "User Profile"
-msgstr "Perfil do usuário"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Áudio do Jingle"
-
-msgid "User Nickname"
-msgstr "Apelido do usuário"
-
-msgid "Jingle ICE UDP"
-msgstr "ECI UDP do Jingle"
-
-msgid "Jingle ICE TCP"
-msgstr "ECI TCP do Jingle"
-
-msgid "Jingle Raw UDP"
-msgstr "UDP puro do Jingle"
-
-msgid "Jingle Video"
-msgstr "Vídeo do Jingle"
-
-msgid "Jingle DTMF"
-msgstr "Discagem a tom do Jingle"
-
-msgid "Message Receipts"
-msgstr "Recibos de mensagem"
-
-msgid "Public Key Publishing"
-msgstr "Publicação de chave pública"
-
-msgid "User Chatting"
-msgstr "Notificação de bate-papos"
-
-msgid "User Browsing"
-msgstr "Notificação de onde está navegando"
-
-msgid "User Gaming"
-msgstr "Notificação do que está jogando"
-
-msgid "User Viewing"
-msgstr "Notificação do que está assistindo"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Criptografia de Stanza"
-
-msgid "Entity Time"
-msgstr "Informações de horário"
-
-msgid "Delayed Delivery"
-msgstr "Entrega atrasada"
-
-msgid "Collaborative Data Objects"
-msgstr "Objetos de dados colaborativos"
-
-msgid "File Repository and Sharing"
-msgstr "Compartilhamento e repositório de arquivos"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "Serviço de descoberta STUN para o Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Negociação de sessão criptografada simplificada"
-
-msgid "Hop Check"
-msgstr "Verificação de saltos"
-
-msgid "Capabilities"
-msgstr "Recursos"
-
 msgid "Priority"
 msgstr "Prioridade"
 
@@ -4032,7 +3923,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Conectado"
 
 msgid "Middle Name"
@@ -4215,16 +4106,13 @@ msgstr "Nenhum usuário compatível encontrado"
 msgid "Roles:"
 msgstr "Função"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Tempo limite de ping excedido"
 
-msgid "Read Error"
-msgstr "Erro de leitura"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4402,9 +4290,6 @@ msgstr "Sua senha foi alterada."
 msgid "Error changing password"
 msgstr "Erro ao mudar a senha"
 
-msgid "Password (again)"
-msgstr "Senha (novamente)"
-
 msgid "Change XMPP Password"
 msgstr "Alterar senha do XMPP"
 
@@ -4798,6 +4683,14 @@ msgstr "Erro ao processar XML"
 msgid "Unknown Error in presence"
 msgstr "Erro desconhecido na presença"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Erro ao entrar no bate-papo %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Erro no bate-papo %s"
+
 msgid "Create New Room"
 msgstr "Criar nova sala"
 
@@ -4814,16 +4707,20 @@ msgstr "_Configurar sala"
 msgid "_Accept Defaults"
 msgstr "_Aceitar padrões"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Erro ao entrar no bate-papo %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Nenhum motivo foi dado."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Erro no bate-papo %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Você foi expulso por %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Chutado por %s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Ocorreu um erro na abertura do arquivo."
 
 #, fuzzy
@@ -5322,9 +5219,6 @@ msgstr ""
 "O suporte ao SSL é necessário para o MSN. Por favor instale uma biblioteca "
 "SSL suportada."
 
-msgid "Failed to connect to server."
-msgstr "Não foi possível conectar ao servidor."
-
 msgid "Error retrieving profile"
 msgstr "Erro ao obter perfil"
 
@@ -5581,9 +5475,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr "A mensagem pode não ter sido enviada devido a um erro desconhecido:"
 
-msgid "Unable to connect"
-msgstr "Não foi possível conectar"
-
 msgid "Writing error"
 msgstr "Erro de escrita"
 
@@ -5598,13 +5489,16 @@ msgstr ""
 "Erro de conexão do servidor %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Nosso protocolo não é suportado pelo servidor."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Erro ao processar HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Você conectou de outro local."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5612,7 +5506,8 @@ msgstr ""
 "Os servidores do MSN estão temporariamente indisponíveis. Favor esperar e "
 "tentar novamente."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Os servidores MSN vão sair do ar temporariamente."
 
 #, c-format
@@ -5625,9 +5520,6 @@ 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"
 
@@ -5729,6 +5621,9 @@ msgstr "Plug-in do protocolo MSN"
 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)"
@@ -5840,12 +5735,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Adicionar contatos do servidor"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Conectado"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Erro de protocolo, código %d: %s"
@@ -5869,16 +5758,6 @@ msgstr "Erro do MySpace"
 msgid "Invalid input condition"
 msgstr "Condição de entrada inválida"
 
-msgid "Read buffer full (2)"
-msgstr "Buffer de leitura cheio (2)"
-
-msgid "Unparseable message"
-msgstr "Mensagem impossível de ser processada"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Não foi possível conectar ao host: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Falha ao adicionar amigo"
 
@@ -5964,6 +5843,15 @@ msgstr "Total de amigos"
 msgid "Client Version"
 msgstr "Versão do cliente"
 
+#, fuzzy
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"Favor visitar http://e<ditprofile.myspace.com/index.cfm?fuseaction=profile."
+"username e escolher um nome de usuário e tentar conectar novamente."
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Nome de Usuário Disponível"
 
@@ -6221,9 +6109,9 @@ msgstr "O usuário está desconectado ou você está bloqueado"
 msgid "Unknown error: 0x%X"
 msgstr "Erro desconhecido: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "A conexão falhou (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Não foi possível fazer o login"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6330,9 +6218,6 @@ msgstr "Conferência GroupWise %d"
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-msgid "Unable to connect to server."
-msgstr "Não foi possível conectar ao servidor."
-
 msgid "Waiting for response..."
 msgstr "Esperando resposta..."
 
@@ -6356,9 +6241,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Você deseja entrar na conversa?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Você foi desconectado porque conectou em outra estação de trabalho."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6366,16 +6248,14 @@ msgstr ""
 "%s parece estar desconectado e não recebeu a mensagem que você acabou de "
 "enviar."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Não foi possível conectar ao servidor. Por favor digite o endereço do "
 "servidor em que você deseja conectar."
 
-msgid "Error. SSL support is not installed."
-msgstr "Erro. O suporte a SSL não está instalado."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Esta conferência foi fechada. Não é possível enviar mais mensagens."
 
@@ -6415,10 +6295,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6427,18 +6304,8 @@ msgstr "Não foi possível entrar na sala de bate-papo"
 msgid "Invalid chat room name"
 msgstr "Nome de sala de bate-papo inválido"
 
-msgid "Server closed the connection."
-msgstr "O servidor encerrou a conexão."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"A conexão com o servidor foi perdida: \n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Dados inválidos foram recebidos na conexão com o servidor."
 
 #. *< type
@@ -6486,7 +6353,8 @@ msgstr "Conexão com o usuário remoto perdida:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Dados inválidos foram recebidos na conexão com o usuário remoto."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Não foi possível estabelecer conexão com o usuário remoto."
 
 msgid "Direct IM established"
@@ -6686,21 +6554,15 @@ msgstr "Nível de alerta"
 msgid "Buddy Comment"
 msgstr "Comentário do amigo"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Não foi possível conectar ao servidor de autenticação:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Não foi possível conectar ao servidor BOS:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Não foi possível conectar ao servidor."
 
 msgid "Username sent"
 msgstr "Nome de usuário enviado"
@@ -6712,11 +6574,11 @@ msgstr "Conexão estabelecida, cookie enviado"
 msgid "Finalizing connection"
 msgstr "Finalizando a conexão"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Impossível efetuar login: Não foi possível conectar como %s porque o nome de "
 "usuário é inválido. Nomes de usuário têm que ser um endereço de email "
@@ -6732,27 +6594,22 @@ msgstr ""
 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."
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Usuário inexistente"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Atualmente, sua conta está suspensa."
 
 #. service temporarily unavailable
@@ -6775,7 +6632,8 @@ msgstr ""
 "minutos e tente novamente. Se você continuar tentando, vai ter que esperar "
 "ainda mais."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "A chave SecurID digitada é inválida."
 
 msgid "Enter SecurID"
@@ -6952,6 +6810,9 @@ msgstr "Conectado desde"
 msgid "Member Since"
 msgstr "Membro desde"
 
+msgid "Capabilities"
+msgstr "Recursos"
+
 msgid "Profile"
 msgstr "Perfil"
 
@@ -7134,9 +6995,9 @@ msgstr[1] ""
 msgid "Away message too long."
 msgstr "Mensagem de ausência muito extensa."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7161,9 +7022,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Órfãos"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Não foi possível adicionar o amigo %s porque você tem muitos amigos na sua "
@@ -7172,8 +7033,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(sem nome)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Não foi possível adicionar o amigo %s por um motivo desconhecido."
 
 #, c-format
@@ -7949,7 +7810,8 @@ msgstr "Intervalo de keep-alive (segundos)"
 msgid "Update interval (seconds)"
 msgstr "Intervalo de update (segundos)"
 
-msgid "Cannot decrypt server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "Não foi possível decodificar a resposta do servidor"
 
 #, c-format
@@ -7974,9 +7836,6 @@ msgstr "Ativação necessária"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Código de resposta desconhecido ao tentar fazer login em (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Não foi possível decodificar a resposta do servidor"
-
 msgid "Requesting captcha"
 msgstr "Requisitando captcha"
 
@@ -8010,29 +7869,18 @@ msgstr ""
 "Código de resposta desconhecido ao fazer login em (0x%02X):\n"
 "%s"
 
-msgid "Unable to connect."
-msgstr "Não foi possível conectar."
-
 msgid "Socket error"
 msgstr "Erro de socket"
 
-msgid "Unable to read from socket"
-msgstr "Não foi possível ler do socket"
-
-msgid "Write Error"
-msgstr "Erro ao enviar"
-
-msgid "Connection lost"
-msgstr "Conexão perdida"
-
 msgid "Getting server"
 msgstr "Coletando servidor"
 
 msgid "Requesting token"
 msgstr "Token de requisição"
 
-msgid "Couldn't resolve host"
-msgstr "Não foi possível resolver ao host"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Não foi possível conectar ao servidor."
 
 msgid "Invalid server or port"
 msgstr "Porta ou servidor inválido"
@@ -8085,7 +7933,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "Comando QQ Qun"
 
-msgid "Could not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "Não foi possível decodificar a resposta do login"
 
 msgid "Unknown LOGIN CMD"
@@ -8105,9 +7954,6 @@ msgstr "Envio de arquivo"
 msgid "%d canceled the transfer of %s"
 msgstr "%d cancelou a transferência de %s"
 
-msgid "Connection closed (writing)"
-msgstr "Conexão fechada (escrevendo)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Título do grupo:</b> %s<br>"
@@ -8162,17 +8008,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Anúncio do administrador do Sametime"
 
-msgid "Connection reset"
-msgstr "Conexão redefinida"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Erro ao ler do socket: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Não foi possível conectar ao servidor."
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Anúncio de %s"
@@ -8195,6 +8030,9 @@ msgstr "Caixas de som"
 msgid "Video Camera"
 msgstr "Câmera de vídeo"
 
+msgid "File Transfer"
+msgstr "Transferência de arquivo"
+
 msgid "Supports"
 msgstr "Suporta"
 
@@ -9014,6 +8852,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Estatísticas da rede"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Falha no ping"
 
@@ -9077,7 +8918,8 @@ msgstr "Tipo de chave pública não suportada"
 msgid "Disconnected by server"
 msgstr "Desconectado pelo servidor"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Erro ao conectar no servidor SILC"
 
 msgid "Key Exchange failed"
@@ -9089,26 +8931,26 @@ msgstr ""
 "Falha ao tentar recuperar sessão desconectada, mas não saída. Pressione "
 "Reconectar para criar uma nova sessão."
 
-msgid "Connection failed"
-msgstr "Falha na conexão"
-
 msgid "Performing key exchange"
 msgstr "Fazendo troca de chaves"
 
-msgid "Unable to create connection"
-msgstr "Não foi possível criar conexão."
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Não foi possível carregar par de chaves SILC"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Conectando ao servidor SILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Não foi possível carregar par de chaves SILC"
+
 msgid "Out of memory"
 msgstr "Sem memória"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Não foi possível iniciar protocolo SILC"
 
 msgid "Error loading SILC key pair"
@@ -9409,7 +9251,8 @@ msgstr "Assinar digitalmente e verificar todas as mensagens"
 msgid "Creating SILC key pair..."
 msgstr "Criando par de chaves do SILC..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Não foi possível criar par de chaves do SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9505,6 +9348,9 @@ msgstr "Quadro de atividades"
 msgid "No server statistics available"
 msgstr "Estatísticas do servidor indisponíveis"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Erro ao conectar no servidor SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Falha: Versões incompatíveis, atualize seu cliente"
@@ -9545,30 +9391,27 @@ msgstr "Falha: Cookie inválido"
 msgid "Failure: Authentication failed"
 msgstr "Falha: Autenticação mal sucedida"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Não foi possível iniciar conexão do cliente SILC"
 
 msgid "John Noname"
 msgstr "João sem nome"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Não foi possível carregar par de chaves SILC: %s"
 
-msgid "Could not write"
-msgstr "Não foi possível enviar"
-
-msgid "Could not connect"
-msgstr "Não foi possível conectar"
+msgid "Unable to create connection"
+msgstr "Não foi possível criar conexão."
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Resposta do servidor desconhecida."
 
-msgid "Could not create listen socket"
-msgstr "Não foi possível criar socket de escuta"
-
-msgid "Could not resolve hostname"
-msgstr "Não foi possível resolver host"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Não foi possível criar socket"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Nomes de usuário do SIP não podem conter espaços ou arrobas"
@@ -9609,6 +9452,77 @@ msgstr "Usuário de autenticação"
 msgid "Auth Domain"
 msgstr "Domínio de autenticação"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;sala&gt;:  Entra numa sala de bate-papo na rede do Yahoo"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Lista as salas desta rede do Yahoo"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Pede ao usuário para iniciar uma sessão para desenhar"
+
+msgid "Yahoo ID..."
+msgstr "ID do Yahoo..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Plug-in do protocolo Yahoo"
+
+msgid "Pager server"
+msgstr "Servidor do pager"
+
+msgid "Pager port"
+msgstr "Porta do pager"
+
+msgid "File transfer server"
+msgstr "Servidor de transferência de arquivo"
+
+msgid "File transfer port"
+msgstr "Porta da transferência de arquivo"
+
+msgid "Chat room locale"
+msgstr "Locale da sala de bate-papo"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignorar convites para bate-papos e conferências"
+
+msgid "Chat room list URL"
+msgstr "URL da lista de salas de bate-papo"
+
+msgid "Yahoo Chat server"
+msgstr "Servidor de bate-papo do Yahoo"
+
+msgid "Yahoo Chat port"
+msgstr "Porta de bate-papo do Yahoo"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "ID do Yahoo..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Plug-in do protocolo Yahoo"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9641,30 +9555,20 @@ msgstr "Pedido para adicionar amigo negado"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  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."
@@ -9707,39 +9611,34 @@ msgstr ""
 "Número de erro %d desconhecido. Entrar na sua conta no site do Yahoo! pode "
 "corrigir isso."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Não foi possível adicionar o amigo %s ao grupo %s à lista do servidor na "
 "conta %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Não foi possível adicionar amigo à lista do servidor"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audível %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "O servidor retornou uma resposta HTTP inválida."
 
-msgid "Connection problem"
-msgstr "Problema na conexão"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "A conexão com %s foi perdida:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Não foi possível estabelecer conexão com %s:\n"
+"Não foi possível estabelecer conexão com o servidor:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9802,73 +9701,15 @@ msgstr "Ingressar usuário no bate-papo..."
 msgid "Open Inbox"
 msgstr "Abrir caixa de entrada"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;sala&gt;:  Entra numa sala de bate-papo na rede do Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Lista as salas desta rede do Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Pede ao usuário para iniciar uma sessão para desenhar"
-
-msgid "Yahoo ID..."
-msgstr "ID do Yahoo..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Plug-in do protocolo Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japão"
-
-msgid "Pager server"
-msgstr "Servidor do pager"
-
-msgid "Japan Pager server"
-msgstr "Servidor japonês do pager"
-
-msgid "Pager port"
-msgstr "Porta do pager"
-
-msgid "File transfer server"
-msgstr "Servidor de transferência de arquivo"
-
-msgid "Japan file transfer server"
-msgstr "Servidor japonês de transferência de arquivo"
-
-msgid "File transfer port"
-msgstr "Porta da transferência de arquivo"
-
-msgid "Chat room locale"
-msgstr "Locale da sala de bate-papo"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignorar convites para bate-papos e conferências"
-
-msgid "Chat room list URL"
-msgstr "URL da lista de salas de bate-papo"
-
-msgid "Yahoo Chat server"
-msgstr "Servidor de bate-papo do Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "Porta de bate-papo do Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Enviado pedido para desenhar."
 
+msgid "Unable to connect."
+msgstr "Não foi possível conectar."
+
 msgid "Unable to establish file descriptor."
 msgstr "Não foi possível estabelecer descritor de arquivo."
 
@@ -9876,6 +9717,9 @@ msgstr "Não foi possível estabelecer descritor de arquivo."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s está tentando lhe enviar um grupo de %d arquivos.\n"
 
+msgid "Write Error"
+msgstr "Erro ao enviar"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Perfil do Yahoo! Japão"
 
@@ -9993,23 +9837,19 @@ msgstr "Vozes"
 msgid "Webcams"
 msgstr "Webcams"
 
+msgid "Connection problem"
+msgstr "Problema na conexão"
+
 msgid "Unable to fetch room list."
 msgstr "Não foi possível obter lista de salas."
 
 msgid "User Rooms"
 msgstr "Salas de usuário"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Problema na conexão ao servidor YCHT."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Perdida conexão com servidor\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10139,24 +9979,16 @@ msgstr "Realm"
 msgid "Exposure"
 msgstr "Exposição"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Não foi possível criar socket\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Não foi possível interpretar resposta do proxy HTTP: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Erro de conexão do proxy HTTP %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "Acesso negado: o servidor proxy HTTP não permite o tunelamento da porta %d."
 
@@ -10164,9 +9996,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr "Erro ao resolver %s"
 
-msgid "Could not resolve host name"
-msgstr "Não foi possível resolver host"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Chamando a atenção de %s..."
@@ -10368,14 +10197,6 @@ msgstr "Erro ao gravar em %s: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "Não foi possível conectar a %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"O servidor requer TLS/SSL para conexão. Nenhum suporte a TLS/SSL foi "
-"encontrado."
-
 #, c-format
 msgid " - %s"
 msgstr "- %s"
@@ -10627,9 +10448,14 @@ msgstr "Adicionar _ação de usuário..."
 msgid "View _Log"
 msgstr "Ver _histórico"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Esconder quando desconectado"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Mostrar quando desconectado"
+
 msgid "_Alias..."
 msgstr "_Apelidar..."
 
@@ -11136,6 +10962,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Modificar informações do usuário para %s"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Digite o nome de host para o qual este certificado será gerado."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Servidores SSL"
@@ -11181,7 +11011,8 @@ msgstr "Ignorar"
 msgid "Get Away Message"
 msgstr "Obter mensagem de ausência"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Última mensagem"
 
 msgid "Unable to save icon file to disk."
@@ -12077,7 +11908,8 @@ msgstr "Cor a ser usada para desenhar os hyperlinks."
 msgid "Hyperlink visited color"
 msgstr "Cor do hyperlink visitado"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+#, fuzzy
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 "Cor a ser usada para desenhar os hyperlinks quando já tiverem sido visitados "
 "(ou estiverem ativos)."
@@ -12117,13 +11949,22 @@ msgstr "Cor para desenhar o nome de uma mensagem de ação."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Cor do Nome da Mensagem de Ação para Mensagem de Sussurro"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Cor para desenhar o nome de uma mensagem de ação."
+
 msgid "Whisper Message Name Color"
 msgstr "Cor do Nome das Mensagens de Sussurro"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Cor para desenhar o nome de uma mensagem de ação."
+
 msgid "Typing notification color"
 msgstr "Cor da notificação de digitação"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "Cor para utilizar na fonte da notificação de digitação"
 
 msgid "Typing notification font"
@@ -12522,6 +12363,10 @@ msgstr ""
 "A opção de comando do navegador 'Manual' foi escolhida, mas nenhum comando "
 "foi definido."
 
+#, fuzzy
+msgid "No message"
+msgstr "Mensagem desconhecida"
+
 msgid "Open All Messages"
 msgstr "Abrir todas as mensagens"
 
@@ -12539,10 +12384,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Você tem email!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Mensagem desconhecida"
-
 msgid "The following plugins will be unloaded."
 msgstr "Os plug-ins a seguir serão descarregados."
 
@@ -12758,8 +12599,9 @@ msgstr "Mo_strar ícone da bandeja"
 msgid "On unread messages"
 msgstr "Para as mensagens não lidas"
 
-msgid "Conversation Window Hiding"
-msgstr "Quando esconder as janelas de conversa"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Janelas de conversa por mensagem instantânea"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Esconder novas conversas de MI:"
@@ -12767,6 +12609,9 @@ msgstr "_Esconder novas conversas de MI:"
 msgid "When away"
 msgstr "Quando ausente"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Minimi_zar novas janelas de conversa"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Abas"
@@ -12825,9 +12670,6 @@ msgstr "Usar rolagem suave"
 msgid "F_lash window when IMs are received"
 msgstr "_Piscar a janela quando mensagens forem recebidas"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Minimi_zar novas janelas de conversa"
-
 msgid "Minimum input area height in lines:"
 msgstr "Altura da área minima de entrada em linhas:"
 
@@ -12862,7 +12704,8 @@ msgstr "Não foi possível iniciar o programa de configuração do navegador."
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemplo: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "Detectar endereço IP _automaticamente"
 
 msgid "Public _IP:"
@@ -13234,21 +13077,6 @@ msgstr "Sal_var e usar"
 msgid "Status for %s"
 msgstr "Status de %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "Emoticon personalizado"
-
-msgid "More Data needed"
-msgstr "Mais dados necessários"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Por favor, defina um atalho para associar com o emoticon."
-
 #, fuzzy, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
@@ -13256,12 +13084,12 @@ msgstr ""
 "Um emoticon personalizado para o atalho selecionado já existe. Por favor, "
 "forneça um atalho diferente."
 
+msgid "Custom Smiley"
+msgstr "Emoticon personalizado"
+
 msgid "Duplicate Shortcut"
 msgstr "Atalho duplicado"
 
-msgid "Please select an image for the smiley."
-msgstr "Por favor, favor selecione uma imagem para o emoticon."
-
 msgid "Edit Smiley"
 msgstr "Editar Emoticon"
 
@@ -13375,9 +13203,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Não é possível enviar atalhos"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Você arrastou um atalho da área de trabalho. Provavelmente você queria "
 "enviar o destino do atalho, e não o atalho em si."
@@ -13984,9 +13813,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Plug-in de conversa musical para composição colaborativa."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "O plug-in de conversa musical permite que vários usuários trabalhem "
 "simultaneamente numa composição musical editando uma partitura comum em "
@@ -14243,9 +14073,10 @@ msgid "Conversation Window Send Button."
 msgstr "Botão de Enviar da Janela de Conversa."
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Adiciona um botão Enviar na área de entrada da janela de conversação. "
 "Idealpara quando nenhum teclado físico está presente."
@@ -14578,8 +14409,9 @@ msgstr "Opções do Pidgin para Windows"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opções específicas do Pidgin para Windows."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Fornece opções específicas do Pidgin para Windows, como ancoramento da lista "
 "de amigos."
@@ -14621,6 +14453,312 @@ msgstr "Envia e recebe comandos (stanzas) do XMPP puros."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este plug-in é útil para depurar servidores ou clientes XMPP."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Não foi possível abrir socket"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Não foi possível escutar no socket"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Não foi possível ler do socket"
+
+#~ msgid "Connection failed."
+#~ msgstr "Falha na conexão."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "O servidor desconectou"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Não foi possível criar socket"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Não foi possível conectar ao host"
+
+#~ msgid "Read error"
+#~ msgstr "Erro de leitura"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Não foi possível estabelecer conexão com o servidor:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Erro ao enviar"
+
+#~ msgid "Last Activity"
+#~ msgstr "Última atividade"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Informações da localização de serviços"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Itens da localização de serviços"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Endereçamento de Stanza estendido"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Bate-papo multiusuário"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Informações estendidas de presença em bate-papos multiusuário"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "Bytestreams In-Band"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Comandos ad-hoc"
+
+#~ msgid "PubSub Service"
+#~ msgstr "Serviço PubSub"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "Bytestreams via SOCKS5"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Suporte a dados 'out of band'"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "Registro 'In-Band'"
+
+#~ msgid "User Location"
+#~ msgstr "Localização do usuário"
+
+#~ msgid "User Avatar"
+#~ msgstr "Imagem de exibição do usuário"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Notificações do status do bate-papo"
+
+#~ msgid "Software Version"
+#~ msgstr "Versão do software"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Inicialização de fluxoOrientação"
+
+#~ msgid "User Mood"
+#~ msgstr "Humor do usuário"
+
+#~ msgid "User Activity"
+#~ msgstr "Atividade do usuário"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Recursos do usuário"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Negociação de sessão criptografada"
+
+#~ msgid "User Tune"
+#~ msgstr "Música do usuário"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Troca de itens da lista de amigos"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Endereço de contato"
+
+#~ msgid "User Profile"
+#~ msgstr "Perfil do usuário"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Áudio do Jingle"
+
+#~ msgid "User Nickname"
+#~ msgstr "Apelido do usuário"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "ECI UDP do Jingle"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "ECI TCP do Jingle"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "UDP puro do Jingle"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Vídeo do Jingle"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Discagem a tom do Jingle"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Recibos de mensagem"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Publicação de chave pública"
+
+#~ msgid "User Chatting"
+#~ msgstr "Notificação de bate-papos"
+
+#~ msgid "User Browsing"
+#~ msgstr "Notificação de onde está navegando"
+
+#~ msgid "User Gaming"
+#~ msgstr "Notificação do que está jogando"
+
+#~ msgid "User Viewing"
+#~ msgstr "Notificação do que está assistindo"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Criptografia de Stanza"
+
+#~ msgid "Entity Time"
+#~ msgstr "Informações de horário"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Entrega atrasada"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Objetos de dados colaborativos"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Compartilhamento e repositório de arquivos"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "Serviço de descoberta STUN para o Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Negociação de sessão criptografada simplificada"
+
+#~ msgid "Hop Check"
+#~ msgstr "Verificação de saltos"
+
+#~ msgid "Read Error"
+#~ msgstr "Erro de leitura"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Não foi possível conectar ao servidor."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Buffer de leitura cheio (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Mensagem impossível de ser processada"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Não foi possível conectar ao host: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "A conexão falhou (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Você foi desconectado porque conectou em outra estação de trabalho."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Erro. O suporte a SSL não está instalado."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Senha incorreta."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Não foi possível conectar ao servidor BOS:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "Você pode ser desconectado daqui a pouco. Verifique atualizações em %s."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Não foi possível conectar"
+
+#~ msgid "Invalid username."
+#~ msgstr "Nome de usuário inválido."
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Não foi possível decodificar a resposta do servidor"
+
+#~ msgid "Connection lost"
+#~ msgstr "Conexão perdida"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Não foi possível resolver ao host"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Conexão fechada (escrevendo)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Conexão redefinida"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Erro ao ler do socket: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Não foi possível conectar ao servidor."
+
+#~ msgid "Could not write"
+#~ msgstr "Não foi possível enviar"
+
+#~ msgid "Could not connect"
+#~ msgstr "Não foi possível conectar"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Não foi possível criar socket de escuta"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Não foi possível resolver host"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Senha incorreta"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Não foi possível estabelecer conexão com %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japão"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Servidor japonês do pager"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Servidor japonês de transferência de arquivo"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Perdida conexão com servidor\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Não foi possível resolver host"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "O servidor requer TLS/SSL para conexão. Nenhum suporte a TLS/SSL foi "
+#~ "encontrado."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Quando esconder as janelas de conversa"
+
+#~ msgid "More Data needed"
+#~ msgstr "Mais dados necessários"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Por favor, defina um atalho para associar com o emoticon."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Por favor, favor selecione uma imagem para o emoticon."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Ativar qual ID?"
 
@@ -15111,9 +15249,6 @@ msgstr "Este plug-in é útil para depurar servidores ou clientes XMPP."
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "Não foi possível conectar, verifique o log de depuração."
 
-#~ msgid "Unable to login"
-#~ msgstr "Não foi possível fazer o login"
-
 #~ msgid "Failed room reply"
 #~ msgstr "Resposta da sala falhou"
 
@@ -15204,14 +15339,6 @@ msgstr "Este plug-in é útil para depurar servidores ou clientes XMPP."
 #~ "Desculpe, senhas com mais de %d caracteres (a sua possui %d) não são "
 #~ "suportadas pelo MySpace."
 
-#~ msgid ""
-#~ "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username and choose a username and try to login again."
-#~ msgstr ""
-#~ "Favor visitar http://e<ditprofile.myspace.com/index.cfm?"
-#~ "fuseaction=profile.username e escolher um nome de usuário e tentar "
-#~ "conectar novamente."
-
 #~ msgid "Screen name sent"
 #~ msgstr "Nome de usuário enviado"
 
diff --git a/po/ro.po b/po/ro.po
index 667405c8f2..c85231e291 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin-2.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2009-01-07 00:42+0200\n"
 "Last-Translator: Mișu Moldovan <dumol@gnome.ro>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
@@ -2599,9 +2599,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Importă înregistrările altor clienți IM."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2655,8 +2656,9 @@ msgstr "Emulare mesaje offline"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Salvează ca întâmpinare mesajele trimise unui utilizator deconectat."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Restul de mesaje vor fi salvate ca întâmpinare. Puteți apoi edita sau șterge "
@@ -2907,14 +2909,16 @@ msgstr ""
 "Nu s-a detectat o instalare ActiveTCL. Dacă doriți să utilizați module TCL, "
 "instalați ActiveTCL de la http://www.activestate.com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Nu s-a găsit Apple Bonjour pentru Windows, pentru detalii consultați: http://"
 "d.pidgin.im/BonjourWindows ."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr ""
 "Utilizarea interfaței de rețea pentru a detecta noi conexiuni IM a eșuat\n"
 
@@ -2968,14 +2972,21 @@ msgstr "%s a încheiat discuția."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Nu s-a putut trimite mesajul, discuția nu a putut fi inițiată."
 
-msgid "Cannot open socket"
-msgstr "Nu s-a putut deschide un socket"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Nu s-a putut crea un socket:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Nu se poate face bind pentru socket pe port"
 
-msgid "Could not listen on socket"
-msgstr "Nu se poate asculta pe socket"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Nu s-a putut crea un socket:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Eroare de comunicare locală cu mDNSResponder."
@@ -3023,13 +3034,16 @@ msgstr "Salvează lista de contacte..."
 msgid "Load buddylist from file..."
 msgstr "Încarcă lista de contacte din fișierul..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Completați câmpurile de înregistrare."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Parolele nu se potrivesc."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Noul cont nu poate fi înregistrat. A intervenit o eroare.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3041,14 +3055,15 @@ msgstr "Înregistrare terminată cu succes!"
 msgid "Password"
 msgstr "Parolă"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr "Confirmare parolă"
 
-msgid "Enter current token"
-msgstr "Introduceți verificarea curentă"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Verificare curentă"
+#, fuzzy
+msgid "Captcha"
+msgstr "Salvează imaginea"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Înregistrare cont nou Gadu-Gadu"
@@ -3101,6 +3116,15 @@ msgstr "Parola a fost schimbată cu succes!"
 msgid "Current password"
 msgstr "Parolă curentă"
 
+msgid "Password (retype)"
+msgstr "Confirmare parolă"
+
+msgid "Enter current token"
+msgstr "Introduceți verificarea curentă"
+
+msgid "Current token"
+msgstr "Verificare curentă"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Introduceți parola curentă și pe cea nouă pentru UIN-ul: "
 
@@ -3148,7 +3172,7 @@ msgstr "Nu s-au găsit utilizatori care să corespundă"
 msgid "There are no users matching your search criteria."
 msgstr "Nu există utilizatori care să se potrivească termenilor căutării."
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "Nu se poate citi din socket"
 
 msgid "Buddy list downloaded"
@@ -3163,8 +3187,14 @@ msgstr "Listă de contacte stocată"
 msgid "Your buddy list was stored on the server."
 msgstr "Lista de contacte v-a fost stocată pe server."
 
-msgid "Connection failed."
-msgstr "Conexiunea a eșuat."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Conectat"
+
+msgid "Connection failed"
+msgstr "Conexiunea a eșuat"
 
 msgid "Add to chat"
 msgstr "Adaugă în chat"
@@ -3172,18 +3202,23 @@ msgstr "Adaugă în chat"
 msgid "Chat _name:"
 msgstr "_Nume chat:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Conectarea la server a eșuat."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Autentificare"
+
 msgid "Chat error"
 msgstr "Eroare de chat"
 
 msgid "This chat name is already in use"
 msgstr "Există deja un chat cu acest nume"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Neconectat la server."
 
 msgid "Find buddies..."
@@ -3243,7 +3278,8 @@ msgstr "Nu există topic"
 msgid "File Transfer Failed"
 msgstr "Transferul fișierului a eșuat"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Nu s-a putut deschide un port pentru a asculta."
 
 msgid "Error displaying MOTD"
@@ -3259,8 +3295,18 @@ msgstr "Nu există un MOTD asociat cu această conexiune."
 msgid "MOTD for %s"
 msgstr "MOTD pentru %s"
 
-msgid "Server has disconnected"
-msgstr "Serverul s-a deconectat"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"S-a pierdut conexiunea cu serverul:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Afișare MOTD"
@@ -3275,22 +3321,20 @@ msgstr "_Parolă:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "Pseudonimele IRC nu pot conține spații"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Autentificare"
-
 msgid "SSL support unavailable"
 msgstr "Suportul SSL nu este disponibil"
 
-msgid "Couldn't create socket"
-msgstr "Nu s-a putut crea un socket"
+msgid "Unable to connect"
+msgstr "Conectare eșuată"
 
-msgid "Couldn't connect to host"
-msgstr "Conectarea la server a eșuat"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Conectarea la %s a eșuat"
 
-msgid "Read error"
-msgstr "Eroare la citire"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Serverul a închis conexiunea."
 
 msgid "Users"
 msgstr "Utilizatori"
@@ -3724,12 +3768,14 @@ msgstr "Comandă Ad-Hoc eșuată"
 msgid "execute"
 msgstr "execută"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "Serverul necesită TLS/SSL pentru autentificare. Nu s-a găsit nici un fel de "
 "suport TLS/SSL."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Ați cerut criptare, dar nu s-a găsit nici un fel de suport TLS/SSL."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3746,7 +3792,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Autentificare în clar (plaintext)"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Autentificare eșuată"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Răspuns invalid de la server."
 
 msgid "Server does not use any supported authentication method"
@@ -3758,7 +3809,8 @@ msgstr "Ați cerut criptare, dar serverul nu suportă criptare"
 msgid "Invalid challenge from server"
 msgstr "Cerere invalidă de la server"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Eroare SASL"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3778,10 +3830,8 @@ msgstr ""
 "Nu s-a putut face o conexiune cu serverul:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Nu s-a putut face o conexiune cu serverul:\n"
 "%s"
@@ -3790,12 +3840,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "Nu se poate inițializa o nouă conexiune"
 
-msgid "Unable to create socket"
-msgstr "Nu se poate crea un socket"
-
-msgid "Write error"
-msgstr "Eroare la scriere"
-
 msgid "Full Name"
 msgstr "Nume complet"
 
@@ -3866,171 +3910,6 @@ msgstr "Sistem de operare"
 msgid "Local Time"
 msgstr "Fișier local:"
 
-msgid "Last Activity"
-msgstr "Ultima activitate"
-
-msgid "Service Discovery Info"
-msgstr "Detalii servicii descoperite"
-
-msgid "Service Discovery Items"
-msgstr "Servicii descoperite"
-
-msgid "Extended Stanza Addressing"
-msgstr "Adresare „stanza” extinsă"
-
-msgid "Multi-User Chat"
-msgstr "Chat cu mai mulți utilizatori"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-"Detalii suplimentare despre prezența într-un chat cu mai mulți utilizatori."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr "Comenzi ad-hoc"
-
-msgid "PubSub Service"
-msgstr "Serviciu PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "Fluxuri de date SOCKS5"
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "Eroare la înregistrare"
-
-msgid "User Location"
-msgstr "Loc utilizator"
-
-msgid "User Avatar"
-msgstr "Avatar utilizator"
-
-msgid "Chat State Notifications"
-msgstr "Notificări de stări pentru chat"
-
-msgid "Software Version"
-msgstr "Versiune de software"
-
-msgid "Stream Initiation"
-msgstr "Inițializare flux de date"
-
-msgid "File Transfer"
-msgstr "Transfer de fișiere"
-
-msgid "User Mood"
-msgstr "Dispoziția utilizatorului"
-
-msgid "User Activity"
-msgstr "Acitivatea utilizatorului"
-
-msgid "Entity Capabilities"
-msgstr "Facilitățile entității"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Negocieri sesiuni criptate"
-
-msgid "User Tune"
-msgstr "Piesă utilizator"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "IM cu schimb de chei"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "Adresă de mail"
-
-msgid "User Profile"
-msgstr "Profil utilizator"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "Intră"
-
-msgid "Jingle Audio"
-msgstr ""
-
-msgid "User Nickname"
-msgstr "Pseudonim utilizator"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "Video în direct"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-msgid "Message Receipts"
-msgstr "Confirmări mesaje"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "Amprentă silabică cheie publică"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "Opțiuni personale"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "Moduri utilizator"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "Nume utilizator"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "Limită utilizatori"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Criptare Trillian"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr "Livrare întârziată"
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr "Repozitorii de fișiere și partajare"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Negociere sesiune de criptare simplificată"
-
-msgid "Hop Check"
-msgstr "Verificare hopuri"
-
-msgid "Capabilities"
-msgstr "Facilități"
-
 msgid "Priority"
 msgstr "Prioritate"
 
@@ -4042,7 +3921,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Autentificat"
 
 msgid "Middle Name"
@@ -4225,16 +4104,13 @@ msgstr "Nu s-au găsit utilizatori care să corespundă"
 msgid "Roles:"
 msgstr "Funcție"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Expirare ping"
 
-msgid "Read Error"
-msgstr "Eroare la citire"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4411,9 +4287,6 @@ msgstr "Parola v-a fost schimbată."
 msgid "Error changing password"
 msgstr "Eroare la schimbarea parolei"
 
-msgid "Password (again)"
-msgstr "Confirmare parolă"
-
 msgid "Change XMPP Password"
 msgstr "Schimbare parolă XMPP"
 
@@ -4802,6 +4675,14 @@ msgstr "Eroare la analiza XML"
 msgid "Unknown Error in presence"
 msgstr "Eroare necunoscută în starea de prezență"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Eroare la intrarea în camera de chat %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Eroare în camera de chat %s"
+
 msgid "Create New Room"
 msgstr "Creează o nouă cameră de chat"
 
@@ -4818,16 +4699,20 @@ msgstr "_Configurare cameră de chat"
 msgid "_Accept Defaults"
 msgstr "_Opțiuni implicite"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Eroare la intrarea în camera de chat %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Fără motiv."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Eroare în camera de chat %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Ați fost dat afară din %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Respins de %s: (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "A apărut o eroare la deschiderea fișierului."
 
 #, fuzzy
@@ -5320,9 +5205,6 @@ msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "Pentru MSN aveți nevoie de suport SSL. Instalați bibliotecile SSL necesare. "
 
-msgid "Failed to connect to server."
-msgstr "Conectarea la server a eșuat."
-
 msgid "Error retrieving profile"
 msgstr "Eroare la descărcarea profilului"
 
@@ -5581,9 +5463,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Mesajul nu a fost trimis pentru că apărut o eroare necunoscută."
 
-msgid "Unable to connect"
-msgstr "Conectare eșuată"
-
 msgid "Writing error"
 msgstr "Eroare la scriere"
 
@@ -5598,19 +5477,23 @@ msgstr ""
 "Eroare de conectare de la serverul %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Protocolul utilizat nu este suportat de către server."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Eroare la prelucrarea datelor HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "V-ați autentificat din altă parte."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "Serverele MSN sunt temporar indisponibile. Reîncercați mai târziu."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Serverele MSN vor fi oprite momentan."
 
 #, c-format
@@ -5622,9 +5505,6 @@ msgid ""
 msgstr ""
 "Lista contactelor MSN este momentan indisponibilă. Încercați mai târziu."
 
-msgid "Unknown error."
-msgstr "Eroare necunoscută."
-
 msgid "Handshaking"
 msgstr "Sincronizare"
 
@@ -5728,6 +5608,9 @@ msgstr "Modul de protocol MSN"
 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)"
@@ -5838,12 +5721,6 @@ msgstr[2] ""
 msgid "Add contacts from server"
 msgstr "Răspuns invalid de la server."
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Conectat"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Eroare de protocol, codul %d: %s"
@@ -5868,16 +5745,6 @@ msgstr "Eroare MySpaceIM"
 msgid "Invalid input condition"
 msgstr "Condiție de intrare invalidă"
 
-msgid "Read buffer full (2)"
-msgstr ""
-
-msgid "Unparseable message"
-msgstr "Nu se poate prelucra mesajul"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Conectarea la server a eșuat"
-
 msgid "Failed to add buddy"
 msgstr "Adăugarea contactului a eșuat"
 
@@ -5966,6 +5833,12 @@ msgstr ""
 msgid "Client Version"
 msgstr "Încheie discuția"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 #, fuzzy
 msgid "MySpaceIM - Username Available"
 msgstr "Serviciu indisponibil"
@@ -6233,9 +6106,9 @@ msgstr "Utilizatorul este deconectat sau sunteți blocat(ă)"
 msgid "Unknown error: 0x%X"
 msgstr "Eroare necunoscută: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Autentificare eșuată (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Autentificare eșuată."
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6340,9 +6213,6 @@ msgstr "Conferință GroupWise %d"
 msgid "Authenticating..."
 msgstr "Autentificare..."
 
-msgid "Unable to connect to server."
-msgstr "Conectarea la server a eșuat."
-
 msgid "Waiting for response..."
 msgstr "Se așteaptă un răspuns..."
 
@@ -6366,25 +6236,19 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Doriți să vă alăturați discuției?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Ați fost deconectat(ă) pentru că v-ați autentificat de pe o altă stație."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s pare să fie deconectat și nu a primit mesajul ce i l-ați trimis."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Conectarea la server a eșuat. Introduceți adresa serverului la care doriți "
 "să vă conectați."
 
-msgid "Error. SSL support is not installed."
-msgstr "Eroare: suportul SSL nu este instalat."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Această conferință a fost închisă. Nu mai pot fi trimise mesaje."
 
@@ -6423,10 +6287,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6435,18 +6296,8 @@ msgstr "Nu s-a putut intra în camera de chat"
 msgid "Invalid chat room name"
 msgstr "Nume invalid de cameră de chat"
 
-msgid "Server closed the connection."
-msgstr "Serverul a închis conexiunea."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"S-a pierdut conexiunea cu serverul:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "S-au primit date invalide de la server."
 
 #. *< type
@@ -6494,7 +6345,8 @@ msgstr "S-a pierdut conexiunea cu utilizatorul la distanță:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "S-au primit date invalide la conectarea la utilizatorul la distanță."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Nu s-a putut deschide o conexiune cu utilizatorul la distanță."
 
 msgid "Direct IM established"
@@ -6695,21 +6547,15 @@ msgstr "Nivel de avertizare"
 msgid "Buddy Comment"
 msgstr "Comentariu contact"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Conectarea pentru serverul de autentificare a eșuat:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Conectarea la serverul BOS a eșuat:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Conectarea la server a eșuat."
 
 msgid "Username sent"
 msgstr "S-a trimit numele de utilizator"
@@ -6721,11 +6567,11 @@ msgstr "Conexiune inițializată, cookie trimis"
 msgid "Finalizing connection"
 msgstr "Finalizare conexiune"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Eroare la autentificare: autentificarea pentru %s a eșuat deoarece numele de "
 "utilizator este invalid. Un nume valid trebuie să fie o adresă de mail "
@@ -6741,28 +6587,22 @@ msgstr ""
 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"
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Utilizator inexistent"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Contul dumneavoastră este momentan suspendat."
 
 #. service temporarily unavailable
@@ -6782,7 +6622,8 @@ 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."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Cheia SecurID introdusă este invalidă."
 
 msgid "Enter SecurID"
@@ -6970,6 +6811,9 @@ msgstr "Conectat din"
 msgid "Member Since"
 msgstr "Membru din"
 
+msgid "Capabilities"
+msgstr "Facilități"
+
 msgid "Profile"
 msgstr "Profil"
 
@@ -7160,9 +7004,9 @@ msgstr[2] ""
 msgid "Away message too long."
 msgstr "Mesaj în absență prea lung."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7186,9 +7030,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Orfani"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Nu s-a putut adăuga contactul %s deoarece aveți prea multe contacte în lista "
@@ -7197,8 +7041,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(fără nume)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Din motive necunoscute nu s-a putut adăuga contactul %s."
 
 #, c-format
@@ -8022,7 +7866,7 @@ msgid "Update interval (seconds)"
 msgstr "Eroare „keep alive”"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Nu s-au putut obține detalii despre server"
 
 #, c-format
@@ -8049,10 +7893,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Nu s-au putut obține detalii despre server"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "Se cere atenție din partea contactului %s..."
 
@@ -8090,21 +7930,9 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "Nu se poate deschide o conexiune."
-
 msgid "Socket error"
 msgstr "Eroare de socket"
 
-msgid "Unable to read from socket"
-msgstr "Nu se poate citi din socket"
-
-msgid "Write Error"
-msgstr "Eroare la scriere"
-
-msgid "Connection lost"
-msgstr "Conexiune pierdută"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "Introducere detalii..."
@@ -8113,8 +7941,9 @@ msgstr "Introducere detalii..."
 msgid "Requesting token"
 msgstr "Cerere respinsă"
 
-msgid "Couldn't resolve host"
-msgstr "Nu s-a putut rezolva numele calculatorului"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Conectarea la server a eșuat."
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8165,7 +7994,7 @@ msgid "QQ Qun Command"
 msgstr "Comandă"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Nu s-au putut obține detalii despre server"
 
 #, fuzzy
@@ -8187,9 +8016,6 @@ msgstr "Trimitere fișier"
 msgid "%d canceled the transfer of %s"
 msgstr "%d a anulat transferul fișierului %s"
 
-msgid "Connection closed (writing)"
-msgstr "Conexiune terminată (la scriere)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Titlu Grup:</b> %s<br>"
@@ -8243,17 +8069,6 @@ msgstr "Un administrator Sametime a făcut următorul anunț pe serverul %s:"
 msgid "Sametime Administrator Announcement"
 msgstr "Anunț din partea administratorului Sametime"
 
-msgid "Connection reset"
-msgstr "Conexiune resetată"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Eroare la citirea din socket: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Conectarea la server a eșuat"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Anunț de la %s"
@@ -8276,6 +8091,9 @@ msgstr "Difuzoare"
 msgid "Video Camera"
 msgstr "Cameră video"
 
+msgid "File Transfer"
+msgstr "Transfer de fișiere"
+
 msgid "Supports"
 msgstr "Suportă:"
 
@@ -9094,6 +8912,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Statistici rețea"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping eșuat"
 
@@ -9158,7 +8979,8 @@ msgstr "Tip nesuportat de cheie publică"
 msgid "Disconnected by server"
 msgstr "Deconectat de server"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Eroare la conectarea la serverul SILC"
 
 msgid "Key Exchange failed"
@@ -9170,26 +8992,26 @@ msgstr ""
 "Reluarea sesiunii detașate a eșuat. Încercați „Reconectare” pentru a crea o "
 "nouă conexiune."
 
-msgid "Connection failed"
-msgstr "Conexiunea a eșuat"
-
 msgid "Performing key exchange"
 msgstr "Se efectuează schimbul de chei"
 
-msgid "Unable to create connection"
-msgstr "Nu se poate crea o nouă conexiune"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Nu s-a putut încărca perechea de chei SILC"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Conectare în progres la serverul SILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Nu s-a putut încărca perechea de chei SILC"
+
 msgid "Out of memory"
 msgstr "Nu mai există memorie disponibilă"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Nu s-a putut inițializa protocolul SILC"
 
 msgid "Error loading SILC key pair"
@@ -9490,7 +9312,8 @@ msgstr "Semnează digital și verifică toate mesajele"
 msgid "Creating SILC key pair..."
 msgstr "Creez perechea de chei SILC..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Nu s-a putut crea perechea de chei SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9587,6 +9410,9 @@ msgstr "„Whiteboard”"
 msgid "No server statistics available"
 msgstr "Nici o statistică nu e disponibilă pentru server"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Eroare la conectarea la serverul SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -9630,30 +9456,27 @@ msgstr "Eroare: Cookie invalid"
 msgid "Failure: Authentication failed"
 msgstr "Eroare: Autentificare eșuată"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Nu s-a putut inițializa conexiunea ca client SILC"
 
 msgid "John Noname"
 msgstr "Ion Fărănume"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Nu s-a putut încărca perechea de chei SILC: %s"
 
-msgid "Could not write"
-msgstr "Nu s-a putut scrie"
-
-msgid "Could not connect"
-msgstr "Conectare eșuată"
+msgid "Unable to create connection"
+msgstr "Nu se poate crea o nouă conexiune"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Răspuns necunoscut de la server."
 
-msgid "Could not create listen socket"
-msgstr "Nu s-a putut crea un socket de ascultare"
-
-msgid "Could not resolve hostname"
-msgstr "Nu s-a putut rezolva numele calculatorului"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Nu se poate crea un socket"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Numele de utilizatori SIP nu pot conține spații sau simbolul @"
@@ -9694,6 +9517,77 @@ msgstr "Autentificare utilizator"
 msgid "Auth Domain"
 msgstr "Autentificare domeniu"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;room&gt;:  Intrați într-un chat din rețeaua Yahoo!"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Listează chat-urile din rețeaua Yahoo"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle:  Cereți unui utilizator să iniție o sesiune de mâzgălituri"
+
+msgid "Yahoo ID..."
+msgstr "Identitate Yahoo..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Modul de protocol Yahoo"
+
+msgid "Pager server"
+msgstr "Server pager"
+
+msgid "Pager port"
+msgstr "Port pager"
+
+msgid "File transfer server"
+msgstr "Server transfer de fișiere"
+
+msgid "File transfer port"
+msgstr "Port transfer de fișiere"
+
+msgid "Chat room locale"
+msgstr "Opțiuni locale chat"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignoră invitațiile la conferințe și chat"
+
+msgid "Chat room list URL"
+msgstr "Adresă listă camere de chat"
+
+msgid "Yahoo Chat server"
+msgstr "Server Yahoo Chat"
+
+msgid "Yahoo Chat port"
+msgstr "Port Yahoo Chat"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Identitate Yahoo..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Modul de protocol Yahoo"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9726,30 +9620,20 @@ msgstr "Adăugarea contactului a fost refuzată"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  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ă."
@@ -9792,39 +9676,34 @@ msgstr ""
 "Eroare necunoscută cu numărul %d. Autentificarea la www.yahoo.com ar putea "
 "rezolva această problemă."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Contactul %s nu a putut fi adăugat în grupul %s în lista de pe server pentru "
 "contul %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Contactul nu a putut fi adăugat în lista de pe server"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audibil %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "S-a primit un răspuns HTTP neașteptat de la server."
 
-msgid "Connection problem"
-msgstr "Probleme la conectare"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "S-a pierdut conexiunea cu %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Nu s-a putut face o conexiune cu %s:\n"
+"Nu s-a putut face o conexiune cu serverul:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9887,73 +9766,15 @@ msgstr "Chat cu un utilizator..."
 msgid "Open Inbox"
 msgstr "Deschidere mail"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;room&gt;:  Intrați într-un chat din rețeaua Yahoo!"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Listează chat-urile din rețeaua Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle:  Cereți unui utilizator să iniție o sesiune de mâzgălituri"
-
-msgid "Yahoo ID..."
-msgstr "Identitate Yahoo..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Modul de protocol Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japonia"
-
-msgid "Pager server"
-msgstr "Server pager"
-
-msgid "Japan Pager server"
-msgstr "Server pager Japonia"
-
-msgid "Pager port"
-msgstr "Port pager"
-
-msgid "File transfer server"
-msgstr "Server transfer de fișiere"
-
-msgid "Japan file transfer server"
-msgstr "Server transfer de fișiere Japonia"
-
-msgid "File transfer port"
-msgstr "Port transfer de fișiere"
-
-msgid "Chat room locale"
-msgstr "Opțiuni locale chat"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignoră invitațiile la conferințe și chat"
-
-msgid "Chat room list URL"
-msgstr "Adresă listă camere de chat"
-
-msgid "Yahoo Chat server"
-msgstr "Server Yahoo Chat"
-
-msgid "Yahoo Chat port"
-msgstr "Port Yahoo Chat"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "S-a trimis o cerere de mâzgăleală."
 
+msgid "Unable to connect."
+msgstr "Nu se poate deschide o conexiune."
+
 msgid "Unable to establish file descriptor."
 msgstr "Nu se poate evalua descriptorul fișierului."
 
@@ -9961,6 +9782,9 @@ msgstr "Nu se poate evalua descriptorul fișierului."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s se oferă să vă trimită un grup de %d fișiere.\n"
 
+msgid "Write Error"
+msgstr "Eroare la scriere"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Profil Yahoo! Japonia"
 
@@ -10080,23 +9904,19 @@ msgstr "Audio"
 msgid "Webcams"
 msgstr "Video"
 
+msgid "Connection problem"
+msgstr "Probleme la conectare"
+
 msgid "Unable to fetch room list."
 msgstr "Nu se poate obține lista camerelor de chat."
 
 msgid "User Rooms"
 msgstr "Camere de chat utilizatori"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Probleme de conectare la serverul YCHT."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"S-a pierdut conexiunea cu serverul\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10226,33 +10046,22 @@ msgstr "Domeniu"
 msgid "Exposure"
 msgstr "Expunere"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Nu s-a putut crea un socket:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Nu se poate prelucra răspunsul de la serverul proxy HTTP: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Eroare la conectarea la serverul proxy HTTP: %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Acces interzis: serverul proxy nu permite tunelarea portului %d."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Eroare la rezolvarea %s"
 
-msgid "Could not resolve host name"
-msgstr "Nu s-a putut rezolva numele serverului"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Se cere atenție din partea contactului %s..."
@@ -10461,14 +10270,6 @@ msgstr "Eroare la scrierea %s: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "Nu s-a reușit conectarea la %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"Serverul necesită TLS/SSL pentru autentificare. Nu s-a găsit nici un fel de "
-"suport TLS/SSL."
-
 #, c-format
 msgid " - %s"
 msgstr " - %s"
@@ -10719,9 +10520,14 @@ msgstr "Adăugare întâm_pinare..."
 msgid "View _Log"
 msgstr "Arată în_registrările"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Ascunde la deconectare"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Arată la deconectare"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
@@ -11231,6 +11037,11 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Modificare detalii pentru %s"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr ""
+"Introduceți numele calculatorului pentru care a fost eliberat certificatul"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Servere SSL"
@@ -11278,7 +11089,8 @@ msgstr "Ignoră"
 msgid "Get Away Message"
 msgstr "Obține mesajul în absență"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Ultima replică"
 
 msgid "Unable to save icon file to disk."
@@ -12173,7 +11985,8 @@ msgstr "Culoare pentru afișarea adreselor."
 msgid "Hyperlink visited color"
 msgstr "Culoare adresă web"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+#, fuzzy
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Culoare pentru afișarea adreselor web vizitate ori activate."
 
 msgid "Hyperlink prelight color"
@@ -12209,13 +12022,22 @@ msgstr "Culoare de utilizat pentru numele mesajelor de tip comandă."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Culoare pentru mesajele comenzi în mod discret"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Culoare de utilizat pentru numele mesajelor de tip comandă."
+
 msgid "Whisper Message Name Color"
 msgstr "Culoare pentru mesajele discrete"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Culoare de utilizat pentru numele mesajelor de tip comandă."
+
 msgid "Typing notification color"
 msgstr "Culoarea mesajelor de notificare"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "Culoare de utilizat pentru mesajele de notificare"
 
 msgid "Typing notification font"
@@ -12616,6 +12438,10 @@ msgstr ""
 "Ați ales să precizați o comandă pentru deschiderea unui navigator, dar nu "
 "ați introdus-o în preferințe."
 
+#, fuzzy
+msgid "No message"
+msgstr "Mesaj necunoscut"
+
 msgid "Open All Messages"
 msgstr "Deschide toate mesajele"
 
@@ -12633,10 +12459,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Aveți mail nou!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Mesaj necunoscut"
-
 msgid "The following plugins will be unloaded."
 msgstr "Următoarele module vor fi dezactivate."
 
@@ -12853,8 +12675,9 @@ msgstr "Arată iconița din _zona de notificare:"
 msgid "On unread messages"
 msgstr "Pentru mesajele necitite"
 
-msgid "Conversation Window Hiding"
-msgstr "Ascundere ferestre de discuții"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Ferestre de discuții"
 
 msgid "_Hide new IM conversations:"
 msgstr "Ascunde discuțiile _noi:"
@@ -12862,6 +12685,9 @@ msgstr "Ascunde discuțiile _noi:"
 msgid "When away"
 msgstr "În absență"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Minimi_zează noile ferestre de discuții"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Taburi"
@@ -12920,9 +12746,6 @@ msgstr "Derulare cu efect"
 msgid "F_lash window when IMs are received"
 msgstr "_Evidențiază fereastra la primirea de mesaje"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Minimi_zează noile ferestre de discuții"
-
 msgid "Minimum input area height in lines:"
 msgstr "Înălțime minimă pentru zona de introducere de text:"
 
@@ -12957,7 +12780,8 @@ msgstr "Nu s-a putut porni programul de configurare a unui navigator."
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemplu: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Autodetectare adresă IP"
 
 msgid "Public _IP:"
@@ -13325,21 +13149,6 @@ msgstr "Sal_vează și utilizează"
 msgid "Status for %s"
 msgstr "Status pentru %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "Iconiță simbolică personalizată"
-
-msgid "More Data needed"
-msgstr "E nevoie de mai multe date"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Alegeți o combinație de semne de asociat acestei iconițe."
-
 #, fuzzy, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
@@ -13347,12 +13156,12 @@ msgstr ""
 "O iconiță simbolică personalizată există deja pentru combinația de semne "
 "selectată. Alegeți o altă combinație de semne."
 
+msgid "Custom Smiley"
+msgstr "Iconiță simbolică personalizată"
+
 msgid "Duplicate Shortcut"
 msgstr "Combinație duplicată de semne"
 
-msgid "Please select an image for the smiley."
-msgstr "Selectați o imagine pentru această iconiță."
-
 msgid "Edit Smiley"
 msgstr "Editare iconiță simbolică"
 
@@ -13466,9 +13275,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Lansatorul nu a putut fi trimis"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Ați tras și plasat un lansator pentru desktop. Probabil doriți sa trimiteți "
 "nu lansatorul în sine, ci fișierul la care face referire."
@@ -14067,9 +13877,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Mesaje muzicale pentru compoziții în colaborare."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Modulul de mesaje muzicale permite utilizatorilor să lucreze simultan la o "
 "piesă muzicală editând o partitură comună în timp real."
@@ -14324,9 +14135,10 @@ msgid "Conversation Window Send Button."
 msgstr "Buton de trimitere în fereastra de discuții"
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr "Adaugă un buton de trimitere a mesajului în fereastra de discuții."
 
 msgid "Duplicate Correction"
@@ -14652,8 +14464,9 @@ msgstr "Opțiuni Pidgin în Windows"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opțiuni Pidgin specifice Windows."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Permite alegerea unor opțiuni Pidgin pentru Windows, precum atașarea listei "
 "de contacte."
@@ -14696,6 +14509,296 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Acest modul poate fi utilizat pentru depanarea serverelor și clienților XMPP."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Nu s-a putut deschide un socket"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Nu se poate asculta pe socket"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Nu se poate citi din socket"
+
+#~ msgid "Connection failed."
+#~ msgstr "Conexiunea a eșuat."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Serverul s-a deconectat"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Nu s-a putut crea un socket"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Conectarea la server a eșuat"
+
+#~ msgid "Read error"
+#~ msgstr "Eroare la citire"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nu s-a putut face o conexiune cu serverul:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Eroare la scriere"
+
+#~ msgid "Last Activity"
+#~ msgstr "Ultima activitate"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Detalii servicii descoperite"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Servicii descoperite"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Adresare „stanza” extinsă"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Chat cu mai mulți utilizatori"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr ""
+#~ "Detalii suplimentare despre prezența într-un chat cu mai mulți "
+#~ "utilizatori."
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Comenzi ad-hoc"
+
+#~ msgid "PubSub Service"
+#~ msgstr "Serviciu PubSub"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "Fluxuri de date SOCKS5"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "Eroare la înregistrare"
+
+#~ msgid "User Location"
+#~ msgstr "Loc utilizator"
+
+#~ msgid "User Avatar"
+#~ msgstr "Avatar utilizator"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Notificări de stări pentru chat"
+
+#~ msgid "Software Version"
+#~ msgstr "Versiune de software"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Inițializare flux de date"
+
+#~ msgid "User Mood"
+#~ msgstr "Dispoziția utilizatorului"
+
+#~ msgid "User Activity"
+#~ msgstr "Acitivatea utilizatorului"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Facilitățile entității"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Negocieri sesiuni criptate"
+
+#~ msgid "User Tune"
+#~ msgstr "Piesă utilizator"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "IM cu schimb de chei"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "Adresă de mail"
+
+#~ msgid "User Profile"
+#~ msgstr "Profil utilizator"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "Intră"
+
+#~ msgid "User Nickname"
+#~ msgstr "Pseudonim utilizator"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "Video în direct"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Confirmări mesaje"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "Amprentă silabică cheie publică"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "Opțiuni personale"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "Moduri utilizator"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "Nume utilizator"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "Limită utilizatori"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Criptare Trillian"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Livrare întârziată"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Repozitorii de fișiere și partajare"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Negociere sesiune de criptare simplificată"
+
+#~ msgid "Hop Check"
+#~ msgstr "Verificare hopuri"
+
+#~ msgid "Read Error"
+#~ msgstr "Eroare la citire"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Conectarea la server a eșuat."
+
+#~ msgid "Unparseable message"
+#~ msgstr "Nu se poate prelucra mesajul"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Conectarea la server a eșuat"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Autentificare eșuată (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Ați fost deconectat(ă) pentru că v-ați autentificat de pe o altă stație."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Eroare: suportul SSL nu este instalat."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Parolă incorectă."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Conectarea la serverul BOS a eșuat:\n"
+#~ "%s"
+
+#~ 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 "Could Not Connect"
+#~ msgstr "Conectare eșuată"
+
+#~ msgid "Invalid username."
+#~ msgstr "Nume invalid de utilizator"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Nu s-au putut obține detalii despre server"
+
+#~ msgid "Connection lost"
+#~ msgstr "Conexiune pierdută"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Nu s-a putut rezolva numele calculatorului"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Conexiune terminată (la scriere)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Conexiune resetată"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Eroare la citirea din socket: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Conectarea la server a eșuat"
+
+#~ msgid "Could not write"
+#~ msgstr "Nu s-a putut scrie"
+
+#~ msgid "Could not connect"
+#~ msgstr "Conectare eșuată"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Nu s-a putut crea un socket de ascultare"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Nu s-a putut rezolva numele calculatorului"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Parolă greșită"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nu s-a putut face o conexiune cu %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japonia"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Server pager Japonia"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Server transfer de fișiere Japonia"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "S-a pierdut conexiunea cu serverul\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Nu s-a putut rezolva numele serverului"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Serverul necesită TLS/SSL pentru autentificare. Nu s-a găsit nici un fel "
+#~ "de suport TLS/SSL."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Ascundere ferestre de discuții"
+
+#~ msgid "More Data needed"
+#~ msgstr "E nevoie de mai multe date"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Alegeți o combinație de semne de asociat acestei iconițe."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Selectați o imagine pentru această iconiță."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Ce identitate doriți să activați?"
 
@@ -15193,9 +15296,6 @@ msgstr ""
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "Autentificare eșuată. Verificați înregistrările de depanare"
 
-#~ msgid "Unable to login"
-#~ msgstr "Autentificare eșuată."
-
 #, fuzzy
 #~ msgid "Failed room reply"
 #~ msgstr "Autentificare eșuată, nici un răspuns"
diff --git a/po/ru.po b/po/ru.po
index 0f33997bf8..ad0384c4bb 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2008-05-14 15:00+0400\n"
 "Last-Translator: Антон Самохвалов <samant.ua@mail.ru>\n"
 "Language-Team: \n"
@@ -2603,9 +2603,10 @@ msgstr ""
 "журналов."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2660,8 +2661,9 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 "Сохранить сообщения, отправленные пользователю \"не в сети\", как правило."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Остальные сообщения будут сохранены как правила. Вы можете их изменять или "
@@ -2912,14 +2914,16 @@ msgstr ""
 "Невозможно обнаружить установку ActiveTCL. Если вы хотите использвать модули "
 "TCL, установите ActiveTCL из http://www.activestate.com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Набор инструментов Apple Bonjour для Windows не был найден, смотрите ЧаВо на:"
 "http://d.pidgin.im/BonjourWindows для дополнительной информации."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Не удаётся прослушивать входящие соединения\n"
 
 msgid ""
@@ -2973,14 +2977,21 @@ msgstr "%s закрыл беседу."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Не удаётся отправить сообщение, не удалось начать беседу."
 
-msgid "Cannot open socket"
-msgstr "Не удаётся открыть сокет"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Не удаётся создать сокет:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Не удалось связать сокет с портом"
 
-msgid "Could not listen on socket"
-msgstr "Не удалось осуществить прослушивание сокета"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Не удаётся создать сокет:\n"
+"%s"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3028,13 +3039,16 @@ msgstr "Сохранить список собеседников..."
 msgid "Load buddylist from file..."
 msgstr "Загрузить список собеседников из файла..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Заполните поля регистрационной формы."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Пароли не совпадают."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Не удаётся зарегистрировать новую учётную запись. Произошла ошибка.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3046,14 +3060,15 @@ msgstr "Регистрация завершена успешно!"
 msgid "Password"
 msgstr "Пароль"
 
-msgid "Password (retype)"
-msgstr "Пароль (наберите ещё раз)"
+msgid "Password (again)"
+msgstr "Пароль (ещё раз)"
 
-msgid "Enter current token"
-msgstr "Введите текущий маркер"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Текущий маркер"
+#, fuzzy
+msgid "Captcha"
+msgstr "Захватить изображение"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Зарегистрировать новую учётную запись Gadu-Gadu"
@@ -3106,6 +3121,15 @@ msgstr "Пароль был успешно изменён!"
 msgid "Current password"
 msgstr "Текущий пароль"
 
+msgid "Password (retype)"
+msgstr "Пароль (наберите ещё раз)"
+
+msgid "Enter current token"
+msgstr "Введите текущий маркер"
+
+msgid "Current token"
+msgstr "Текущий маркер"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Введите текущий и новый пароли для UIN: "
 
@@ -3153,8 +3177,8 @@ msgstr "Пользователи не найдены"
 msgid "There are no users matching your search criteria."
 msgstr "Нет пользователей, соответствующих критериям поиска."
 
-msgid "Unable to read socket"
-msgstr "Не удаётся прочитать сокет"
+msgid "Unable to read from socket"
+msgstr "Не удаётся прочитать из сокета"
 
 msgid "Buddy list downloaded"
 msgstr "Список собеседников загружен"
@@ -3168,8 +3192,14 @@ msgstr "Список собеседников сохранён"
 msgid "Your buddy list was stored on the server."
 msgstr "Список собеседников был сохранён на сервере."
 
-msgid "Connection failed."
-msgstr "Не удалось установить соединение."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Соединение установлено"
+
+msgid "Connection failed"
+msgstr "Не удалось установить соединение"
 
 msgid "Add to chat"
 msgstr "Добавить к чату"
@@ -3177,18 +3207,23 @@ msgstr "Добавить к чату"
 msgid "Chat _name:"
 msgstr "_Имя чата:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Не удаётся соединиться с сервером."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Соединение"
+
 msgid "Chat error"
 msgstr "Ошибка чата"
 
 msgid "This chat name is already in use"
 msgstr "Это имя чата уже используется"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Нет соединения с сервером."
 
 msgid "Find buddies..."
@@ -3248,7 +3283,8 @@ msgstr "Тема не установлена"
 msgid "File Transfer Failed"
 msgstr "Не удалось произвести передачу файлов"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Не удалось открыть порт для прослушивания."
 
 msgid "Error displaying MOTD"
@@ -3264,8 +3300,18 @@ msgstr "Нет MOTD, соотнесённого с этим соединение
 msgid "MOTD for %s"
 msgstr "MOTD для %s"
 
-msgid "Server has disconnected"
-msgstr "Сервер разорвал соединение"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Соединение с сервером потеряно:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Просмотреть MOTD"
@@ -3280,22 +3326,20 @@ msgstr "_Пароль:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "Псевдонимы IRC не могут содержать пробелы"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Соединение"
-
 msgid "SSL support unavailable"
 msgstr "Поддержка SSL недоступна"
 
-msgid "Couldn't create socket"
-msgstr "Не удалось создать сокет"
+msgid "Unable to connect"
+msgstr "Не удаётся установить соединение"
 
-msgid "Couldn't connect to host"
-msgstr "Не удалось соединиться с узлом"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Не удаётся соединиться с %s"
 
-msgid "Read error"
-msgstr "Ошибка чтения"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Сервер разорвал соединение."
 
 msgid "Users"
 msgstr "Пользователи"
@@ -3730,11 +3774,12 @@ msgstr "Команда Ad-Hoc не удалась"
 msgid "execute"
 msgstr "выполнить"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Сервер требует TLS/SSL для входа. Поддержка TLS/SSL не найдена."
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Вы потребовали шифрование, но поддержка TLS/SSL не найдена."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3752,7 +3797,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Аутентификация простым текстом"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Аутентификация завершилась неудачно"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Неверный отклик от сервера."
 
 msgid "Server does not use any supported authentication method"
@@ -3764,7 +3814,8 @@ msgstr "Вы запросили шифрование, но оно недосту
 msgid "Invalid challenge from server"
 msgstr "Неверный запрос с сервера"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Ошибка SASL"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3784,10 +3835,8 @@ msgstr ""
 "Не удалось установить соединение с сервером:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Не удалось установить соединение с сервером:\n"
 "%s"
@@ -3796,12 +3845,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "Не удаётся инициализировать соединение"
 
-msgid "Unable to create socket"
-msgstr "Не удаётся создать сокет"
-
-msgid "Write error"
-msgstr "Ошибка записи"
-
 msgid "Full Name"
 msgstr "Полное имя"
 
@@ -3871,165 +3914,6 @@ msgstr "Операционная система"
 msgid "Local Time"
 msgstr "Локальный файл:"
 
-msgid "Last Activity"
-msgstr "Последняя активность"
-
-msgid "Service Discovery Info"
-msgstr "Информация о службе Разъяснения"
-
-msgid "Service Discovery Items"
-msgstr "Элементы службы Разъяснения"
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "Расширенная строфная адресация"
-
-msgid "Multi-User Chat"
-msgstr "Многопользовательский чат"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Информация о расширенном присутствии многопользовательского чата."
-
-msgid "In-Band Bytestreams"
-msgstr "Внутриполосные потоки информации"
-
-msgid "Ad-Hoc Commands"
-msgstr "Команды Ad-Hoc"
-
-msgid "PubSub Service"
-msgstr "Служба PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "Потоки информации SOCKS5"
-
-msgid "Out of Band Data"
-msgstr "Вне полосы данных"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "Внутриполосная регистрация"
-
-msgid "User Location"
-msgstr "Местоположение пользователя"
-
-msgid "User Avatar"
-msgstr "Аватара пользователя"
-
-msgid "Chat State Notifications"
-msgstr "Уведомления о состоянии чата"
-
-msgid "Software Version"
-msgstr "Версия программного обеспечения"
-
-msgid "Stream Initiation"
-msgstr "Создание потока"
-
-msgid "File Transfer"
-msgstr "Передача файлов"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "Настроение пользователя"
-
-msgid "User Activity"
-msgstr "Активность пользователя"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "Возможности существования"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Зашифрованный сеанс переговоров"
-
-msgid "User Tune"
-msgstr "Настройка пользователя"
-
-msgid "Roster Item Exchange"
-msgstr "Реестр элементов обмена"
-
-msgid "Reachability Address"
-msgstr "Доступность адреса"
-
-msgid "User Profile"
-msgstr "Профиль пользователя"
-
-msgid "Jingle"
-msgstr "Звон"
-
-msgid "Jingle Audio"
-msgstr "Звенящий звук"
-
-msgid "User Nickname"
-msgstr "Псевдоним пользователя"
-
-msgid "Jingle ICE UDP"
-msgstr "Звон ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Звон ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Звон Raw UDP"
-
-msgid "Jingle Video"
-msgstr "Звенящее видео"
-
-msgid "Jingle DTMF"
-msgstr "Звон DTMF"
-
-msgid "Message Receipts"
-msgstr "Получение сообщений"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "Файл публичного ключа"
-
-msgid "User Chatting"
-msgstr "Переписка пользователя"
-
-msgid "User Browsing"
-msgstr "Проводник пользователя"
-
-msgid "User Gaming"
-msgstr "Игра пользователя"
-
-msgid "User Viewing"
-msgstr "Просмотр пользователя"
-
-msgid "Ping"
-msgstr "Прозвон"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Строфное шифрование"
-
-msgid "Entity Time"
-msgstr "Время существования"
-
-msgid "Delayed Delivery"
-msgstr "Задержанная доставка"
-
-msgid "Collaborative Data Objects"
-msgstr "Совместные объекты данных"
-
-msgid "File Repository and Sharing"
-msgstr "Хранилище файлов и совместное пользование"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "Служба Разъяснения STUN для Звона"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Упрощённо зашифрованный сеанс переговоров"
-
-msgid "Hop Check"
-msgstr "Проверка прыжков"
-
-msgid "Capabilities"
-msgstr "Возможности"
-
 msgid "Priority"
 msgstr "Приоритет"
 
@@ -4041,7 +3925,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "В сети"
 
 msgid "Middle Name"
@@ -4224,16 +4108,13 @@ msgstr "Пользователи не найдены"
 msgid "Roles:"
 msgstr "Должность"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Время ожидания при прозвоне истекло"
 
-msgid "Read Error"
-msgstr "Ошибка чтения"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4410,9 +4291,6 @@ msgstr "Пароль был изменён."
 msgid "Error changing password"
 msgstr "Ошибка изменения пароля"
 
-msgid "Password (again)"
-msgstr "Пароль (ещё раз)"
-
 msgid "Change XMPP Password"
 msgstr "Изменить пароль XMPP"
 
@@ -4798,6 +4676,14 @@ msgstr "Ошибка разбора XML"
 msgid "Unknown Error in presence"
 msgstr "Имеет место неизвестная ошибка"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Ошибка присоединения к чату %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Ошибка в чате %s"
+
 msgid "Create New Room"
 msgstr "Создать новую комнату"
 
@@ -4814,16 +4700,20 @@ msgstr "_Настроить комнату"
 msgid "_Accept Defaults"
 msgstr "_Принять установки по умолчанию"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Ошибка присоединения к чату %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Причина не указана"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Ошибка в чате %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Вы были удалены оператором %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Удалён оператором %s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Произошла ошибка при открытии файла."
 
 #, fuzzy
@@ -5323,9 +5213,6 @@ msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "Поддержка SSL необходима для MSN. Установите поддерживаемую библиотеку SSL."
 
-msgid "Failed to connect to server."
-msgstr "Не удалось соединиться с сервером."
-
 msgid "Error retrieving profile"
 msgstr "Ошибка загрузки профиля"
 
@@ -5596,9 +5483,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Сообщение не было отправлено, потому что произошла неизвестная ошибка."
 
-msgid "Unable to connect"
-msgstr "Не удаётся установить соединение"
-
 msgid "Writing error"
 msgstr "Ошибка записи"
 
@@ -5613,19 +5497,23 @@ msgstr ""
 "Ошибка соединения от сервера %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Наш протокол не поддерживается сервером."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Ошибка разбора HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Вы подключены из другого места."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "Серверы MSN временно недоступны. Повторите попытку позже."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Серверы MSN временно выключаются."
 
 #, c-format
@@ -5637,9 +5525,6 @@ msgid ""
 msgstr ""
 "Ваш список собеседников MSN временно недоступен. Повторите попытку позже."
 
-msgid "Unknown error."
-msgstr "Неизвестная ошибка."
-
 msgid "Handshaking"
 msgstr "Согласование"
 
@@ -5746,6 +5631,9 @@ msgstr "Модуль протокола MSN"
 msgid "%s is not a valid group."
 msgstr "%s не является допустимой группой."
 
+msgid "Unknown error."
+msgstr "Неизвестная ошибка."
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s на %s (%s)"
@@ -5860,12 +5748,6 @@ msgstr[2] ""
 msgid "Add contacts from server"
 msgstr "Добавить контакты с сервера"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Соединение установлено"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Ошибка протокола, код %d: %s"
@@ -5889,17 +5771,6 @@ msgstr "Ошибка MySpaceIM"
 msgid "Invalid input condition"
 msgstr "Неверное состояние ввода"
 
-#, fuzzy
-msgid "Read buffer full (2)"
-msgstr "Буфер чтения полон (2)"
-
-msgid "Unparseable message"
-msgstr "Неразбираемое сообщение"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Не удалось соединиться с узлом: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Не удалось добавить собеседника"
 
@@ -5988,6 +5859,12 @@ msgstr "Всего друзей"
 msgid "Client Version"
 msgstr "Версия клиента"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Имя пользователя доступно"
 
@@ -6246,9 +6123,9 @@ msgstr "Пользователь не в сети или заблокирова�
 msgid "Unknown error: 0x%X"
 msgstr "Неизвестная ошибка: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Не удалось войти в сеть (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Не могу прозвонить пользователя %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6354,9 +6231,6 @@ msgstr "Конференция GroupWise %d"
 msgid "Authenticating..."
 msgstr "Аутентификация..."
 
-msgid "Unable to connect to server."
-msgstr "Не удаётся соединиться с сервером."
-
 msgid "Waiting for response..."
 msgstr "Ожидание отклика..."
 
@@ -6380,9 +6254,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Хотите присоединиться к беседе?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Вы были отключены, так как вошли с другой машины."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6390,16 +6261,14 @@ msgstr ""
 "Вероятно, %s не в сети и не получил сообщение, которое вы только что "
 "отправили."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Не удаётся соединиться с сервером. Введите адрес сервера, с которым вы "
 "хотите соединиться."
 
-msgid "Error. SSL support is not installed."
-msgstr "Ошибка. Поддержка SSL не установлена."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 "Эта конференция была закрыта. Больше не может быть отправлено ни одного "
@@ -6440,10 +6309,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "Ошибка запроса маркера входа"
 
-msgid "Incorrect password."
-msgstr "Неправильный пароль."
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6452,18 +6318,8 @@ msgstr "Не удалось присоединиться к чату"
 msgid "Invalid chat room name"
 msgstr "Неверное имя чата"
 
-msgid "Server closed the connection."
-msgstr "Сервер разорвал соединение."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Соединение с сервером потеряно:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "При соединении с сервером получены недопустимые данные."
 
 #. *< type
@@ -6511,7 +6367,8 @@ msgstr "Соединение с удалённым пользователем п
 msgid "Received invalid data on connection with remote user."
 msgstr "При соединении с удалённым пользователем получены недопустимые данные."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Не удалось установить соединение с удалённым пользователем."
 
 msgid "Direct IM established"
@@ -6711,21 +6568,15 @@ msgstr "Уровень предупреждения"
 msgid "Buddy Comment"
 msgstr "Комментарий собеседника"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Не удалось установить соединение с сервером аутентификации:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Не удалось установить соединение с BOS-сервером:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Не удаётся соединиться с сервером."
 
 msgid "Username sent"
 msgstr "Имя пользователя отправлено"
@@ -6737,11 +6588,11 @@ msgstr "Соединение установлено, данные отправл
 msgid "Finalizing connection"
 msgstr "Завершение установления соединения"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Не могу войти: Не могу войти как %s, потому что имя пользователя неверное.  "
 "Именем пользователя должен быть правильный адрес эл.почты или начинаться с "
@@ -6756,27 +6607,22 @@ msgstr ""
 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 "Неверное имя пользователя."
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Пользователь не существует"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Ваша учётная запись сейчас заблокирована."
 
 #. service temporarily unavailable
@@ -6796,7 +6642,8 @@ msgstr ""
 "Вы соединялись и отсоединялись слишком часто. Подождите 10 минут и "
 "попытайтесь снова. Если вы продолжите попытки, вам придётся ждать ещё дольше."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Введённый ключ SecurID неверный."
 
 msgid "Enter SecurID"
@@ -6989,6 +6836,9 @@ msgstr "В сети с"
 msgid "Member Since"
 msgstr "Член с"
 
+msgid "Capabilities"
+msgstr "Возможности"
+
 msgid "Profile"
 msgstr "Профиль"
 
@@ -7176,9 +7026,9 @@ msgstr[2] ""
 msgid "Away message too long."
 msgstr "Сообщение об отсутствии слишком велико."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7205,9 +7055,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Сироты"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Не удалось добавить собеседника %s, так как в списке собеседников слишком "
@@ -7216,8 +7066,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(нет имени)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Не удалось добавить собеседника %s по неизвестной причине."
 
 #, fuzzy, c-format
@@ -8055,7 +7905,7 @@ msgid "Update interval (seconds)"
 msgstr "Обновить интервал (секунды)"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Не удаётся расшифровать ответ сервера"
 
 #, c-format
@@ -8082,10 +7932,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Неизвестный код ответа при входе (0x%02X)"
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Не могу расшифровать ответ сервера"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "Запрос захвата"
 
@@ -8124,21 +7970,9 @@ msgstr ""
 "Неизвестный код ответа при входе (0x%02X):\n"
 "%s"
 
-msgid "Unable to connect."
-msgstr "Не удаётся установить соединение."
-
 msgid "Socket error"
 msgstr "Ошибка сокета"
 
-msgid "Unable to read from socket"
-msgstr "Не удаётся прочитать из сокета"
-
-msgid "Write Error"
-msgstr "Ошибка записи"
-
-msgid "Connection lost"
-msgstr "Соединение потеряно"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "Получение сервера"
@@ -8147,8 +7981,9 @@ msgstr "Получение сервера"
 msgid "Requesting token"
 msgstr "Принят запрос"
 
-msgid "Couldn't resolve host"
-msgstr "Не удалось разрешить имя узла"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Не удаётся соединиться с сервером."
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8207,7 +8042,7 @@ msgid "QQ Qun Command"
 msgstr "Команда QQ Qun"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Не могу расшифровать ответ входа"
 
 #, fuzzy
@@ -8229,9 +8064,6 @@ msgstr "Отправка файла"
 msgid "%d canceled the transfer of %s"
 msgstr "%d отменил передачу %s"
 
-msgid "Connection closed (writing)"
-msgstr "Соединение разорвано (запись)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Название группы:</b> %s<br>"
@@ -8285,17 +8117,6 @@ msgstr "Текущий администратор огласил следующ�
 msgid "Sametime Administrator Announcement"
 msgstr "Объявление текущего администратора"
 
-msgid "Connection reset"
-msgstr "Сброс соединения"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Ошибка при чтении из сокета: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Не удаётся соединиться с узлом"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Объявление от %s"
@@ -8318,6 +8139,9 @@ msgstr "Колонки"
 msgid "Video Camera"
 msgstr "Видеокамера"
 
+msgid "File Transfer"
+msgstr "Передача файлов"
+
 msgid "Supports"
 msgstr "Поддерживается"
 
@@ -9137,6 +8961,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Статистика сети"
 
+msgid "Ping"
+msgstr "Прозвон"
+
 msgid "Ping failed"
 msgstr "Прозвон неудался"
 
@@ -9200,7 +9027,8 @@ msgstr "Неподдерживаемый тип публичного ключа"
 msgid "Disconnected by server"
 msgstr "Соединение разорвано сервером"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Ошибка во время соединения с сервером SILC"
 
 msgid "Key Exchange failed"
@@ -9212,26 +9040,26 @@ msgstr ""
 "Не удалось возобновить прерванную сессию. Нажмите \"Переустановить соединение"
 "\" для создания нового соединения."
 
-msgid "Connection failed"
-msgstr "Не удалось установить соединение"
-
 msgid "Performing key exchange"
 msgstr "Выполнение обмена ключами"
 
-msgid "Unable to create connection"
-msgstr "Не удаётся создать соединение"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Не удалось загрузить пару ключей SILC"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Соединение с сервером SILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Не удалось загрузить пару ключей SILC"
+
 msgid "Out of memory"
 msgstr "Недостаточно памяти"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Не удаётся инициализировать протокол SILC"
 
 msgid "Error loading SILC key pair"
@@ -9536,7 +9364,8 @@ msgstr "Делать цифровую подпись и проверку все�
 msgid "Creating SILC key pair..."
 msgstr "Создание пары ключей SILC..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Не удаётся создать пару ключей SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9631,6 +9460,9 @@ msgstr "Белая доска"
 msgid "No server statistics available"
 msgstr "Нет доступной статистики сервера"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Ошибка во время соединения с сервером SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Ошибка: Несоответствие версии, обновите свой клиент"
@@ -9671,30 +9503,27 @@ msgstr "Ошибка: Неверные данные"
 msgid "Failure: Authentication failed"
 msgstr "Ошибка: Аутентификация завершилась неудачно"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Не удаётся инициализировать соединение клиента SILC"
 
 msgid "John Noname"
 msgstr "Иван Безымянный"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Не удалось загрузить пару ключей SILC: %s"
 
-msgid "Could not write"
-msgstr "Не удалось записать"
-
-msgid "Could not connect"
-msgstr "Не удалось установить соединение"
+msgid "Unable to create connection"
+msgstr "Не удаётся создать соединение"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Неизвестный отклик от сервера."
 
-msgid "Could not create listen socket"
-msgstr "Не удалось создать сокет для прослушивания"
-
-msgid "Could not resolve hostname"
-msgstr "Не удалось разрешить имя узла"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Не удаётся создать сокет"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Имена пользователей SIP не могут содержать пробелы или символы @"
@@ -9736,6 +9565,78 @@ msgstr "Пользователь авторизации"
 msgid "Auth Domain"
 msgstr "Домен авторизации"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;комната&gt;:  Присоединиться к чату в сети Yahoo"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Вывести список комнат в сети Yahoo"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "безделье: Запросите пользователя, чтобы начать сеанс безделья"
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Модуль протокола Yahoo"
+
+msgid "Pager server"
+msgstr "Сервер пейджера"
+
+msgid "Pager port"
+msgstr "Порт пейджера"
+
+msgid "File transfer server"
+msgstr "Сервер передачи файлов"
+
+msgid "File transfer port"
+msgstr "Порт передачи файлов"
+
+msgid "Chat room locale"
+msgstr "Языковой формат чата"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Игнорировать приглашения в конференции и чаты"
+
+msgid "Chat room list URL"
+msgstr "URL списка чатов"
+
+msgid "Yahoo Chat server"
+msgstr "Сервер чата Yahoo"
+
+msgid "Yahoo Chat port"
+msgstr "Порт чата Yahoo"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Модуль протокола Yahoo"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9765,29 +9666,19 @@ msgstr "В добавлении собеседника отказано"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 "Неизвестная ошибка номер %d. Вход с web-сайта Yahoo! может исправить это."
 
@@ -9828,39 +9719,34 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Неизвестная ошибка номер %d. Вход с web-сайта Yahoo! может исправить это."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Не удалось добавить собеседника %s в группу %s в список на сервере учётной "
 "записи %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Не удалось добавить собеседника в список на сервере"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Слышимый %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Получен непредвиденный HTTP-отклик от сервера."
 
-msgid "Connection problem"
-msgstr "Проблема с соединением"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Соединение с %s потеряно:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Не удалось установить соединение с %s:\n"
+"Не удалось установить соединение с сервером:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9923,74 +9809,15 @@ msgstr "Присоединиться к пользователю в чате..."
 msgid "Open Inbox"
 msgstr "Открыть входящие"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;комната&gt;:  Присоединиться к чату в сети Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Вывести список комнат в сети Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "безделье: Запросите пользователя, чтобы начать сеанс безделья"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Модуль протокола Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-msgid "Pager server"
-msgstr "Сервер пейджера"
-
-msgid "Japan Pager server"
-msgstr "Сервер пейджера Japan"
-
-msgid "Pager port"
-msgstr "Порт пейджера"
-
-msgid "File transfer server"
-msgstr "Сервер передачи файлов"
-
-msgid "Japan file transfer server"
-msgstr "Сервер передачи файлов Japan"
-
-msgid "File transfer port"
-msgstr "Порт передачи файлов"
-
-msgid "Chat room locale"
-msgstr "Языковой формат чата"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Игнорировать приглашения в конференции и чаты"
-
-msgid "Chat room list URL"
-msgstr "URL списка чатов"
-
-msgid "Yahoo Chat server"
-msgstr "Сервер чата Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "Порт чата Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Послан запрос безделья."
 
+msgid "Unable to connect."
+msgstr "Не удаётся установить соединение."
+
 msgid "Unable to establish file descriptor."
 msgstr "Не удаётся установить дескриптор файла."
 
@@ -9998,6 +9825,9 @@ msgstr "Не удаётся установить дескриптор файла
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s пытается отправить вам группу из %d файлов.\n"
 
+msgid "Write Error"
+msgstr "Ошибка записи"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Профиль Yahoo! Japan"
 
@@ -10118,23 +9948,19 @@ msgstr "Голоса"
 msgid "Webcams"
 msgstr "Веб-камеры"
 
+msgid "Connection problem"
+msgstr "Проблема с соединением"
+
 msgid "Unable to fetch room list."
 msgstr "Не удаётся загрузить список комнат."
 
 msgid "User Rooms"
 msgstr "Комнаты пользователя"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Проблема с соединением с сервером YCHT."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Соединение с сервером потеряно\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10266,33 +10092,22 @@ msgstr "Сфера"
 msgid "Exposure"
 msgstr "Выдержка"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Не удаётся создать сокет:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Не в состоянии разобрать ответ от HTTP прокси: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Ошибка соединения с HTTP-прокси %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Доступ запрещён: прокси-сервер HTTP запрещает туннелирование порта %d."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Ошибка разрешения имени %s"
 
-msgid "Could not resolve host name"
-msgstr "Не удалось разрешить имя узла"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Прошу внимания %s..."
@@ -10502,12 +10317,6 @@ msgstr "Ошибка записи в %s: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "Не удаётся соединиться с %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "Сервер требует TLS/SSL для входа. Поддержка TLS/SSL не найдена."
-
 #, c-format
 msgid " - %s"
 msgstr " - %s"
@@ -10761,9 +10570,14 @@ msgstr "Добавить п_равило..."
 msgid "View _Log"
 msgstr "Просмотреть _журнал"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Скрывать, когда не в сети"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Показывать, когда не в сети"
+
 msgid "_Alias..."
 msgstr "_Псевдоним..."
 
@@ -11273,6 +11087,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Изменить пользовательскую информацию для %s"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Укажите имя компьютера, для которого этот сертификат."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL-серверы"
@@ -11319,7 +11137,8 @@ msgstr "Игнорировать"
 msgid "Get Away Message"
 msgstr "Получить сообщение об отсутствии"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Последнее сказанное"
 
 msgid "Unable to save icon file to disk."
@@ -12229,7 +12048,7 @@ msgid "Hyperlink visited color"
 msgstr "Цвет посещённой гиперссылки"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Цвет для отображения гиперссылок после их посещения (или активации)."
 
 msgid "Hyperlink prelight color"
@@ -12270,14 +12089,23 @@ msgid "Action Message Name Color for Whispered Message"
 msgstr "Цвет имени сообщения действия для прошепченного сообщения"
 
 #, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Цвет для отображения имени сообщения действия."
+
+#, fuzzy
 msgid "Whisper Message Name Color"
 msgstr "Цвет имени прошепченного сообщения"
 
 #, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Цвет для отображения имени сообщения действия."
+
+#, fuzzy
 msgid "Typing notification color"
 msgstr "Цвет набора уведомления"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "Цвет, использующийся для шрифта набора уведомления"
 
 msgid "Typing notification font"
@@ -12675,6 +12503,10 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Был выбран браузер \"Другой\", но команда не была задана."
 
+#, fuzzy
+msgid "No message"
+msgstr "Неизвестное сообщение"
+
 msgid "Open All Messages"
 msgstr "Открыть все сообщения"
 
@@ -12692,10 +12524,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Вам пришла почта!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Неизвестное сообщение"
-
 msgid "The following plugins will be unloaded."
 msgstr "Следующие модули будут выгружены."
 
@@ -12911,8 +12739,9 @@ msgstr "_Показывать значок системного лотка:"
 msgid "On unread messages"
 msgstr "При наличии непрочитанных сообщений"
 
-msgid "Conversation Window Hiding"
-msgstr "Скрытие окон бесед"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Окна бесед"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Скрывать новые беседы:"
@@ -12920,6 +12749,9 @@ msgstr "_Скрывать новые беседы:"
 msgid "When away"
 msgstr "Во время отсутствия"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "_Сворачивать новые окна бесед"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Вкладки"
@@ -12978,9 +12810,6 @@ msgstr "Использовать плавную прокрутку"
 msgid "F_lash window when IMs are received"
 msgstr "_Мерцать окном при получении мгновенных сообщений"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "_Сворачивать новые окна бесед"
-
 msgid "Minimum input area height in lines:"
 msgstr "Минимальная высота области ввода (в строках):"
 
@@ -13016,7 +12845,8 @@ msgstr "Не могу запустить программу настройки �
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Пример: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "Определять IP-адрес _автоматически"
 
 msgid "Public _IP:"
@@ -13390,22 +13220,6 @@ msgstr "Сохранить _и применить"
 msgid "Status for %s"
 msgstr "Статус для %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "Своя рожица"
-
-msgid "More Data needed"
-msgstr "Требуется больше данных"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Пожалуйста, создайте ярлычок для сопоставления с рожицей."
-
 #, fuzzy, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
@@ -13414,12 +13228,12 @@ msgstr ""
 "ярлычок."
 
 #, fuzzy
-msgid "Duplicate Shortcut"
-msgstr "Сделать копию ярлычка"
+msgid "Custom Smiley"
+msgstr "Своя рожица"
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Пожалуйста, выберите картинку для рожицы."
+msgid "Duplicate Shortcut"
+msgstr "Сделать копию ярлычка"
 
 #, fuzzy
 msgid "Edit Smiley"
@@ -13541,9 +13355,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Нельзя отправить ярлык"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Вы перетянули кнопку запуска рабочего стола. Скорее всего вы хотели "
 "отправить то, на что эта кнопка ссылается, а не саму её."
@@ -14148,9 +13963,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Модуль музыкальной переписки для совместного сочинения"
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Модуль музыкальной переписки позволяет нескольким пользователям совместно "
 "работать над кусочком мелодии путём редактирования общих результатов в "
@@ -14417,9 +14233,10 @@ msgid "Conversation Window Send Button."
 msgstr "Кнопка отправки окна беседы."
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Добавляет кнопку отправки к области ввода окна беседы. Предназначается для "
 "случая, когда физическая клавиатура отсутствует."
@@ -14749,8 +14566,9 @@ msgstr "Параметры Pidgin для Windows"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Параметры, специфичные для Pidgin для Windows."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Параметры, специфичные для Pidgin для Windows, такие как закрепление списка "
 "собеседников."
@@ -14792,6 +14610,319 @@ msgstr "Отправлять и получать прямые XMPP строфы.
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Этот модуль полезен для отладки XMPP серверов или клиентов."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Не удаётся открыть сокет"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Не удалось осуществить прослушивание сокета"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Не удаётся прочитать сокет"
+
+#~ msgid "Connection failed."
+#~ msgstr "Не удалось установить соединение."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Сервер разорвал соединение"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Не удалось создать сокет"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Не удалось соединиться с узлом"
+
+#~ msgid "Read error"
+#~ msgstr "Ошибка чтения"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не удалось установить соединение с сервером:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Ошибка записи"
+
+#~ msgid "Last Activity"
+#~ msgstr "Последняя активность"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Информация о службе Разъяснения"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Элементы службы Разъяснения"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Расширенная строфная адресация"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Многопользовательский чат"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Информация о расширенном присутствии многопользовательского чата."
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "Внутриполосные потоки информации"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Команды Ad-Hoc"
+
+#~ msgid "PubSub Service"
+#~ msgstr "Служба PubSub"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "Потоки информации SOCKS5"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Вне полосы данных"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "Внутриполосная регистрация"
+
+#~ msgid "User Location"
+#~ msgstr "Местоположение пользователя"
+
+#~ msgid "User Avatar"
+#~ msgstr "Аватара пользователя"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Уведомления о состоянии чата"
+
+#~ msgid "Software Version"
+#~ msgstr "Версия программного обеспечения"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Создание потока"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "Настроение пользователя"
+
+#~ msgid "User Activity"
+#~ msgstr "Активность пользователя"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "Возможности существования"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Зашифрованный сеанс переговоров"
+
+#~ msgid "User Tune"
+#~ msgstr "Настройка пользователя"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Реестр элементов обмена"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Доступность адреса"
+
+#~ msgid "User Profile"
+#~ msgstr "Профиль пользователя"
+
+#~ msgid "Jingle"
+#~ msgstr "Звон"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Звенящий звук"
+
+#~ msgid "User Nickname"
+#~ msgstr "Псевдоним пользователя"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Звон ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Звон ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Звон Raw UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Звенящее видео"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Звон DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Получение сообщений"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "Файл публичного ключа"
+
+#~ msgid "User Chatting"
+#~ msgstr "Переписка пользователя"
+
+#~ msgid "User Browsing"
+#~ msgstr "Проводник пользователя"
+
+#~ msgid "User Gaming"
+#~ msgstr "Игра пользователя"
+
+#~ msgid "User Viewing"
+#~ msgstr "Просмотр пользователя"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Строфное шифрование"
+
+#~ msgid "Entity Time"
+#~ msgstr "Время существования"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Задержанная доставка"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Совместные объекты данных"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Хранилище файлов и совместное пользование"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "Служба Разъяснения STUN для Звона"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Упрощённо зашифрованный сеанс переговоров"
+
+#~ msgid "Hop Check"
+#~ msgstr "Проверка прыжков"
+
+#~ msgid "Read Error"
+#~ msgstr "Ошибка чтения"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Не удалось соединиться с сервером."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Буфер чтения полон (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Неразбираемое сообщение"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Не удалось соединиться с узлом: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Не удалось войти в сеть (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Вы были отключены, так как вошли с другой машины."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Ошибка. Поддержка SSL не установлена."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Неправильный пароль."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не удалось установить соединение с BOS-сервером:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "Соединение с вами вскоре может быть разорвано. Смотрите обновления на %s."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Не удалось установить соединение"
+
+#~ msgid "Invalid username."
+#~ msgstr "Неверное имя пользователя."
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Не могу расшифровать ответ сервера"
+
+#~ msgid "Connection lost"
+#~ msgstr "Соединение потеряно"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Не удалось разрешить имя узла"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Соединение разорвано (запись)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Сброс соединения"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Ошибка при чтении из сокета: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Не удаётся соединиться с узлом"
+
+#~ msgid "Could not write"
+#~ msgstr "Не удалось записать"
+
+#~ msgid "Could not connect"
+#~ msgstr "Не удалось установить соединение"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Не удалось создать сокет для прослушивания"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Не удалось разрешить имя узла"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Неправильный пароль"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не удалось установить соединение с %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Сервер пейджера Japan"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Сервер передачи файлов Japan"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Соединение с сервером потеряно\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Не удалось разрешить имя узла"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "Сервер требует TLS/SSL для входа. Поддержка TLS/SSL не найдена."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Скрытие окон бесед"
+
+#~ msgid "More Data needed"
+#~ msgstr "Требуется больше данных"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Пожалуйста, создайте ярлычок для сопоставления с рожицей."
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Пожалуйста, выберите картинку для рожицы."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Какой ID активировать?"
 
diff --git a/po/si.po b/po/si.po
index 1788b477fc..b16a6605f5 100644
--- a/po/si.po
+++ b/po/si.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: si\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2008-05-17 11:08+0530\n"
 "Last-Translator: Yajith Ajantha Dayarathna <yajith@gmail.com>\n"
 "Language-Team: Sinhala <sinhala@linux.lk>\n"
@@ -2457,7 +2457,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2505,7 +2505,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2746,11 +2746,11 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr ""
 
 msgid ""
@@ -2802,14 +2802,17 @@ msgstr ""
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-msgid "Cannot open socket"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
 
-msgid "Could not bind socket to port"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
 
-msgid "Could not listen on socket"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
@@ -2856,13 +2859,14 @@ msgstr ""
 msgid "Load buddylist from file..."
 msgstr ""
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "රහස්පද ගැල පෙන්නේ නැත."
 
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr ""
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2874,14 +2878,15 @@ msgstr ""
 msgid "Password"
 msgstr "රහස්පදය"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr ""
 
-msgid "Enter current token"
+msgid "Enter captcha text"
 msgstr ""
 
-msgid "Current token"
-msgstr ""
+#, fuzzy
+msgid "Captcha"
+msgstr "පිළිඹිබුව සුරකින්න"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr ""
@@ -2934,6 +2939,15 @@ msgstr ""
 msgid "Current password"
 msgstr ""
 
+msgid "Password (retype)"
+msgstr ""
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
@@ -2981,7 +2995,7 @@ msgstr ""
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr ""
 
 msgid "Buddy list downloaded"
@@ -2996,7 +3010,13 @@ msgstr ""
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
-msgid "Connection failed."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr ""
+
+msgid "Connection failed"
 msgstr ""
 
 msgid "Add to chat"
@@ -3005,19 +3025,24 @@ msgstr ""
 msgid "Chat _name:"
 msgstr ""
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr ""
+
 msgid "Chat error"
 msgstr ""
 
 msgid "This chat name is already in use"
 msgstr ""
 
-msgid "Not connected to the server."
-msgstr ""
+#, fuzzy
+msgid "Not connected to the server"
+msgstr "SILC සේවාදායක සමඟ සම්බන්ධ වෙමින් පවතී"
 
 msgid "Find buddies..."
 msgstr ""
@@ -3076,8 +3101,9 @@ msgstr ""
 msgid "File Transfer Failed"
 msgstr ""
 
-msgid "Could not open a listening port."
-msgstr ""
+#, fuzzy
+msgid "Unable to open a listening port."
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
 
 msgid "Error displaying MOTD"
 msgstr ""
@@ -3092,8 +3118,16 @@ msgstr ""
 msgid "MOTD for %s"
 msgstr ""
 
-msgid "Server has disconnected"
-msgstr ""
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "SILC සේවාදායක සමඟ සම්බන්ධ වෙමින් පවතී"
 
 msgid "View MOTD"
 msgstr ""
@@ -3107,21 +3141,19 @@ msgstr "රහස්පදය: (_P)"
 msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr ""
-
 msgid "SSL support unavailable"
 msgstr ""
 
-msgid "Couldn't create socket"
+msgid "Unable to connect"
 msgstr ""
 
-msgid "Couldn't connect to host"
-msgstr ""
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
 
-msgid "Read error"
+#, c-format
+msgid "Server closed the connection"
 msgstr ""
 
 msgid "Users"
@@ -3508,10 +3540,10 @@ msgstr ""
 msgid "execute"
 msgstr ""
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3526,8 +3558,13 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
-msgid "Invalid response from server."
-msgstr ""
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "සත්‍යාපනය අසමත් විය"
+
+#, fuzzy
+msgid "Invalid response from server"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
 
 msgid "Server does not use any supported authentication method"
 msgstr ""
@@ -3538,7 +3575,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr ""
 
-msgid "SASL error"
+#, c-format
+msgid "SASL error: %s"
 msgstr ""
 
 msgid "The BOSH connection manager terminated your session."
@@ -3553,21 +3591,13 @@ msgstr ""
 msgid "Unable to establish a connection with the server"
 msgstr ""
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "SILC සේවාදායක සමඟ සම්බන්ධ වෙමින් පවතී"
 
 msgid "Unable to establish SSL connection"
 msgstr ""
 
-msgid "Unable to create socket"
-msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
-
-msgid "Write error"
-msgstr ""
-
 msgid "Full Name"
 msgstr "සම්පූර්ණ නම"
 
@@ -3635,159 +3665,6 @@ msgstr "මෙහෙයුම් පද්ධතිය"
 msgid "Local Time"
 msgstr ""
 
-msgid "Last Activity"
-msgstr "අවසන් ක්‍රියාව"
-
-msgid "Service Discovery Info"
-msgstr ""
-
-msgid "Service Discovery Items"
-msgstr ""
-
-msgid "Extended Stanza Addressing"
-msgstr ""
-
-msgid "Multi-User Chat"
-msgstr ""
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr ""
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr ""
-
-msgid "User Location"
-msgstr ""
-
-msgid "User Avatar"
-msgstr ""
-
-msgid "Chat State Notifications"
-msgstr ""
-
-msgid "Software Version"
-msgstr ""
-
-msgid "Stream Initiation"
-msgstr ""
-
-msgid "File Transfer"
-msgstr ""
-
-msgid "User Mood"
-msgstr ""
-
-msgid "User Activity"
-msgstr ""
-
-msgid "Entity Capabilities"
-msgstr ""
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-msgid "User Tune"
-msgstr ""
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-msgid "Reachability Address"
-msgstr ""
-
-msgid "User Profile"
-msgstr ""
-
-msgid "Jingle"
-msgstr ""
-
-msgid "Jingle Audio"
-msgstr ""
-
-msgid "User Nickname"
-msgstr ""
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr ""
-
-msgid "Jingle DTMF"
-msgstr ""
-
-msgid "Message Receipts"
-msgstr ""
-
-msgid "Public Key Publishing"
-msgstr ""
-
-msgid "User Chatting"
-msgstr ""
-
-msgid "User Browsing"
-msgstr ""
-
-msgid "User Gaming"
-msgstr ""
-
-msgid "User Viewing"
-msgstr ""
-
-msgid "Ping"
-msgstr ""
-
-msgid "Stanza Encryption"
-msgstr ""
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr ""
-
 msgid "Priority"
 msgstr "ප්‍රමුකත්වය"
 
@@ -3799,7 +3676,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "පිට වීම"
 
 msgid "Middle Name"
@@ -3978,16 +3855,12 @@ msgstr ""
 msgid "Roles:"
 msgstr "කාර්‍යය"
 
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr ""
 
-msgid "Read Error"
-msgstr ""
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4161,9 +4034,6 @@ msgstr ""
 msgid "Error changing password"
 msgstr ""
 
-msgid "Password (again)"
-msgstr ""
-
 msgid "Change XMPP Password"
 msgstr ""
 
@@ -4537,6 +4407,14 @@ msgstr ""
 msgid "Unknown Error in presence"
 msgstr ""
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr ""
+
+#, c-format
+msgid "Error in chat %s"
+msgstr ""
+
 msgid "Create New Room"
 msgstr ""
 
@@ -4551,16 +4429,20 @@ msgstr ""
 msgid "_Accept Defaults"
 msgstr ""
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr ""
+#, fuzzy
+msgid "No reason"
+msgstr "නොදන්නා හේතුවක්"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "%s අභාවිත විය (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "ගොනුව විවෘත කිරීමේදී දෝශයක් ඇතිවිය."
 
 msgid "Transfer was closed."
@@ -5045,9 +4927,6 @@ msgstr ""
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-msgid "Failed to connect to server."
-msgstr ""
-
 msgid "Error retrieving profile"
 msgstr ""
 
@@ -5286,9 +5165,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 
-msgid "Unable to connect"
-msgstr ""
-
 msgid "Writing error"
 msgstr ""
 
@@ -5301,19 +5177,20 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Our protocol is not supported by the server."
+msgid "Our protocol is not supported by the server"
 msgstr ""
 
-msgid "Error parsing HTTP."
-msgstr ""
+#, fuzzy
+msgid "Error parsing HTTP"
+msgstr "%s ධාවනය කිරීමේ දෝශයක්."
 
-msgid "You have signed on from another location."
+msgid "You have signed on from another location"
 msgstr ""
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr ""
 
 #, c-format
@@ -5324,9 +5201,6 @@ msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "Unknown error."
-msgstr ""
-
 msgid "Handshaking"
 msgstr ""
 
@@ -5422,6 +5296,9 @@ msgstr ""
 msgid "%s is not a valid group."
 msgstr ""
 
+msgid "Unknown error."
+msgstr ""
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr ""
@@ -5529,12 +5406,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr ""
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr ""
@@ -5556,16 +5427,6 @@ msgstr ""
 msgid "Invalid input condition"
 msgstr ""
 
-msgid "Read buffer full (2)"
-msgstr ""
-
-msgid "Unparseable message"
-msgstr ""
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr ""
-
 msgid "Failed to add buddy"
 msgstr ""
 
@@ -5647,6 +5508,12 @@ msgstr ""
 msgid "Client Version"
 msgstr ""
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr ""
 
@@ -5901,9 +5768,9 @@ msgstr ""
 msgid "Unknown error: 0x%X"
 msgstr ""
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "පිවිසුම සක්‍රීය කරන්න"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6001,9 +5868,6 @@ msgstr ""
 msgid "Authenticating..."
 msgstr ""
 
-msgid "Unable to connect to server."
-msgstr ""
-
 msgid "Waiting for response..."
 msgstr ""
 
@@ -6024,20 +5888,14 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr ""
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-
-msgid "Error. SSL support is not installed."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 
 msgid "This conference has been closed. No more messages can be sent."
@@ -6075,10 +5933,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "%s ධාවනය කිරීමේ දෝශයක්."
 
-msgid "Incorrect password."
-msgstr "සාවද්‍ය රහස්පදයකී."
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6087,17 +5942,9 @@ msgstr ""
 msgid "Invalid chat room name"
 msgstr ""
 
-msgid "Server closed the connection."
-msgstr ""
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-
-msgid "Received invalid data on connection with server."
-msgstr ""
+#, fuzzy
+msgid "Received invalid data on connection with server"
+msgstr "SILC සේවාදායක සමඟ සම්බන්ධ වෙමින් පවතී"
 
 #. *< type
 #. *< ui_requirement
@@ -6144,7 +5991,7 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr ""
 
 msgid "Direct IM established"
@@ -6337,16 +6184,12 @@ msgid "Buddy Comment"
 msgstr ""
 
 #, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
 
 #, fuzzy
 msgid "Username sent"
@@ -6361,9 +6204,9 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 
 #, c-format
@@ -6373,26 +6216,21 @@ 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 ""
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "පරිශීලක නම"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+msgid "Your account is currently suspended"
 msgstr ""
 
 #. service temporarily unavailable
@@ -6409,7 +6247,7 @@ msgid ""
 "try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
-msgid "The SecurID key entered is invalid."
+msgid "The SecurID key entered is invalid"
 msgstr ""
 
 msgid "Enter SecurID"
@@ -6560,6 +6398,9 @@ msgstr ""
 msgid "Member Since"
 msgstr ""
 
+msgid "Capabilities"
+msgstr ""
+
 msgid "Profile"
 msgstr ""
 
@@ -6716,7 +6557,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6739,7 +6580,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
@@ -6747,7 +6588,7 @@ msgid "(no name)"
 msgstr ""
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr ""
 
 #, c-format
@@ -7545,8 +7386,9 @@ msgstr ""
 msgid "Update interval (seconds)"
 msgstr "පරිශීලක තොරතුරු"
 
-msgid "Cannot decrypt server reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt server reply"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
@@ -7571,9 +7413,6 @@ msgstr "සත්‍යාපනය අසමත් විය"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
-msgid "Could not decrypt server reply"
-msgstr ""
-
 #, fuzzy
 msgid "Requesting captcha"
 msgstr "ඉතිරිය"
@@ -7608,21 +7447,9 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr ""
-
 msgid "Socket error"
 msgstr ""
 
-msgid "Unable to read from socket"
-msgstr ""
-
-msgid "Write Error"
-msgstr ""
-
-msgid "Connection lost"
-msgstr ""
-
 #, fuzzy
 msgid "Getting server"
 msgstr "SILC සේවාදායක සමඟ සම්බන්ධ වෙමින් පවතී"
@@ -7631,8 +7458,9 @@ msgstr "SILC සේවාදායක සමඟ සම්බන්ධ වෙම�
 msgid "Requesting token"
 msgstr "ඉතිරිය"
 
-msgid "Couldn't resolve host"
-msgstr ""
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
 
 msgid "Invalid server or port"
 msgstr ""
@@ -7681,8 +7509,9 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "විධානය"
 
-msgid "Could not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
 
 #, fuzzy
 msgid "Unknown LOGIN CMD"
@@ -7703,9 +7532,6 @@ msgstr ""
 msgid "%d canceled the transfer of %s"
 msgstr ""
 
-msgid "Connection closed (writing)"
-msgstr ""
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr ""
@@ -7759,17 +7585,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-msgid "Connection reset"
-msgstr ""
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr ""
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr ""
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -7792,6 +7607,9 @@ msgstr ""
 msgid "Video Camera"
 msgstr ""
 
+msgid "File Transfer"
+msgstr ""
+
 msgid "Supports"
 msgstr ""
 
@@ -8547,6 +8365,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr ""
 
+msgid "Ping"
+msgstr ""
+
 msgid "Ping failed"
 msgstr ""
 
@@ -8604,8 +8425,9 @@ msgstr ""
 msgid "Disconnected by server"
 msgstr ""
 
-msgid "Error during connecting to SILC Server"
-msgstr ""
+#, fuzzy
+msgid "Error connecting to SILC Server"
+msgstr "SILC සේවාදායක සමඟ සම්බන්ධ වෙමින් පවතී"
 
 msgid "Key Exchange failed"
 msgstr ""
@@ -8614,26 +8436,25 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-msgid "Connection failed"
-msgstr ""
-
 msgid "Performing key exchange"
 msgstr ""
 
-msgid "Unable to create connection"
-msgstr ""
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "SILC යතුරු කූට්ටම නැංවීමට නොහැක"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "SILC සේවාදායක සමඟ සම්බන්ධ වෙමින් පවතී"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "SILC යතුරු කූට්ටම නැංවීමට නොහැක"
+
 msgid "Out of memory"
 msgstr "මතකය ප්‍රමාණවත් නොමැත"
 
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr ""
 
 msgid "Error loading SILC key pair"
@@ -8910,7 +8731,8 @@ msgstr ""
 msgid "Creating SILC key pair..."
 msgstr "SILC යතුරු කූට්ටමක් සම්පාදනය වෙමින් පවතී..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "SILC යතුරු කූට්ටම සම්පාදනය කිරීමට නොහැකි විය\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -8999,6 +8821,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr ""
 
+msgid "Error during connecting to SILC Server"
+msgstr ""
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -9039,30 +8864,26 @@ msgstr ""
 msgid "Failure: Authentication failed"
 msgstr ""
 
-msgid "Cannot initialize SILC Client connection"
+msgid "Unable to initialize SILC Client connection"
 msgstr ""
 
 msgid "John Noname"
 msgstr ""
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr ""
-
-msgid "Could not write"
-msgstr ""
-
-msgid "Could not connect"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
+msgstr "SILC යතුරු කූට්ටම නැංවීමට නොහැක"
 
-msgid "Unknown server response."
+msgid "Unable to create connection"
 msgstr ""
 
-msgid "Could not create listen socket"
-msgstr ""
+#, fuzzy
+msgid "Unknown server response"
+msgstr "නොදන්නා හේතුවක්"
 
-msgid "Could not resolve hostname"
-msgstr ""
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "කෙවෙනියට සම්බන්ධවිය නොහැක"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
@@ -9104,6 +8925,78 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr ""
+
+msgid "list: List rooms on the Yahoo network"
+msgstr ""
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "තෝරන්න..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "නියමාවලිය"
+
+msgid "Pager server"
+msgstr ""
+
+msgid "Pager port"
+msgstr ""
+
+msgid "File transfer server"
+msgstr ""
+
+msgid "File transfer port"
+msgstr ""
+
+msgid "Chat room locale"
+msgstr ""
+
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
+
+msgid "Chat room list URL"
+msgstr ""
+
+msgid "Yahoo Chat server"
+msgstr ""
+
+msgid "Yahoo Chat port"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "තෝරන්න..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "නියමාවලිය"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9131,26 +9024,16 @@ msgstr ""
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 
 #. username or password missing
@@ -9185,32 +9068,26 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-msgid "Could not add buddy to server list"
-msgstr ""
+#, fuzzy
+msgid "Unable to add buddy to server list"
+msgstr "මබගේ ලැයිස්තුවට මිතුරා එක් කළ යුතුද?"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr ""
 
-msgid "Connection problem"
-msgstr ""
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
+msgstr "SILC සේවාදායක සමඟ සම්බන්ධ වෙමින් පවතී"
 
 #, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
 
 msgid "Not at Home"
@@ -9273,74 +9150,15 @@ msgstr ""
 msgid "Open Inbox"
 msgstr ""
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-
-msgid "list: List rooms on the Yahoo network"
-msgstr ""
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "තෝරන්න..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr ""
-
-msgid "Yahoo Japan"
-msgstr ""
-
-msgid "Pager server"
-msgstr ""
-
-msgid "Japan Pager server"
-msgstr ""
-
-msgid "Pager port"
-msgstr ""
-
-msgid "File transfer server"
-msgstr ""
-
-msgid "Japan file transfer server"
-msgstr ""
-
-msgid "File transfer port"
-msgstr ""
-
-msgid "Chat room locale"
-msgstr ""
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-msgid "Chat room list URL"
-msgstr ""
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-msgid "Yahoo Chat port"
-msgstr ""
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr ""
+
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -9348,6 +9166,9 @@ msgstr ""
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr ""
 
+msgid "Write Error"
+msgstr ""
+
 msgid "Yahoo! Japan Profile"
 msgstr ""
 
@@ -9452,20 +9273,18 @@ msgstr ""
 msgid "Webcams"
 msgstr ""
 
-msgid "Unable to fetch room list."
+msgid "Connection problem"
 msgstr ""
 
-msgid "User Rooms"
+msgid "Unable to fetch room list."
 msgstr ""
 
-msgid "Connection problem with the YCHT server."
+msgid "User Rooms"
 msgstr ""
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Connection problem with the YCHT server"
+msgstr "SILC සේවාදායක සමඟ සම්බන්ධ වෙමින් පවතී"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9583,13 +9402,7 @@ msgid "Exposure"
 msgstr ""
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
 
 #, c-format
@@ -9597,16 +9410,13 @@ msgid "HTTP proxy connection error %d"
 msgstr ""
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
 #, c-format
 msgid "Error resolving %s"
 msgstr ""
 
-msgid "Could not resolve host name"
-msgstr ""
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -9807,12 +9617,6 @@ msgid "Unable to connect to %s: %s"
 msgstr ""
 
 #, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-
-#, c-format
 msgid " - %s"
 msgstr ""
 
@@ -10044,9 +9848,13 @@ msgstr ""
 msgid "View _Log"
 msgstr ""
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
 msgstr ""
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "නොබැඳි මිතුරන් දර්ශනය"
+
 msgid "_Alias..."
 msgstr ""
 
@@ -10537,6 +10345,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr ""
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr ""
@@ -10582,8 +10393,9 @@ msgstr "දාවක මට්ටම"
 msgid "Get Away Message"
 msgstr ""
 
-msgid "Last said"
-msgstr ""
+#, fuzzy
+msgid "Last Said"
+msgstr "අවසන් නම"
 
 msgid "Unable to save icon file to disk."
 msgstr ""
@@ -11466,7 +11278,7 @@ msgstr ""
 msgid "Hyperlink visited color"
 msgstr ""
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 
 msgid "Hyperlink prelight color"
@@ -11502,16 +11314,23 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
-msgid "Typing notification color"
+msgid "Color to draw the name of a whispered message."
 msgstr ""
 
-msgid "The color to use for the typing notification font"
+msgid "Typing notification color"
 msgstr ""
 
 #, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "නව තැපැල් දැන්වීම"
+
+#, fuzzy
 msgid "Typing notification font"
 msgstr "නව තැපැල් දැන්වීම"
 
@@ -11848,6 +11667,10 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
+#, fuzzy
+msgid "No message"
+msgstr "පණිවිඩ"
+
 msgid "Open All Messages"
 msgstr ""
 
@@ -11864,10 +11687,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr ""
 
-#, fuzzy
-msgid "No message"
-msgstr "පණිවිඩ"
-
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -12076,8 +11895,9 @@ msgstr ""
 msgid "On unread messages"
 msgstr "නොකියවන ලද පණිවුඩ සඳහා"
 
-msgid "Conversation Window Hiding"
-msgstr "දෙබස් කවුඵව සැඟවීම"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "ක්ෂණික පණිවුඩ සංවාද කවුළු"
 
 msgid "_Hide new IM conversations:"
 msgstr ""
@@ -12085,6 +11905,9 @@ msgstr ""
 msgid "When away"
 msgstr ""
 
+msgid "Minimi_ze new conversation windows"
+msgstr ""
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -12143,9 +11966,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr ""
 
-msgid "Minimi_ze new conversation windows"
-msgstr ""
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12178,7 +11998,8 @@ msgstr ""
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-msgid "_Autodetect IP address"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr ""
 
 msgid "Public _IP:"
@@ -12547,30 +12368,15 @@ msgstr ""
 msgid "Status for %s"
 msgstr ""
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr ""
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
-msgid "Duplicate Shortcut"
+msgid "Custom Smiley"
 msgstr ""
 
-msgid "Please select an image for the smiley."
+msgid "Duplicate Shortcut"
 msgstr ""
 
 msgid "Edit Smiley"
@@ -12680,8 +12486,8 @@ msgid "Cannot send launcher"
 msgstr ""
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -13252,7 +13058,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -13500,7 +13306,7 @@ msgstr ""
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -13817,8 +13623,9 @@ msgstr "වින්ඩෝස් Pidgin වෛකල්පිත"
 msgid "Options specific to Pidgin for Windows."
 msgstr "වින්ඩෝස් මත Pidgin සඳහා වූ වෛකල්පිතයන් ලබාදෙයි."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "වින්ඩෝස් මත Pidgin වලට අදාල, මිතුරු ලැයිස්තුව යාකිරීම වැනි, වෛකල්පිතයන් ලබා දෙයි."
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -13858,6 +13665,22 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "මෙම ඈඳුතුව XMPP සේවා දායකයන්හි නිරවද්‍යකරනයන් කිරීමට ප්‍රයෝජනවත් වේ."
 
+#~ msgid "Last Activity"
+#~ msgstr "අවසන් ක්‍රියාව"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "Incorrect password."
+#~ msgstr "සාවද්‍ය රහස්පදයකී."
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "සාවද්‍ය රහස්පදයකී."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "දෙබස් කවුඵව සැඟවීම"
+
 #, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "අන්තර්ජාල පණිවිඩකරු"
diff --git a/po/sk.po b/po/sk.po
index 39f7fd940d..86cbde6efe 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2009-02-22 21:22+0100\n"
 "Last-Translator: loptosko <loptosko@gmail.com>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -2570,9 +2570,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "V prehliadači záznamov prehliadať aj záznamy ostatných IM klientov."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2627,8 +2628,9 @@ msgstr "Emulácia offline správ"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Pridáva správy pre odhlásených používateľov ako sledovanie."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Zostatok správ bude uložený ako sledovanie. Sledovanie môžete pridať/"
@@ -2878,14 +2880,16 @@ msgstr ""
 "Nebol nájdený ActiveTCL. Ak chcete používať moduly TCL, nainštalujťe "
 "ActiveTCL z http://www.activestate.com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Toolkit Apple Bonjour For Windows nebol nájdený, pozrite časté otázky na "
 "stránke: http://d.pidgin.im/BonjourWindows"
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Nepodarilo sa spustiť čakanie na prichádzajúce spojenia\n"
 
 msgid ""
@@ -2937,14 +2941,21 @@ msgstr "Používateľ %s uzavrel rozhovor."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Nepodarilo sa odoslať správu, rozhovor sa nezačal."
 
-msgid "Cannot open socket"
-msgstr "Nepodarilo sa otvoriť socket"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Nepodarilo sa vytvoriť socket:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Nepodarilo sa zviazať socket na port"
 
-msgid "Could not listen on socket"
-msgstr "Nepodarilo sa spustiť čakanie na sockete"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Nepodarilo sa vytvoriť socket:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Chyba počas komunikácie s lokálnym mDNSResponder."
@@ -2991,13 +3002,16 @@ msgstr "Uložiť zoznam priateľov..."
 msgid "Load buddylist from file..."
 msgstr "Otvoriť zoznam priateľov zo súboru..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Vyplňte políčka registrácie."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Heslá sa nezhodujú."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Nepodarilo sa vytvoriť nový účet. Vyskytla sa chyba.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3009,14 +3023,15 @@ msgstr "Registrácia bola úspešne dokončená!"
 msgid "Password"
 msgstr "Heslo"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr "Heslo (znovu)"
 
-msgid "Enter current token"
-msgstr "Vstúpiť do aktuálneho tokenu"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Aktuálny token"
+#, fuzzy
+msgid "Captcha"
+msgstr "Obrázok captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Zaregistrovať nový Gadu-Gadu účet"
@@ -3069,6 +3084,15 @@ msgstr "Heslo bolo úspešne zmenené!"
 msgid "Current password"
 msgstr "Súčasné heslo"
 
+msgid "Password (retype)"
+msgstr "Heslo (znovu)"
+
+msgid "Enter current token"
+msgstr "Vstúpiť do aktuálneho tokenu"
+
+msgid "Current token"
+msgstr "Aktuálny token"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Zadajte, prosím, svoje súčasné heslo a vaše nové heslo pre UIN: "
 
@@ -3116,8 +3140,8 @@ msgstr "Neboli nájdení žiadni zodpovedajúci používatelia"
 msgid "There are no users matching your search criteria."
 msgstr "Používatelia, ktorí vyhovujú vaším kritériám vyhľadávania neexistujú."
 
-msgid "Unable to read socket"
-msgstr "Nebolo možné čítať soket"
+msgid "Unable to read from socket"
+msgstr "Nedá sa čítať zo soketu"
 
 msgid "Buddy list downloaded"
 msgstr "Zoznam priateľov bol stiahnutý"
@@ -3131,8 +3155,14 @@ msgstr "Zoznam priateľov bol nahraný"
 msgid "Your buddy list was stored on the server."
 msgstr "Váš zoznam priateľov bol uložený na serveri."
 
-msgid "Connection failed."
-msgstr "Pripojenie zlyhalo."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Pripojený"
+
+msgid "Connection failed"
+msgstr "Pripojenie zlyhalo"
 
 msgid "Add to chat"
 msgstr "Pridať na chat"
@@ -3140,18 +3170,23 @@ msgstr "Pridať na chat"
 msgid "Chat _name:"
 msgstr "Me_no na chate:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Nepodarilo sa pripojiť na server."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Pripája sa"
+
 msgid "Chat error"
 msgstr "Chyba chatu"
 
 msgid "This chat name is already in use"
 msgstr "Toto meno už používa niekto iný"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Nepripojený na server."
 
 msgid "Find buddies..."
@@ -3211,7 +3246,8 @@ msgstr "Nie je nastavená žiadna téma"
 msgid "File Transfer Failed"
 msgstr "Prenos súboru zlyhal"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Nebolo možné otvoriť port na počúvanie."
 
 msgid "Error displaying MOTD"
@@ -3227,8 +3263,18 @@ msgstr "S týmto pripojením nie je asociovaná žiadna správa dňa."
 msgid "MOTD for %s"
 msgstr "Správa dňa pre %s"
 
-msgid "Server has disconnected"
-msgstr "Server bol odpojený"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Pripojenie k servera bolo prerušené:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Zobraziť správu dňa"
@@ -3243,22 +3289,20 @@ msgstr "_Heslo:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "Prezývky na IRC nesmú obsahovať medzery"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Pripája sa"
-
 msgid "SSL support unavailable"
 msgstr "Podpora SSL je nedostupná"
 
-msgid "Couldn't create socket"
-msgstr "Nepodarilo sa vytvoriť socket"
+msgid "Unable to connect"
+msgstr "Nepodarilo sa pripojiť"
 
-msgid "Couldn't connect to host"
-msgstr "Nepodarilo sa pripojiť ku hostiteľovi"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Nepodarilo sa pripojiť na %s"
 
-msgid "Read error"
-msgstr "Chyba čítania"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Server zrušil pripojenie."
 
 msgid "Users"
 msgstr "Používatelia"
@@ -3689,12 +3733,14 @@ msgstr "príkaz Ad-Hoc zlyhal"
 msgid "execute"
 msgstr "vykonať"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "Server vyžaduje na prihlásenie TLS/SSL, ale podpora pre TLS/SSL nebola "
 "nájdená."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Požadujete šifrovanie, ale podpora pre TLS/SSL nebola nájdená."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3711,7 +3757,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Čisto textová autentifikácia"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Autentifikácia zlyhala"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Chybná odpoveď zo servera."
 
 msgid "Server does not use any supported authentication method"
@@ -3723,7 +3774,8 @@ msgstr "Požadovali ste šifrovanie, ale na tomto serveri nie je dostupné."
 msgid "Invalid challenge from server"
 msgstr "Chybná výzva zo servera"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Chyba SASL"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3743,10 +3795,8 @@ msgstr ""
 "Nepodarilo sa založiť spojenie so serverom:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Nepodarilo sa založiť spojenie so serverom:\n"
 "%s"
@@ -3755,12 +3805,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "Spojenie sa nedá inicializovať"
 
-msgid "Unable to create socket"
-msgstr "Nepodarilo sa vytvoriť socket"
-
-msgid "Write error"
-msgstr "Chyba zápisu"
-
 msgid "Full Name"
 msgstr "Celé meno"
 
@@ -3831,159 +3875,6 @@ msgstr "Operačný systém"
 msgid "Local Time"
 msgstr "Lokálny súbor:"
 
-msgid "Last Activity"
-msgstr "Posledná aktivita"
-
-msgid "Service Discovery Info"
-msgstr "Prieskum služieb"
-
-msgid "Service Discovery Items"
-msgstr "Položky prieskumu služieb"
-
-msgid "Extended Stanza Addressing"
-msgstr "Rozšírené adresovanie slôh"
-
-msgid "Multi-User Chat"
-msgstr "Skupinový chat"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Rozšírené informácie o prítomnosti v skupinovom chate"
-
-msgid "In-Band Bytestreams"
-msgstr "In-Band bitové toky"
-
-msgid "Ad-Hoc Commands"
-msgstr "Príkaz Ad-Hoc"
-
-msgid "PubSub Service"
-msgstr "PubSub služba"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 bitové toky"
-
-msgid "Out of Band Data"
-msgstr "Mimo skupinových dát"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "In-Band Registrácia"
-
-msgid "User Location"
-msgstr "Lokalita"
-
-msgid "User Avatar"
-msgstr "Avatar používateľa"
-
-msgid "Chat State Notifications"
-msgstr "Upozornenie na stav v chate"
-
-msgid "Software Version"
-msgstr "Verzia softvéru"
-
-msgid "Stream Initiation"
-msgstr "Iniciácia toku"
-
-msgid "File Transfer"
-msgstr "Prenos súborov"
-
-msgid "User Mood"
-msgstr "Nálada používateľa"
-
-msgid "User Activity"
-msgstr "Aktivita používateľa"
-
-msgid "Entity Capabilities"
-msgstr "Schopnosti"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Požadovanie šifrovaného spojenia"
-
-msgid "User Tune"
-msgstr "Používateľ Tune"
-
-msgid "Roster Item Exchange"
-msgstr "Výmena kontaktov"
-
-msgid "Reachability Address"
-msgstr "Dostupná adresa"
-
-msgid "User Profile"
-msgstr "Profil používateľa"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Zvuk Jingle"
-
-msgid "User Nickname"
-msgstr "Prezývka používateľa"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle Video"
-msgstr "Jingle Video"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Príjem správ"
-
-msgid "Public Key Publishing"
-msgstr "Zverejnenie verejného kľúča"
-
-msgid "User Chatting"
-msgstr "Používateľ chatuje"
-
-msgid "User Browsing"
-msgstr "Používateľ surfuje"
-
-msgid "User Gaming"
-msgstr "Používateľ hrá"
-
-msgid "User Viewing"
-msgstr "Používateľ prezerá"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Šifrovanie slôh"
-
-msgid "Entity Time"
-msgstr "Čas entity"
-
-msgid "Delayed Delivery"
-msgstr "Odložené doručenie"
-
-msgid "Collaborative Data Objects"
-msgstr "Spolupracujúce dátové objekty"
-
-msgid "File Repository and Sharing"
-msgstr "Ukladanie a zdieľanie súborov"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "Objavenie STUN služieb pre Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Požadovanie zjednodušeného šifrovaného spojenia"
-
-msgid "Hop Check"
-msgstr "Kontrola skoku"
-
-msgid "Capabilities"
-msgstr "Schopnosti"
-
 msgid "Priority"
 msgstr "Priorita"
 
@@ -3995,7 +3886,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Prihlásený"
 
 msgid "Middle Name"
@@ -4177,16 +4068,13 @@ msgstr "Neboli nájdení žiadni zodpovedajúci používatelia"
 msgid "Roles:"
 msgstr "Postavenie"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Interval ping"
 
-msgid "Read Error"
-msgstr "Chyba čítania"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4365,9 +4253,6 @@ msgstr "Vaše heslo bolo zmenené."
 msgid "Error changing password"
 msgstr "Chyba pri zmene hesla"
 
-msgid "Password (again)"
-msgstr "Heslo (znovu)"
-
 msgid "Change XMPP Password"
 msgstr "Zmeniť XMPP heslo"
 
@@ -4752,6 +4637,14 @@ msgstr "Chyba pri spracovaní XML"
 msgid "Unknown Error in presence"
 msgstr "Prítomná neznáma chyba"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Chyba pripojenia na chat %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Chyba v chate %s"
+
 msgid "Create New Room"
 msgstr "Vytvoriť novú miestnosť"
 
@@ -4768,16 +4661,20 @@ msgstr "Konfigurovať miestnosť"
 msgid "_Accept Defaults"
 msgstr "_Prijať štandardné"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Chyba pripojenia na chat %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Nebol uvedený dôvod"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Chyba v chate %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Používateľ %s vás vykopol: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Vykopnutý používateľom %s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Pri otváraní súboru sa vyskytla chyba."
 
 #, fuzzy
@@ -5268,9 +5165,6 @@ msgstr ""
 "Pre MSN je potrebná podpora SSL. Nainštalujte, prosím, podporovanú SSL "
 "knižnicu."
 
-msgid "Failed to connect to server."
-msgstr "Nepodarilo sa spojiť so serverom."
-
 msgid "Error retrieving profile"
 msgstr "Chyba pri získavaní profilu"
 
@@ -5527,9 +5421,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Správu sa nepodarilo odoslať, pretože sa vyskytla neznáma chyba."
 
-msgid "Unable to connect"
-msgstr "Nepodarilo sa pripojiť"
-
 msgid "Writing error"
 msgstr "Chyba pri zápise"
 
@@ -5544,20 +5435,24 @@ msgstr ""
 "Chyba pripojenia %s servera:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Server nepodporuje náš protokol."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Chyba pri spracovávaní HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Prihlásili ste sa z iného miesta."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN servery sú dočasne nedostupné. Počkajte, prosím, a skúste to znovu."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN servery sa dočasne vypínajú."
 
 #, c-format
@@ -5569,9 +5464,6 @@ msgid ""
 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"
 
@@ -5668,6 +5560,9 @@ msgstr "Modul protokolu HTTP"
 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)"
@@ -5781,12 +5676,6 @@ msgstr[2] ""
 msgid "Add contacts from server"
 msgstr "Pridať kontakty zo serveru"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Pripojený"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Chyba protokolu, kód %d: %s"
@@ -5810,16 +5699,6 @@ msgstr "Chyba MySpaceIM"
 msgid "Invalid input condition"
 msgstr "Chybná podmienka vstupu"
 
-msgid "Read buffer full (2)"
-msgstr "Zásobník čítania plný (2)"
-
-msgid "Unparseable message"
-msgstr "Nespracovateľná správa"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Nebolo možné sa pripojiť ku hostiteľovi: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Nebolo možné pridať priateľa"
 
@@ -5905,6 +5784,16 @@ msgstr "Spolu priateľov"
 msgid "Client Version"
 msgstr "Verzia klienta"
 
+#, fuzzy
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"Prosím, choďte na http://editprofile.myspace.com/index.cfm?"
+"fuseaction=profile.username a vyberte si používateľské meno a skúste sa "
+"prihlásiť znovu."
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Používateľské meno je dostupné"
 
@@ -6161,9 +6050,9 @@ msgstr "Používateľ je buď odpojený, alebo ste zablokovaný"
 msgid "Unknown error: 0x%X"
 msgstr "Neznáma chyba: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Prihlásenie zlyhalo (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Nebolo možné sa prihlásiť"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6268,9 +6157,6 @@ msgstr "GroupWise konferencia %d"
 msgid "Authenticating..."
 msgstr "Overuje sa..."
 
-msgid "Unable to connect to server."
-msgstr "Nepodarilo sa pripojiť na server."
-
 msgid "Waiting for response..."
 msgstr "Čaká sa na odpoveď..."
 
@@ -6294,26 +6180,20 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Chcete sa pripojiť do tohoto rozhovoru?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Boli ste odhlásený, pretože ste sa prihlásili na inej pracovnej stanici."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 "%s je podľa všetkého odpojený a neprijal správu, ktorú ste práve odoslali."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Nedá sa pripojiť na server. Zadajte, prosím, adresu servera, na ktorý sa "
 "chcete pripojiť."
 
-msgid "Error. SSL support is not installed."
-msgstr "Chyba. SSL podpora nie je nainštalovaná."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 "Táto konferencia bola uzavretá. Nie je možné do nej odosielať ďalšie správy."
@@ -6353,10 +6233,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6365,18 +6242,8 @@ msgstr "Nepodarilo sa pripojiť do miestnosti"
 msgid "Invalid chat room name"
 msgstr "Chybný názov miestnosti"
 
-msgid "Server closed the connection."
-msgstr "Server zrušil pripojenie."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Pripojenie k servera bolo prerušené:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Prijaté neplatné dáta počas spojenia so serverom."
 
 #. *< type
@@ -6424,7 +6291,8 @@ msgstr "Pripojenie so vzdialeným používateľom je prerušené:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Prijaté neplatné dáta pri spojení so vzdialeným používateľom."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Nepodarilo sa založiť pripojenie so vzdialeným používateľom."
 
 msgid "Direct IM established"
@@ -6623,21 +6491,15 @@ msgstr "Úroveň upozornenia"
 msgid "Buddy Comment"
 msgstr "Komentár priateľa"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Nepodarilo sa pripojiť na autentifikačný server:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Nepodarilo sa pripojiť na BOS server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Nepodarilo sa pripojiť na OIM server."
 
 msgid "Username sent"
 msgstr "Používateľské meno odoslané"
@@ -6649,11 +6511,11 @@ msgstr "Pripojenie založené, boli odoslané cookies"
 msgid "Finalizing connection"
 msgstr "Dokončuje sa pripojenie"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Nepodarilo sa prihlásiť: Nepodarilo sa prihlásiť ako %s, pretože "
 "používateľské meno je chybné.  Používateľské mená musia byť správna e-"
@@ -6668,26 +6530,22 @@ msgstr ""
 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."
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Používateľ neexistuje"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Váš účet je momentálne pozastavený"
 
 #. service temporarily unavailable
@@ -6709,7 +6567,8 @@ 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 "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Zadaný kľúč SecurID je neplatný."
 
 msgid "Enter SecurID"
@@ -6889,6 +6748,9 @@ msgstr "Pripojený od"
 msgid "Member Since"
 msgstr "Člen od"
 
+msgid "Capabilities"
+msgstr "Schopnosti"
+
 msgid "Profile"
 msgstr "Profil"
 
@@ -7078,9 +6940,9 @@ msgstr[2] ""
 msgid "Away message too long."
 msgstr "Správa neprítomnosti je príliš dlhá."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7105,9 +6967,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Siroty"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Nepodarilo sa pridať priateľa %s, pretože vo vašom zozname máte príliš veľa "
@@ -7116,8 +6978,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(bez názvu)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Nebolo možné pridať priateľa %s z neznámeho dôvodu."
 
 #, c-format
@@ -7892,7 +7754,8 @@ msgstr "Interval udržiavania spojenia (sekúnd)"
 msgid "Update interval (seconds)"
 msgstr "Interval obnovovania (sekúnd)"
 
-msgid "Cannot decrypt server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "Nedá sa dešifrovať odpoveď serveru"
 
 #, c-format
@@ -7917,9 +7780,6 @@ msgstr "Je vyžadovaná aktivácia"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Neznámy kód odpovede pri prihlasovaní (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Nedá sa dešifrovať odpoveď serveru"
-
 msgid "Requesting captcha"
 msgstr "Získava sa captcha"
 
@@ -7953,29 +7813,18 @@ msgstr ""
 "Neznámy kód odpovede pri prihlasovaní (0x%02X):\n"
 "%s"
 
-msgid "Unable to connect."
-msgstr "Nepodarilo sa pripojiť."
-
 msgid "Socket error"
 msgstr "Chyba socketu"
 
-msgid "Unable to read from socket"
-msgstr "Nedá sa čítať zo soketu"
-
-msgid "Write Error"
-msgstr "Chyba zápisu"
-
-msgid "Connection lost"
-msgstr "Pripojenie bolo prerušené"
-
 msgid "Getting server"
 msgstr "Získava sa server"
 
 msgid "Requesting token"
 msgstr "Vyžiadava sa token"
 
-msgid "Couldn't resolve host"
-msgstr "Nebolo možné preložiť názov hostiteľa"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Nepodarilo sa pripojiť na server."
 
 msgid "Invalid server or port"
 msgstr "Chybný server alebo port"
@@ -8028,7 +7877,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "QQ Qun príkaz"
 
-msgid "Could not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "Nedá sa dešifrovať odpoveď prihlásenia"
 
 msgid "Unknown LOGIN CMD"
@@ -8048,9 +7898,6 @@ msgstr "Súbor odoslaný"
 msgid "%d canceled the transfer of %s"
 msgstr "používateľ %d prerušil prenos %s"
 
-msgid "Connection closed (writing)"
-msgstr "Pripojenie uzavreté (zapisuje sa)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Názov skupiny:</b> %s<br>"
@@ -8104,17 +7951,6 @@ msgstr "Administrátor Sametime vystavil na serveri %s nasledujúce oznámenie"
 msgid "Sametime Administrator Announcement"
 msgstr "Oznámenie administrátora Sametime"
 
-msgid "Connection reset"
-msgstr "Obnovenie spojenia"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Chyba čítania zo soketu: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Nepodarilo sa pripojiť ku hostiteľovi"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Oznámenie od %s"
@@ -8137,6 +7973,9 @@ msgstr "Reproduktory"
 msgid "Video Camera"
 msgstr "Kamera"
 
+msgid "File Transfer"
+msgstr "Prenos súborov"
+
 msgid "Supports"
 msgstr "Podporuje"
 
@@ -8955,6 +8794,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Sieťové štatistiky"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping zlyhal"
 
@@ -9018,7 +8860,8 @@ msgstr "Nepodporovaný typ verejného kľúča"
 msgid "Disconnected by server"
 msgstr "Odpojený serverom"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Chyba počas pripájania sa na SILC server"
 
 msgid "Key Exchange failed"
@@ -9030,26 +8873,26 @@ msgstr ""
 "Obnovenie prerušenej relácie zlyhalo. Kliknutím na „Znovu pripojiť“ "
 "vytvoríte nové pripojenie."
 
-msgid "Connection failed"
-msgstr "Pripojenie zlyhalo"
-
 msgid "Performing key exchange"
 msgstr "Vykonáva sa výmena kľúčov"
 
-msgid "Unable to create connection"
-msgstr "Nedá sa vytvoriť spojenie"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Nedá sa načítať pár kľúčov SILC"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Pripája sa na SILC server"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Nedá sa načítať pár kľúčov SILC"
+
 msgid "Out of memory"
 msgstr "Nedostatok pamäte"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Nepodarilo sa inicializovať protokol SILC"
 
 msgid "Error loading SILC key pair"
@@ -9344,7 +9187,8 @@ msgstr "Digitálne podpísať a skontrolovať všetky správy"
 msgid "Creating SILC key pair..."
 msgstr "Vytvára sa pár kľúčov pre SILC..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Nebolo možné vytvoriť pár SILC kľúčov\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9439,6 +9283,9 @@ msgstr "Tabuľa"
 msgid "No server statistics available"
 msgstr "Nie sú dostupné žiadne štatistiky"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Chyba počas pripájania sa na SILC server"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Zlyhanie: Nezhoda verzií, aktualizujte vášho klienta"
@@ -9480,30 +9327,27 @@ msgstr "Chyba: Neplatný koláčik (cookie)"
 msgid "Failure: Authentication failed"
 msgstr "Chyba: Zlyhala autentifikácia"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Nedá sa inicializovať spojenie s SILC klientom"
 
 msgid "John Noname"
 msgstr "Jožo Bezmena"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Nedá sa načínať pár kľúčov SILC: %s"
 
-msgid "Could not write"
-msgstr "Nepodarilo sa zapisovať"
-
-msgid "Could not connect"
-msgstr "Nepodarilo sa pripojiť"
+msgid "Unable to create connection"
+msgstr "Nedá sa vytvoriť spojenie"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Neznáma odpoveď serveru."
 
-msgid "Could not create listen socket"
-msgstr "Nepodarilo sa vytvoriť socket pre príjem"
-
-msgid "Could not resolve hostname"
-msgstr "Nebolo možné previesť názov hostiteľa na IP"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Nepodarilo sa vytvoriť socket"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Používateľské mená SIP nemôžu obsahovať čisté znaky alebo znaky @"
@@ -9544,6 +9388,78 @@ msgstr "Autentifikačný používateľ"
 msgid "Auth Domain"
 msgstr "Autentifikačná doména"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr ""
+"join &lt;miestnosť&gt;:  Vstúpiť do chatovacej miestnosti na sieti Yahoo"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Vypísať zoznam miestností na sieti Yahoo"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "Čmáranie: Požiadať používateľa o reláciu Čmáranie"
+
+msgid "Yahoo ID..."
+msgstr "Yahoo ID..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Modul protokolu Yahoo"
+
+msgid "Pager server"
+msgstr "Server záznamníku"
+
+msgid "Pager port"
+msgstr "Port záznamníku"
+
+msgid "File transfer server"
+msgstr "Server prenosu súborov"
+
+msgid "File transfer port"
+msgstr "Port prenosu súborov"
+
+msgid "Chat room locale"
+msgstr "Jazyk chatovacej miestnosti"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignorovať pozvánky na konferencie a chatovacie miestnosti"
+
+msgid "Chat room list URL"
+msgstr "URL zoznamu miestností chatu"
+
+msgid "Yahoo Chat server"
+msgstr "Server Yahoo chatu"
+
+msgid "Yahoo Chat port"
+msgstr "Port Yahoo chatu"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo ID..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Modul protokolu Yahoo"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9576,29 +9492,19 @@ msgstr "Pridanie kamaráta bolo odmietnuté"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  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ť."
 
@@ -9640,39 +9546,34 @@ msgid "Unknown error number %d. 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ť."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Nepodarilo sa pridať kamaráta %s do skupiny %s do zoznamu na serveri na účte "
 "%s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Nepodarilo sa pridať priateľa do zoznamu na serveri"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Prehrateľné %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Zo servera bola prijatá neočakávaná HTTP odpoveď."
 
-msgid "Connection problem"
-msgstr "Problém s pripojením"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Prerušené pripojenie ku %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Nebolo možné nadviazať spojenie s %s:\n"
+"Nepodarilo sa založiť spojenie so serverom:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9735,74 +9636,15 @@ msgstr "Spojiť sa s používateľom v chate..."
 msgid "Open Inbox"
 msgstr "Otvoriť schránku Doručené"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-"join &lt;miestnosť&gt;:  Vstúpiť do chatovacej miestnosti na sieti Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Vypísať zoznam miestností na sieti Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "Čmáranie: Požiadať používateľa o reláciu Čmáranie"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo ID..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Modul protokolu Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japonsko"
-
-msgid "Pager server"
-msgstr "Server záznamníku"
-
-msgid "Japan Pager server"
-msgstr "Japonský server záznamníku"
-
-msgid "Pager port"
-msgstr "Port záznamníku"
-
-msgid "File transfer server"
-msgstr "Server prenosu súborov"
-
-msgid "Japan file transfer server"
-msgstr "Japonský server prenosu súborov"
-
-msgid "File transfer port"
-msgstr "Port prenosu súborov"
-
-msgid "Chat room locale"
-msgstr "Jazyk chatovacej miestnosti"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignorovať pozvánky na konferencie a chatovacie miestnosti"
-
-msgid "Chat room list URL"
-msgstr "URL zoznamu miestností chatu"
-
-msgid "Yahoo Chat server"
-msgstr "Server Yahoo chatu"
-
-msgid "Yahoo Chat port"
-msgstr "Port Yahoo chatu"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Odoslať žiadosť na začatie Čmárania."
 
+msgid "Unable to connect."
+msgstr "Nepodarilo sa pripojiť."
+
 msgid "Unable to establish file descriptor."
 msgstr "Nepodarilo sa založiť popisovač súboru."
 
@@ -9810,6 +9652,9 @@ msgstr "Nepodarilo sa založiť popisovač súboru."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "Používateľ %s vám posiela skupinu %d súborov.\n"
 
+msgid "Write Error"
+msgstr "Chyba zápisu"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Profil Yahoo! Japonsko"
 
@@ -9929,23 +9774,19 @@ msgstr "Hlasy"
 msgid "Webcams"
 msgstr "Webkamery"
 
+msgid "Connection problem"
+msgstr "Problém s pripojením"
+
 msgid "Unable to fetch room list."
 msgstr "Nepodarilo sa získať zoznam miestností."
 
 msgid "User Rooms"
 msgstr "Používateľské miestnosti"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Problém počas pripojenia s YCHT serverom."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Pripojenie zo serverom je prerušené\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10075,33 +9916,22 @@ msgstr "Realm"
 msgid "Exposure"
 msgstr "Expozícia"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Nepodarilo sa vytvoriť socket:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Nepodarilo sa spracovať odpoveď od HTTP proxy: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Chyba pripojenia HTTP proxy %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Prístup zamietnutý: HTTP proxy server neumožňuje tunelovanie portu %d."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Chyba pri prevode %s"
 
-msgid "Could not resolve host name"
-msgstr "Nepodarilo sa previesť názov hostiteľa"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Poprosili ste o pozornosť používateľa %s..."
@@ -10309,14 +10139,6 @@ msgstr "Chyba pri zápise do %s: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "Nepodarilo sa pripojiť ku %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"Server vyžaduje na prihlásenie TLS/SSL, ale podpora pre TLS/SSL nebola "
-"nájdená."
-
 #, c-format
 msgid " - %s"
 msgstr " - %s"
@@ -10571,9 +10393,14 @@ msgstr "Pridať sledovanie _priateľa..."
 msgid "View _Log"
 msgstr "Zobraziť _záznam"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Skryť v odpojenom stave"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Zobraziť v odpojenom stave"
+
 msgid "_Alias..."
 msgstr "_Prezývka..."
 
@@ -11078,6 +10905,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Zmeniť podrobnosti o používateľovi %s"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Zadajte názov hostiteľa, ktorému je určený tento certifikát."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL servery"
@@ -11124,7 +10955,8 @@ msgstr "Ignorovať"
 msgid "Get Away Message"
 msgstr "Získať správu o neprítomnosti"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Naposledy povedal"
 
 msgid "Unable to save icon file to disk."
@@ -12020,7 +11852,8 @@ msgstr "Farba na vykreslenie odkazov."
 msgid "Hyperlink visited color"
 msgstr "Farba navštíveného odkazu"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+#, fuzzy
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Farba na vykreslenie odkazu ktorý bol navštívený alebo aktivovaný."
 
 msgid "Hyperlink prelight color"
@@ -12056,13 +11889,22 @@ msgstr "Farba ktorou zobraziť názov správy akcie."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Farba názvu správy akcie pre šepkanú správu"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Farba ktorou zobraziť názov správy akcie."
+
 msgid "Whisper Message Name Color"
 msgstr "Farba názvu šepkanej správy"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Farba ktorou zobraziť názov správy akcie."
+
 msgid "Typing notification color"
 msgstr "Odstránenie upozornenia"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "Farba, ktorú použiť pre upozornenie na písanie"
 
 msgid "Typing notification font"
@@ -12455,6 +12297,10 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Vybrali ste možnosť „Ručne“, ale nenastavili ste príkaz prehliadača."
 
+#, fuzzy
+msgid "No message"
+msgstr "Neznáma správa"
+
 msgid "Open All Messages"
 msgstr "Otvoriť všetky správy"
 
@@ -12472,10 +12318,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Máte poštu!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Neznáma správa"
-
 msgid "The following plugins will be unloaded."
 msgstr "Nasledujúce moduly budú zastavené."
 
@@ -12690,8 +12532,9 @@ msgstr "_Zobraziť ikonu v oznamovacej oblasti:"
 msgid "On unread messages"
 msgstr "Pri neprečítaných správach"
 
-msgid "Conversation Window Hiding"
-msgstr "Skrývanie okna rozhovoru"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Okná rozhovoru"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Skrývať nové rozhovory:"
@@ -12699,6 +12542,9 @@ msgstr "_Skrývať nové rozhovory:"
 msgid "When away"
 msgstr "Pri neprítomnosti"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Minimali_zovať nové rozhovory"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Karty"
@@ -12757,9 +12603,6 @@ msgstr "Používať hladké posúvanie"
 msgid "F_lash window when IMs are received"
 msgstr "Blikanie okna po prijatí správy"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Minimali_zovať nové rozhovory"
-
 msgid "Minimum input area height in lines:"
 msgstr "Minimálna výška textového poľa v riadkoch:"
 
@@ -12794,7 +12637,8 @@ msgstr "Nebolo možné spustiť program na nastavenie prehliadača."
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Príklad: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Automaticky zistiť IP adresu"
 
 msgid "Public _IP:"
@@ -13163,33 +13007,18 @@ msgstr "Ul_ožiť a Použiť"
 msgid "Status for %s"
 msgstr "Stav pre %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "Vlastný smajlík"
-
-msgid "More Data needed"
-msgstr "Je treba viac dát"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Zadajte, prosím, skratku pre tohoto smajlíka."
-
 #, fuzzy, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 "Vlastný smajlík pre vybranú skratku už existuje. Prosím vyberte inú skratku."
 
+msgid "Custom Smiley"
+msgstr "Vlastný smajlík"
+
 msgid "Duplicate Shortcut"
 msgstr "Duplicitná skratka"
 
-msgid "Please select an image for the smiley."
-msgstr "Prosím, vyberte obrázok pre smajlíka."
-
 msgid "Edit Smiley"
 msgstr "Upraviť smajlíka"
 
@@ -13303,9 +13132,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Nepodarilo sa odoslať spúšťač"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Vložili ste spúšťač. Pravdepodobne ste chceli odoslať súbor, na ktorý tento "
 "spúšťač odkazuje, namiesto samotného spúšťača."
@@ -13902,9 +13732,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Modul Music Messaging na spoluprácu pri komponovaní."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Modul Music Messaging umožňuje viacerým používateľom súčastne pracovať na "
 "hudobnom diele tak, že upravujú spoločnú partitúru v reálnom čase."
@@ -14159,9 +13990,10 @@ msgid "Conversation Window Send Button."
 msgstr "Tlačidlo odoslať v okne rozhovoru."
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Pridá tlačidlo odoslať do textového poľa v okne rozhovoru. Užitočné ak "
 "súčasťou počítača nie je klávesnica."
@@ -14492,8 +14324,9 @@ msgstr "Možnosti pre Windows verziu programu Pidgin"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Špecifické možnosti programu Pidgin pre Windows."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Poskytuje možnosti špecifické pre Pidgin pre Windows, napríklad ukotvovanie "
 "zoznamu priateľov."
@@ -14535,6 +14368,315 @@ msgstr "Odosielanie a prijímanie nespracovaných XMPP slôh."
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Nepodarilo sa otvoriť socket"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Nepodarilo sa spustiť čakanie na sockete"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Nebolo možné čítať soket"
+
+#~ msgid "Connection failed."
+#~ msgstr "Pripojenie zlyhalo."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Server bol odpojený"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Nepodarilo sa vytvoriť socket"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Nepodarilo sa pripojiť ku hostiteľovi"
+
+#~ msgid "Read error"
+#~ msgstr "Chyba čítania"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nepodarilo sa založiť spojenie so serverom:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Chyba zápisu"
+
+#~ msgid "Last Activity"
+#~ msgstr "Posledná aktivita"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Prieskum služieb"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Položky prieskumu služieb"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Rozšírené adresovanie slôh"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Skupinový chat"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Rozšírené informácie o prítomnosti v skupinovom chate"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "In-Band bitové toky"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Príkaz Ad-Hoc"
+
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub služba"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5 bitové toky"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Mimo skupinových dát"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "In-Band Registrácia"
+
+#~ msgid "User Location"
+#~ msgstr "Lokalita"
+
+#~ msgid "User Avatar"
+#~ msgstr "Avatar používateľa"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Upozornenie na stav v chate"
+
+#~ msgid "Software Version"
+#~ msgstr "Verzia softvéru"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Iniciácia toku"
+
+#~ msgid "User Mood"
+#~ msgstr "Nálada používateľa"
+
+#~ msgid "User Activity"
+#~ msgstr "Aktivita používateľa"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Schopnosti"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Požadovanie šifrovaného spojenia"
+
+#~ msgid "User Tune"
+#~ msgstr "Používateľ Tune"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Výmena kontaktov"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Dostupná adresa"
+
+#~ msgid "User Profile"
+#~ msgstr "Profil používateľa"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Zvuk Jingle"
+
+#~ msgid "User Nickname"
+#~ msgstr "Prezývka používateľa"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Jingle Video"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Príjem správ"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Zverejnenie verejného kľúča"
+
+#~ msgid "User Chatting"
+#~ msgstr "Používateľ chatuje"
+
+#~ msgid "User Browsing"
+#~ msgstr "Používateľ surfuje"
+
+#~ msgid "User Gaming"
+#~ msgstr "Používateľ hrá"
+
+#~ msgid "User Viewing"
+#~ msgstr "Používateľ prezerá"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Šifrovanie slôh"
+
+#~ msgid "Entity Time"
+#~ msgstr "Čas entity"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Odložené doručenie"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Spolupracujúce dátové objekty"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Ukladanie a zdieľanie súborov"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "Objavenie STUN služieb pre Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Požadovanie zjednodušeného šifrovaného spojenia"
+
+#~ msgid "Hop Check"
+#~ msgstr "Kontrola skoku"
+
+#~ msgid "Read Error"
+#~ msgstr "Chyba čítania"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Nepodarilo sa spojiť so serverom."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Zásobník čítania plný (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Nespracovateľná správa"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Nebolo možné sa pripojiť ku hostiteľovi: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Prihlásenie zlyhalo (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Nepodarilo sa pripojiť na server."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Boli ste odhlásený, pretože ste sa prihlásili na inej pracovnej stanici."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Chyba. SSL podpora nie je nainštalovaná."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Nesprávne heslo."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nepodarilo sa pripojiť na BOS server:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Zakrátko môžete byť odpojený. Skontrolujte aktualizácie na %s."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Nepodarilo sa pripojiť"
+
+#~ msgid "Invalid username."
+#~ msgstr "Nesprávne používateľské meno."
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Nedá sa dešifrovať odpoveď serveru"
+
+#~ msgid "Connection lost"
+#~ msgstr "Pripojenie bolo prerušené"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Nebolo možné preložiť názov hostiteľa"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Pripojenie uzavreté (zapisuje sa)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Obnovenie spojenia"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Chyba čítania zo soketu: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Nepodarilo sa pripojiť ku hostiteľovi"
+
+#~ msgid "Could not write"
+#~ msgstr "Nepodarilo sa zapisovať"
+
+#~ msgid "Could not connect"
+#~ msgstr "Nepodarilo sa pripojiť"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Nepodarilo sa vytvoriť socket pre príjem"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Nebolo možné previesť názov hostiteľa na IP"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Nesprávne heslo"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nebolo možné nadviazať spojenie s %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japonsko"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Japonský server záznamníku"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japonský server prenosu súborov"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Pripojenie zo serverom je prerušené\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Nepodarilo sa previesť názov hostiteľa"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Server vyžaduje na prihlásenie TLS/SSL, ale podpora pre TLS/SSL nebola "
+#~ "nájdená."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Skrývanie okna rozhovoru"
+
+#~ msgid "More Data needed"
+#~ msgstr "Je treba viac dát"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Zadajte, prosím, skratku pre tohoto smajlíka."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Prosím, vyberte obrázok pre smajlíka."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Aktivovať s ID?"
 
@@ -15083,9 +15225,6 @@ msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov."
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "Nepodarilo sa prihlásiť. Pozrite ladiaci záznam."
 
-#~ msgid "Unable to login"
-#~ msgstr "Nebolo možné sa prihlásiť"
-
 #~ msgid "TCP Address"
 #~ msgstr "TCP adresa"
 
@@ -15182,14 +15321,6 @@ msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov."
 #~ "Prepáčte, ale heslá ktoré sú dlhšie ako %d znakov (vaše má %d znakov) nie "
 #~ "sú podporované na MySpace."
 
-#~ msgid ""
-#~ "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username and choose a username and try to login again."
-#~ msgstr ""
-#~ "Prosím, choďte na http://editprofile.myspace.com/index.cfm?"
-#~ "fuseaction=profile.username a vyberte si používateľské meno a skúste sa "
-#~ "prihlásiť znovu."
-
 #~ msgid "Use recent buddies group"
 #~ msgstr "Použiť naposledy použitú skupinu kamarátov"
 
@@ -15235,9 +15366,6 @@ msgstr "Tento modul je vhodný pre ladenie XMPP serverov alebo klientov."
 #~ msgid "Unable to connect to contact server"
 #~ msgstr "Nepodarilo sa pripojiť na server kontaktov."
 
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Nepodarilo sa pripojiť na OIM server."
-
 #~ msgid "Unable to make SSL connection to server."
 #~ msgstr "Nepodarilo sa vytvoriť SSL pripojenie na server."
 
diff --git a/po/sl.po b/po/sl.po
index 2c4efb61f4..73d7a2672c 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-04 15:07-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2009-05-02 16:54+0100\n"
 "Last-Translator: Martin Srebotnjak  <miles@filmsi.net>\n"
 "Language-Team: Martin Srebotnjak <miles@filmsi.net>\n"
@@ -2921,15 +2921,17 @@ msgstr ""
 "Namestitve ActiveTCL ni mogoče najti. Če želite uporabljati vtičnike TCL, "
 "namestite ActiveTCL z naslova http://www.activestate.com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Paketa orodij Apple Bonjour za Windows ni mogoče najti, oglejte si pogosto "
 "zastavljena vprašanja na naslovu: http://d.pidgin.im/BonjourWindows za več "
 "podrobnosti."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Dohodnim povezavam IM ni mogoče prisluhniti\n"
 
 msgid ""
@@ -2983,14 +2985,21 @@ msgstr "%s je zaprl pomenek."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Sporočila ni mogoče poslati, pogovora ni mogoče začeti."
 
-msgid "Cannot open socket"
-msgstr "Vtičnice ni mogoče odpreti"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Ni mogoče ustvariti vtičnice:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Povezava vtičnice z vrati ni uspela"
 
-msgid "Could not listen on socket"
-msgstr "Poslušanje vtičnice ni možno"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Ni mogoče ustvariti vtičnice:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Napaka pri komunikaciji s krajevnim mDNSReponderjem."
@@ -3039,13 +3048,16 @@ msgstr "Shrani seznam prijateljev ..."
 msgid "Load buddylist from file..."
 msgstr "Uvozi seznam prijateljev iz datoteke ..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Izpolnite polja za registracijo."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Gesli se ne ujemata."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Novega računa ni bilo mogoče registrirati. Prišlo je do napake.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3057,14 +3069,15 @@ msgstr "Registracija je uspela!"
 msgid "Password"
 msgstr "Geslo"
 
-msgid "Password (retype)"
-msgstr "Geslo (ponovno vtipkajte)"
+msgid "Password (again)"
+msgstr "Novo geslo (ponovno)"
 
-msgid "Enter current token"
-msgstr "Vnesite trenutni žeton"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Trenutni žeton"
+#, fuzzy
+msgid "Captcha"
+msgstr "Slika z napisom"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrirajte nov račun za Gadu-Gadu"
@@ -3117,6 +3130,15 @@ msgstr "Geslo je bilo uspešno spremenjeno!"
 msgid "Current password"
 msgstr "Trenutno geslo"
 
+msgid "Password (retype)"
+msgstr "Geslo (ponovno vtipkajte)"
+
+msgid "Enter current token"
+msgstr "Vnesite trenutni žeton"
+
+msgid "Current token"
+msgstr "Trenutni žeton"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Vnesite svoje obstoječe in novo geslo za UIN:"
 
@@ -3164,8 +3186,8 @@ msgstr "Ni najdenih uporabnikov"
 msgid "There are no users matching your search criteria."
 msgstr "Noben uporabnik ne ustreza iskalnim pogojem."
 
-msgid "Unable to read socket"
-msgstr "Ne morem brati vtičnice"
+msgid "Unable to read from socket"
+msgstr "Ni mogoče brati iz vtičnice"
 
 msgid "Buddy list downloaded"
 msgstr "Seznam prijateljev prenesen"
@@ -3179,8 +3201,14 @@ msgstr "Seznam prijateljev prenesen"
 msgid "Your buddy list was stored on the server."
 msgstr "Seznam prijateljev je bil shranjen na strežniku."
 
-msgid "Connection failed."
-msgstr "Povezava ni uspela."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Povezano"
+
+msgid "Connection failed"
+msgstr "Povezava ni uspela"
 
 msgid "Add to chat"
 msgstr "Dodaj k pomenku"
@@ -3188,18 +3216,23 @@ msgstr "Dodaj k pomenku"
 msgid "Chat _name:"
 msgstr "_Ime za klepet:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Ni se bilo mogoče povezati na strežnik."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Povezovanje"
+
 msgid "Chat error"
 msgstr "Napaka pri pomenku"
 
 msgid "This chat name is already in use"
 msgstr "Ime za pomenek že obstaja"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "S strežnikom niste povezani."
 
 msgid "Find buddies..."
@@ -3259,7 +3292,8 @@ msgstr "Ni teme"
 msgid "File Transfer Failed"
 msgstr "Prenos datoteke ni uspel"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Vrat za poslušanje ni mogoče odpreti."
 
 msgid "Error displaying MOTD"
@@ -3275,8 +3309,18 @@ msgstr "Noben MOTD ni povezan s to povezavo."
 msgid "MOTD for %s"
 msgstr "MOTD za %s"
 
-msgid "Server has disconnected"
-msgstr "Strežnik ni več povezan"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Izgubljena povezava s strežnikom:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Ogled MOTD"
@@ -3291,22 +3335,20 @@ msgstr "_Geslo:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC vzdevki ne smejo vsebovati presledka"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Povezovanje"
-
 msgid "SSL support unavailable"
 msgstr "Podpora SSL ni na voljo"
 
-msgid "Couldn't create socket"
-msgstr "Vtičnice ni bilo mogoče ustvariti"
+msgid "Unable to connect"
+msgstr "Ni se mogoče povezati"
 
-msgid "Couldn't connect to host"
-msgstr "Povezava do gostitelja ni uspela"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Ni se mogoče povezati z %s."
 
-msgid "Read error"
-msgstr "Napaka pri branju"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Strežnik je zaprl povezavo."
 
 msgid "Users"
 msgstr "Uporabniki"
@@ -3735,11 +3777,13 @@ msgstr "Improvizirani ukaz ni uspel"
 msgid "execute"
 msgstr "izvedi"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "Strežnik zahteva TLS/SSL za prijavo. Podpore za TLS/SSL ni mogoče najti."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Vi zahtevate šifriranje, podpore za TLS/SSL pa ni mogoče najti."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3757,7 +3801,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Overovitev z navadnim besedilom"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Overovitev ni uspela"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Neveljaven odgovor strežnika."
 
 msgid "Server does not use any supported authentication method"
@@ -3769,7 +3818,8 @@ msgstr "Zahtevate šifriranje, vendar to na tem strežniku ni na voljo."
 msgid "Invalid challenge from server"
 msgstr "Neveljaven poziv strežnika"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Napaka SASL"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3784,23 +3834,13 @@ msgstr "Nepodprta različica protokola BOSH"
 msgid "Unable to establish a connection with the server"
 msgstr "Povezave s strežnikom ni mogoče vzpostaviti"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"Povezave s strežnikom ni mogoče vzpostaviti:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Povezave s strežnikom ni mogoče vzpostaviti"
 
 msgid "Unable to establish SSL connection"
 msgstr "Povezave SSL ni mogoče vzpostaviti"
 
-msgid "Unable to create socket"
-msgstr "Ni mogoče ustvariti vtičnice"
-
-msgid "Write error"
-msgstr "Napaka pri pisanju"
-
 msgid "Full Name"
 msgstr "Polno ime"
 
@@ -3868,159 +3908,6 @@ msgstr "Operacijski sistem"
 msgid "Local Time"
 msgstr "Krajevni čas"
 
-msgid "Last Activity"
-msgstr "Zadnja dejavnost"
-
-msgid "Service Discovery Info"
-msgstr "Podatki iskanja storitev"
-
-msgid "Service Discovery Items"
-msgstr "Elementi razpoznave storitev"
-
-msgid "Extended Stanza Addressing"
-msgstr "Razširjeno naslavljanje kitic"
-
-msgid "Multi-User Chat"
-msgstr "Večuporabniški pomenek"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Podatki o prisotnosti pri večuporabniškem pomenku"
-
-msgid "In-Band Bytestreams"
-msgstr "Bitni tokovi v pasu"
-
-msgid "Ad-Hoc Commands"
-msgstr "Improvizirani ukazi"
-
-msgid "PubSub Service"
-msgstr "Storitev PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "Bajtni tokovi SOCKS5"
-
-msgid "Out of Band Data"
-msgstr "Zmanjkalo je pasovnih podatkov"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "Prijava v pasu"
-
-msgid "User Location"
-msgstr "Lokacija uporabnika"
-
-msgid "User Avatar"
-msgstr "Avatar uporabnika"
-
-msgid "Chat State Notifications"
-msgstr "Obvestila o stanjih klepeta"
-
-msgid "Software Version"
-msgstr "Programska različica"
-
-msgid "Stream Initiation"
-msgstr "Vzpostavitev toka"
-
-msgid "File Transfer"
-msgstr "Prenos datotek"
-
-msgid "User Mood"
-msgstr "Uporabnikovo počutje"
-
-msgid "User Activity"
-msgstr "Uporabnikova dejavnost"
-
-msgid "Entity Capabilities"
-msgstr "Zmožnosti entitete"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Pogajanja šifrirane seje"
-
-msgid "User Tune"
-msgstr "Uporabnikova skladba"
-
-msgid "Roster Item Exchange"
-msgstr "Izmenjava elementov seznama"
-
-msgid "Reachability Address"
-msgstr "Naslov dosegljivosti"
-
-msgid "User Profile"
-msgstr "Profil uporabnika"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle - zvok"
-
-msgid "User Nickname"
-msgstr "Vzdevek uporabnika"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle - ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle - ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle - surovi UDP"
-
-msgid "Jingle Video"
-msgstr "Jingle - video"
-
-msgid "Jingle DTMF"
-msgstr "Jingle - DTMF"
-
-msgid "Message Receipts"
-msgstr "Dokazila o prejemu sporočila"
-
-msgid "Public Key Publishing"
-msgstr "Objava javnega ključa"
-
-msgid "User Chatting"
-msgstr "Uporabnik klepeta"
-
-msgid "User Browsing"
-msgstr "Uporabnik brska"
-
-msgid "User Gaming"
-msgstr "Uporabnik igra"
-
-msgid "User Viewing"
-msgstr "Uporabnik gleda"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Šifriranje kitic"
-
-msgid "Entity Time"
-msgstr "Čas entitete"
-
-msgid "Delayed Delivery"
-msgstr "Zakasnjena dostava"
-
-msgid "Collaborative Data Objects"
-msgstr "Podatkovni predmeti sodelovanja"
-
-msgid "File Repository and Sharing"
-msgstr "Hramba datotek in skupna raba"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "Razpoznava storitev STUN za Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Poenostavljeno pogajanje šifrirane seje"
-
-msgid "Hop Check"
-msgstr "Preveri hop"
-
-msgid "Capabilities"
-msgstr "Zmožnosti"
-
 msgid "Priority"
 msgstr "Prednost stika"
 
@@ -4032,7 +3919,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Prijavljeni"
 
 msgid "Middle Name"
@@ -4213,16 +4100,14 @@ msgstr "Ni najdenih uporabnikov"
 msgid "Roles:"
 msgstr "Funkcija"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Časovna prekoračitev pinga"
 
-msgid "Read Error"
-msgstr "Napaka pri branju"
-
-#, c-format
+#, fuzzy
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 "Po neuspehu neposredne povezave ni bilo mogoče najti drugih povezovalnih "
 "metod XMPP.\n"
@@ -4400,9 +4285,6 @@ msgstr "Vaše geslo je bilo spremenjeno."
 msgid "Error changing password"
 msgstr "Napaka pri spreminjanju gesla"
 
-msgid "Password (again)"
-msgstr "Novo geslo (ponovno)"
-
 msgid "Change XMPP Password"
 msgstr "Spremeni geslo XMPP"
 
@@ -4787,6 +4669,14 @@ msgstr "Napaka pri razčlenjevanu XML"
 msgid "Unknown Error in presence"
 msgstr "Prišlo je do neznane napake"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Napaka pri pridruževanju pomenku %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Napaka v pomenku %s"
+
 msgid "Create New Room"
 msgstr "Ustvari novo sobo"
 
@@ -4803,13 +4693,17 @@ msgstr "_Nastavi sobo"
 msgid "_Accept Defaults"
 msgstr "_Sprejmi privzeto"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Napaka pri pridruževanju pomenku %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Ni podanega razloga"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Napaka v pomenku %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Brcnil vas je %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Brcnil vas je %s (%s)"
 
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
@@ -5301,9 +5195,6 @@ msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "Za MSN potrebujete podporo SSL, zato morate namestiti podprto knjižnico SSL."
 
-msgid "Failed to connect to server."
-msgstr "Povezava na strežnik neuspešna."
-
 msgid "Error retrieving profile"
 msgstr "Napaka pri pridobivanju profila"
 
@@ -5571,9 +5462,6 @@ msgstr "Sporočila ni bilo poslano, ker je prišlo do neznane napake kodiranja."
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Sporočila ni bilo poslano, ker je prišlo do neznane napake."
 
-msgid "Unable to connect"
-msgstr "Ni se mogoče povezati"
-
 msgid "Writing error"
 msgstr "Napaka pri pisanju"
 
@@ -5588,20 +5476,24 @@ msgstr ""
 "Napaka povezave s strežnika %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Strežnik ne podpira tega protokola."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Napaka pri parsanju HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Prijavili ste se z druge lokacije."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Strežniki MSN so trenutno nedostopni. Prosimo počakajte in poskusite znova."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Strežniki MSN se bodo začasno zaustavili."
 
 #  Data is assumed to be the destination sn
@@ -5615,9 +5507,6 @@ msgstr ""
 "Vaš seznam prijateljev MSN je trenutno nedostopen. Prosimo počakajte in "
 "poskusite znova."
 
-msgid "Unknown error."
-msgstr "Neznana napaka."
-
 msgid "Handshaking"
 msgstr "Rokovanje"
 
@@ -5716,6 +5605,9 @@ msgstr "Vtičnik za protokol MSN"
 msgid "%s is not a valid group."
 msgstr "%s ni veljavna skupina."
 
+msgid "Unknown error."
+msgstr "Neznana napaka."
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s na %s (%s)"
@@ -5832,12 +5724,6 @@ msgstr[3] ""
 msgid "Add contacts from server"
 msgstr "Dodaj stike s strežnika"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Povezano"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Napaka protokola, koda %d: %s"
@@ -5861,16 +5747,6 @@ msgstr "Napaka MySpaceIM"
 msgid "Invalid input condition"
 msgstr "Neveljaven vnosni pogoj"
 
-msgid "Read buffer full (2)"
-msgstr "Bralni predpomnilnik je poln (2)"
-
-msgid "Unparseable message"
-msgstr "Sporočila ni mogoče razčleniti"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Povezava z gostiteljem ni uspela: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Prijatelja ni bilo mogoče dodati"
 
@@ -5955,6 +5831,15 @@ msgstr "Skupno prijateljev"
 msgid "Client Version"
 msgstr "Različica odjemalca"
 
+#, fuzzy
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"Obiščite http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username in izberite uporabniško ime ter se znova poskusite prijaviti."
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Uporabniško ime je na voljo"
 
@@ -6211,9 +6096,9 @@ msgstr "Uporabnike ni na zvezi ali pa ste zavrnjeni"
 msgid "Unknown error: 0x%X"
 msgstr "Neznana napaka: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Prijava spodletela (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Prijava ni uspela"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6316,9 +6201,6 @@ msgstr "Konferenca GroupWise %d"
 msgid "Authenticating..."
 msgstr "Overovljanje ..."
 
-msgid "Unable to connect to server."
-msgstr "Ni se bilo mogoče povezati na strežnik."
-
 msgid "Waiting for response..."
 msgstr "Čakanje odgovora ..."
 
@@ -6342,9 +6224,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Se želite pridružiti pomenku?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Ker ste se prijavili na drugi delovni postaji, ste bili odjavljeni."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6358,9 +6237,6 @@ msgstr ""
 "Ni se mogoče povezati na strežnik. Vnesite naslov strežnika, na katerega se "
 "želite povezati."
 
-msgid "Error. SSL support is not installed."
-msgstr "Napaka. Podpora SSL ni nameščena."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Ta konferenca je bila zaprta. Spročil se ne da pošiljati več.več."
 
@@ -6399,10 +6275,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6411,18 +6284,8 @@ msgstr "Pogovorni sobi se ni mogoče pridružiti"
 msgid "Invalid chat room name"
 msgstr "Neveljavno ime sobe"
 
-msgid "Server closed the connection."
-msgstr "Strežnik je zaprl povezavo."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Izgubljena povezava s strežnikom:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Na povezavi s strežnikom prejeti neveljavni podatki."
 
 #. *< type
@@ -6470,7 +6333,8 @@ msgstr "Izgubljena povezava z oddaljenim uporabnikom:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Pri povezavi z oddaljenim uporabnikom prejeti neveljavni podatki."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Povezave z oddaljenim uporabnikom ni mogoče vzpostaviti."
 
 msgid "Direct IM established"
@@ -6671,21 +6535,15 @@ msgstr "Stopnja opozoril"
 msgid "Buddy Comment"
 msgstr "Komentar prijatelja"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Povezava z overovitvenim strežnikom ni uspela:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Povezava na strežnik BOS ni uspela:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Povezava s strežnikom OIM ni uspela."
 
 msgid "Username sent"
 msgstr "Uporabniško ime poslano"
@@ -6697,11 +6555,11 @@ msgstr "Povezava vzpostavljena, piškotek poslan"
 msgid "Finalizing connection"
 msgstr "Dokončujem povezavo"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Prijava ni mogoča: ni se mogoče prijaviti kot %s, ker je uporabniško ime "
 "neveljavno. Imena morajo biti veljaven e-poštni naslov ali se morajo začeti "
@@ -6717,27 +6575,22 @@ msgstr ""
 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
 #. the username does not exist
 #, fuzzy
 msgid "Username does not exist"
 msgstr "Uporabnik ne obstaja"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Vaš račun je trenutno zamrznjen."
 
 #. service temporarily unavailable
@@ -6759,7 +6612,8 @@ 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 "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Vnešeni ključ SecurID ni veljaven."
 
 msgid "Enter SecurID"
@@ -6950,6 +6804,9 @@ msgstr "Na zvezi od"
 msgid "Member Since"
 msgstr "Član od"
 
+msgid "Capabilities"
+msgstr "Zmožnosti"
+
 msgid "Profile"
 msgstr "Profil"
 
@@ -7144,9 +7001,9 @@ msgstr[3] ""
 msgid "Away message too long."
 msgstr "Spo_ročilo o odsotnosti:"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7171,9 +7028,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Sirote"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Prijatelja %s ni bilo mogoče dodati, ker imate na seznamu preveč "
@@ -7182,8 +7039,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(brez imena)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Iz neznanega razloga prijatelja %s ni mogoče dodati."
 
 #, c-format
@@ -7954,7 +7811,8 @@ msgstr "Interval ohranjanja povezave (s)"
 msgid "Update interval (seconds)"
 msgstr "Interval posodabljanja (s)"
 
-msgid "Cannot decrypt server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "Odgovora strežnika ni mogoče dešifrirati"
 
 #, c-format
@@ -7979,9 +7837,6 @@ msgstr "Zahtevana aktivacija"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Neznana koda odgovora pri prijavljanju v (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Odgovora strežnika ni mogoče dešifrirati"
-
 msgid "Requesting captcha"
 msgstr "Zahtevanje slike z napisom ..."
 
@@ -8003,10 +7858,6 @@ msgstr "Preverjanje napisa s slike QQ"
 msgid "Enter the text from the image"
 msgstr "Vnesite besedilo s slike"
 
-#. uid is not exist
-msgid "Invalid username."
-msgstr "Neveljavno uporabniško ime."
-
 #, c-format
 msgid "Unknown reply when checking password (0x%02X)"
 msgstr "Neznan odgovor pri preverjanju gesla (0x%02X)"
@@ -8019,29 +7870,18 @@ msgstr ""
 "Neznana koda odgovora pri prijavljanju (0x%02X):\n"
 "%s"
 
-msgid "Unable to connect."
-msgstr "Ni se bilo mogoče povezati."
-
 msgid "Socket error"
 msgstr "Napaka vtičnice"
 
-msgid "Unable to read from socket"
-msgstr "Ni mogoče brati iz vtičnice"
-
-msgid "Write Error"
-msgstr "Napaka pri pisanju"
-
-msgid "Connection lost"
-msgstr "Povezava izgubljena"
-
 msgid "Getting server"
 msgstr "Pridobivanje strežnika"
 
 msgid "Requesting token"
 msgstr "Zahtevanje žetona"
 
-msgid "Couldn't resolve host"
-msgstr "Gostitelja ni mogoče razbrati"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Ni se bilo mogoče povezati na strežnik."
 
 msgid "Invalid server or port"
 msgstr "Neveljaven strežnik ali vrata"
@@ -8094,7 +7934,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "Ukaz QQ Qun"
 
-msgid "Could not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "Odgovora na prijavo ni mogoče dešifrirati"
 
 msgid "Unknown LOGIN CMD"
@@ -8114,9 +7955,6 @@ msgstr "Datoteka poslana"
 msgid "%d canceled the transfer of %s"
 msgstr "Uporabnik %d je prekinil prenos %s"
 
-msgid "Connection closed (writing)"
-msgstr "Povezava zaprta (pisanje)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Ime skupine:</b> %s<br>"
@@ -8171,17 +8009,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Upravljalsko obvestilo Sametime"
 
-msgid "Connection reset"
-msgstr "Povezava ponovno nastavljena"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Napaka pri branju iz vtičnice: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Ni se bilo mogoče povezati na strežnik."
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Oznanilo od %s"
@@ -8205,6 +8032,9 @@ msgstr "Zvočniki"
 msgid "Video Camera"
 msgstr "Videokamera"
 
+msgid "File Transfer"
+msgstr "Prenos datotek"
+
 msgid "Supports"
 msgstr "podpira"
 
@@ -9014,6 +8844,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Statistika omrežja"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping ni uspel"
 
@@ -9077,7 +8910,8 @@ msgstr "Nepodprt tip javnega ključa"
 msgid "Disconnected by server"
 msgstr "Strežnik je prekinil povezavo"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Napaka pri povezovanju s strežnikom SILC"
 
 msgid "Key Exchange failed"
@@ -9089,26 +8923,26 @@ msgstr ""
 "Nadaljevanje odpete seje ni uspelo. Pritisnite Ponovna povezava za tvorbo "
 "nove povezave."
 
-msgid "Connection failed"
-msgstr "Povezava ni uspela"
-
 msgid "Performing key exchange"
 msgstr "Izvajanje izmenjave ključev"
 
-msgid "Unable to create connection"
-msgstr "Ni bilo mogoče ustvariti povezave"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Para ključev SILC ni mogoče naložiti"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Povezovanjes strežnikom SILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Para ključev SILC ni mogoče naložiti"
+
 msgid "Out of memory"
 msgstr "Zmanjkalo je pomnilnika"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Protokola SILC ni mogoče inicializirati"
 
 msgid "Error loading SILC key pair"
@@ -9405,7 +9239,8 @@ msgstr "Digitalno podpiši in preveri vsa sporočila"
 msgid "Creating SILC key pair..."
 msgstr "Ustvarjanje para ključev SILC ..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Ustvarjanje para ključev SILC ni mogoče\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9499,6 +9334,9 @@ msgstr "Tabla"
 msgid "No server statistics available"
 msgstr "Statistika strežnika ni na voljo."
 
+msgid "Error during connecting to SILC Server"
+msgstr "Napaka pri povezovanju s strežnikom SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Napaka: Neustrezna različica, nadgradite svojega odjemalca"
@@ -9539,30 +9377,27 @@ msgstr "Napaka: Napačen piškot"
 msgid "Failure: Authentication failed"
 msgstr "Napaka: Overovitev ni uspela"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Ni moč začeti povezave odjemalca SILC"
 
 msgid "John Noname"
 msgstr "Janez Neimenovani"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Ni mogoče naložiti para ključev SILC: %s"
 
-msgid "Could not write"
-msgstr "Ni mogoče pisati"
-
-msgid "Could not connect"
-msgstr "Povezava ni uspela"
+msgid "Unable to create connection"
+msgstr "Ni bilo mogoče ustvariti povezave"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Neznan odgovor strežnika."
 
-msgid "Could not create listen socket"
-msgstr "Vtičnice ni bilo mogoče ustvariti"
-
-msgid "Could not resolve hostname"
-msgstr "Imena strežnika ni mogoče razločiti"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Ni mogoče ustvariti vtičnice"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Uporabniška imena SIP ne smejo vsebovati presledka ali simbola @"
@@ -9603,6 +9438,77 @@ msgstr "Avtoriziraj uporabnika"
 msgid "Auth Domain"
 msgstr "Avtoriziraj domeno"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;soba&gt;:  Pridružite se klepetalnici v omrežju Yahoo."
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Seznam sob na omrežju Yahoo"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Od uporabnika zahtevajte, da začne sejo Doodle"
+
+msgid "Yahoo ID..."
+msgstr "Yahoo-ID ..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Vtičnik za protokol Yahoo"
+
+msgid "Pager server"
+msgstr "Strežnik pozivnika"
+
+msgid "Pager port"
+msgstr "Vrata za pozivnik"
+
+msgid "File transfer server"
+msgstr "Strežnik prenosa datotek"
+
+msgid "File transfer port"
+msgstr "Vrata za prenos datotek"
+
+msgid "Chat room locale"
+msgstr "Razpored tipk sobe pomenkov"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Prezri povabila na konference in v klepetalnice"
+
+msgid "Chat room list URL"
+msgstr "URL seznama sob pomenkov"
+
+msgid "Yahoo Chat server"
+msgstr "Strežnik klepeta Yahoo"
+
+msgid "Yahoo Chat port"
+msgstr "Vrata klepeta Yahoo"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo-ID ..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Vtičnik za protokol Yahoo"
+
 msgid "Your SMS was not delivered"
 msgstr "Vaš SMS ni bil dostavljen"
 
@@ -9634,15 +9540,11 @@ msgstr "Dodajanje prijatelja zavrnjeno"
 msgid "Received invalid data"
 msgstr "Na povezavi s strežnikom prejeti neveljavni podatki."
 
-#, fuzzy
-msgid "Incorrect Password"
-msgstr "Neveljavno geslo"
-
 #. 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."
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
 msgstr ""
 "Neznana številka napake %d. Prijavljanje v spletno stran Yahoo! lahko to "
 "odpravi."
@@ -9650,8 +9552,8 @@ msgstr ""
 #. indicates a lock of some description
 #, fuzzy
 msgid ""
-"Account locked: Unknown reason.\n"
-"Logging into the Yahoo! website may fix this."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 "Neznana številka napake %d. Prijavljanje v spletno stran Yahoo! lahko to "
 "odpravi."
@@ -9693,40 +9595,33 @@ msgstr ""
 "Neznana številka napake %d. Prijavljanje v spletno stran Yahoo! lahko to "
 "odpravi."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Ni mogoče dodati prijatelja %s v skupino %s na seznamu strežnikov za račun %"
 "s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Prijatelja ni mogoče dodati ne seznam strežnikov"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Slišni %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Prejet neveljaven odgovor HTTP strežnika."
 
-msgid "Connection problem"
-msgstr "Težava s povezavo"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Izgubljena povezava s strežnikom %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"Povezave s strežnikom %s ni mogoče vzpostaviti:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Povezave s strežnikom ni mogoče vzpostaviti"
 
 msgid "Not at Home"
 msgstr "Nisem doma"
@@ -9788,73 +9683,15 @@ msgstr "Pridruži se uporabniku v pomenku ..."
 msgid "Open Inbox"
 msgstr "Odpri prejeto pošto"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;soba&gt;:  Pridružite se klepetalnici v omrežju Yahoo."
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Seznam sob na omrežju Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Od uporabnika zahtevajte, da začne sejo Doodle"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo-ID ..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Vtičnik za protokol Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japonska"
-
-msgid "Pager server"
-msgstr "Strežnik pozivnika"
-
-msgid "Japan Pager server"
-msgstr "Japonski strežnik pozivnika"
-
-msgid "Pager port"
-msgstr "Vrata za pozivnik"
-
-msgid "File transfer server"
-msgstr "Strežnik prenosa datotek"
-
-msgid "Japan file transfer server"
-msgstr "Japonski strežnik prenosa datotek"
-
-msgid "File transfer port"
-msgstr "Vrata za prenos datotek"
-
-msgid "Chat room locale"
-msgstr "Razpored tipk sobe pomenkov"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Prezri povabila na konference in v klepetalnice"
-
-msgid "Chat room list URL"
-msgstr "URL seznama sob pomenkov"
-
-msgid "Yahoo Chat server"
-msgstr "Strežnik klepeta Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "Vrata klepeta Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Pošlji zahtevo Doodle."
 
+msgid "Unable to connect."
+msgstr "Ni se bilo mogoče povezati."
+
 msgid "Unable to establish file descriptor."
 msgstr "Opisa datoteke ni bilo mogoče vzpostaviti."
 
@@ -9862,6 +9699,9 @@ msgstr "Opisa datoteke ni bilo mogoče vzpostaviti."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s vam skuša poslati skupino %d datotek.\n"
 
+msgid "Write Error"
+msgstr "Napaka pri pisanju"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Profil Yahoo!-Japonska"
 
@@ -9976,23 +9816,19 @@ msgstr "Glasovi"
 msgid "Webcams"
 msgstr "Spletne kamere"
 
+msgid "Connection problem"
+msgstr "Težava s povezavo"
+
 msgid "Unable to fetch room list."
 msgstr "Ni mogoče prenesti seznama sob."
 
 msgid "User Rooms"
 msgstr "Sobe uporabnikov"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Težava s povezavo s strežnikom YCHT."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Izgubljena povezava s strežnikom\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10126,25 +9962,17 @@ msgstr "Področje"
 msgid "Exposure"
 msgstr "Izpostavljanje"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Ni mogoče ustvariti vtičnice:\n"
-"%s"
-
 #  Data is assumed to be the destination sn
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Ni moč razčleniti odziva posredovalnega strežnika HTTP: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Napaka pri povezavi na posredovalni strežnik HTTP %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "Dostop zavrnjen: posredovalni strežnik HTTP ne dovoljuje preusmerjanja vrat %"
 "d."
@@ -10153,9 +9981,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr "Napaka pri razločanju %s"
 
-msgid "Could not resolve host name"
-msgstr "Imena strežnika ni možno razločiti"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Zahtevanje pozornosti uporabnika %s ..."
@@ -10370,14 +10195,6 @@ msgid "Unable to connect to %s: %s"
 msgstr "Napaka pri povezovanju z %s: %s"
 
 #, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"Povezava z %s ni uspela: strežnik zahteva TLS/SSL za prijavo, vendar podpore "
-"za TLS/SSL ni mogoče najti."
-
-#, c-format
 msgid " - %s"
 msgstr " - %s"
 
@@ -10624,9 +10441,14 @@ msgstr "Dodaj &opozorilo prijatelju ..."
 msgid "View _Log"
 msgstr "Pokaži _dnevnik"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Skrij, če nepovezan"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Pokaži, če nepovezan"
+
 msgid "_Alias..."
 msgstr "Psevdo_nim ..."
 
@@ -11185,7 +11007,8 @@ msgstr "Prezri"
 msgid "Get Away Message"
 msgstr "Sporočilo o odsotnosti"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Nazadnje rečeno"
 
 msgid "Unable to save icon file to disk."
@@ -12759,8 +12582,9 @@ msgstr "_Pokaži sistemsko ikono na pladnju:"
 msgid "On unread messages"
 msgstr "ob neprebranih sporočilih"
 
-msgid "Conversation Window Hiding"
-msgstr "Skrivanje okna pogovora"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Pogovorna okna"
 
 msgid "_Hide new IM conversations:"
 msgstr "Skrij nove po_govore IM:"
@@ -12768,6 +12592,9 @@ msgstr "Skrij nove po_govore IM:"
 msgid "When away"
 msgstr "ob odsotnosti"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Poman_jšaj pogovorna okna"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Zavihki"
@@ -12826,9 +12653,6 @@ msgstr "Uporabi animirano drsenje"
 msgid "F_lash window when IMs are received"
 msgstr "Utripaj z _oknom, ko prispe novo sporočilo"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Poman_jšaj pogovorna okna"
-
 msgid "Minimum input area height in lines:"
 msgstr "Najmanjša višina vnosne površine v vrsticah:"
 
@@ -14595,6 +14419,305 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Ta vtičnik je uporaben za razhroščevanje strežnikov ali odjemalcev XMPP."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Vtičnice ni mogoče odpreti"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Poslušanje vtičnice ni možno"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Ne morem brati vtičnice"
+
+#~ msgid "Connection failed."
+#~ msgstr "Povezava ni uspela."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Strežnik ni več povezan"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Vtičnice ni bilo mogoče ustvariti"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Povezava do gostitelja ni uspela"
+
+#~ msgid "Read error"
+#~ msgstr "Napaka pri branju"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Povezave s strežnikom ni mogoče vzpostaviti:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Napaka pri pisanju"
+
+#~ msgid "Last Activity"
+#~ msgstr "Zadnja dejavnost"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Podatki iskanja storitev"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Elementi razpoznave storitev"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Razširjeno naslavljanje kitic"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Večuporabniški pomenek"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Podatki o prisotnosti pri večuporabniškem pomenku"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "Bitni tokovi v pasu"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Improvizirani ukazi"
+
+#~ msgid "PubSub Service"
+#~ msgstr "Storitev PubSub"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "Bajtni tokovi SOCKS5"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Zmanjkalo je pasovnih podatkov"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "Prijava v pasu"
+
+#~ msgid "User Location"
+#~ msgstr "Lokacija uporabnika"
+
+#~ msgid "User Avatar"
+#~ msgstr "Avatar uporabnika"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Obvestila o stanjih klepeta"
+
+#~ msgid "Software Version"
+#~ msgstr "Programska različica"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Vzpostavitev toka"
+
+#~ msgid "User Mood"
+#~ msgstr "Uporabnikovo počutje"
+
+#~ msgid "User Activity"
+#~ msgstr "Uporabnikova dejavnost"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Zmožnosti entitete"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Pogajanja šifrirane seje"
+
+#~ msgid "User Tune"
+#~ msgstr "Uporabnikova skladba"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Izmenjava elementov seznama"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Naslov dosegljivosti"
+
+#~ msgid "User Profile"
+#~ msgstr "Profil uporabnika"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Jingle - zvok"
+
+#~ msgid "User Nickname"
+#~ msgstr "Vzdevek uporabnika"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle - ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle - ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle - surovi UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Jingle - video"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle - DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Dokazila o prejemu sporočila"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Objava javnega ključa"
+
+#~ msgid "User Chatting"
+#~ msgstr "Uporabnik klepeta"
+
+#~ msgid "User Browsing"
+#~ msgstr "Uporabnik brska"
+
+#~ msgid "User Gaming"
+#~ msgstr "Uporabnik igra"
+
+#~ msgid "User Viewing"
+#~ msgstr "Uporabnik gleda"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Šifriranje kitic"
+
+#~ msgid "Entity Time"
+#~ msgstr "Čas entitete"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Zakasnjena dostava"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Podatkovni predmeti sodelovanja"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Hramba datotek in skupna raba"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "Razpoznava storitev STUN za Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Poenostavljeno pogajanje šifrirane seje"
+
+#~ msgid "Hop Check"
+#~ msgstr "Preveri hop"
+
+#~ msgid "Read Error"
+#~ msgstr "Napaka pri branju"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Povezava na strežnik neuspešna."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Bralni predpomnilnik je poln (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Sporočila ni mogoče razčleniti"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Povezava z gostiteljem ni uspela: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Prijava spodletela (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Ni se bilo mogoče povezati na strežnik."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Ker ste se prijavili na drugi delovni postaji, ste bili odjavljeni."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Napaka. Podpora SSL ni nameščena."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Neveljavno geslo."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Povezava na strežnik BOS ni uspela:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "Morda bo povezava v kratkem prekinjena. Preverite %s za posodobitve."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Povezava ni uspela"
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Odgovora strežnika ni mogoče dešifrirati"
+
+#~ msgid "Invalid username."
+#~ msgstr "Neveljavno uporabniško ime."
+
+#~ msgid "Connection lost"
+#~ msgstr "Povezava izgubljena"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Gostitelja ni mogoče razbrati"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Povezava zaprta (pisanje)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Povezava ponovno nastavljena"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Napaka pri branju iz vtičnice: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Ni se bilo mogoče povezati na strežnik."
+
+#~ msgid "Could not write"
+#~ msgstr "Ni mogoče pisati"
+
+#~ msgid "Could not connect"
+#~ msgstr "Povezava ni uspela"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Vtičnice ni bilo mogoče ustvariti"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Imena strežnika ni mogoče razločiti"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Neveljavno geslo"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Povezave s strežnikom %s ni mogoče vzpostaviti:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japonska"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Japonski strežnik pozivnika"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japonski strežnik prenosa datotek"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Izgubljena povezava s strežnikom\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Imena strežnika ni možno razločiti"
+
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Povezava z %s ni uspela: strežnik zahteva TLS/SSL za prijavo, vendar "
+#~ "podpore za TLS/SSL ni mogoče najti."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Skrivanje okna pogovora"
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Kateri ID naj bo aktiviran?"
 
@@ -15109,9 +15232,6 @@ msgstr ""
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "Prijava ni uspela. Preverite zapisnik razhroščevanja."
 
-#~ msgid "Unable to login"
-#~ msgstr "Prijava ni uspela"
-
 #~ msgid "Failed room reply"
 #~ msgstr "Spodleteli odgovor sobe"
 
@@ -15248,22 +15368,12 @@ msgstr ""
 #~ msgid "Current media"
 #~ msgstr "Trenutni medij"
 
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Povezava s strežnikom OIM ni uspela."
-
 #~ msgid ""
 #~ "Sorry, passwords over %d characters in length (yours is %d) are not "
 #~ "supported by MySpace."
 #~ msgstr ""
 #~ "Žal MySpace ne podpira gesel, daljših od %d znakov (vaše jih ima %d)."
 
-#~ msgid ""
-#~ "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username and choose a username and try to login again."
-#~ msgstr ""
-#~ "Obiščite http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username in izberite uporabniško ime ter se znova poskusite prijaviti."
-
 #~ msgid "Unable to make SSL connection to server."
 #~ msgstr "Ni se bilo mogoče povezati na strežnik preko SSL."
 
diff --git a/po/sq.po b/po/sq.po
index 0904c406a2..73a6509faf 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2008-11-14 13:56+0200\n"
 "Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
 "Language-Team: Albanian <besnik@programeshqip.org>\n"
@@ -2686,9 +2686,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Përfshin te parës regjistrimesh regjistrim prej tjetër klienti MA-sh."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2743,8 +2744,9 @@ msgstr "Simulim Mesazhi për Offline"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Ruaji si cytje mesazhet e dërguar te një përdorues jo në linjë."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Ç'mbetet nga mesazhi do të ruhet si cytje. Mund ta përpunoni/fshini cytjen "
@@ -3074,14 +3076,16 @@ msgstr ""
 "Nuk u gjet dot instalim i Active TCL. Nëse dëshironi të përdorni shtojca "
 "TCL, instaloni ActiveTCL prej http://www.activestate.com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Nuk u gjet grupi i mjeteve Apple Bonjour For Windows, për më tepër të dhëna "
 "shihni FAQ te: http://d.pidgin.im/BonjourWindows."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "I pazoti të presë për lidhje MA ardhëse\n"
 
 msgid ""
@@ -3146,14 +3150,21 @@ msgstr "%s mbylli bashkëbisedimin"
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "I pazoti të dërgojë mesazh, nuk u nis dot bashkëbisedimi."
 
-msgid "Cannot open socket"
-msgstr "S'hap dot \"socket\""
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"I pazoti të krijojë \"socket\":\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Nuk lidhi dot \"socket\"-in te porta"
 
-msgid "Could not listen on socket"
-msgstr "Nuk u dëgjua dot te \"socket\"-i"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"I pazoti të krijojë \"socket\":\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Gabim gjatë komunikimit me mDNSResponder vendor."
@@ -3202,13 +3213,16 @@ msgstr "Ruaj listë shokësh..."
 msgid "Load buddylist from file..."
 msgstr "Ngarko listë shokësh prej kartele..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Plotësoni fushat e regjistrimin."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Fjalëkalimet nuk përputhen."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "I pazoti të regjistrojë llogari të re. ndodhi një gabim.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3220,14 +3234,15 @@ msgstr "Regjistrimi u plotësua me sukses!"
 msgid "Password"
 msgstr "Fjalëkalim"
 
-msgid "Password (retype)"
-msgstr "Fjalëkalim (rishtypeni)"
+msgid "Password (again)"
+msgstr "Fjalëkalim (sërish)"
 
-msgid "Enter current token"
-msgstr "Jepni \"token\"-in e çastit"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "\"Token\" i çastit"
+#, fuzzy
+msgid "Captcha"
+msgstr "Pamje Captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Regjistro Llogari të Re Gadu-Gadu"
@@ -3282,6 +3297,15 @@ msgstr "Fjalëkalimi u ndryshua me sukses!"
 msgid "Current password"
 msgstr "Fjalëkalim i çastit."
 
+msgid "Password (retype)"
+msgstr "Fjalëkalim (rishtypeni)"
+
+msgid "Enter current token"
+msgstr "Jepni \"token\"-in e çastit"
+
+msgid "Current token"
+msgstr "\"Token\" i çastit"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 "Ju lutem jepni fjalëkalimin tuaj të çastit dhe fjalëkalimin tuaj të ri për "
@@ -3332,8 +3356,8 @@ msgstr "S'u gjetën përputhje me ndonjë përdorues"
 msgid "There are no users matching your search criteria."
 msgstr "Kriteri juaj i kërkimit nuk ka përputhje për asnjë përdorues. "
 
-msgid "Unable to read socket"
-msgstr "I pazoti të lexojë \"socket\"-in"
+msgid "Unable to read from socket"
+msgstr "I pazoti të lexojë prej \"socket\"-i"
 
 msgid "Buddy list downloaded"
 msgstr "Listë shokësh e shkarkuar"
@@ -3347,7 +3371,13 @@ msgstr "Listë shokësh e ngarkuar"
 msgid "Your buddy list was stored on the server."
 msgstr "Lista juaj e shokëve është ruajtur në shërbyes."
 
-msgid "Connection failed."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "I lidhur"
+
+msgid "Connection failed"
 msgstr "Lidhja dështoi"
 
 msgid "Add to chat"
@@ -3356,18 +3386,24 @@ msgstr "Shto te fjalosje"
 msgid "Chat _name:"
 msgstr "_Emër fjalosjeje:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "I pazoti të lidhet me shërbyesin."
 
+#  connect to the server
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Po bëhet lidhja"
+
 msgid "Chat error"
 msgstr "Gabim fjalosjeje"
 
 msgid "This chat name is already in use"
 msgstr "Ky emër fjalosjeje është tashmë në përdorim"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "I palidhur te shërbyesi."
 
 msgid "Find buddies..."
@@ -3438,7 +3474,8 @@ msgstr "Nuk është caktuar temë"
 msgid "File Transfer Failed"
 msgstr "Shpërngulja e Kartelave Dështoi"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "S'u hap dot një portë dëgjuese."
 
 msgid "Error displaying MOTD"
@@ -3454,8 +3491,18 @@ msgstr "Nuk ka MOTD shoqëruar kësaj lidhjeje."
 msgid "MOTD for %s"
 msgstr "MOTD për %s"
 
-msgid "Server has disconnected"
-msgstr "Shërbyesi është shkëputur"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Humbi lidhja me shërbyesin:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Shihni MOTD"
@@ -3470,23 +3517,20 @@ msgstr "_Fjalëkalim:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "Nofka IRC nuk duhet të përmbajnë hapësira"
 
-#  connect to the server
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Po bëhet lidhja"
-
 msgid "SSL support unavailable"
 msgstr "Suport SSL jo i mundshëm"
 
-msgid "Couldn't create socket"
-msgstr "S'munda të krijojë \"socket\""
+msgid "Unable to connect"
+msgstr "I pazoti të lidhet"
 
-msgid "Couldn't connect to host"
-msgstr "S'munda të lidhem te strehë"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "I pazoti të lidhet te %s."
 
-msgid "Read error"
-msgstr "Gabim leximi"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Shërbyesi e mbylli lidhjen."
 
 msgid "Users"
 msgstr "Përdoruesa"
@@ -3934,10 +3978,12 @@ msgstr "Urdhri Ad-Hoc Dështoi"
 msgid "execute"
 msgstr "përmbush"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Shërbyesi lyp TLS/SSL për hyrje. Nuk u gjet suport për TLS/SSL."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Shërbyesi lyp kodim, por nuk u gjet mbulim për TLS/SSL-në."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3956,7 +4002,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Mirëfilltësim me bazë Tekst të Thjeshtë"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Dështoi mirëflltësimi"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Përgjigje e pavlefshme prej shërbyesit."
 
 msgid "Server does not use any supported authentication method"
@@ -3968,7 +4019,8 @@ 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."
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Gabim SASL"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3988,10 +4040,8 @@ msgstr ""
 "Nuk u vendos dot lidhje me shërbyesin:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Nuk u vendos dot lidhje me shërbyesin:\n"
 "%s"
@@ -4000,12 +4050,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "I pazoti të gatisë lidhjen"
 
-msgid "Unable to create socket"
-msgstr "I pazoti të krijojë \"socket\""
-
-msgid "Write error"
-msgstr "Gabim shkrimi"
-
 msgid "Full Name"
 msgstr "Emër i Plotë"
 
@@ -4078,166 +4122,6 @@ msgstr "Sistem Operativ"
 msgid "Local Time"
 msgstr "Kartelë Vendore:"
 
-msgid "Last Activity"
-msgstr "Veprimtaria e Fundit"
-
-msgid "Service Discovery Info"
-msgstr "Të dhëna Zbulimi Shërbimesh"
-
-msgid "Service Discovery Items"
-msgstr "Objekte Zbulimi Shërbimesh"
-
-msgid "Extended Stanza Addressing"
-msgstr "Adresim i Zgjeruar Stanza"
-
-msgid "Multi-User Chat"
-msgstr "Fjalosje me Shumë Përdorues"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Të dhëna Pranie të Zgjeruar në Fjalosje me Shumë Përdorues"
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr "Urdhra Ad-Hoc"
-
-msgid "PubSub Service"
-msgstr "Shërbim PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 Bytestreams"
-
-msgid "Out of Band Data"
-msgstr "Pa të Dhëna Bande"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr ""
-
-msgid "User Location"
-msgstr "Vendndodhje Përdoruesi"
-
-msgid "User Avatar"
-msgstr "Avatar Përdoruesi"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-msgid "Chat State Notifications"
-msgstr "Njoftime Gjendjeje Fjalosjeje"
-
-msgid "Software Version"
-msgstr "Version Software-i"
-
-msgid "Stream Initiation"
-msgstr "Fillim Rrjedhe"
-
-msgid "File Transfer"
-msgstr "Shpërngulje Kartele"
-
-msgid "User Mood"
-msgstr "Humor Përdoruesi"
-
-msgid "User Activity"
-msgstr "Veprimtari Përdoruesi"
-
-msgid "Entity Capabilities"
-msgstr "Aftësi Njësie"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Negociata Sesioni të Koduar"
-
-msgid "User Tune"
-msgstr "Melodi Përdoruesi"
-
-msgid "Roster Item Exchange"
-msgstr "Shkëmbim Objekti Roster"
-
-msgid "Reachability Address"
-msgstr ""
-
-msgid "User Profile"
-msgstr "Profil Përdoruesi"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Audio Jingle"
-
-msgid "User Nickname"
-msgstr "Nofkë Përdoruesi"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle Raw UDP"
-
-msgid "Jingle Video"
-msgstr "Video Jingle"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Fatura Mesazhesh"
-
-msgid "Public Key Publishing"
-msgstr "Botim Kyçi Publik"
-
-msgid "User Chatting"
-msgstr "Fjalosje Përdoruesi"
-
-msgid "User Browsing"
-msgstr "Shfletim Përdoruesi"
-
-msgid "User Gaming"
-msgstr "Lojë Përdoruesi"
-
-msgid "User Viewing"
-msgstr "Parje Përdoruesi"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Kodim Stanza"
-
-msgid "Entity Time"
-msgstr "Kohë Njësie"
-
-msgid "Delayed Delivery"
-msgstr "Dërgim i Vonuar"
-
-msgid "Collaborative Data Objects"
-msgstr "Objekte Të Dhënash Bashkëpunimi"
-
-msgid "File Repository and Sharing"
-msgstr "Depo Kartelash dhe Ndarje"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "STUN Service Discovery për Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Negociata Sesioni të Koduar të Thjeshtëzuar"
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Aftësi"
-
 msgid "Priority"
 msgstr "Përparësi"
 
@@ -4249,7 +4133,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "I futur"
 
 msgid "Middle Name"
@@ -4438,16 +4322,13 @@ msgstr "S'u gjetën përputhje me ndonjë përdorues"
 msgid "Roles:"
 msgstr "Rol"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Skadim kohe për ping-un"
 
-msgid "Read Error"
-msgstr "Gabim Leximi"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4630,9 +4511,6 @@ msgstr "Fjalëkalimi juaj është ndryshuar."
 msgid "Error changing password"
 msgstr "Gabim në ndryshim fjalëkalimi "
 
-msgid "Password (again)"
-msgstr "Fjalëkalim (sërish)"
-
 #  if (js->protocol_options & CHANGE_PASSWORD) {
 msgid "Change XMPP Password"
 msgstr "Ndrysho Fjalëkalimin për XMPP"
@@ -5034,6 +4912,14 @@ msgstr "Gabim përtypjeje XML"
 msgid "Unknown Error in presence"
 msgstr "Gabim i Panjohur te prania"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Gabim në hyrjen te fjalosje %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Gabim në fjalosje %s"
+
 msgid "Create New Room"
 msgstr "Krijo Dhomë të Re"
 
@@ -5050,16 +4936,20 @@ msgstr "_Formësoni Dhomën"
 msgid "_Accept Defaults"
 msgstr "_Prano Parazgjedhjet"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Gabim në hyrjen te fjalosje %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Nuk u dha arsye"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Gabim në fjalosje %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Jeni përzënë prej %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Përzënë prej %s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Ndodhi një gabim gjatë hapjes së kartelës."
 
 #, fuzzy
@@ -5556,9 +5446,6 @@ msgstr "Nis _Fjalosje"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "Lypset mbulim SSL për MSN. Ju lutem instaloni një librari suporti SSL."
 
-msgid "Failed to connect to server."
-msgstr "Dështoi në lidhjen me shërbyesin."
-
 msgid "Error retrieving profile"
 msgstr "Gabim në marrje profili"
 
@@ -5836,9 +5723,6 @@ msgstr "Mesazhi nuk u dërgua dot ngaqë ndodhi një gabim i panjohur kodimi."
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Mesazhi nuk u dërgua dot ngaqë ndodhi një gabim i panjohur."
 
-msgid "Unable to connect"
-msgstr "I pazoti të lidhet"
-
 msgid "Writing error"
 msgstr "Gabim shkrimi"
 
@@ -5853,20 +5737,24 @@ msgstr ""
 "Gabim lidhjeje nga shërbyesi %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Protokolli ynë nuk mbulohet nga shërbyesi."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Gabim në përtypjen e HTTP-së."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Keni nënshkruar prej një tjetër vendi."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Shërbyesat MSN janë përkohësisht jashtë pune. Ju lutem prisni dhe riprovoni."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Shërbyesat MSN po ndalen përkohësisht."
 
 #  TODO: Improve this! message to who or for what conference?
@@ -5880,9 +5768,6 @@ 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"
 
@@ -5991,6 +5876,9 @@ msgstr "Shtojcë Protokolli MSN"
 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)"
@@ -6106,12 +5994,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Shto kontakte prej shërbyesit"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "I lidhur"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Gabim protokolli, kod %d: %s"
@@ -6136,16 +6018,6 @@ msgstr "Gabim MySpaceIM"
 msgid "Invalid input condition"
 msgstr "Kusht i pavlefshëm futjeje"
 
-msgid "Read buffer full (2)"
-msgstr "Shtytëz leximi plot (2)"
-
-msgid "Unparseable message"
-msgstr "Mesazh i papërtypshëm"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "S'u lidha dot te strehë: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Shtimi i shokut dështoi"
 
@@ -6230,6 +6102,12 @@ msgstr "Miq Gjithsej"
 msgid "Client Version"
 msgstr "Version Klienti"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Emër përdoruesi i Passhëm"
 
@@ -6487,9 +6365,9 @@ msgstr "ose përdoruesi është i palidhur ose ju jeni të bllokuar"
 msgid "Unknown error: 0x%X"
 msgstr "Gabim i panjohur: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Hyrja dështoi (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "I pazoti të dërgojë ping për përdoruesin %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6600,9 +6478,6 @@ msgstr "Konferencë GroupWise %d"
 msgid "Authenticating..."
 msgstr "Po kryhet mirëfilltësimi..."
 
-msgid "Unable to connect to server."
-msgstr "I pazoti të lidhet me shërbyesin."
-
 msgid "Waiting for response..."
 msgstr "Në pritje të përgjigjes..."
 
@@ -6626,9 +6501,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Do të donit të merrni pjesë në diskutim?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Jeni nxjerrë jashtë ngaqë jeni futur prej një tjetër kompjuteri."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6638,16 +6510,14 @@ msgstr ""
 #  TODO: Would be nice to prompt if not set!
 #  *  Pidgin_request_fields(gc, _("Server Address"),...);
 #  ...but for now just error out with a nice message.
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "I pazoti të lidhet me shërbyesin. Ju lutem jepni vendndodhjen e shërbyesit "
 "që doni të kontaktohet."
 
-msgid "Error. SSL support is not installed."
-msgstr "Gabim. Nuk është instaluar suport për SSL."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Kjo konferencë është mbyllur. S'mund të dërgohen më mesazhe."
 
@@ -6697,10 +6567,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6709,18 +6576,8 @@ msgstr "Nuk u bë dot futja në dhomën e fjalosjes"
 msgid "Invalid chat room name"
 msgstr "U dha emër i pavlefshëm dhome fjalosjeje."
 
-msgid "Server closed the connection."
-msgstr "Shërbyesi e mbylli lidhjen."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Humbi lidhja me shërbyesin:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "U morën të dhëna të pavlefshme rreth lidhjes me shërbyesin."
 
 #  *< api_version
@@ -6788,7 +6645,8 @@ msgstr "Humbi lidhja me përdoruesin e largët:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "U morën të dhëna të pavlefshme rreth lidhjes me përdoruesin e largët."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Nuk u vendos dot lidhje me përdoruesin e largët."
 
 msgid "Direct IM established"
@@ -6990,21 +6848,15 @@ msgstr "Shkallë Sinjalizimi"
 msgid "Buddy Comment"
 msgstr "Koment Shoku"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Nuk u bë dot lidhja me shërbyesin e mirëfilltësimeve:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Nuk u bë dot lidhja me shërbyesin BOS:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "I pazoti të lidhet me shërbyesin."
 
 msgid "Username sent"
 msgstr "U dërgua emri i përdoruesit"
@@ -7016,11 +6868,11 @@ msgstr "Lidhje e vendosur, \"cookie\" u dërgua"
 msgid "Finalizing connection"
 msgstr "Po finalizohet lidhja"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "I pazoti të futet: Nuk hyri dot si %s sepse emri i përdoruesit është i "
 "pavlefshëm.  Emrat e përdoruesve duhet të jenë venndodhje email të vlefshme, "
@@ -7034,26 +6886,22 @@ 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."
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Përdoruesi nuk ekziston"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Llogaria juaj për çastin është e pezulluar."
 
 #  service temporarily unavailable
@@ -7076,7 +6924,8 @@ 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 "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Kyçi SecurID i dhënë është i pavlefshëm."
 
 msgid "Enter SecurID"
@@ -7255,6 +7104,9 @@ msgstr "I lidhur që Prej"
 msgid "Member Since"
 msgstr "Anëtar që Prej"
 
+msgid "Capabilities"
+msgstr "Aftësi"
+
 msgid "Profile"
 msgstr "Profil"
 
@@ -7439,9 +7291,9 @@ msgstr[1] ""
 msgid "Away message too long."
 msgstr "Mesazh largimi shumë i gjatë."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7469,9 +7321,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Jetimë"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "S'mundi të shtojë shokun %s sepse keni shumë shokë në listë shokësh tuajën.  "
@@ -7480,8 +7332,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(pa emër)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Për një arsye të panjohur, nuk u shtua dot shoku %s."
 
 #, c-format
@@ -8293,7 +8145,7 @@ msgid "Update interval (seconds)"
 msgstr "Interval(e) përditësimi"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "S'zbërthen dot përgjigje për \"kap shërbyesin\""
 
 #, c-format
@@ -8320,10 +8172,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Kod i panjohur përgjigje ndërsa hyhej (0x%02X)"
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "S'zbërthen dot përgjigje për \"kap shërbyesin\""
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "Po kërkohet captcha ..."
 
@@ -8362,22 +8210,9 @@ msgstr ""
 "Kod i panjohur përgjigjeje ndërsa hyhej (0x%02X):\n"
 "%s"
 
-#  we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "I pazoti të lidhet."
-
 msgid "Socket error"
 msgstr "Gabim \"socket\"-i"
 
-msgid "Unable to read from socket"
-msgstr "I pazoti të lexojë prej \"socket\"-i"
-
-msgid "Write Error"
-msgstr "Gabim Shkrimi"
-
-msgid "Connection lost"
-msgstr "Lidhje e humbur"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "Kap shërbyesin ..."
@@ -8386,8 +8221,9 @@ msgstr "Kap shërbyesin ..."
 msgid "Requesting token"
 msgstr "\"Token\" kërkese"
 
-msgid "Couldn't resolve host"
-msgstr "S'u shquajt dot streha"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "I pazoti të lidhet me shërbyesin."
 
 msgid "Invalid server or port"
 msgstr "Portë ose shërbyes i pavlefshëm"
@@ -8443,7 +8279,7 @@ msgid "QQ Qun Command"
 msgstr "Urdhër QQ Qun"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Nuk zbërthen dot përgjigje hyrjeje"
 
 msgid "Unknown LOGIN CMD"
@@ -8463,9 +8299,6 @@ msgstr "Dërgim Kartele"
 msgid "%d canceled the transfer of %s"
 msgstr "%d anuloi shpërnguljen e %s"
 
-msgid "Connection closed (writing)"
-msgstr "Lidhja u ndërpre (shkrim)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Titull Grup:</b> %s<br>"
@@ -8520,17 +8353,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Njoftime Administratori Sametime"
 
-msgid "Connection reset"
-msgstr "Rivendosje lidhjeje"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Gabim gjatë leximit prej \"socket\"-i: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "S'bëhet dot lidhja me strehën"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Njoftim prej %s"
@@ -8554,6 +8376,9 @@ msgstr "Altoparlantë"
 msgid "Video Camera"
 msgstr "Video Kamera"
 
+msgid "File Transfer"
+msgstr "Shpërngulje Kartele"
+
 msgid "Supports"
 msgstr "Mbulon"
 
@@ -9378,6 +9203,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Statistika Rrjeti"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Pingu dështoi"
 
@@ -9441,7 +9269,8 @@ msgstr "Tip kyçi publik i pambuluar"
 msgid "Disconnected by server"
 msgstr "Shkëputur prej shërbyesit"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Gabim gjatë lidhjes te Shërbyes SILC"
 
 msgid "Key Exchange failed"
@@ -9453,16 +9282,11 @@ msgstr ""
 "Dështoi rimarrja e sesionit të shkëputur. Shtypni Rilidhu për të krijuar një "
 "lidhje të re."
 
-msgid "Connection failed"
-msgstr "Lidhja dështoi"
-
 msgid "Performing key exchange"
 msgstr "Po kryhet shkëmbim kyçesh"
 
-msgid "Unable to create connection"
-msgstr "I pazoti të krijojë lidhje"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "S'u ngarkua dot çift kyçesh SILC"
 
 #  Progress
@@ -9470,10 +9294,15 @@ msgstr "S'u ngarkua dot çift kyçesh SILC"
 msgid "Connecting to SILC Server"
 msgstr "Po bëhet lidhja me Shërbyesin SILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "S'u ngarkua dot çift kyçesh SILC"
+
 msgid "Out of memory"
 msgstr "Kujtesë e pamjaftueshme"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "S'gatitet dot protokolli SILC"
 
 msgid "Error loading SILC key pair"
@@ -9779,7 +9608,8 @@ msgstr "Nënshkruaj dhe verifiko në mënyrë shifrore tërë mesazhet"
 msgid "Creating SILC key pair..."
 msgstr "Po krijohet çift kyçesh SILC..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "S'krijohet dot çift  kyçesh SILC\n"
 
 #  Hint for translators: Please check the tabulator width here and in
@@ -9876,6 +9706,9 @@ msgstr "Tabela"
 msgid "No server statistics available"
 msgstr "Pa statistika shërbyesi të gatshme"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Gabim gjatë lidhjes te Shërbyes SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Dështim: Mospërputhje versioni, përditësoni klientin tuaj"
@@ -9916,30 +9749,27 @@ msgstr "Dështim: \"Cookie\" e pavlefshme"
 msgid "Failure: Authentication failed"
 msgstr "Dështim: Mirëfilltësimi dështoi"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "S'gatis dot lidhje SILC Client"
 
 msgid "John Noname"
 msgstr "Gjoni i Paemërt"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "S'u ngarkua dot çift kyçesh SILC: %s"
 
-msgid "Could not write"
-msgstr "S'shkruhej dot"
-
-msgid "Could not connect"
-msgstr "S'u bë dot lidhja"
+msgid "Unable to create connection"
+msgstr "I pazoti të krijojë lidhje"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Përgjigje e panjohur shërbyesi"
 
-msgid "Could not create listen socket"
-msgstr "S'mundi të krijojë \"listen socket\""
-
-msgid "Could not resolve hostname"
-msgstr "S'u shqua dot emërstreha"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "I pazoti të krijojë \"socket\""
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Emra përdoruesish SIP mund të mos përmbajnë hapësira ose simbole @"
@@ -10001,6 +9831,99 @@ msgstr "Mirëfilltësim Përdoruesi"
 msgid "Auth Domain"
 msgstr "Mirëfilltësim Përkatësie"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;dhomë&gt; Bashkoju një dhome fjalosjeje në rrjetin Yahoo"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Radhit dhoma te rrjeti Yahoo"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Kërkoji përdoruesit të nisë një sesion Doodle"
+
+msgid "Yahoo ID..."
+msgstr "ID Yahoo..."
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#  *< name
+#  *< version
+#  *  summary
+#  *  description
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Shtojcë Protokolli Yahoo"
+
+msgid "Pager server"
+msgstr "Shërbyes Faquesi"
+
+msgid "Pager port"
+msgstr "Portë faquesi"
+
+msgid "File transfer server"
+msgstr "Shërbyes shpërnguljesh kartelash"
+
+msgid "File transfer port"
+msgstr "Portë shpërnguljesh kartelash"
+
+msgid "Chat room locale"
+msgstr "Vendore dhome fjalosjeje"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Shpërfill ftesa konferencash dhe dhomash fjalosjeje"
+
+msgid "Chat room list URL"
+msgstr "Url liste dhome fjalosjeje"
+
+msgid "Yahoo Chat server"
+msgstr "Shërbyes fjalosjeje Yahoo"
+
+msgid "Yahoo Chat port"
+msgstr "Portë fjalosjeje Yahoo"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "ID Yahoo..."
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#  *< name
+#  *< version
+#  *  summary
+#  *  description
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Shtojcë Protokolli Yahoo"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -10033,30 +9956,20 @@ msgstr "Shto shok të hedhur tej"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  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ë."
@@ -10099,37 +10012,32 @@ msgstr ""
 "Numrë gabimi të panjohur %d. Hyrja te \"site\"-i web Yahoo! mund ta ndreqë "
 "këtë."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "S'shtoi dot shokun %s te grupi %s te listë shërbyesi në llogarinë %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "S'shtoi dot shok te listë shërbyesi"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[%s/%s/%s.swf  e dëgjueshme] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "U mor prej shërbyesit përgjigje HTTP e papritur."
 
-msgid "Connection problem"
-msgstr "Problem lidhjeje"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "U humb lidhja me %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Nuk u arrit të vendosej lidhja me %s:\n"
+"Nuk u vendos dot lidhje me shërbyesin:\n"
 "%s"
 
 msgid "Not at Home"
@@ -10192,84 +10100,16 @@ msgstr "Bashkoju Përdoruesi në Fjalosje..."
 msgid "Open Inbox"
 msgstr "Hap Të Marrë"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;dhomë&gt; Bashkoju një dhome fjalosjeje në rrjetin Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Radhit dhoma te rrjeti Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Kërkoji përdoruesit të nisë një sesion Doodle"
-
-msgid "Yahoo ID..."
-msgstr "ID Yahoo..."
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#  *< name
-#  *< version
-#  *  summary
-#  *  description
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Shtojcë Protokolli Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japoni"
-
-msgid "Pager server"
-msgstr "Shërbyes Faquesi"
-
-msgid "Japan Pager server"
-msgstr "Shërbyes Japonez Faquesi"
-
-msgid "Pager port"
-msgstr "Portë faquesi"
-
-msgid "File transfer server"
-msgstr "Shërbyes shpërnguljesh kartelash"
-
-msgid "Japan file transfer server"
-msgstr "Shërbyes Japonez shpërnguljesh kartelash"
-
-msgid "File transfer port"
-msgstr "Portë shpërnguljesh kartelash"
-
-msgid "Chat room locale"
-msgstr "Vendore dhome fjalosjeje"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Shpërfill ftesa konferencash dhe dhomash fjalosjeje"
-
-msgid "Chat room list URL"
-msgstr "Url liste dhome fjalosjeje"
-
-msgid "Yahoo Chat server"
-msgstr "Shërbyes fjalosjeje Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "Portë fjalosjeje Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Dërgoi kërkesë Doodle."
 
+#  we didn't successfully connect. tdt->toc_fd is valid here
+msgid "Unable to connect."
+msgstr "I pazoti të lidhet."
+
 msgid "Unable to establish file descriptor."
 msgstr "I pazoti të vendosë përshkrues kartele."
 
@@ -10277,6 +10117,9 @@ msgstr "I pazoti të vendosë përshkrues kartele."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s po përpiqet t'ju dërgojë një grup prej %d kartelash.\n"
 
+msgid "Write Error"
+msgstr "Gabim Shkrimi"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Profil Yahoo! për Japoninë"
 
@@ -10396,23 +10239,19 @@ msgstr "Zëra"
 msgid "Webcams"
 msgstr "Kamera web"
 
+msgid "Connection problem"
+msgstr "Problem lidhjeje"
+
 msgid "Unable to fetch room list."
 msgstr "I pazoti të bjerë listë dhomash."
 
 msgid "User Rooms"
 msgstr "Dhoma Përdoruesi"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Problem lidhjeje me shërbyesin YCHT."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Humbi lidhja me shërbyesin\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10553,16 +10392,8 @@ msgstr "Emër i vërtetë"
 msgid "Exposure"
 msgstr "Ekspozim"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"I pazoti të krijojë \"socket\":\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Nuk u përtyp dot përgjigjja prej ndërmjetësit HTTP: %s\n"
 
 #, c-format
@@ -10571,8 +10402,8 @@ msgstr "Gabim lidhjeje i shërbyesit HTTP %d"
 
 #  XXX: why in the hell are we calling Pidgin_connection_error() here?
 #  Forbidden
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "Hyrje e mohuar: shërbyesi ndërmjetës HTTP ndalon tunelizim të portës %d."
 
@@ -10580,9 +10411,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr "Gabim në shquajtjen e %s"
 
-msgid "Could not resolve host name"
-msgstr "Nuk shquajti dot emër strehe"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Po tërhiqet vëmendja e %s..."
@@ -10789,12 +10617,6 @@ msgstr "Gabim gjatë shkrimit prej %s: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "I pazoti të lidhet %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "Shërbyesi lyp TLS/SSL për hyrje. Nuk u gjet suport për TLS/SSL."
-
 #, c-format
 msgid " - %s"
 msgstr " - %s"
@@ -11050,9 +10872,14 @@ msgstr "Shto _Cytje Shoku..."
 msgid "View _Log"
 msgstr "Shih _Regjistrim"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Fshihe kur është i palidhur"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Shfaqe kur është i palidhur"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
@@ -11561,6 +11388,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Ndrysho të dhëna përdoruesi për %s"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Shtypni emrin e strehës për të cilën është dëshmia."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Shërbyesa SSL"
@@ -11608,7 +11439,8 @@ msgstr "Shpërfill"
 msgid "Get Away Message"
 msgstr "Mesazh Largimi"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Thënë së fundmi"
 
 msgid "Unable to save icon file to disk."
@@ -12510,7 +12342,8 @@ msgstr "Ngjyrë për vizatim tejlidhjesh.."
 msgid "Hyperlink visited color"
 msgstr "Ngjyrë tejlidhjesh të vizituara"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+#, fuzzy
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Ngjyrë për vizatim tejlidhjesh pasi të jenë vizituar (ose aktivizuar)."
 
 msgid "Hyperlink prelight color"
@@ -12546,14 +12379,23 @@ msgstr "Ngjyrë vizatimi për emrin e mesazhit të një veprimi."
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Ngjyrë vizatimi për emrin e mesazhit të një veprimi."
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Ngjyrë vizatimi për emrin e mesazhit të një veprimi."
+
 #  ---------- "Notification Removals" ----------
 msgid "Typing notification color"
 msgstr "Ngjyrë njoftimesh shtypjeje"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "Ngjyra e përdorur për gërma njoftimesh shtypjesh"
 
 msgid "Typing notification font"
@@ -12957,6 +12799,10 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Është zgjedhur urdhër shfletuesi 'Dorazi', por nuk është caktuar cili."
 
+#, fuzzy
+msgid "No message"
+msgstr "Mesazh i panjohur "
+
 msgid "Open All Messages"
 msgstr "Hap Tërë Mesazhet"
 
@@ -12975,10 +12821,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Ka postë për ju!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Mesazh i panjohur "
-
 msgid "The following plugins will be unloaded."
 msgstr "Shtojcat vijuese do të çngarkohen."
 
@@ -13197,8 +13039,9 @@ msgid "On unread messages"
 msgstr "Për mesazhe të palexuar"
 
 #  IM Convo trans options
-msgid "Conversation Window Hiding"
-msgstr "Fshehje Dritareje Bashkëbisedimi"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Dritare Bashkëbisedimi MA"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Fshih bashkëbisedime të rinj MA:"
@@ -13206,6 +13049,10 @@ msgstr "_Fshih bashkëbisedime të rinj MA:"
 msgid "When away"
 msgstr "Gjatë largimesh"
 
+#  IM Convo trans options
+msgid "Minimi_ze new conversation windows"
+msgstr "Minimi_zo dritare bashkëbisedimesh të rinj"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Skeda"
@@ -13264,10 +13111,6 @@ msgstr "Përdor rrëshqitje të butë"
 msgid "F_lash window when IMs are received"
 msgstr "_Xixëllo dritaren kur merren mesazhe të rinj MA"
 
-#  IM Convo trans options
-msgid "Minimi_ze new conversation windows"
-msgstr "Minimi_zo dritare bashkëbisedimesh të rinj"
-
 msgid "Minimum input area height in lines:"
 msgstr "Lartësia minimum e fushës së futjeve, në rreshta:"
 
@@ -13303,7 +13146,8 @@ msgstr "S'niset dot programi i formësimit të shfletuesit."
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Shembull: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Vetëzbulo vendndodhje IP"
 
 msgid "Public _IP:"
@@ -13674,21 +13518,6 @@ msgstr "Rua_j & Përdor"
 msgid "Status for %s"
 msgstr "Gjendje për %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "Emotikon Vetjak"
-
-msgid "More Data needed"
-msgstr "Lypsen më tepër Të dhëna"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Ju lutem jepni një shkurtore për t'ia shoqëruar këtij emotikoni."
-
 #, fuzzy, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
@@ -13696,12 +13525,12 @@ msgstr ""
 "Ka tashmë një emotikon vetjak për shkurtoren e përzgjedhur. Ju lutem tregoni "
 "një shkurtore tjetër."
 
+msgid "Custom Smiley"
+msgstr "Emotikon Vetjak"
+
 msgid "Duplicate Shortcut"
 msgstr "Dyfishoni Shkurtore"
 
-msgid "Please select an image for the smiley."
-msgstr "Ju lutem përzgjidhni një pamje për emotikonin."
-
 #  show everything
 msgid "Edit Smiley"
 msgstr "Përpunoni Emotikon"
@@ -13818,9 +13647,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "S'dërgon dot nisës"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Tërhoqët një nisës desktopi. Ka shumë të ngjarë që donit të dërgonit atë me "
 "çka lidhet ky nisës, çfarëdo qoftë ajo, dhe jo vetë nisësin. "
@@ -14490,9 +14320,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Shtojcë Shkëmbimi Mesazhesh Muzike për kompozim në bashkëpunim."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Shtojca për Shkëmbim Mesazhesh Muzike u lejon një numri përdoruesish të "
 "punojnë njëkohësisht mbi një pjesë muzikore duke përpunuar partiturën e "
@@ -14811,9 +14642,10 @@ msgid "Conversation Window Send Button."
 msgstr "Buton Dërgimi Dritareje Bashkëbisedimi."
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Shton një buton Dërgo te zona e futjeve në dritaren e bashkëbisedimeve. E "
 "paramenduar për rastet kur nuk ka tastierë materiale."
@@ -15193,8 +15025,9 @@ msgstr "Mundësi për Pidgin-in nën Windows."
 msgid "Options specific to Pidgin for Windows."
 msgstr "Mundësi vetëm për Pidgin-in nën Windows."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Furnizon mundësi karakteristike për Pidgin-in nën Windows, si bie fjala "
 "listë të lëvizshme shokësh."
@@ -15237,6 +15070,306 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Kjo shtojcë është e dobishme për diagnostikim shërbyesish apo klientësh XMPP."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "S'hap dot \"socket\""
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Nuk u dëgjua dot te \"socket\"-i"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "I pazoti të lexojë \"socket\"-in"
+
+#~ msgid "Connection failed."
+#~ msgstr "Lidhja dështoi"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Shërbyesi është shkëputur"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "S'munda të krijojë \"socket\""
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "S'munda të lidhem te strehë"
+
+#~ msgid "Read error"
+#~ msgstr "Gabim leximi"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nuk u vendos dot lidhje me shërbyesin:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Gabim shkrimi"
+
+#~ msgid "Last Activity"
+#~ msgstr "Veprimtaria e Fundit"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Të dhëna Zbulimi Shërbimesh"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Objekte Zbulimi Shërbimesh"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Adresim i Zgjeruar Stanza"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Fjalosje me Shumë Përdorues"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Të dhëna Pranie të Zgjeruar në Fjalosje me Shumë Përdorues"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Urdhra Ad-Hoc"
+
+#~ msgid "PubSub Service"
+#~ msgstr "Shërbim PubSub"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5 Bytestreams"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Pa të Dhëna Bande"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "User Location"
+#~ msgstr "Vendndodhje Përdoruesi"
+
+#~ msgid "User Avatar"
+#~ msgstr "Avatar Përdoruesi"
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#~ msgid "Chat State Notifications"
+#~ msgstr "Njoftime Gjendjeje Fjalosjeje"
+
+#~ msgid "Software Version"
+#~ msgstr "Version Software-i"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Fillim Rrjedhe"
+
+#~ msgid "User Mood"
+#~ msgstr "Humor Përdoruesi"
+
+#~ msgid "User Activity"
+#~ msgstr "Veprimtari Përdoruesi"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Aftësi Njësie"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Negociata Sesioni të Koduar"
+
+#~ msgid "User Tune"
+#~ msgstr "Melodi Përdoruesi"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Shkëmbim Objekti Roster"
+
+#~ msgid "User Profile"
+#~ msgstr "Profil Përdoruesi"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Audio Jingle"
+
+#~ msgid "User Nickname"
+#~ msgstr "Nofkë Përdoruesi"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle Raw UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Video Jingle"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Fatura Mesazhesh"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Botim Kyçi Publik"
+
+#~ msgid "User Chatting"
+#~ msgstr "Fjalosje Përdoruesi"
+
+#~ msgid "User Browsing"
+#~ msgstr "Shfletim Përdoruesi"
+
+#~ msgid "User Gaming"
+#~ msgstr "Lojë Përdoruesi"
+
+#~ msgid "User Viewing"
+#~ msgstr "Parje Përdoruesi"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Kodim Stanza"
+
+#~ msgid "Entity Time"
+#~ msgstr "Kohë Njësie"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Dërgim i Vonuar"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Objekte Të Dhënash Bashkëpunimi"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Depo Kartelash dhe Ndarje"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "STUN Service Discovery për Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Negociata Sesioni të Koduar të Thjeshtëzuar"
+
+#~ msgid "Read Error"
+#~ msgstr "Gabim Leximi"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Dështoi në lidhjen me shërbyesin."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Shtytëz leximi plot (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Mesazh i papërtypshëm"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "S'u lidha dot te strehë: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Hyrja dështoi (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Jeni nxjerrë jashtë ngaqë jeni futur prej një tjetër kompjuteri."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Gabim. Nuk është instaluar suport për SSL."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Fjalëkalim i pasaktë."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nuk u bë dot lidhja me shërbyesin BOS:\n"
+#~ "%s"
+
+#~ 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 "Could Not Connect"
+#~ msgstr "Nuk u Lidh Dot"
+
+#~ msgid "Invalid username."
+#~ msgstr "Emër përdoruesi i pavlefshëm."
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "S'zbërthen dot përgjigje për \"kap shërbyesin\""
+
+#~ msgid "Connection lost"
+#~ msgstr "Lidhje e humbur"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "S'u shquajt dot streha"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Lidhja u ndërpre (shkrim)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Rivendosje lidhjeje"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Gabim gjatë leximit prej \"socket\"-i: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "S'bëhet dot lidhja me strehën"
+
+#~ msgid "Could not write"
+#~ msgstr "S'shkruhej dot"
+
+#~ msgid "Could not connect"
+#~ msgstr "S'u bë dot lidhja"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "S'mundi të krijojë \"listen socket\""
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "S'u shqua dot emërstreha"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Fjalëkalim i pasaktë."
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nuk u arrit të vendosej lidhja me %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japoni"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Shërbyes Japonez Faquesi"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Shërbyes Japonez shpërnguljesh kartelash"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Humbi lidhja me shërbyesin\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Nuk shquajti dot emër strehe"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "Shërbyesi lyp TLS/SSL për hyrje. Nuk u gjet suport për TLS/SSL."
+
+#  IM Convo trans options
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Fshehje Dritareje Bashkëbisedimi"
+
+#~ msgid "More Data needed"
+#~ msgstr "Lypsen më tepër Të dhëna"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Ju lutem jepni një shkurtore për t'ia shoqëruar këtij emotikoni."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Ju lutem përzgjidhni një pamje për emotikonin."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Veprues cila ID?"
 
diff --git a/po/sr.po b/po/sr.po
index a4f581773d..b9c2372442 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2007-09-09 11:54+0100\n"
 "Last-Translator: Милош Поповић <gpopac@gmail.com>\n"
 "Language-Team: Serbian <gnome@prevod.org>\n"
@@ -2548,9 +2548,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Прикажи и белешке о осталим програмима при прегледу дневника."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2605,8 +2606,9 @@ msgstr "Емулатор порука ван мреже"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Сачувај поруке послате кориснику ван мреже као заседу."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Остатак поруке ће бити сачуван као заседа. Можете уредити/уклонити заседу из "
@@ -2857,11 +2859,12 @@ msgstr ""
 "инсталирајте ActiveTCL са http://www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Не могу да пратим долазећа повезивања на брзе поруке\n"
 
 msgid ""
@@ -2914,14 +2917,21 @@ msgstr "%s је затворио разговор."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Не могу да пошаљем поруку. Разговор не може да отпочне."
 
-msgid "Cannot open socket"
-msgstr "Не могу да отворим утичницу"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Не могу да направим утичницу:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Не могу да вежем утичницу на порт"
 
-msgid "Could not listen on socket"
-msgstr "Не могу да слушам утичницу"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Не могу да направим утичницу:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Грешка при споразумевању са локалним mDNSResponder-ом."
@@ -2970,13 +2980,16 @@ msgstr "Сачувај списак другара..."
 msgid "Load buddylist from file..."
 msgstr "Учитај списак другара из датотеке..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Попуни поља за регистрацију."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Лозинке нису исте."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Не могу да региструјем нови налог. Десила се грешка.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2988,14 +3001,14 @@ msgstr "Регистрација завршена успешно!"
 msgid "Password"
 msgstr "Лозинка"
 
-msgid "Password (retype)"
-msgstr "Лозинка (поново откуцајте)"
+msgid "Password (again)"
+msgstr "Лозинка (поновите)"
 
-msgid "Enter current token"
-msgstr "Унесите тренутни токен"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Тренутни токен"
+msgid "Captcha"
+msgstr ""
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Региструј нови Гаду-Гаду налог"
@@ -3048,6 +3061,15 @@ msgstr "Лозинка је успешно измењена!"
 msgid "Current password"
 msgstr "Тренутна лозинка"
 
+msgid "Password (retype)"
+msgstr "Лозинка (поново откуцајте)"
+
+msgid "Enter current token"
+msgstr "Унесите тренутни токен"
+
+msgid "Current token"
+msgstr "Тренутни токен"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Молим вас унесите текућу лозинку и нову лозинку: "
 
@@ -3095,7 +3117,7 @@ msgstr "Нема нађених корисника"
 msgid "There are no users matching your search criteria."
 msgstr "Нема нађених корисника по вашем критеријуму претраге."
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "Не могу да читам утичницу"
 
 msgid "Buddy list downloaded"
@@ -3110,8 +3132,14 @@ msgstr "Листа другова послата"
 msgid "Your buddy list was stored on the server."
 msgstr "Ваша листа другова је послана на сервер."
 
-msgid "Connection failed."
-msgstr "Повезивање пропало."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Повезан"
+
+msgid "Connection failed"
+msgstr "Веза неуспешна"
 
 msgid "Add to chat"
 msgstr "Додај у ћаскање"
@@ -3119,18 +3147,23 @@ msgstr "Додај у ћаскање"
 msgid "Chat _name:"
 msgstr "_Име ћаскања:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Не могу да се повежем на сервер."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Успостављање везе"
+
 msgid "Chat error"
 msgstr "Грешка у ћаскању"
 
 msgid "This chat name is already in use"
 msgstr "Ово име ћаскања је већ заузето"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Нисте у вези са сервером."
 
 msgid "Find buddies..."
@@ -3190,7 +3223,8 @@ msgstr "Тема није постављена"
 msgid "File Transfer Failed"
 msgstr "Пропао пренос датотеке"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Не могу да отворим порт за слушање."
 
 msgid "Error displaying MOTD"
@@ -3206,8 +3240,18 @@ msgstr "Нема поруке дана за ову везу."
 msgid "MOTD for %s"
 msgstr "Порука дана за %s"
 
-msgid "Server has disconnected"
-msgstr "Сервер се искључио"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Веза са сервером је прекинута:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Погледајте поруку дана"
@@ -3222,22 +3266,20 @@ msgstr "_Лозинка:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC надимци не могу садржати белине"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Успостављање везе"
-
 msgid "SSL support unavailable"
 msgstr "SSL подршка је недоступна"
 
-msgid "Couldn't create socket"
-msgstr "Не могу да начиним утичницу"
+msgid "Unable to connect"
+msgstr "Немогуће повезивање"
 
-msgid "Couldn't connect to host"
-msgstr "Не могу да се повежем са домаћином"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Не могу да се повежем на %s"
 
-msgid "Read error"
-msgstr "Грешка при читању"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Сервер је прекинуо везу"
 
 msgid "Users"
 msgstr "Корисници"
@@ -3666,10 +3708,12 @@ msgstr ""
 msgid "execute"
 msgstr "изврши"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Сервер захтева TLS/SSL за пријаву. Није нађена подршка за TLS/SSL."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Захтевате шифровану везу, али није нађена подршка за TLS/SSL."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3687,7 +3731,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Идентификација обичним текстом"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Неуспешна идентификација"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Неисправан одговор сервера."
 
 msgid "Server does not use any supported authentication method"
@@ -3699,7 +3748,8 @@ msgstr "Захтевате шифровање, али оно није досту
 msgid "Invalid challenge from server"
 msgstr "Неисправан изазов сервера"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "САСЛ грешка"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3719,10 +3769,8 @@ msgstr ""
 "Не могу да успоставим везу са сервером:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Не могу да успоставим везу са сервером:\n"
 "%s"
@@ -3731,12 +3779,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "Не могу да успоставим везу."
 
-msgid "Unable to create socket"
-msgstr "Не могу начинити утичницу"
-
-msgid "Write error"
-msgstr "Грешка при писању"
-
 msgid "Full Name"
 msgstr "Пуно име"
 
@@ -3808,159 +3850,6 @@ msgstr "Оперативни систем"
 msgid "Local Time"
 msgstr "Локална датотека:"
 
-msgid "Last Activity"
-msgstr "Последња активност"
-
-msgid "Service Discovery Info"
-msgstr "Подаци откривања сервиса"
-
-msgid "Service Discovery Items"
-msgstr "Ставке откривања сервиса"
-
-msgid "Extended Stanza Addressing"
-msgstr "Проширено адресирање одељка"
-
-msgid "Multi-User Chat"
-msgstr "Вишекорисничко ћаскање"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Подаци о проширеном ћаскању са више корисника"
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr ""
-
-msgid "PubSub Service"
-msgstr "PubSub сервис"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 протоци"
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "ХХТМЛ — брзе поруке"
-
-msgid "In-Band Registration"
-msgstr ""
-
-msgid "User Location"
-msgstr "Корисникова локација"
-
-msgid "User Avatar"
-msgstr "Корисникова сличица"
-
-msgid "Chat State Notifications"
-msgstr "Обавештења о стању ћаскања"
-
-msgid "Software Version"
-msgstr "Верзија програма"
-
-msgid "Stream Initiation"
-msgstr "Покретање протока"
-
-msgid "File Transfer"
-msgstr "Преноси датотека"
-
-msgid "User Mood"
-msgstr "Расположење корисника"
-
-msgid "User Activity"
-msgstr "Активност корисника"
-
-msgid "Entity Capabilities"
-msgstr "Способности"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Преговори о шифрованој сесији"
-
-msgid "User Tune"
-msgstr "Корисникова мелодија"
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-msgid "Reachability Address"
-msgstr "Адреса за контакт"
-
-msgid "User Profile"
-msgstr "Корисников профил"
-
-msgid "Jingle"
-msgstr "Џингл"
-
-msgid "Jingle Audio"
-msgstr "Џингл звук"
-
-msgid "User Nickname"
-msgstr "Надимак"
-
-msgid "Jingle ICE UDP"
-msgstr "Џингл ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Џингл ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Изворни џингл UDP"
-
-msgid "Jingle Video"
-msgstr "Џингл видео"
-
-msgid "Jingle DTMF"
-msgstr "Џингл DTMF"
-
-msgid "Message Receipts"
-msgstr "Пријем порука"
-
-msgid "Public Key Publishing"
-msgstr "Издавање јавног кључа"
-
-msgid "User Chatting"
-msgstr "Корисник ћаска"
-
-msgid "User Browsing"
-msgstr "Корисник разгледа"
-
-msgid "User Gaming"
-msgstr "Корисник се игра"
-
-msgid "User Viewing"
-msgstr "Корисник гледа"
-
-msgid "Ping"
-msgstr "Пинг"
-
-msgid "Stanza Encryption"
-msgstr "Шифровање одељка"
-
-msgid "Entity Time"
-msgstr "Време важности"
-
-msgid "Delayed Delivery"
-msgstr "Одложена достава"
-
-msgid "Collaborative Data Objects"
-msgstr "Сараднички подаци објеката"
-
-msgid "File Repository and Sharing"
-msgstr "Складиштење и дељење датотека"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Поједностављени преговори и шифрованој сесији"
-
-msgid "Hop Check"
-msgstr "Провера скока"
-
-msgid "Capabilities"
-msgstr "Могућности"
-
 msgid "Priority"
 msgstr "Приоритет"
 
@@ -3972,7 +3861,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Пријављен"
 
 # Овде је некада стајало 'име оца'. Код нас је средње име углавном име
@@ -4161,16 +4050,13 @@ msgstr "Нема нађених корисника"
 msgid "Roles:"
 msgstr "Улога"
 
-msgid "Ping timeout"
-msgstr ""
-
-msgid "Read Error"
-msgstr "Грешка при читању"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Време везе не истекло"
 
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4346,9 +4232,6 @@ msgstr "Ваша лозинка је измењена."
 msgid "Error changing password"
 msgstr "Грешка при измени лозинке"
 
-msgid "Password (again)"
-msgstr "Лозинка (поновите)"
-
 msgid "Change XMPP Password"
 msgstr "Промени Џабер лозинку"
 
@@ -4732,6 +4615,14 @@ msgstr "Грешка при XML обради"
 msgid "Unknown Error in presence"
 msgstr "Непозната грешка у присуству"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Грешка при укључењу у ћаскање: %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Грешка при ћаскању: %s"
+
 msgid "Create New Room"
 msgstr "Направи нову собу"
 
@@ -4748,16 +4639,20 @@ msgstr "П_оставке за собу"
 msgid "_Accept Defaults"
 msgstr "П_рихвати подразумевано"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Грешка при укључењу у ћаскање: %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Није наведен разлог"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Грешка при ћаскању: %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Избацио Вас је %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Избачени од стране %s: (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Дошло је до грешке при отварању датотеке."
 
 #, fuzzy
@@ -5251,9 +5146,6 @@ msgstr ""
 "За повезивање са МСН потребна је подршка за SSL. Инсталирајте подржану SSL "
 "библиотеку."
 
-msgid "Failed to connect to server."
-msgstr "Не могу да се повежем на сервер."
-
 msgid "Error retrieving profile"
 msgstr "Грешка при читању са сервера"
 
@@ -5515,9 +5407,6 @@ msgstr "Порука није послата зато што је дошло д�
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Порука није послата зато што је дошло до непознате грешке:"
 
-msgid "Unable to connect"
-msgstr "Немогуће повезивање"
-
 msgid "Writing error"
 msgstr "Грешка при писању"
 
@@ -5532,20 +5421,24 @@ msgstr ""
 "Грешка при повезивању са сервера %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Наш протокол није подржан на серверу."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Грешка при обради HTTP-а."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Пријавили сте се са неког другог места."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "МСН сервери су привремено недоступни. Сачекајте мало па покушајте поново."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Веза Вам је прекинута. Привремено се гасе МСН сервери."
 
 #, c-format
@@ -5558,9 +5451,6 @@ msgstr ""
 "Ваш списак МСН другара је привремено недоступан. Сачекајте мало па покушајте "
 "поново."
 
-msgid "Unknown error."
-msgstr "Непозната грешка."
-
 msgid "Handshaking"
 msgstr "Руковање"
 
@@ -5661,6 +5551,9 @@ msgstr "Додатак за МСН протокол"
 msgid "%s is not a valid group."
 msgstr "%s није дозвољена група."
 
+msgid "Unknown error."
+msgstr "Непозната грешка."
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s на %s (%s)"
@@ -5778,12 +5671,6 @@ msgstr[3] ""
 msgid "Add contacts from server"
 msgstr "Додај контакт са сервера"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Повезан"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Грешка у протоколу, код %d: %s"
@@ -5804,17 +5691,6 @@ msgstr "Грешка у Мом свемиру"
 msgid "Invalid input condition"
 msgstr "Погрешан улазни услов"
 
-msgid "Read buffer full (2)"
-msgstr "Бафер за читање је пун (2)"
-
-# Mozda "razume poruku"
-msgid "Unparseable message"
-msgstr "Порука се не може проследити"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Не могу да се повежем са домаћином: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Неуспешно додавање другара разговору"
 
@@ -5898,6 +5774,15 @@ msgstr "Укупно другова"
 msgid "Client Version"
 msgstr "Верзија програма"
 
+#, fuzzy
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"Идите на http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username и одаберите корисничко име како би покушали поново."
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Корисничко име је доступно"
 
@@ -6154,9 +6039,9 @@ msgstr "Корисник или није на вези или имате заб�
 msgid "Unknown error: 0x%X"
 msgstr "Непозната грешка: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Пријава није успела (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Не могу да пингујем корисника %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6260,9 +6145,6 @@ msgstr "GroupWise конференција %d"
 msgid "Authenticating..."
 msgstr "Идентификација"
 
-msgid "Unable to connect to server."
-msgstr "Не могу да се повежем на сервер."
-
 msgid "Waiting for response..."
 msgstr "Чекам на одговор..."
 
@@ -6286,26 +6168,19 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Да ли желите да се прикључите разговору?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Веза је прекинута зато што сте се пријавили под овим именом са неког другог "
-"места."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "Изгледа да %s није присутан и да није примио послату поруку."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Не могу да се повежем на сеервер. Унесите адресу сервера на ког желите да се "
 "повежем."
 
-msgid "Error. SSL support is not installed."
-msgstr "SSL подршка је неопходна. Инсталирајте је."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Ова конференција је затворена. Поруке се више не могу слати."
 
@@ -6344,10 +6219,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "Грешка у захтеву токена за пријаву"
 
-msgid "Incorrect password."
-msgstr "Неисправна лозинка."
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6356,18 +6228,8 @@ msgstr "Не могу да се повежем на причаоницу"
 msgid "Invalid chat room name"
 msgstr "Неисправно име причаонице"
 
-msgid "Server closed the connection."
-msgstr "Сервер је прекинуо везу"
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Веза са сервером је прекинута:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Добијени су погрешни подаци од сервера."
 
 #. *< type
@@ -6415,7 +6277,8 @@ msgstr "Прекинута је веза са удаљеним корисник�
 msgid "Received invalid data on connection with remote user."
 msgstr "Примљени погрешни подаци од удаљеног корисника."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Не могу да успоставим везу са удаљеним корисником."
 
 msgid "Direct IM established"
@@ -6614,21 +6477,15 @@ msgstr "_Нивои упозорења"
 msgid "Buddy Comment"
 msgstr "Примедба за другара:"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Не могу се повежем на сервер за потврду:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Не могу да се повежем на БОС сервер:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Не могу да се повежем на сервер."
 
 msgid "Username sent"
 msgstr "Корисничко име је послато"
@@ -6640,11 +6497,11 @@ msgstr "Веза је успостављена, колачић је послат
 msgid "Finalizing connection"
 msgstr "Довршава повезивање"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Пријава није успела: Не могу да се пријавим као %s јер је то неисправно "
 "корисничко име. Корисничка имена морају бити исправне адресе е-поште, почети "
@@ -6658,27 +6515,22 @@ msgstr "Веза се ускоро може прекинути.  Погледа�
 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 "Неисправно корисничко име."
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Корисник не постоји."
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Ваш налог је тренутно недоступан."
 
 #. service temporarily unavailable
@@ -6698,7 +6550,8 @@ msgstr ""
 "Успостављали сте и прекидали везу сувише често. Сачекајте десет минута па "
 "покушајте поново. Ако наставите да покушавате, мораћете да сачекате још дуже."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Унети SecurID кључ је неисправан."
 
 msgid "Enter SecurID"
@@ -6876,6 +6729,9 @@ msgstr "На вези од"
 msgid "Member Since"
 msgstr "Члан од"
 
+msgid "Capabilities"
+msgstr "Могућности"
+
 msgid "Profile"
 msgstr "Профил"
 
@@ -7070,9 +6926,9 @@ msgstr[3] ""
 msgid "Away message too long."
 msgstr "Порука за одсуство је предугачка."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7096,9 +6952,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Сирочићи"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Не могу да додам другара %s зато што имате превише другара у списку. "
@@ -7107,8 +6963,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(без имена)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Не могу да додам другара %s из непознатих разлога."
 
 # Is it "them"? Or "him/her"?
@@ -7886,7 +7742,8 @@ msgstr "Интервал одржавања везе (у секундама)"
 msgid "Update interval (seconds)"
 msgstr "Интервал ажурирања (у секундама)"
 
-msgid "Cannot decrypt server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "Не могу да дешифрујем одговор са сервера"
 
 #, c-format
@@ -7911,9 +7768,6 @@ msgstr "Потребна је активација"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Непознат одговор при пријави (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Не могу да дешифрујем одговор са сервера"
-
 msgid "Requesting captcha"
 msgstr ""
 
@@ -7947,29 +7801,18 @@ msgstr ""
 "Непознат одговор при пројави (0x%02X):\n"
 "%s"
 
-msgid "Unable to connect."
-msgstr "Не могу да се повежем."
-
 msgid "Socket error"
 msgstr "Грешка у утичници"
 
-msgid "Unable to read from socket"
-msgstr "Не могу да читам утичницу"
-
-msgid "Write Error"
-msgstr "Грешка при писању"
-
-msgid "Connection lost"
-msgstr "Веза прекинута"
-
 msgid "Getting server"
 msgstr "Добављам сервер"
 
 msgid "Requesting token"
 msgstr ""
 
-msgid "Couldn't resolve host"
-msgstr "Не могу да добијем домаћина"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Не могу да се повежем на сервер."
 
 msgid "Invalid server or port"
 msgstr "Неисправан сервер или порт"
@@ -8020,7 +7863,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "QQ Qun наредба"
 
-msgid "Could not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "Не могу да дешифрујем одговор приликом пријаве"
 
 msgid "Unknown LOGIN CMD"
@@ -8040,9 +7884,6 @@ msgstr "Датотека послата"
 msgid "%d canceled the transfer of %s"
 msgstr "%d је прекинуо пренос датотеке %s"
 
-msgid "Connection closed (writing)"
-msgstr "Веза прекинута (пишем)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Назив групе:</b> %s<br>"
@@ -8096,17 +7937,6 @@ msgstr "Sametime администратор је дао следећу изја�
 msgid "Sametime Administrator Announcement"
 msgstr "Изјава Sametime администратора"
 
-msgid "Connection reset"
-msgstr "Понављање везе"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Грешка при читању из утичнице: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Не могу да се повежем на домаћина"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Најава од %s"
@@ -8129,6 +7959,9 @@ msgstr "Звучници"
 msgid "Video Camera"
 msgstr "Видео камера"
 
+msgid "File Transfer"
+msgstr "Преноси датотека"
+
 msgid "Supports"
 msgstr "Подршка"
 
@@ -8944,6 +8777,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Мрежне статистике"
 
+msgid "Ping"
+msgstr "Пинг"
+
 msgid "Ping failed"
 msgstr "Пинг није успео"
 
@@ -9009,7 +8845,8 @@ msgstr "Неподржана врста јавног кључа"
 msgid "Disconnected by server"
 msgstr "Сервер Вас је искључио"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Грешка при повезивању на SILC сервер"
 
 msgid "Key Exchange failed"
@@ -9021,26 +8858,26 @@ msgstr ""
 "Настављам прекинуту сесију. Притисните Поновно повезивање да направите нову "
 "везу."
 
-msgid "Connection failed"
-msgstr "Веза неуспешна"
-
 msgid "Performing key exchange"
 msgstr "Размена кључева је у току"
 
-msgid "Unable to create connection"
-msgstr "Не могу да успоставим нову везу."
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Не могу да учитам SILC пар кључева"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Повезивање са SILC сервером"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Не могу да учитам SILC пар кључева"
+
 msgid "Out of memory"
 msgstr "Нема довољно меморије"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Не могу да покренем SILC протокол"
 
 msgid "Error loading SILC key pair"
@@ -9332,7 +9169,8 @@ msgstr "Дигитално потпиши и провери све поруке"
 msgid "Creating SILC key pair..."
 msgstr "Израда SILC пара кључева је у току..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Не могу да направим SILC пар кључева\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9428,6 +9266,9 @@ msgstr "Табла"
 msgid "No server statistics available"
 msgstr "Нема доступних статистика"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Грешка при повезивању на SILC сервер"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Грешка: издања се не слажу, обновите вашег програма"
@@ -9468,30 +9309,27 @@ msgstr "Грешка: колачић је неисправан."
 msgid "Failure: Authentication failed"
 msgstr "Неуспешна идентификација"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Не може се покренути SILC програмска веза"
 
 msgid "John Noname"
 msgstr "Безимени балон"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Не могу да учитам SILC пар кључева: %s"
 
-msgid "Could not write"
-msgstr "Не могу да упишем"
-
-msgid "Could not connect"
-msgstr "Не могу да се повежем"
+msgid "Unable to create connection"
+msgstr "Не могу да успоставим нову везу."
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Непознат одговор сервера."
 
-msgid "Could not create listen socket"
-msgstr " е могу да начиним утичницу за слушање"
-
-msgid "Could not resolve hostname"
-msgstr "Не могу да добијем име домаћина"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Не могу начинити утичницу"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "СИП корисничка имена несмеју садржати размак или @ симболе"
@@ -9532,6 +9370,77 @@ msgstr "Овласти корисника"
 msgid "Auth Domain"
 msgstr "Овласти домен"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;соба&gt;:  Прикључи се причаоници на Јаху мрежи"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Исписује собе на Јаху мрежи"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "цртање: захтевај од корисника да почне сесију цртања"
+
+msgid "Yahoo ID..."
+msgstr "Јаху ИБ..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Додатак за Јаху протокол"
+
+msgid "Pager server"
+msgstr "Пејџер сервер"
+
+msgid "Pager port"
+msgstr "Порт за пејџер"
+
+msgid "File transfer server"
+msgstr "Сервер за пренос датотека"
+
+msgid "File transfer port"
+msgstr "Порт за пренос датотека"
+
+msgid "Chat room locale"
+msgstr "Локализација причаонице"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Занемари позиве причаонице и конференције"
+
+msgid "Chat room list URL"
+msgstr "УРЛ за списак причаоница"
+
+msgid "Yahoo Chat server"
+msgstr "Јаху причаоница"
+
+msgid "Yahoo Chat port"
+msgstr "Јаху порт за разговор"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Јаху ИБ..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Додатак за Јаху протокол"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9563,28 +9472,18 @@ msgstr "Одбијено додавање другара"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr "Непознат број грешке: %d. Пријава на Јаху можда може да то отклони."
 
 #. username or password missing
@@ -9622,37 +9521,32 @@ msgstr "Ваш налог је закључан, пријавите се на Ј
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Непознат број грешке: %d. Пријава на Јаху можда може да то отклони."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "Не могу да додам другара %s у групу %s у списак сервера за налог %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Не могу да додам другара у списак сервера"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Разговетан %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Добијен је неочекиван одговор HTTP сервера."
 
-msgid "Connection problem"
-msgstr "Грешка при повезивању"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Прекинута је веза са %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Не могу да успоставим везу са %s:\n"
+"Не могу да успоставим везу са сервером:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9715,73 +9609,15 @@ msgstr "Прикључи корисника ћаскању..."
 msgid "Open Inbox"
 msgstr "Отвори сандуче"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;соба&gt;:  Прикључи се причаоници на Јаху мрежи"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Исписује собе на Јаху мрежи"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "цртање: захтевај од корисника да почне сесију цртања"
-
-msgid "Yahoo ID..."
-msgstr "Јаху ИБ..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Додатак за Јаху протокол"
-
-msgid "Yahoo Japan"
-msgstr "Јаху Јапан"
-
-msgid "Pager server"
-msgstr "Пејџер сервер"
-
-msgid "Japan Pager server"
-msgstr "Јапанов пејџер сервер"
-
-msgid "Pager port"
-msgstr "Порт за пејџер"
-
-msgid "File transfer server"
-msgstr "Сервер за пренос датотека"
-
-msgid "Japan file transfer server"
-msgstr "Јапанов сервер за пренос датотека"
-
-msgid "File transfer port"
-msgstr "Порт за пренос датотека"
-
-msgid "Chat room locale"
-msgstr "Локализација причаонице"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Занемари позиве причаонице и конференције"
-
-msgid "Chat room list URL"
-msgstr "УРЛ за списак причаоница"
-
-msgid "Yahoo Chat server"
-msgstr "Јаху причаоница"
-
-msgid "Yahoo Chat port"
-msgstr "Јаху порт за разговор"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Пошаљи захтев за жврљање"
 
+msgid "Unable to connect."
+msgstr "Не могу да се повежем."
+
 # Ovo je FD kao broj koji je ekvivalentan "file handle"-u, odnosno, to je jedinstvena oznaka otvorenog fajla za pristup; sta znaci "establish" u ovom kontekstu mi nije jasno
 msgid "Unable to establish file descriptor."
 msgstr "Не могу да успоставим описник датотеке."
@@ -9790,6 +9626,9 @@ msgstr "Не могу да успоставим описник датотеке.
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s покушава да вам пошаље групу од %d датотека.\n"
 
+msgid "Write Error"
+msgstr "Грешка при писању"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Профил за Јаху Јапан"
 
@@ -9904,23 +9743,19 @@ msgstr "Глас"
 msgid "Webcams"
 msgstr "Камере"
 
+msgid "Connection problem"
+msgstr "Грешка при повезивању"
+
 msgid "Unable to fetch room list."
 msgstr "Не могу да добавим списак соба."
 
 msgid "User Rooms"
 msgstr "Корисничке собе"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Проблем при повезивању на YCHT сервер."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Веза са сервером је прекинута\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10048,33 +9883,22 @@ msgstr "Подручје"
 msgid "Exposure"
 msgstr "Излагање"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Не могу да направим утичницу:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Не могу да обрадим одговор са ХТТП мрежног посредника: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Грешка при повезивању посредника %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Приступ одбијен: посредник одбија тунел на порту %d."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Грешка при добијању %s"
 
-msgid "Could not resolve host name"
-msgstr "Не могу да добијем име домаћина"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Тражим %sovu пажњу..."
@@ -10289,12 +10113,6 @@ msgstr "Грешка при упису у %s: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "Не могу да се повежем на %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "Сервер захтева TLS/SSL за пријаву. Није нађена подршка за TLS/SSL."
-
 #, c-format
 msgid " - %s"
 msgstr " - %s"
@@ -10544,9 +10362,14 @@ msgstr "Д_одај заседу другару..."
 msgid "View _Log"
 msgstr "Преглед дневни_ка"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Сакриј када нисам на мрежи"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Прикажи и ван мреже"
+
 msgid "_Alias..."
 msgstr "Н_адени име..."
 
@@ -11052,6 +10875,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Измени податке о кориснику за %s"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Одреди име домаћина за које важи овај сертификат."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL сервери"
@@ -11097,7 +10924,8 @@ msgstr "Игнориши"
 msgid "Get Away Message"
 msgstr "Прибави поруку за одсуство"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Последње речи"
 
 msgid "Unable to save icon file to disk."
@@ -11996,7 +11824,8 @@ msgstr "Боја за исцртавање над-веза."
 msgid "Hyperlink visited color"
 msgstr "Боја посећене над-везе"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+#, fuzzy
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Боја за исцртавање над-веза након њихове посете."
 
 msgid "Hyperlink prelight color"
@@ -12032,14 +11861,23 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Боја за испис имена поруке коју шаљете."
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Боја за испис имена поруке коју шаљете."
+
 msgid "Typing notification color"
 msgstr "Боја обавештења о куцању"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "Омогући обавештење о куцању"
 
 msgid "Typing notification font"
 msgstr "Фонт обавештења о куцању"
@@ -12433,6 +12271,10 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Изабрана је „ручна“ наредба за веб читач, а наредба није постављена."
 
+#, fuzzy
+msgid "No message"
+msgstr "Непозната грешка"
+
 msgid "Open All Messages"
 msgstr "Отвори све поруке"
 
@@ -12450,10 +12292,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Имате е-пошту!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Непозната грешка"
-
 msgid "The following plugins will be unloaded."
 msgstr "Следећи додаци ће бити искључени."
 
@@ -12669,8 +12507,9 @@ msgstr "Прика_жи иконица на панелу:"
 msgid "On unread messages"
 msgstr "На непрочитане поруке"
 
-msgid "Conversation Window Hiding"
-msgstr "Скривање прозора за разговор"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Прозор разговора"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Сакриј нове разговоре:"
@@ -12678,6 +12517,9 @@ msgstr "_Сакриј нове разговоре:"
 msgid "When away"
 msgstr "При одсуству"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Ума_њи ноци прозор разговора"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Кратице"
@@ -12736,9 +12578,6 @@ msgstr "Користи глатко клизање"
 msgid "F_lash window when IMs are received"
 msgstr "_Засијај прозор када пристигне нова порука"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Ума_њи ноци прозор разговора"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12773,7 +12612,8 @@ msgstr "Не могу да покренем програм за подешава
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Пример: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "Сам о_дреди ИП адресу"
 
 msgid "Public _IP:"
@@ -13139,32 +12979,17 @@ msgstr "Са_чувај и примени"
 msgid "Status for %s"
 msgstr "Стање за %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "Произвољни смешци"
-
-msgid "More Data needed"
-msgstr "Потребно је више података"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
+msgid "Custom Smiley"
+msgstr "Произвољни смешци"
+
 msgid "Duplicate Shortcut"
 msgstr "Удвостручи пречицу"
 
-msgid "Please select an image for the smiley."
-msgstr "Изаберите слику за смешак."
-
 msgid "Edit Smiley"
 msgstr "Уреди смешак"
 
@@ -13277,9 +13102,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Не могу да пошаљем извршивач"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Довукли сте покретач. Вероватно желите да пошаљете оно на шта он показује "
 "него покретача самог."
@@ -13874,9 +13700,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Додатак музичких порука за сараднички састав."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Додатак за поруке музичким порукама дозвољава корисницима да истовремено "
 "раде на делу музике мењајући прост резултат у реалном времену."
@@ -14132,7 +13959,7 @@ msgstr "Дугме за слање у прозору разговора."
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14459,8 +14286,9 @@ msgstr "Пиџинове Виндоус опције"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Поставке својствене Пиџину за Виндоус."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Пружа опције специфичне Пиџину за Виндоус, као што је спуштање листе другара."
 
@@ -14502,6 +14330,292 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Овај додатак је користан за уклањање грешака Џабер сервера или програма"
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Не могу да отворим утичницу"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Не могу да слушам утичницу"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Не могу да читам утичницу"
+
+#~ msgid "Connection failed."
+#~ msgstr "Повезивање пропало."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Сервер се искључио"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Не могу да начиним утичницу"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Не могу да се повежем са домаћином"
+
+#~ msgid "Read error"
+#~ msgstr "Грешка при читању"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не могу да успоставим везу са сервером:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Грешка при писању"
+
+#~ msgid "Last Activity"
+#~ msgstr "Последња активност"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Подаци откривања сервиса"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Ставке откривања сервиса"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Проширено адресирање одељка"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Вишекорисничко ћаскање"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Подаци о проширеном ћаскању са више корисника"
+
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub сервис"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5 протоци"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "ХХТМЛ — брзе поруке"
+
+#~ msgid "User Location"
+#~ msgstr "Корисникова локација"
+
+#~ msgid "User Avatar"
+#~ msgstr "Корисникова сличица"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Обавештења о стању ћаскања"
+
+#~ msgid "Software Version"
+#~ msgstr "Верзија програма"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Покретање протока"
+
+#~ msgid "User Mood"
+#~ msgstr "Расположење корисника"
+
+#~ msgid "User Activity"
+#~ msgstr "Активност корисника"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Способности"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Преговори о шифрованој сесији"
+
+#~ msgid "User Tune"
+#~ msgstr "Корисникова мелодија"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Адреса за контакт"
+
+#~ msgid "User Profile"
+#~ msgstr "Корисников профил"
+
+#~ msgid "Jingle"
+#~ msgstr "Џингл"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Џингл звук"
+
+#~ msgid "User Nickname"
+#~ msgstr "Надимак"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Џингл ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Џингл ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Изворни џингл UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Џингл видео"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Џингл DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Пријем порука"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Издавање јавног кључа"
+
+#~ msgid "User Chatting"
+#~ msgstr "Корисник ћаска"
+
+#~ msgid "User Browsing"
+#~ msgstr "Корисник разгледа"
+
+#~ msgid "User Gaming"
+#~ msgstr "Корисник се игра"
+
+#~ msgid "User Viewing"
+#~ msgstr "Корисник гледа"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Шифровање одељка"
+
+#~ msgid "Entity Time"
+#~ msgstr "Време важности"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Одложена достава"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Сараднички подаци објеката"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Складиштење и дељење датотека"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Поједностављени преговори и шифрованој сесији"
+
+#~ msgid "Hop Check"
+#~ msgstr "Провера скока"
+
+#~ msgid "Read Error"
+#~ msgstr "Грешка при читању"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Не могу да се повежем на сервер."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Бафер за читање је пун (2)"
+
+# Mozda "razume poruku"
+#~ msgid "Unparseable message"
+#~ msgstr "Порука се не може проследити"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Не могу да се повежем са домаћином: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Пријава није успела (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Веза је прекинута зато што сте се пријавили под овим именом са неког "
+#~ "другог места."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "SSL подршка је неопходна. Инсталирајте је."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Неисправна лозинка."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не могу да се повежем на БОС сервер:\n"
+#~ "%s"
+
+# Da li je "shortly" ovde "uskoro", ili "na kratko"? Pravilno je "uskoro", ali ostalo mi se ne slaze sa time!
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Веза се ускоро може прекинути. Погледајте %s за допуне."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Не могу да се повежем"
+
+#~ msgid "Invalid username."
+#~ msgstr "Неисправно корисничко име."
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Не могу да дешифрујем одговор са сервера"
+
+#~ msgid "Connection lost"
+#~ msgstr "Веза прекинута"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Не могу да добијем домаћина"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Веза прекинута (пишем)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Понављање везе"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Грешка при читању из утичнице: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Не могу да се повежем на домаћина"
+
+#~ msgid "Could not write"
+#~ msgstr "Не могу да упишем"
+
+#~ msgid "Could not connect"
+#~ msgstr "Не могу да се повежем"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr " е могу да начиним утичницу за слушање"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Не могу да добијем име домаћина"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Неисправна лозинка"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не могу да успоставим везу са %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Јаху Јапан"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Јапанов пејџер сервер"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Јапанов сервер за пренос датотека"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Веза са сервером је прекинута\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Не могу да добијем име домаћина"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "Сервер захтева TLS/SSL за пријаву. Није нађена подршка за TLS/SSL."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Скривање прозора за разговор"
+
+#~ msgid "More Data needed"
+#~ msgstr "Потребно је више података"
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Изаберите слику за смешак."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Који ИД да активирам?"
 
@@ -14878,13 +14992,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Лозинке преко %d карактера (ваша је %d) нису подржане у Мом свемиру."
 
-#~ msgid ""
-#~ "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username and choose a username and try to login again."
-#~ msgstr ""
-#~ "Идите на http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username и одаберите корисничко име како би покушали поново."
-
 #~ msgid "Unable to make SSL connection to server."
 #~ msgstr "Не могу да се повежем на SSL сервер."
 
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 7e449fbd61..bd9441864b 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2007-09-09 11:54+0100\n"
 "Last-Translator: Miloš Popović <gpopac@gmail.com>\n"
 "Language-Team: Serbian <gnome@prevod.org>\n"
@@ -2553,9 +2553,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Prikaži i beleške o ostalim programima pri pregledu dnevnika."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2610,8 +2611,9 @@ msgstr "Emulator poruka van mreže"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Sačuvaj poruke poslate korisniku van mreže kao zasedu."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Ostatak poruke će biti sačuvan kao zaseda. Možete urediti/ukloniti zasedu iz "
@@ -2862,11 +2864,12 @@ msgstr ""
 "instalirajte ActiveTCL sa http://www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Ne mogu da pratim dolazeća povezivanja na brze poruke\n"
 
 msgid ""
@@ -2919,14 +2922,21 @@ msgstr "%s je zatvorio razgovor."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Ne mogu da pošaljem poruku. Razgovor ne može da otpočne."
 
-msgid "Cannot open socket"
-msgstr "Ne mogu da otvorim utičnicu"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Ne mogu da napravim utičnicu:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Ne mogu da vežem utičnicu na port"
 
-msgid "Could not listen on socket"
-msgstr "Ne mogu da slušam utičnicu"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Ne mogu da napravim utičnicu:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Greška pri sporazumevanju sa lokalnim mDNSResponder-om."
@@ -2975,13 +2985,16 @@ msgstr "Sačuvaj spisak drugara..."
 msgid "Load buddylist from file..."
 msgstr "Učitaj spisak drugara iz datoteke..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Popuni polja za registraciju."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Lozinke nisu iste."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Ne mogu da registrujem novi nalog. Desila se greška.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2993,14 +3006,14 @@ msgstr "Registracija završena uspešno!"
 msgid "Password"
 msgstr "Lozinka"
 
-msgid "Password (retype)"
-msgstr "Lozinka (ponovo otkucajte)"
+msgid "Password (again)"
+msgstr "Lozinka (ponovite)"
 
-msgid "Enter current token"
-msgstr "Unesite trenutni token"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Trenutni token"
+msgid "Captcha"
+msgstr ""
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registruj novi Gadu-Gadu nalog"
@@ -3053,6 +3066,15 @@ msgstr "Lozinka je uspešno izmenjena!"
 msgid "Current password"
 msgstr "Trenutna lozinka"
 
+msgid "Password (retype)"
+msgstr "Lozinka (ponovo otkucajte)"
+
+msgid "Enter current token"
+msgstr "Unesite trenutni token"
+
+msgid "Current token"
+msgstr "Trenutni token"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Molim vas unesite tekuću lozinku i novu lozinku: "
 
@@ -3100,7 +3122,7 @@ msgstr "Nema nađenih korisnika"
 msgid "There are no users matching your search criteria."
 msgstr "Nema nađenih korisnika po vašem kriterijumu pretrage."
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "Ne mogu da čitam utičnicu"
 
 msgid "Buddy list downloaded"
@@ -3115,8 +3137,14 @@ msgstr "Lista drugova poslata"
 msgid "Your buddy list was stored on the server."
 msgstr "Vaša lista drugova je poslana na server."
 
-msgid "Connection failed."
-msgstr "Povezivanje propalo."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Povezan"
+
+msgid "Connection failed"
+msgstr "Veza neuspešna"
 
 msgid "Add to chat"
 msgstr "Dodaj u ćaskanje"
@@ -3124,18 +3152,23 @@ msgstr "Dodaj u ćaskanje"
 msgid "Chat _name:"
 msgstr "_Ime ćaskanja:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Ne mogu da se povežem na server."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Uspostavljanje veze"
+
 msgid "Chat error"
 msgstr "Greška u ćaskanju"
 
 msgid "This chat name is already in use"
 msgstr "Ovo ime ćaskanja je već zauzeto"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Niste u vezi sa serverom."
 
 msgid "Find buddies..."
@@ -3195,7 +3228,8 @@ msgstr "Tema nije postavljena"
 msgid "File Transfer Failed"
 msgstr "Propao prenos datoteke"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Ne mogu da otvorim port za slušanje."
 
 msgid "Error displaying MOTD"
@@ -3211,8 +3245,18 @@ msgstr "Nema poruke dana za ovu vezu."
 msgid "MOTD for %s"
 msgstr "Poruka dana za %s"
 
-msgid "Server has disconnected"
-msgstr "Server se isključio"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Veza sa serverom je prekinuta:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Pogledajte poruku dana"
@@ -3227,22 +3271,20 @@ msgstr "_Lozinka:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC nadimci ne mogu sadržati beline"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Uspostavljanje veze"
-
 msgid "SSL support unavailable"
 msgstr "SSL podrška je nedostupna"
 
-msgid "Couldn't create socket"
-msgstr "Ne mogu da načinim utičnicu"
+msgid "Unable to connect"
+msgstr "Nemoguće povezivanje"
 
-msgid "Couldn't connect to host"
-msgstr "Ne mogu da se povežem sa domaćinom"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Ne mogu da se povežem na %s"
 
-msgid "Read error"
-msgstr "Greška pri čitanju"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Server je prekinuo vezu"
 
 msgid "Users"
 msgstr "Korisnici"
@@ -3671,10 +3713,12 @@ msgstr ""
 msgid "execute"
 msgstr "izvrši"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Server zahteva TLS/SSL za prijavu. Nije nađena podrška za TLS/SSL."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Zahtevate šifrovanu vezu, ali nije nađena podrška za TLS/SSL."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3693,7 +3737,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Identifikacija običnim tekstom"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Neuspešna identifikacija"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Neispravan odgovor servera."
 
 msgid "Server does not use any supported authentication method"
@@ -3705,7 +3754,8 @@ msgstr "Zahtevate šifrovanje, ali ono nije dostupno na ovom serveru."
 msgid "Invalid challenge from server"
 msgstr "Neispravan izazov servera"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL greška"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3725,10 +3775,8 @@ msgstr ""
 "Ne mogu da uspostavim vezu sa serverom:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Ne mogu da uspostavim vezu sa serverom:\n"
 "%s"
@@ -3737,12 +3785,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "Ne mogu da uspostavim vezu."
 
-msgid "Unable to create socket"
-msgstr "Ne mogu načiniti utičnicu"
-
-msgid "Write error"
-msgstr "Greška pri pisanju"
-
 msgid "Full Name"
 msgstr "Puno ime"
 
@@ -3814,159 +3856,6 @@ msgstr "Operativni sistem"
 msgid "Local Time"
 msgstr "Lokalna datoteka:"
 
-msgid "Last Activity"
-msgstr "Poslednja aktivnost"
-
-msgid "Service Discovery Info"
-msgstr "Podaci otkrivanja servisa"
-
-msgid "Service Discovery Items"
-msgstr "Stavke otkrivanja servisa"
-
-msgid "Extended Stanza Addressing"
-msgstr "Prošireno adresiranje odeljka"
-
-msgid "Multi-User Chat"
-msgstr "Višekorisničko ćaskanje"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Podaci o proširenom ćaskanju sa više korisnika"
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr ""
-
-msgid "PubSub Service"
-msgstr "PubSub servis"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 protoci"
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "HHTML — brze poruke"
-
-msgid "In-Band Registration"
-msgstr ""
-
-msgid "User Location"
-msgstr "Korisnikova lokacija"
-
-msgid "User Avatar"
-msgstr "Korisnikova sličica"
-
-msgid "Chat State Notifications"
-msgstr "Obaveštenja o stanju ćaskanja"
-
-msgid "Software Version"
-msgstr "Verzija programa"
-
-msgid "Stream Initiation"
-msgstr "Pokretanje protoka"
-
-msgid "File Transfer"
-msgstr "Prenosi datoteka"
-
-msgid "User Mood"
-msgstr "Raspoloženje korisnika"
-
-msgid "User Activity"
-msgstr "Aktivnost korisnika"
-
-msgid "Entity Capabilities"
-msgstr "Sposobnosti"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Pregovori o šifrovanoj sesiji"
-
-msgid "User Tune"
-msgstr "Korisnikova melodija"
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-msgid "Reachability Address"
-msgstr "Adresa za kontakt"
-
-msgid "User Profile"
-msgstr "Korisnikov profil"
-
-msgid "Jingle"
-msgstr "Džingl"
-
-msgid "Jingle Audio"
-msgstr "Džingl zvuk"
-
-msgid "User Nickname"
-msgstr "Nadimak"
-
-msgid "Jingle ICE UDP"
-msgstr "Džingl ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Džingl ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Izvorni džingl UDP"
-
-msgid "Jingle Video"
-msgstr "Džingl video"
-
-msgid "Jingle DTMF"
-msgstr "Džingl DTMF"
-
-msgid "Message Receipts"
-msgstr "Prijem poruka"
-
-msgid "Public Key Publishing"
-msgstr "Izdavanje javnog ključa"
-
-msgid "User Chatting"
-msgstr "Korisnik ćaska"
-
-msgid "User Browsing"
-msgstr "Korisnik razgleda"
-
-msgid "User Gaming"
-msgstr "Korisnik se igra"
-
-msgid "User Viewing"
-msgstr "Korisnik gleda"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Šifrovanje odeljka"
-
-msgid "Entity Time"
-msgstr "Vreme važnosti"
-
-msgid "Delayed Delivery"
-msgstr "Odložena dostava"
-
-msgid "Collaborative Data Objects"
-msgstr "Saradnički podaci objekata"
-
-msgid "File Repository and Sharing"
-msgstr "Skladištenje i deljenje datoteka"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Pojednostavljeni pregovori i šifrovanoj sesiji"
-
-msgid "Hop Check"
-msgstr "Provera skoka"
-
-msgid "Capabilities"
-msgstr "Mogućnosti"
-
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -3978,7 +3867,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Prijavljen"
 
 # Ovde je nekada stajalo 'ime oca'. Kod nas je srednje ime uglavnom ime
@@ -4167,16 +4056,13 @@ msgstr "Nema nađenih korisnika"
 msgid "Roles:"
 msgstr "Uloga"
 
-msgid "Ping timeout"
-msgstr ""
-
-msgid "Read Error"
-msgstr "Greška pri čitanju"
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Vreme veze ne isteklo"
 
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4352,9 +4238,6 @@ msgstr "Vaša lozinka je izmenjena."
 msgid "Error changing password"
 msgstr "Greška pri izmeni lozinke"
 
-msgid "Password (again)"
-msgstr "Lozinka (ponovite)"
-
 msgid "Change XMPP Password"
 msgstr "Promeni Džaber lozinku"
 
@@ -4739,6 +4622,14 @@ msgstr "Greška pri XML obradi"
 msgid "Unknown Error in presence"
 msgstr "Nepoznata greška u prisustvu"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Greška pri uključenju u ćaskanje: %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Greška pri ćaskanju: %s"
+
 msgid "Create New Room"
 msgstr "Napravi novu sobu"
 
@@ -4755,16 +4646,20 @@ msgstr "P_ostavke za sobu"
 msgid "_Accept Defaults"
 msgstr "P_rihvati podrazumevano"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Greška pri uključenju u ćaskanje: %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Nije naveden razlog"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Greška pri ćaskanju: %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Izbacio Vas je %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Izbačeni od strane %s: (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Došlo je do greške pri otvaranju datoteke."
 
 #, fuzzy
@@ -5259,9 +5154,6 @@ msgstr ""
 "Za povezivanje sa MSN potrebna je podrška za SSL. Instalirajte podržanu SSL "
 "biblioteku."
 
-msgid "Failed to connect to server."
-msgstr "Ne mogu da se povežem na server."
-
 msgid "Error retrieving profile"
 msgstr "Greška pri čitanju sa servera"
 
@@ -5523,9 +5415,6 @@ msgstr "Poruka nije poslata zato što je došlo do nepoznate greške u kodiranju
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Poruka nije poslata zato što je došlo do nepoznate greške:"
 
-msgid "Unable to connect"
-msgstr "Nemoguće povezivanje"
-
 msgid "Writing error"
 msgstr "Greška pri pisanju"
 
@@ -5540,20 +5429,24 @@ msgstr ""
 "Greška pri povezivanju sa servera %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Naš protokol nije podržan na serveru."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Greška pri obradi HTTP-a."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Prijavili ste se sa nekog drugog mesta."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN serveri su privremeno nedostupni. Sačekajte malo pa pokušajte ponovo."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Veza Vam je prekinuta. Privremeno se gase MSN serveri."
 
 #, c-format
@@ -5566,9 +5459,6 @@ 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"
 
@@ -5669,6 +5559,9 @@ msgstr "Dodatak za MSN protokol"
 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)"
@@ -5786,12 +5679,6 @@ msgstr[3] ""
 msgid "Add contacts from server"
 msgstr "Dodaj kontakt sa servera"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Povezan"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Greška u protokolu, kod %d: %s"
@@ -5812,17 +5699,6 @@ msgstr "Greška u Mom svemiru"
 msgid "Invalid input condition"
 msgstr "Pogrešan ulazni uslov"
 
-msgid "Read buffer full (2)"
-msgstr "Bafer za čitanje je pun (2)"
-
-# Mozda "razume poruku"
-msgid "Unparseable message"
-msgstr "Poruka se ne može proslediti"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Ne mogu da se povežem sa domaćinom: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Neuspešno dodavanje drugara razgovoru"
 
@@ -5906,6 +5782,15 @@ msgstr "Ukupno drugova"
 msgid "Client Version"
 msgstr "Verzija programa"
 
+#, fuzzy
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+"Idite na http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username i odaberite korisničko ime kako bi pokušali ponovo."
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Korisničko ime je dostupno"
 
@@ -6162,9 +6047,9 @@ msgstr "Korisnik ili nije na vezi ili imate zabranu"
 msgid "Unknown error: 0x%X"
 msgstr "Nepoznata greška: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Prijava nije uspela (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Ne mogu da pingujem korisnika %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6269,9 +6154,6 @@ msgstr "GroupWise konferencija %d"
 msgid "Authenticating..."
 msgstr "Identifikacija"
 
-msgid "Unable to connect to server."
-msgstr "Ne mogu da se povežem na server."
-
 msgid "Waiting for response..."
 msgstr "Čekam na odgovor..."
 
@@ -6295,26 +6177,19 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Da li želite da se priključite razgovoru?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-"Veza je prekinuta zato što ste se prijavili pod ovim imenom sa nekog drugog "
-"mesta."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "Izgleda da %s nije prisutan i da nije primio poslatu poruku."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Ne mogu da se povežem na seerver. Unesite adresu servera na kog želite da se "
 "povežem."
 
-msgid "Error. SSL support is not installed."
-msgstr "SSL podrška je neophodna. Instalirajte je."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Ova konferencija je zatvorena. Poruke se više ne mogu slati."
 
@@ -6353,10 +6228,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6365,18 +6237,8 @@ msgstr "Ne mogu da se povežem na pričaonicu"
 msgid "Invalid chat room name"
 msgstr "Neispravno ime pričaonice"
 
-msgid "Server closed the connection."
-msgstr "Server je prekinuo vezu"
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Veza sa serverom je prekinuta:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Dobijeni su pogrešni podaci od servera."
 
 #. *< type
@@ -6424,7 +6286,8 @@ msgstr "Prekinuta je veza sa udaljenim korisnikom:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Primljeni pogrešni podaci od udaljenog korisnika."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Ne mogu da uspostavim vezu sa udaljenim korisnikom."
 
 msgid "Direct IM established"
@@ -6623,21 +6486,15 @@ msgstr "_Nivoi upozorenja"
 msgid "Buddy Comment"
 msgstr "Primedba za drugara:"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Ne mogu se povežem na server za potvrdu:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Ne mogu da se povežem na BOS server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Ne mogu da se povežem na server."
 
 msgid "Username sent"
 msgstr "Korisničko ime je poslato"
@@ -6649,11 +6506,11 @@ msgstr "Veza je uspostavljena, kolačić je poslat"
 msgid "Finalizing connection"
 msgstr "Dovršava povezivanje"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Prijava nije uspela: Ne mogu da se prijavim kao %s jer je to neispravno "
 "korisničko ime. Korisnička imena moraju biti ispravne adrese e-pošte, početi "
@@ -6667,27 +6524,22 @@ 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."
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Korisnik ne postoji."
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Vaš nalog je trenutno nedostupan."
 
 #. service temporarily unavailable
@@ -6707,7 +6559,8 @@ 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."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Uneti SecurID ključ je neispravan."
 
 msgid "Enter SecurID"
@@ -6889,6 +6742,9 @@ msgstr "Na vezi od"
 msgid "Member Since"
 msgstr "Član od"
 
+msgid "Capabilities"
+msgstr "Mogućnosti"
+
 msgid "Profile"
 msgstr "Profil"
 
@@ -7083,9 +6939,9 @@ msgstr[3] ""
 msgid "Away message too long."
 msgstr "Poruka za odsustvo je predugačka."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7109,9 +6965,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Siročići"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Ne mogu da dodam drugara %s zato što imate previše drugara u spisku. "
@@ -7120,8 +6976,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(bez imena)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Ne mogu da dodam drugara %s iz nepoznatih razloga."
 
 # Is it "them"? Or "him/her"?
@@ -7899,7 +7755,8 @@ msgstr "Interval održavanja veze (u sekundama)"
 msgid "Update interval (seconds)"
 msgstr "Interval ažuriranja (u sekundama)"
 
-msgid "Cannot decrypt server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "Ne mogu da dešifrujem odgovor sa servera"
 
 #, c-format
@@ -7924,9 +7781,6 @@ msgstr "Potrebna je aktivacija"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Nepoznat odgovor pri prijavi (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Ne mogu da dešifrujem odgovor sa servera"
-
 msgid "Requesting captcha"
 msgstr ""
 
@@ -7960,29 +7814,18 @@ msgstr ""
 "Nepoznat odgovor pri projavi (0x%02X):\n"
 "%s"
 
-msgid "Unable to connect."
-msgstr "Ne mogu da se povežem."
-
 msgid "Socket error"
 msgstr "Greška u utičnici"
 
-msgid "Unable to read from socket"
-msgstr "Ne mogu da čitam utičnicu"
-
-msgid "Write Error"
-msgstr "Greška pri pisanju"
-
-msgid "Connection lost"
-msgstr "Veza prekinuta"
-
 msgid "Getting server"
 msgstr "Dobavljam server"
 
 msgid "Requesting token"
 msgstr ""
 
-msgid "Couldn't resolve host"
-msgstr "Ne mogu da dobijem domaćina"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Ne mogu da se povežem na server."
 
 msgid "Invalid server or port"
 msgstr "Neispravan server ili port"
@@ -8033,7 +7876,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "QQ Qun naredba"
 
-msgid "Could not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "Ne mogu da dešifrujem odgovor prilikom prijave"
 
 msgid "Unknown LOGIN CMD"
@@ -8053,9 +7897,6 @@ msgstr "Datoteka poslata"
 msgid "%d canceled the transfer of %s"
 msgstr "%d je prekinuo prenos datoteke %s"
 
-msgid "Connection closed (writing)"
-msgstr "Veza prekinuta (pišem)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Naziv grupe:</b> %s<br>"
@@ -8109,17 +7950,6 @@ msgstr "Sametime administrator je dao sledeću izjavu na serveru %s"
 msgid "Sametime Administrator Announcement"
 msgstr "Izjava Sametime administratora"
 
-msgid "Connection reset"
-msgstr "Ponavljanje veze"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Greška pri čitanju iz utičnice: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Ne mogu da se povežem na domaćina"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Najava od %s"
@@ -8142,6 +7972,9 @@ msgstr "Zvučnici"
 msgid "Video Camera"
 msgstr "Video kamera"
 
+msgid "File Transfer"
+msgstr "Prenosi datoteka"
+
 msgid "Supports"
 msgstr "Podrška"
 
@@ -8958,6 +8791,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Mrežne statistike"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping nije uspeo"
 
@@ -9023,7 +8859,8 @@ msgstr "Nepodržana vrsta javnog ključa"
 msgid "Disconnected by server"
 msgstr "Server Vas je isključio"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Greška pri povezivanju na SILC server"
 
 msgid "Key Exchange failed"
@@ -9035,26 +8872,26 @@ msgstr ""
 "Nastavljam prekinutu sesiju. Pritisnite Ponovno povezivanje da napravite "
 "novu vezu."
 
-msgid "Connection failed"
-msgstr "Veza neuspešna"
-
 msgid "Performing key exchange"
 msgstr "Razmena ključeva je u toku"
 
-msgid "Unable to create connection"
-msgstr "Ne mogu da uspostavim novu vezu."
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Ne mogu da učitam SILC par ključeva"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Povezivanje sa SILC serverom"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Ne mogu da učitam SILC par ključeva"
+
 msgid "Out of memory"
 msgstr "Nema dovoljno memorije"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Ne mogu da pokrenem SILC protokol"
 
 msgid "Error loading SILC key pair"
@@ -9347,7 +9184,8 @@ msgstr "Digitalno potpiši i proveri sve poruke"
 msgid "Creating SILC key pair..."
 msgstr "Izrada SILC para ključeva je u toku..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Ne mogu da napravim SILC par ključeva\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9443,6 +9281,9 @@ msgstr "Tabla"
 msgid "No server statistics available"
 msgstr "Nema dostupnih statistika"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Greška pri povezivanju na SILC server"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Greška: izdanja se ne slažu, obnovite vašeg programa"
@@ -9483,30 +9324,27 @@ msgstr "Greška: kolačić je neispravan."
 msgid "Failure: Authentication failed"
 msgstr "Neuspešna identifikacija"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Ne može se pokrenuti SILC programska veza"
 
 msgid "John Noname"
 msgstr "Bezimeni balon"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Ne mogu da učitam SILC par ključeva: %s"
 
-msgid "Could not write"
-msgstr "Ne mogu da upišem"
-
-msgid "Could not connect"
-msgstr "Ne mogu da se povežem"
+msgid "Unable to create connection"
+msgstr "Ne mogu da uspostavim novu vezu."
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Nepoznat odgovor servera."
 
-msgid "Could not create listen socket"
-msgstr " e mogu da načinim utičnicu za slušanje"
-
-msgid "Could not resolve hostname"
-msgstr "Ne mogu da dobijem ime domaćina"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Ne mogu načiniti utičnicu"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP korisnička imena nesmeju sadržati razmak ili @ simbole"
@@ -9547,6 +9385,77 @@ msgstr "Ovlasti korisnika"
 msgid "Auth Domain"
 msgstr "Ovlasti domen"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;soba&gt;:  Priključi se pričaonici na Jahu mreži"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Ispisuje sobe na Jahu mreži"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "crtanje: zahtevaj od korisnika da počne sesiju crtanja"
+
+msgid "Yahoo ID..."
+msgstr "Jahu IB..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Dodatak za Jahu protokol"
+
+msgid "Pager server"
+msgstr "Pejdžer server"
+
+msgid "Pager port"
+msgstr "Port za pejdžer"
+
+msgid "File transfer server"
+msgstr "Server za prenos datoteka"
+
+msgid "File transfer port"
+msgstr "Port za prenos datoteka"
+
+msgid "Chat room locale"
+msgstr "Lokalizacija pričaonice"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Zanemari pozive pričaonice i konferencije"
+
+msgid "Chat room list URL"
+msgstr "URL za spisak pričaonica"
+
+msgid "Yahoo Chat server"
+msgstr "Jahu pričaonica"
+
+msgid "Yahoo Chat port"
+msgstr "Jahu port za razgovor"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Jahu IB..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Dodatak za Jahu protokol"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9578,28 +9487,18 @@ msgstr "Odbijeno dodavanje drugara"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  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
@@ -9637,37 +9536,32 @@ msgstr "Vaš nalog je zaključan, prijavite se na Jahu! veb stranicu."
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Nepoznat broj greške: %d. Prijava na Jahu možda može da to otkloni."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "Ne mogu da dodam drugara %s u grupu %s u spisak servera za nalog %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Ne mogu da dodam drugara u spisak servera"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Razgovetan %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Dobijen je neočekivan odgovor HTTP servera."
 
-msgid "Connection problem"
-msgstr "Greška pri povezivanju"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Prekinuta je veza sa %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Ne mogu da uspostavim vezu sa %s:\n"
+"Ne mogu da uspostavim vezu sa serverom:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9730,73 +9624,15 @@ msgstr "Priključi korisnika ćaskanju..."
 msgid "Open Inbox"
 msgstr "Otvori sanduče"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;soba&gt;:  Priključi se pričaonici na Jahu mreži"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Ispisuje sobe na Jahu mreži"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "crtanje: zahtevaj od korisnika da počne sesiju crtanja"
-
-msgid "Yahoo ID..."
-msgstr "Jahu IB..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Dodatak za Jahu protokol"
-
-msgid "Yahoo Japan"
-msgstr "Jahu Japan"
-
-msgid "Pager server"
-msgstr "Pejdžer server"
-
-msgid "Japan Pager server"
-msgstr "Japanov pejdžer server"
-
-msgid "Pager port"
-msgstr "Port za pejdžer"
-
-msgid "File transfer server"
-msgstr "Server za prenos datoteka"
-
-msgid "Japan file transfer server"
-msgstr "Japanov server za prenos datoteka"
-
-msgid "File transfer port"
-msgstr "Port za prenos datoteka"
-
-msgid "Chat room locale"
-msgstr "Lokalizacija pričaonice"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Zanemari pozive pričaonice i konferencije"
-
-msgid "Chat room list URL"
-msgstr "URL za spisak pričaonica"
-
-msgid "Yahoo Chat server"
-msgstr "Jahu pričaonica"
-
-msgid "Yahoo Chat port"
-msgstr "Jahu port za razgovor"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Pošalji zahtev za žvrljanje"
 
+msgid "Unable to connect."
+msgstr "Ne mogu da se povežem."
+
 # Ovo je FD kao broj koji je ekvivalentan "file handle"-u, odnosno, to je jedinstvena oznaka otvorenog fajla za pristup; sta znaci "establish" u ovom kontekstu mi nije jasno
 msgid "Unable to establish file descriptor."
 msgstr "Ne mogu da uspostavim opisnik datoteke."
@@ -9805,6 +9641,9 @@ msgstr "Ne mogu da uspostavim opisnik datoteke."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s pokušava da vam pošalje grupu od %d datoteka.\n"
 
+msgid "Write Error"
+msgstr "Greška pri pisanju"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Profil za Jahu Japan"
 
@@ -9919,23 +9758,19 @@ msgstr "Glas"
 msgid "Webcams"
 msgstr "Kamere"
 
+msgid "Connection problem"
+msgstr "Greška pri povezivanju"
+
 msgid "Unable to fetch room list."
 msgstr "Ne mogu da dobavim spisak soba."
 
 msgid "User Rooms"
 msgstr "Korisničke sobe"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Problem pri povezivanju na YCHT server."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Veza sa serverom je prekinuta\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10064,33 +9899,22 @@ msgstr "Područje"
 msgid "Exposure"
 msgstr "Izlaganje"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Ne mogu da napravim utičnicu:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Ne mogu da obradim odgovor sa HTTP mrežnog posrednika: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Greška pri povezivanju posrednika %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Pristup odbijen: posrednik odbija tunel na portu %d."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Greška pri dobijanju %s"
 
-msgid "Could not resolve host name"
-msgstr "Ne mogu da dobijem ime domaćina"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Tražim %sovu pažnju..."
@@ -10305,12 +10129,6 @@ msgstr "Greška pri upisu u %s: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "Ne mogu da se povežem na %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "Server zahteva TLS/SSL za prijavu. Nije nađena podrška za TLS/SSL."
-
 #, c-format
 msgid " - %s"
 msgstr " - %s"
@@ -10560,9 +10378,14 @@ msgstr "D_odaj zasedu drugaru..."
 msgid "View _Log"
 msgstr "Pregled dnevni_ka"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Sakrij kada nisam na mreži"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Prikaži i van mreže"
+
 msgid "_Alias..."
 msgstr "N_adeni ime..."
 
@@ -11068,6 +10891,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Izmeni podatke o korisniku za %s"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Odredi ime domaćina za koje važi ovaj sertifikat."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL serveri"
@@ -11113,7 +10940,8 @@ msgstr "Ignoriši"
 msgid "Get Away Message"
 msgstr "Pribavi poruku za odsustvo"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Poslednje reči"
 
 msgid "Unable to save icon file to disk."
@@ -12012,7 +11840,8 @@ msgstr "Boja za iscrtavanje nad-veza."
 msgid "Hyperlink visited color"
 msgstr "Boja posećene nad-veze"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+#, fuzzy
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Boja za iscrtavanje nad-veza nakon njihove posete."
 
 msgid "Hyperlink prelight color"
@@ -12048,14 +11877,23 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Boja za ispis imena poruke koju šaljete."
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Boja za ispis imena poruke koju šaljete."
+
 msgid "Typing notification color"
 msgstr "Boja obaveštenja o kucanju"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "Omogući obaveštenje o kucanju"
 
 msgid "Typing notification font"
 msgstr "Font obaveštenja o kucanju"
@@ -12449,6 +12287,10 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Izabrana je „ručna“ naredba za veb čitač, a naredba nije postavljena."
 
+#, fuzzy
+msgid "No message"
+msgstr "Nepoznata greška"
+
 msgid "Open All Messages"
 msgstr "Otvori sve poruke"
 
@@ -12466,10 +12308,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Imate e-poštu!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Nepoznata greška"
-
 msgid "The following plugins will be unloaded."
 msgstr "Sledeći dodaci će biti isključeni."
 
@@ -12685,8 +12523,9 @@ msgstr "Prika_ži ikonica na panelu:"
 msgid "On unread messages"
 msgstr "Na nepročitane poruke"
 
-msgid "Conversation Window Hiding"
-msgstr "Skrivanje prozora za razgovor"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Prozor razgovora"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Sakrij nove razgovore:"
@@ -12694,6 +12533,9 @@ msgstr "_Sakrij nove razgovore:"
 msgid "When away"
 msgstr "Pri odsustvu"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Uma_nji noci prozor razgovora"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Kratice"
@@ -12752,9 +12594,6 @@ msgstr "Koristi glatko klizanje"
 msgid "F_lash window when IMs are received"
 msgstr "_Zasijaj prozor kada pristigne nova poruka"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Uma_nji noci prozor razgovora"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12789,7 +12628,8 @@ msgstr "Ne mogu da pokrenem program za podešavanje veb preglednika."
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Primer: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "Sam o_dredi IP adresu"
 
 msgid "Public _IP:"
@@ -13155,32 +12995,17 @@ msgstr "Sa_čuvaj i primeni"
 msgid "Status for %s"
 msgstr "Stanje za %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "Proizvoljni smešci"
-
-msgid "More Data needed"
-msgstr "Potrebno je više podataka"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
+msgid "Custom Smiley"
+msgstr "Proizvoljni smešci"
+
 msgid "Duplicate Shortcut"
 msgstr "Udvostruči prečicu"
 
-msgid "Please select an image for the smiley."
-msgstr "Izaberite sliku za smešak."
-
 msgid "Edit Smiley"
 msgstr "Uredi smešak"
 
@@ -13293,9 +13118,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Ne mogu da pošaljem izvršivač"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Dovukli ste pokretač. Verovatno želite da pošaljete ono na šta on pokazuje "
 "nego pokretača samog."
@@ -13890,9 +13716,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Dodatak muzičkih poruka za saradnički sastav."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Dodatak za poruke muzičkim porukama dozvoljava korisnicima da istovremeno "
 "rade na delu muzike menjajući prost rezultat u realnom vremenu."
@@ -14149,7 +13976,7 @@ msgstr "Dugme za slanje u prozoru razgovora."
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14476,8 +14303,9 @@ msgstr "Pidžinove Vindous opcije"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Postavke svojstvene Pidžinu za Vindous."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Pruža opcije specifične Pidžinu za Vindous, kao što je spuštanje liste "
 "drugara."
@@ -14520,6 +14348,292 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Ovaj dodatak je koristan za uklanjanje grešaka Džaber servera ili programa"
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Ne mogu da otvorim utičnicu"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Ne mogu da slušam utičnicu"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Ne mogu da čitam utičnicu"
+
+#~ msgid "Connection failed."
+#~ msgstr "Povezivanje propalo."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Server se isključio"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Ne mogu da načinim utičnicu"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Ne mogu da se povežem sa domaćinom"
+
+#~ msgid "Read error"
+#~ msgstr "Greška pri čitanju"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ne mogu da uspostavim vezu sa serverom:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Greška pri pisanju"
+
+#~ msgid "Last Activity"
+#~ msgstr "Poslednja aktivnost"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Podaci otkrivanja servisa"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Stavke otkrivanja servisa"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Prošireno adresiranje odeljka"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Višekorisničko ćaskanje"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Podaci o proširenom ćaskanju sa više korisnika"
+
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub servis"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5 protoci"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "HHTML — brze poruke"
+
+#~ msgid "User Location"
+#~ msgstr "Korisnikova lokacija"
+
+#~ msgid "User Avatar"
+#~ msgstr "Korisnikova sličica"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Obaveštenja o stanju ćaskanja"
+
+#~ msgid "Software Version"
+#~ msgstr "Verzija programa"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Pokretanje protoka"
+
+#~ msgid "User Mood"
+#~ msgstr "Raspoloženje korisnika"
+
+#~ msgid "User Activity"
+#~ msgstr "Aktivnost korisnika"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Sposobnosti"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Pregovori o šifrovanoj sesiji"
+
+#~ msgid "User Tune"
+#~ msgstr "Korisnikova melodija"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Adresa za kontakt"
+
+#~ msgid "User Profile"
+#~ msgstr "Korisnikov profil"
+
+#~ msgid "Jingle"
+#~ msgstr "Džingl"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Džingl zvuk"
+
+#~ msgid "User Nickname"
+#~ msgstr "Nadimak"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Džingl ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Džingl ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Izvorni džingl UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Džingl video"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Džingl DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Prijem poruka"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Izdavanje javnog ključa"
+
+#~ msgid "User Chatting"
+#~ msgstr "Korisnik ćaska"
+
+#~ msgid "User Browsing"
+#~ msgstr "Korisnik razgleda"
+
+#~ msgid "User Gaming"
+#~ msgstr "Korisnik se igra"
+
+#~ msgid "User Viewing"
+#~ msgstr "Korisnik gleda"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Šifrovanje odeljka"
+
+#~ msgid "Entity Time"
+#~ msgstr "Vreme važnosti"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Odložena dostava"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Saradnički podaci objekata"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Skladištenje i deljenje datoteka"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Pojednostavljeni pregovori i šifrovanoj sesiji"
+
+#~ msgid "Hop Check"
+#~ msgstr "Provera skoka"
+
+#~ msgid "Read Error"
+#~ msgstr "Greška pri čitanju"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Ne mogu da se povežem na server."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Bafer za čitanje je pun (2)"
+
+# Mozda "razume poruku"
+#~ msgid "Unparseable message"
+#~ msgstr "Poruka se ne može proslediti"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Ne mogu da se povežem sa domaćinom: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Prijava nije uspela (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "Veza je prekinuta zato što ste se prijavili pod ovim imenom sa nekog "
+#~ "drugog mesta."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "SSL podrška je neophodna. Instalirajte je."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Neispravna lozinka."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ne mogu da se povežem na BOS server:\n"
+#~ "%s"
+
+# Da li je "shortly" ovde "uskoro", ili "na kratko"? Pravilno je "uskoro", ali ostalo mi se ne slaze sa time!
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Veza se uskoro može prekinuti. Pogledajte %s za dopune."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Ne mogu da se povežem"
+
+#~ msgid "Invalid username."
+#~ msgstr "Neispravno korisničko ime."
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Ne mogu da dešifrujem odgovor sa servera"
+
+#~ msgid "Connection lost"
+#~ msgstr "Veza prekinuta"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Ne mogu da dobijem domaćina"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Veza prekinuta (pišem)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Ponavljanje veze"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Greška pri čitanju iz utičnice: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Ne mogu da se povežem na domaćina"
+
+#~ msgid "Could not write"
+#~ msgstr "Ne mogu da upišem"
+
+#~ msgid "Could not connect"
+#~ msgstr "Ne mogu da se povežem"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr " e mogu da načinim utičnicu za slušanje"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Ne mogu da dobijem ime domaćina"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Neispravna lozinka"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ne mogu da uspostavim vezu sa %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Jahu Japan"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Japanov pejdžer server"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japanov server za prenos datoteka"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Veza sa serverom je prekinuta\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Ne mogu da dobijem ime domaćina"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "Server zahteva TLS/SSL za prijavu. Nije nađena podrška za TLS/SSL."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Skrivanje prozora za razgovor"
+
+#~ msgid "More Data needed"
+#~ msgstr "Potrebno je više podataka"
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Izaberite sliku za smešak."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Koji ID da aktiviram?"
 
@@ -14896,13 +15010,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Lozinke preko %d karaktera (vaša je %d) nisu podržane u Mom svemiru."
 
-#~ msgid ""
-#~ "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username and choose a username and try to login again."
-#~ msgstr ""
-#~ "Idite na http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-#~ "username i odaberite korisničko ime kako bi pokušali ponovo."
-
 #~ msgid "Unable to make SSL connection to server."
 #~ msgstr "Ne mogu da se povežem na SSL server."
 
diff --git a/po/sv.po b/po/sv.po
index 9a1cb626d3..8085df96c0 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2009-02-25 23:14+0100\n"
 "Last-Translator: Peter Hjalmarsson <xake@rymdraket.net>\n"
 "Language-Team: \n"
@@ -2564,9 +2564,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Inkludera andra IM-klienters loggfiler i loggfilsvisaren."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2622,8 +2623,9 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 "Spara meddelandet skickat till en frånkopplad användare som en notifiering"
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Resten av meddelanden kommer sparas som notifieringar. Du kan ändra/ta bort "
@@ -2876,14 +2878,16 @@ msgstr ""
 "Kunde inte finna en installation av ActiveTCL. Om du tänker använda TCL-"
 "modulen måste du installera ActiveTCL från http://www.activestate.com\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Apples Bonjour För Windows hittades inte, läs FAQen: http://d.pidgin.im/"
 "BonjourWindows för mer information"
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Kan inte lyssna efter inkommande IM anslutningar\n"
 
 msgid ""
@@ -2935,14 +2939,21 @@ msgstr "%s har stängt konversationen."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Kan inte skicka meddelandet, konversationen kunde inte startas."
 
-msgid "Cannot open socket"
-msgstr "Kan inte öppna uttag"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Kan inte skapa uttag:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Kunde inte binda uttag till port"
 
-msgid "Could not listen on socket"
-msgstr "Kunde inte lyssna på uttag"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Kan inte skapa uttag:\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Fel vid kommunikation med den lokala mDNSRespondern."
@@ -2994,13 +3005,16 @@ msgstr "Spara kompislista..."
 msgid "Load buddylist from file..."
 msgstr "Läs in kompislista från fil..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Fyll i registreringsfälten."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Lösenorden stämmer inte överens."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Kunde inte registrera nytt konto. Ett fel uppstod.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3012,14 +3026,15 @@ msgstr "Registreringen lyckades!"
 msgid "Password"
 msgstr "Lösenord"
 
-msgid "Password (retype)"
-msgstr "Lösenord (upprepa)"
+msgid "Password (again)"
+msgstr "Lösenord (igen)"
 
-msgid "Enter current token"
-msgstr "Ange nuvarande markör"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Nuvarande markör"
+#, fuzzy
+msgid "Captcha"
+msgstr "Captcha-bild"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrera nytt Gadu-Gadu-konto"
@@ -3072,6 +3087,15 @@ msgstr "Lösenordet ändrat utan problem!"
 msgid "Current password"
 msgstr "Nuvarande lösenord"
 
+msgid "Password (retype)"
+msgstr "Lösenord (upprepa)"
+
+msgid "Enter current token"
+msgstr "Ange nuvarande markör"
+
+msgid "Current token"
+msgstr "Nuvarande markör"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Var god ange ditt nuvarande lösenord och nya lösenord för UIN: "
 
@@ -3119,7 +3143,7 @@ msgstr "Inga matchande användare funna"
 msgid "There are no users matching your search criteria."
 msgstr "Det finns inga användare som matchar dina sökkriterier."
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "Kan inte läsa från uttag"
 
 msgid "Buddy list downloaded"
@@ -3134,7 +3158,13 @@ msgstr "Kompislistan är uppladdad"
 msgid "Your buddy list was stored on the server."
 msgstr "Din kompislista blev lagrad på servern."
 
-msgid "Connection failed."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Ansluten"
+
+msgid "Connection failed"
 msgstr "Anslutning misslyckad"
 
 msgid "Add to chat"
@@ -3143,18 +3173,23 @@ msgstr "Lägg till i chatt"
 msgid "Chat _name:"
 msgstr "Chatt_namn:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Kan inte ansluta till servern."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Ansluter"
+
 msgid "Chat error"
 msgstr "Chattfel"
 
 msgid "This chat name is already in use"
 msgstr "Det chattnamnet används redan"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Inte ansluten till servern."
 
 msgid "Find buddies..."
@@ -3214,7 +3249,8 @@ msgstr "Inget ämne är inställt"
 msgid "File Transfer Failed"
 msgstr "Filöverföringen misslyckades"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Kunde inte öppna en lyssnande port."
 
 msgid "Error displaying MOTD"
@@ -3230,8 +3266,18 @@ msgstr "Det finns ingen MOTD associerad med denna anslutning."
 msgid "MOTD for %s"
 msgstr "MOTD för %s"
 
-msgid "Server has disconnected"
-msgstr "Servern har kopplat ifrån"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Tappade anslutningen med servern:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Visa MOTD"
@@ -3246,22 +3292,20 @@ msgstr "_Lösenord:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC-nickar får inte innehålla blanksteg"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Ansluter"
-
 msgid "SSL support unavailable"
 msgstr "SSL-stöd ej tillgängligt"
 
-msgid "Couldn't create socket"
-msgstr "Kunde inte skapa socket"
+msgid "Unable to connect"
+msgstr "Kan inte ansluta"
 
-msgid "Couldn't connect to host"
-msgstr "Kunde inte ansluta till värden"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Kan inte ansluta till %s"
 
-msgid "Read error"
-msgstr "Läsfel"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Servern stängde konversationen."
 
 msgid "Users"
 msgstr "Användare"
@@ -3696,10 +3740,12 @@ msgstr "'Ad-Hoc'-kommandot misslyckades"
 msgid "execute"
 msgstr "utför"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Servern kräver TLS/SSL vid inloggning. Hittade inget stöd för TLS/SSL."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Du kräver kryptering, men inget stöd för TLS/SSL hittades."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3716,7 +3762,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Klartextautentisering"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Autentisering misslyckades"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Ogiltigt svar från servern."
 
 msgid "Server does not use any supported authentication method"
@@ -3728,7 +3779,8 @@ msgstr "Du kräver cryptering, men server stödjer det inte."
 msgid "Invalid challenge from server"
 msgstr "Ogiltigt utmaning från servern"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL fel"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3748,10 +3800,8 @@ msgstr ""
 "Kunde inte skapa en anslutning med servern:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Kunde inte skapa en anslutning med servern:\n"
 "%s"
@@ -3760,12 +3810,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "Kan inte skapa anslutning"
 
-msgid "Unable to create socket"
-msgstr "Kan inte skapa socket"
-
-msgid "Write error"
-msgstr "Skrivfel"
-
 msgid "Full Name"
 msgstr "Fullständigt namn"
 
@@ -3839,169 +3883,6 @@ msgstr "Operativsystem"
 msgid "Local Time"
 msgstr "Lokal fil:"
 
-msgid "Last Activity"
-msgstr "Senaste aktivitet"
-
-msgid "Service Discovery Info"
-msgstr "Tjänsteupptäckningsinfo"
-
-msgid "Service Discovery Items"
-msgstr "Tjänstupptäckningsföremål"
-
-msgid "Extended Stanza Addressing"
-msgstr "Utökad Strofadressering"
-
-msgid "Multi-User Chat"
-msgstr "Månganvändarchatt"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr "In-Band Byteströmmar"
-
-msgid "Ad-Hoc Commands"
-msgstr "'Ad-Hoc' Kommandon"
-
-# Vad är PubSub? Hittar bara antydningar till en sökmotor med speciella möjligheter för uppföljning. Är det den som avses?
-msgid "PubSub Service"
-msgstr "PubSub Service"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 Byteströmmar"
-
-# Vad för?
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-# Vad menas med In-Band, när används och vad blir då lämplig översättning? Denna har antagligen något med "Out-of-Band att göra men hur hänger de ihop?
-msgid "In-Band Registration"
-msgstr "In-Bandsregistrering"
-
-msgid "User Location"
-msgstr "Placering"
-
-msgid "User Avatar"
-msgstr "Användar-avatar"
-
-msgid "Chat State Notifications"
-msgstr "Chatt-status notifieringar"
-
-msgid "Software Version"
-msgstr "Mjukvaruversion"
-
-msgid "Stream Initiation"
-msgstr "Ströminitiering"
-
-msgid "File Transfer"
-msgstr "Filöverföringar"
-
-msgid "User Mood"
-msgstr "Användarhumör"
-
-msgid "User Activity"
-msgstr "Användaraktivitet"
-
-# Låter mysko, vet inte i vilket sammanhang.
-msgid "Entity Capabilities"
-msgstr "Existensmöjligheter"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Förhandlingar om krypterade sessioner"
-
-msgid "User Tune"
-msgstr "Användarlåt"
-
-msgid "Roster Item Exchange"
-msgstr "Listinnehållsutbyte"
-
-# Vet inte om detta är bästa, men...
-msgid "Reachability Address"
-msgstr "Nåbar adress"
-
-msgid "User Profile"
-msgstr "Användarprofil"
-
-msgid "Jingle"
-msgstr "Ramsa"
-
-# Vad är dessa?
-msgid "Jingle Audio"
-msgstr "Sångsnutt"
-
-msgid "User Nickname"
-msgstr "Användarsmeknamn"
-
-# Vad är dessa?
-msgid "Jingle ICE UDP"
-msgstr "Ramsa ICE UDP"
-
-# Vad är dessa?
-msgid "Jingle ICE TCP"
-msgstr "Ramsa ICE TCP"
-
-# Vad är dessa?
-msgid "Jingle Raw UDP"
-msgstr "Ramsa Rå UDP"
-
-msgid "Jingle Video"
-msgstr "Ramsa Video"
-
-# Vad är dessa?
-msgid "Jingle DTMF"
-msgstr "Ramsa DTMF"
-
-msgid "Message Receipts"
-msgstr "Meddelandekvitton"
-
-msgid "Public Key Publishing"
-msgstr "Publik nyckelpublisering"
-
-msgid "User Chatting"
-msgstr "Användarchattning"
-
-msgid "User Browsing"
-msgstr "Användarbläddring"
-
-msgid "User Gaming"
-msgstr "Användarspelning"
-
-msgid "User Viewing"
-msgstr "Användarvisning"
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Strofkryptering"
-
-msgid "Entity Time"
-msgstr "Enhet Tid"
-
-msgid "Delayed Delivery"
-msgstr "Försenad försändelse"
-
-msgid "Collaborative Data Objects"
-msgstr "Kollebrationsdata objekt"
-
-msgid "File Repository and Sharing"
-msgstr "Filförvaringsplats och Delning"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "STUN Serviceupptäckning för Ramsor"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Simpel crypterad session förhandling"
-
-msgid "Hop Check"
-msgstr "Hoppkontroll"
-
-msgid "Capabilities"
-msgstr "Stödjer"
-
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -4018,7 +3899,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Ansluten"
 
 msgid "Middle Name"
@@ -4200,16 +4081,13 @@ msgstr "Inga matchande användare funna"
 msgid "Roles:"
 msgstr "Roll"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Ping överskred en tidsgräns"
 
-msgid "Read Error"
-msgstr "Läsfel"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4385,9 +4263,6 @@ msgstr "Ditt lösenord har ändrats."
 msgid "Error changing password"
 msgstr "Fel vid byte av lösenord"
 
-msgid "Password (again)"
-msgstr "Lösenord (igen)"
-
 msgid "Change XMPP Password"
 msgstr "Byt XMPP lösenord"
 
@@ -4774,6 +4649,14 @@ msgstr "XML-tolkningsfel"
 msgid "Unknown Error in presence"
 msgstr "Okänt fel i närvaro"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Fel vid anslutning till chatt %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Fel i chatt %s"
+
 msgid "Create New Room"
 msgstr "Skapa nytt rum"
 
@@ -4790,16 +4673,20 @@ msgstr "_Konfigurera rum"
 msgid "_Accept Defaults"
 msgstr "_Acceptera förval"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Fel vid anslutning till chatt %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Ingen motivering angavs."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Fel i chatt %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Du har sparkats ut av %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Utsparkad av %s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Ett fel uppstod när filen öppnades."
 
 #, fuzzy
@@ -5292,9 +5179,6 @@ msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "SSL-stöd krävs för att använda MSN. Installera ett SSL-bibliotek som stöds."
 
-msgid "Failed to connect to server."
-msgstr "Kunde inte ansluta till servern."
-
 msgid "Error retrieving profile"
 msgstr "Fel vid hämtning av profil"
 
@@ -5551,9 +5435,6 @@ msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 "Meddelandet kunde kanske inte skickas på grund av att ett okänt fel uppstod."
 
-msgid "Unable to connect"
-msgstr "Kan inte ansluta"
-
 msgid "Writing error"
 msgstr "Skrivfel"
 
@@ -5568,19 +5449,23 @@ msgstr ""
 "Anslutningsfel från %s servern:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Vårt protokoll stöds inte av servern."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Fel vid avkodning av HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Du har loggat in från en annan plats."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "MSN-sernvern är temporärt otillgänglig. Var god försök igen senare."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN-servern går ner temporärt."
 
 #, c-format
@@ -5592,9 +5477,6 @@ msgid ""
 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"
 
@@ -5693,6 +5575,9 @@ msgstr "Insticksmodul för MSN-protokollet"
 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)"
@@ -5803,12 +5688,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Lägg till kontakter från server"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Ansluten"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protokollfel, gav felkod %d: %s"
@@ -5833,16 +5712,6 @@ msgstr "MySpaceIM-fel"
 msgid "Invalid input condition"
 msgstr "Ogiltigt inmatningsvillkor"
 
-msgid "Read buffer full (2)"
-msgstr "Läsbuffert full (2)"
-
-msgid "Unparseable message"
-msgstr "Otolkbart meddelande"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Kunde inte ansluta till värd: %s (%d)"
-
 # Vad säger att det är till just en chatt kompisen ska läggas till?
 msgid "Failed to add buddy"
 msgstr "Kunde inte lägga till kompis"
@@ -5930,6 +5799,12 @@ msgstr "Totala vänner"
 msgid "Client Version"
 msgstr "Klientversion"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Användarnamnet är tillgänglig"
 
@@ -6189,9 +6064,9 @@ msgstr "Användaren är antingen frånkopplad eller så är du blockerad"
 msgid "Unknown error: 0x%X"
 msgstr "Okänt fel: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Inloggningen misslyckades (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Kunde inte logga in."
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6295,9 +6170,6 @@ msgstr "GroupWise konferens %d"
 msgid "Authenticating..."
 msgstr "Autentiserar..."
 
-msgid "Unable to connect to server."
-msgstr "Kan inte ansluta till servern."
-
 msgid "Waiting for response..."
 msgstr "Väntar på svar..."
 
@@ -6321,24 +6193,19 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Vill du går med i konversationen?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Du har blivit utloggad eftersom du loggat in från en annan dator."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s verkar vara frånkopplad och fick inte meddelandet du just skickade."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Kunde inte ansluta till servern. Var god ange serveradressen som du vill "
 "ansluta till."
 
-msgid "Error. SSL support is not installed."
-msgstr "Fel. SSL-stöd är inte installerat."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Denna konferens har stängts. Inga fler meddelande kan bli skickade."
 
@@ -6377,10 +6244,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6389,18 +6253,8 @@ msgstr "Kunde inte ansluta till chatrummet"
 msgid "Invalid chat room name"
 msgstr "Ogiltigt namn på chatrum"
 
-msgid "Server closed the connection."
-msgstr "Servern stängde konversationen."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Tappade anslutningen med servern:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Tog emot felaktig data vid anslutning till server."
 
 #. *< type
@@ -6449,7 +6303,8 @@ msgstr "Tappade anslutningen till motparten: <br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Tog emot felaktig data över anslutningen till motparten."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Kunde inte skapa en anslutning till motparten."
 
 msgid "Direct IM established"
@@ -6650,21 +6505,15 @@ msgid "Buddy Comment"
 msgstr "Kompiskommentar"
 
 # Osäker!!!
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Kunde inte ansluta till autentiseringsserver:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Kunde inte ansluta till BOS-server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Kan inte ansluta till servern."
 
 msgid "Username sent"
 msgstr "Användarnamnet är skickat"
@@ -6676,11 +6525,11 @@ msgstr "Anslutning etablerad, kaka skickad"
 msgid "Finalizing connection"
 msgstr "Avsluta anslutning"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Kan inte logga in: Kunde inte ansluta som %s eftersom användarnamnet är "
 "ogiltigt.  Användarnamnet måste vara en giltig mejladress eller starta med "
@@ -6696,26 +6545,22 @@ msgstr ""
 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"
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Användaren finns inte"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Ditt konto är avstängt för tillfället."
 
 #. service temporarily unavailable
@@ -6735,7 +6580,8 @@ 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."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "SecurID-nyckeln som är angiven är ogiltig."
 
 msgid "Enter SecurID"
@@ -6910,6 +6756,9 @@ msgstr "Ansluten sedan"
 msgid "Member Since"
 msgstr "Medlem sedan"
 
+msgid "Capabilities"
+msgstr "Stödjer"
+
 msgid "Profile"
 msgstr "Profil"
 
@@ -7092,9 +6941,9 @@ msgstr[1] ""
 msgid "Away message too long."
 msgstr "Frånvaromeddelandet är för långt."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7120,9 +6969,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Föräldralösa"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Kunde inte lägga till kompisen %s eftersom du har för många kompisar i din "
@@ -7131,8 +6980,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(inget namn)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Kunde inte lägga till kompisen %s av okänd anledning."
 
 #, c-format
@@ -7910,7 +7759,8 @@ msgstr "Livhållningsintervall (seconds)"
 msgid "Update interval (seconds)"
 msgstr "Uppdateringsintervall (seconds)"
 
-msgid "Cannot decrypt server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "Kan inte dekryptera serversvaret"
 
 #, c-format
@@ -7935,9 +7785,6 @@ msgstr "Registrering krävs"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "Okänd svarskod vid inloggning (0x%02X)"
 
-msgid "Could not decrypt server reply"
-msgstr "Kan inte avkryptera inloggningssvaret"
-
 msgid "Requesting captcha"
 msgstr "Efterfrågar captcha"
 
@@ -7971,29 +7818,18 @@ msgstr ""
 "Okänd svarskod vid inloggning (0x%02X):\n"
 "%s"
 
-msgid "Unable to connect."
-msgstr "Kan inte ansluta."
-
 msgid "Socket error"
 msgstr "Uttag-fel"
 
-msgid "Unable to read from socket"
-msgstr "Kan inte läsa från uttag"
-
-msgid "Write Error"
-msgstr "Skrivfel"
-
-msgid "Connection lost"
-msgstr "Anslutningen tappades"
-
 msgid "Getting server"
 msgstr "Hämtar server"
 
 msgid "Requesting token"
 msgstr "Efterfrågar polett"
 
-msgid "Couldn't resolve host"
-msgstr "Kunde ej slå upp värden"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Kan inte ansluta till servern."
 
 msgid "Invalid server or port"
 msgstr "Ogiltig server eller port"
@@ -8046,7 +7882,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "QQ Qun Kommand"
 
-msgid "Could not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "Kan inte avkryptera inloggningssvaret"
 
 msgid "Unknown LOGIN CMD"
@@ -8066,9 +7903,6 @@ msgstr "Filsändning"
 msgid "%d canceled the transfer of %s"
 msgstr "%d avbröt överföringen av %s"
 
-msgid "Connection closed (writing)"
-msgstr "Anslutningen stängd (skrivande)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Grupptitel:</b> %s<br>"
@@ -8123,17 +7957,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Sametimeadministratörannonsering"
 
-msgid "Connection reset"
-msgstr "Anslutningen nollställd"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Fel vid läsning av från uttag %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Kan inte ansluta till värd"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Utskick från %s"
@@ -8156,6 +7979,9 @@ msgstr "Högtalare"
 msgid "Video Camera"
 msgstr "Videokamera"
 
+msgid "File Transfer"
+msgstr "Filöverföringar"
+
 msgid "Supports"
 msgstr "Stödjer"
 
@@ -8973,6 +8799,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Nätverksstatistik"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping misslyckades"
 
@@ -9036,7 +8865,8 @@ msgstr "Ej stödd publik nyckeltyp"
 msgid "Disconnected by server"
 msgstr "Frånkopplad av server"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Fel vid anslutning till SILC-server"
 
 msgid "Key Exchange failed"
@@ -9048,26 +8878,26 @@ msgstr ""
 "Misslyckades med att återuppta frånskild session. Tryck \"Återanslut\" för "
 "att skapa en ny uppkoppling."
 
-msgid "Connection failed"
-msgstr "Anslutning misslyckad"
-
 msgid "Performing key exchange"
 msgstr "Utför nyckelutbyte"
 
-msgid "Unable to create connection"
-msgstr "Kan inte skapa anslutning"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Kunde inte ladda SILC nyckelpar"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Ansluter till SILC-server"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Kunde inte ladda SILC nyckelpar"
+
 msgid "Out of memory"
 msgstr "Slut på minne"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Kan inte inleda SILC-klientanslutning"
 
 msgid "Error loading SILC key pair"
@@ -9364,7 +9194,8 @@ msgstr "Signera och verifiera alla meddelanden digitalt"
 msgid "Creating SILC key pair..."
 msgstr "Skapa SILC-nyckelpar..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Kunde inte skapa SILC-nyckelpar\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9460,6 +9291,9 @@ msgstr "Whiteboard"
 msgid "No server statistics available"
 msgstr "Ingen serverstatistik tillgänglig"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Fel vid anslutning till SILC-server"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Misslyckande: Versionerna matchar inte, upgradera din klient"
@@ -9501,30 +9335,27 @@ msgstr "Misslyckande: Felaktig cookie"
 msgid "Failure: Authentication failed"
 msgstr "Misslyckande: Autentisering misslyckades"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Kan inte inleda SILC-klientanslutning"
 
 msgid "John Noname"
 msgstr "John Namnlös"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Kunde inte ladda SILC nyckelpar: %s"
 
-msgid "Could not write"
-msgstr "Kunde inte skriva"
-
-msgid "Could not connect"
-msgstr "Kunde inte ansluta"
+msgid "Unable to create connection"
+msgstr "Kan inte skapa anslutning"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Okänt serversvar."
 
-msgid "Could not create listen socket"
-msgstr "Kunde inte skapa lyssnarsocket"
-
-msgid "Could not resolve hostname"
-msgstr "Kunde ej slå upp värden"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Kan inte skapa socket"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-användarnamnet får inte innehålla mellanslag eller symbolen @"
@@ -9565,6 +9396,77 @@ msgstr "Autentisera användare"
 msgid "Auth Domain"
 msgstr "Autentiserad domän"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;rum&gt;:  Anslut till ett chatt-rum på Yahoo-nätverket"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Listar rummen på Yahoo's nätverk"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Fråga användaren angående att starta en kladd-session"
+
+msgid "Yahoo ID..."
+msgstr "Yahoo-ID..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Insticksmodul för Yahoo-protokoll"
+
+msgid "Pager server"
+msgstr "Sökarserver"
+
+msgid "Pager port"
+msgstr "Sökarport"
+
+msgid "File transfer server"
+msgstr "Filöverföringsserver"
+
+msgid "File transfer port"
+msgstr "Port för filöverföring"
+
+msgid "Chat room locale"
+msgstr "Chatrummets språk"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignorera inbjudningar till konferenser och chatrum"
+
+msgid "Chat room list URL"
+msgstr "URL för chattrumlista"
+
+msgid "Yahoo Chat server"
+msgstr "Yahoo Chat-server"
+
+msgid "Yahoo Chat port"
+msgstr "Yahoo Chatt port"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo-ID..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Insticksmodul för Yahoo-protokoll"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9597,28 +9499,18 @@ msgstr "Lägg till kompisavvisning"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  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
@@ -9657,37 +9549,32 @@ msgstr "Ditt konto är låst, var vänlig och logga in på Yahoo!s webbplats."
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Okänt felnummer %d. Logga in på Yahoo!s hemsida kan fixa detta."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "Kan inte lägga till kompis %s i grupp %s på serverlistan för konto %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Kunde inte lägga till kompis i listan på servern"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hörbar %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Mottog oväntat HTTP-svar från servern."
 
-msgid "Connection problem"
-msgstr "Problem med anslutning"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Tappade anslutningen med %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Kunde inte skapa en anslutning med %s:\n"
+"Kunde inte skapa en anslutning med servern:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9750,73 +9637,15 @@ msgstr "Gå med användare i chatt..."
 msgid "Open Inbox"
 msgstr "Öppna Inkorg"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;rum&gt;:  Anslut till ett chatt-rum på Yahoo-nätverket"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Listar rummen på Yahoo's nätverk"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Fråga användaren angående att starta en kladd-session"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo-ID..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Insticksmodul för Yahoo-protokoll"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-msgid "Pager server"
-msgstr "Sökarserver"
-
-msgid "Japan Pager server"
-msgstr "Japan Sökarserver"
-
-msgid "Pager port"
-msgstr "Sökarport"
-
-msgid "File transfer server"
-msgstr "Filöverföringsserver"
-
-msgid "Japan file transfer server"
-msgstr "Japan filöverföringsserver"
-
-msgid "File transfer port"
-msgstr "Port för filöverföring"
-
-msgid "Chat room locale"
-msgstr "Chatrummets språk"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Ignorera inbjudningar till konferenser och chatrum"
-
-msgid "Chat room list URL"
-msgstr "URL för chattrumlista"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo Chat-server"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo Chatt port"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Skickade Doodle-förfrågan."
 
+msgid "Unable to connect."
+msgstr "Kan inte ansluta."
+
 msgid "Unable to establish file descriptor."
 msgstr "Kan inte inte etablera filbeskrivning."
 
@@ -9824,6 +9653,9 @@ msgstr "Kan inte inte etablera filbeskrivning."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s försöker skicka en grupp av %d filer till dig.\n"
 
+msgid "Write Error"
+msgstr "Skrivfel"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan-profil"
 
@@ -9935,23 +9767,19 @@ msgstr "Röster"
 msgid "Webcams"
 msgstr "Webbkamera"
 
+msgid "Connection problem"
+msgstr "Problem med anslutning"
+
 msgid "Unable to fetch room list."
 msgstr "Kan inte hämta rumlista."
 
 msgid "User Rooms"
 msgstr "Användarrum"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Problem med anslutning till YCHT-server."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Tappade anslutningen till servern\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10080,33 +9908,22 @@ msgstr "Kungarike"
 msgid "Exposure"
 msgstr "Exponering"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Kan inte skapa uttag:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Kan inte tolka svaret från HTTP-proxyn: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP-proxyanslutningsfel %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Åtkomst nekad: HTTP-proxyservern tillåter inte tunnel på port %d."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "Fel vid uppslagning av %s"
 
-msgid "Could not resolve host name"
-msgstr "Kunde inte slå upp värdnamnet"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Efterfrågar %s's uppmärksamhet..."
@@ -10308,12 +10125,6 @@ msgstr "Fel vid skrivning av %s: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "Kan inte ansluta till %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "Servern kräver TLS/SSL vid inloggning. Hittade inget stöd för TLS/SSL."
-
 #, c-format
 msgid " - %s"
 msgstr "- %s"
@@ -10564,9 +10375,14 @@ msgstr "Lägg till kom_pisnotifiering..."
 msgid "View _Log"
 msgstr "Visa _logg"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Dölj om frånkopplade"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Visa om frånkopplade"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
@@ -11072,6 +10888,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Ändra användarinformationen för %s"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Ange värden detta certifikatet är för."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL-Server"
@@ -11119,7 +10939,8 @@ msgstr "Ignorera"
 msgid "Get Away Message"
 msgstr "Hämta frånvaromeddelande"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Senast sagt"
 
 msgid "Unable to save icon file to disk."
@@ -12017,7 +11838,8 @@ msgstr "Färg som länkar ska ha."
 msgid "Hyperlink visited color"
 msgstr "Färg på besökta hyperlänkar"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+#, fuzzy
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Färgen länkar ska skrivas i när de har besökts (eller aktiverats)."
 
 # "utpekade" var det bästa ord jag kunde komma på.
@@ -12056,13 +11878,22 @@ msgstr "Färgen att skriva namnet i ett actionmeddelande."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Actionmeddelandens namnfärg"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Färgen att skriva namnet i ett actionmeddelande."
+
 msgid "Whisper Message Name Color"
 msgstr "Viskade meddelandens namnfärg"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Färgen att skriva namnet i ett actionmeddelande."
+
 msgid "Typing notification color"
 msgstr "Färg på notifiering"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "Färgen används för skriftnotifiering"
 
 msgid "Typing notification font"
@@ -12459,6 +12290,10 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Manuellt webbläsarkommando har valts, men inget kommando angivits."
 
+#, fuzzy
+msgid "No message"
+msgstr "Okänt meddelande"
+
 msgid "Open All Messages"
 msgstr "Öppna alla meddelanden"
 
@@ -12476,10 +12311,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Du har fått e-post!!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Okänt meddelande"
-
 msgid "The following plugins will be unloaded."
 msgstr "De följande modulerna kommer avladdas."
 
@@ -12695,8 +12526,9 @@ msgstr "Vi_sa systempanelsikon:"
 msgid "On unread messages"
 msgstr "Vid olästa meddelanden"
 
-msgid "Conversation Window Hiding"
-msgstr "Dölj konversationsfönster"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Snabbmeddelandefönster"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Dölj nya IM-konversationer:"
@@ -12704,6 +12536,9 @@ msgstr "_Dölj nya IM-konversationer:"
 msgid "When away"
 msgstr "Vid frånvaro"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "_Minimera nya konversationsfönstret"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Flikar"
@@ -12762,9 +12597,6 @@ msgstr "Använd mjuk rullning"
 msgid "F_lash window when IMs are received"
 msgstr "B_linka med fönstret när meddelanden tagits emot"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "_Minimera nya konversationsfönstret"
-
 msgid "Minimum input area height in lines:"
 msgstr "Minsta höjd i rader på inmatningsfältet:"
 
@@ -12799,7 +12631,8 @@ msgstr "Kan inte starta konfigurationsprogrammet för webbläsaren"
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exempel: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "Känn av IP-adress _automatiskt"
 
 msgid "Public _IP:"
@@ -13168,21 +13001,6 @@ msgstr "Spara & An_vänd"
 msgid "Status for %s"
 msgstr "Status för %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "Egen Smiley"
-
-msgid "More Data needed"
-msgstr "Mer Data behövs"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Var god ange en genväg att assocciera med den valda smileyn."
-
 #, fuzzy, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
@@ -13190,12 +13008,12 @@ msgstr ""
 "En egen smiley för den valda genvägen existerar redan. Var vänlig ange en "
 "annorlunda genväg."
 
+msgid "Custom Smiley"
+msgstr "Egen Smiley"
+
 msgid "Duplicate Shortcut"
 msgstr "Genvägen är upptagen"
 
-msgid "Please select an image for the smiley."
-msgstr "Ange en bild för smileyn."
-
 msgid "Edit Smiley"
 msgstr "Redigera Smiley"
 
@@ -13308,9 +13126,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Kan inte skicka startare"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Du drog en skrivbordsstartare. Antagligen ville du skicka vad som startaren "
 "pekar på istället för startaren själv."
@@ -13908,9 +13727,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Music Messaging-modul för gemensam komponering."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Music Messaging-modulen tillåter ett antal användare att samtidigt arbeta på "
 "ett stycke musik genom att editera ett gemensamt notblad i realtid."
@@ -14168,9 +13988,10 @@ msgid "Conversation Window Send Button."
 msgstr "Skicka-knapp i konversationsfönster"
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr "Lägger till en \"Skicka\" knapp till konversationsfönstret. "
 
 msgid "Duplicate Correction"
@@ -14497,8 +14318,9 @@ msgstr "Inställningar för Pidgin i Windows"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Inställningar specifika för Pidgin i Windows."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Tillhandahåller insällningar specifika för Pidgion i Windows såsom dockning "
 "av kompislistan."
@@ -14540,6 +14362,313 @@ msgstr "Skicka och ta emot råa XMPP strofer."
 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 "Cannot open socket"
+#~ msgstr "Kan inte öppna uttag"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Kunde inte lyssna på uttag"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Kan inte läsa från uttag"
+
+#~ msgid "Connection failed."
+#~ msgstr "Anslutning misslyckad"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Servern har kopplat ifrån"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Kunde inte skapa socket"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Kunde inte ansluta till värden"
+
+#~ msgid "Read error"
+#~ msgstr "Läsfel"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kunde inte skapa en anslutning med servern:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Skrivfel"
+
+#~ msgid "Last Activity"
+#~ msgstr "Senaste aktivitet"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Tjänsteupptäckningsinfo"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Tjänstupptäckningsföremål"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Utökad Strofadressering"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Månganvändarchatt"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "In-Band Byteströmmar"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "'Ad-Hoc' Kommandon"
+
+# Vad är PubSub? Hittar bara antydningar till en sökmotor med speciella möjligheter för uppföljning. Är det den som avses?
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub Service"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5 Byteströmmar"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+# Vad menas med In-Band, när används och vad blir då lämplig översättning? Denna har antagligen något med "Out-of-Band att göra men hur hänger de ihop?
+#~ msgid "In-Band Registration"
+#~ msgstr "In-Bandsregistrering"
+
+#~ msgid "User Location"
+#~ msgstr "Placering"
+
+#~ msgid "User Avatar"
+#~ msgstr "Användar-avatar"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Chatt-status notifieringar"
+
+#~ msgid "Software Version"
+#~ msgstr "Mjukvaruversion"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Ströminitiering"
+
+#~ msgid "User Mood"
+#~ msgstr "Användarhumör"
+
+#~ msgid "User Activity"
+#~ msgstr "Användaraktivitet"
+
+# Låter mysko, vet inte i vilket sammanhang.
+#~ msgid "Entity Capabilities"
+#~ msgstr "Existensmöjligheter"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Förhandlingar om krypterade sessioner"
+
+#~ msgid "User Tune"
+#~ msgstr "Användarlåt"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Listinnehållsutbyte"
+
+# Vet inte om detta är bästa, men...
+#~ msgid "Reachability Address"
+#~ msgstr "Nåbar adress"
+
+#~ msgid "User Profile"
+#~ msgstr "Användarprofil"
+
+#~ msgid "Jingle"
+#~ msgstr "Ramsa"
+
+# Vad är dessa?
+#~ msgid "Jingle Audio"
+#~ msgstr "Sångsnutt"
+
+#~ msgid "User Nickname"
+#~ msgstr "Användarsmeknamn"
+
+# Vad är dessa?
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Ramsa ICE UDP"
+
+# Vad är dessa?
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Ramsa ICE TCP"
+
+# Vad är dessa?
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Ramsa Rå UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Ramsa Video"
+
+# Vad är dessa?
+#~ msgid "Jingle DTMF"
+#~ msgstr "Ramsa DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Meddelandekvitton"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Publik nyckelpublisering"
+
+#~ msgid "User Chatting"
+#~ msgstr "Användarchattning"
+
+#~ msgid "User Browsing"
+#~ msgstr "Användarbläddring"
+
+#~ msgid "User Gaming"
+#~ msgstr "Användarspelning"
+
+#~ msgid "User Viewing"
+#~ msgstr "Användarvisning"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Strofkryptering"
+
+#~ msgid "Entity Time"
+#~ msgstr "Enhet Tid"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Försenad försändelse"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Kollebrationsdata objekt"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Filförvaringsplats och Delning"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "STUN Serviceupptäckning för Ramsor"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Simpel crypterad session förhandling"
+
+#~ msgid "Hop Check"
+#~ msgstr "Hoppkontroll"
+
+#~ msgid "Read Error"
+#~ msgstr "Läsfel"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Kunde inte ansluta till servern."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Läsbuffert full (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Otolkbart meddelande"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Kunde inte ansluta till värd: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Inloggningen misslyckades (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Du har blivit utloggad eftersom du loggat in från en annan dator."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Fel. SSL-stöd är inte installerat."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Felaktigt lösenord."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kunde inte ansluta till BOS-server:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "Du kanske snart blir frånkopplad. Kolla på %s efter uppdateringar."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Kunde inte ansluta"
+
+#~ msgid "Invalid username."
+#~ msgstr "Ogiltigt användarnamn"
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Kan inte avkryptera inloggningssvaret"
+
+#~ msgid "Connection lost"
+#~ msgstr "Anslutningen tappades"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Kunde ej slå upp värden"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Anslutningen stängd (skrivande)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Anslutningen nollställd"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Fel vid läsning av från uttag %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Kan inte ansluta till värd"
+
+#~ msgid "Could not write"
+#~ msgstr "Kunde inte skriva"
+
+#~ msgid "Could not connect"
+#~ msgstr "Kunde inte ansluta"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Kunde inte skapa lyssnarsocket"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Kunde ej slå upp värden"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Felaktigt lösenord"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kunde inte skapa en anslutning med %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Japan Sökarserver"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japan filöverföringsserver"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Tappade anslutningen till servern\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Kunde inte slå upp värdnamnet"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Servern kräver TLS/SSL vid inloggning. Hittade inget stöd för TLS/SSL."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Dölj konversationsfönster"
+
+#~ msgid "More Data needed"
+#~ msgstr "Mer Data behövs"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Var god ange en genväg att assocciera med den valda smileyn."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Ange en bild för smileyn."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Vilket ID ska aktiveras?"
 
@@ -15031,9 +15160,6 @@ msgstr "Denna modul är användbar vid felsökning av XMPP serverar och klienter
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "Kan inte logga in. Kolla felsökningsloggen."
 
-#~ msgid "Unable to login"
-#~ msgstr "Kunde inte logga in."
-
 #~ msgid "Failed room reply"
 #~ msgstr "Misslyckades med rumssvar"
 
diff --git a/po/sw.po b/po/sw.po
index 3255f90065..fb9bc15ef2 100644
--- a/po/sw.po
+++ b/po/sw.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2009-04-16 22:24+0300\n"
 "Last-Translator: \n"
 "Language-Team: American English <kde-i18n-doc@lists.kde.org>\n"
@@ -2532,7 +2532,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2581,7 +2581,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2825,12 +2825,13 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
+msgstr "Haikuweza kuunganishwa"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2883,15 +2884,17 @@ msgstr "Mwenzi SSL imefunga uunganisho huu"
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-#, fuzzy
-msgid "Cannot open socket"
-msgstr "Haiwezi kufungua %S"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Haikuweza kuunganishwa"
 
-msgid "Could not bind socket to port"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
+msgstr "Haikuweza kuunganishwa"
 
-msgid "Could not listen on socket"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Haikuweza kuunganishwa"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
@@ -2939,13 +2942,14 @@ msgstr ""
 msgid "Load buddylist from file..."
 msgstr ""
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
-msgid "Passwords do not match."
-msgstr ""
+#, fuzzy
+msgid "Passwords do not match"
+msgstr "Nywila"
 
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr ""
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2958,14 +2962,16 @@ msgstr "Sakinisho limemaliza kikamilifu"
 msgid "Password"
 msgstr "Nywila"
 
-msgid "Password (retype)"
-msgstr ""
+#, fuzzy
+msgid "Password (again)"
+msgstr "Nywila mpya (tena):"
 
-msgid "Enter current token"
+msgid "Enter captcha text"
 msgstr ""
 
-msgid "Current token"
-msgstr ""
+#, fuzzy
+msgid "Captcha"
+msgstr "Naki&li Picha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr ""
@@ -3023,6 +3029,15 @@ msgstr ""
 msgid "Current password"
 msgstr "Nywila ya sasa hivi:"
 
+msgid "Password (retype)"
+msgstr ""
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
@@ -3075,9 +3090,8 @@ msgstr "Hamna uwiyano sawa na CRL uliopatikana."
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-#, fuzzy
-msgid "Unable to read socket"
-msgstr "Haiwezi kuongeza moduli"
+msgid "Unable to read from socket"
+msgstr ""
 
 msgid "Buddy list downloaded"
 msgstr ""
@@ -3091,8 +3105,15 @@ msgstr ""
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+#, fuzzy
+msgid "Connected"
+msgstr "Unganisho"
+
 #, fuzzy
-msgid "Connection failed."
+msgid "Connection failed"
 msgstr "Unganisho Limeshindikana"
 
 msgid "Add to chat"
@@ -3101,11 +3122,16 @@ msgstr ""
 msgid "Chat _name:"
 msgstr ""
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Imeshindwa kuipata seva wakala"
 
+#. 1. connect to server
+#. connect to the server
+#, fuzzy
+msgid "Connecting"
+msgstr "Inaunganisha…"
+
 #, fuzzy
 msgid "Chat error"
 msgstr "Kichamorro"
@@ -3113,8 +3139,9 @@ msgstr "Kichamorro"
 msgid "This chat name is already in use"
 msgstr ""
 
-msgid "Not connected to the server."
-msgstr ""
+#, fuzzy
+msgid "Not connected to the server"
+msgstr "Imeshindwa kuipata seva wakala"
 
 msgid "Find buddies..."
 msgstr ""
@@ -3175,8 +3202,9 @@ msgstr "Hakuna sifa zilizowekwa."
 msgid "File Transfer Failed"
 msgstr ""
 
-msgid "Could not open a listening port."
-msgstr ""
+#, fuzzy
+msgid "Unable to open a listening port."
+msgstr "Nimeshindwa Kusasisha"
 
 msgid "Error displaying MOTD"
 msgstr ""
@@ -3192,8 +3220,16 @@ msgstr ""
 msgid "MOTD for %s"
 msgstr ""
 
-msgid "Server has disconnected"
-msgstr ""
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "Firefox haiwezi kuzindua unganisho katika seva ya %S."
 
 msgid "View MOTD"
 msgstr ""
@@ -3208,23 +3244,20 @@ msgstr "Nywila:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr ""
 
-#. 1. connect to server
-#. connect to the server
-#, fuzzy
-msgid "Connecting"
-msgstr "Inaunganisha…"
-
 msgid "SSL support unavailable"
 msgstr ""
 
-msgid "Couldn't create socket"
-msgstr ""
+msgid "Unable to connect"
+msgstr "Haikuweza kuunganishwa"
 
-msgid "Couldn't connect to host"
-msgstr ""
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Haikuweza kuunganishwa"
 
-msgid "Read error"
-msgstr ""
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Mwenzi SSL imefunga uunganisho huu"
 
 msgid "Users"
 msgstr ""
@@ -3617,10 +3650,10 @@ msgstr ""
 msgid "execute"
 msgstr ""
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3637,7 +3670,11 @@ msgid "Plaintext Authentication"
 msgstr "Ishara ya Uthibitisho Inayoulindwa"
 
 #, fuzzy
-msgid "Invalid response from server."
+msgid "SASL authentication failed"
+msgstr "Uthibitisho unatakiwa"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Mwitiko wa bila kutegemea kutoka kwa seva"
 
 msgid "Server does not use any supported authentication method"
@@ -3649,8 +3686,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr ""
 
-#, fuzzy
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SSL Seva"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3668,9 +3705,7 @@ msgid "Unable to establish a connection with the server"
 msgstr "Firefox haiwezi kuzindua unganisho katika seva ya %S."
 
 #, fuzzy, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+msgid "Unable to establish a connection with the server: %s"
 msgstr "Firefox haiwezi kuzindua unganisho katika seva ya %S."
 
 #, fuzzy
@@ -3678,14 +3713,6 @@ msgid "Unable to establish SSL connection"
 msgstr "Haikuweza kuunganishwa"
 
 #, fuzzy
-msgid "Unable to create socket"
-msgstr "Haikuweza kuunganishwa"
-
-#, fuzzy
-msgid "Write error"
-msgstr "Hitilafu ya Printa"
-
-#, fuzzy
 msgid "Full Name"
 msgstr "Jina la faili:"
 
@@ -3759,167 +3786,6 @@ msgstr ""
 msgid "Local Time"
 msgstr "faili la kikweti"
 
-msgid "Last Activity"
-msgstr ""
-
-msgid "Service Discovery Info"
-msgstr ""
-
-msgid "Service Discovery Items"
-msgstr ""
-
-msgid "Extended Stanza Addressing"
-msgstr ""
-
-msgid "Multi-User Chat"
-msgstr ""
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr ""
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr ""
-
-msgid "In-Band Registration"
-msgstr ""
-
-#, fuzzy
-msgid "User Location"
-msgstr "Mapali pa &Tawanyiko:"
-
-msgid "User Avatar"
-msgstr ""
-
-msgid "Chat State Notifications"
-msgstr ""
-
-msgid "Software Version"
-msgstr ""
-
-msgid "Stream Initiation"
-msgstr ""
-
-msgid "File Transfer"
-msgstr ""
-
-msgid "User Mood"
-msgstr ""
-
-msgid "User Activity"
-msgstr ""
-
-msgid "Entity Capabilities"
-msgstr ""
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "Jina la Mtumiaji:"
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-msgid "Reachability Address"
-msgstr ""
-
-#, fuzzy
-msgid "User Profile"
-msgstr "Notisi za Mtumiaji"
-
-msgid "Jingle"
-msgstr ""
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "Jina la mtumiaji"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr ""
-
-msgid "Jingle DTMF"
-msgstr ""
-
-msgid "Message Receipts"
-msgstr ""
-
-msgid "Public Key Publishing"
-msgstr ""
-
-msgid "User Chatting"
-msgstr ""
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "Kuvinjari kwa kareti"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "Jina la Mtumiaji:"
-
-msgid "User Viewing"
-msgstr ""
-
-#, fuzzy
-msgid "Ping"
-msgstr "Chapisha"
-
-msgid "Stanza Encryption"
-msgstr ""
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-#, fuzzy
-msgid "Hop Check"
-msgstr "Usikague"
-
-msgid "Capabilities"
-msgstr ""
-
 msgid "Priority"
 msgstr ""
 
@@ -3932,7 +3798,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Ingia"
 
 #, fuzzy
@@ -4127,17 +3993,13 @@ msgstr "Hamna uwiyano sawa na CRL uliopatikana."
 msgid "Roles:"
 msgstr ""
 
-msgid "Ping timeout"
-msgstr ""
-
 #, fuzzy
-msgid "Read Error"
-msgstr "Hitilafu ya Faili"
+msgid "Ping timed out"
+msgstr "Muunganiko umepita muda"
 
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 #, fuzzy
@@ -4327,10 +4189,6 @@ msgid "Error changing password"
 msgstr ""
 
 #, fuzzy
-msgid "Password (again)"
-msgstr "Nywila mpya (tena):"
-
-#, fuzzy
 msgid "Change XMPP Password"
 msgstr "Badil &Nywila"
 
@@ -4727,6 +4585,14 @@ msgstr ""
 msgid "Unknown Error in presence"
 msgstr ""
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr ""
+
+#, c-format
+msgid "Error in chat %s"
+msgstr ""
+
 msgid "Create New Room"
 msgstr ""
 
@@ -4742,15 +4608,19 @@ msgstr ""
 msgid "_Accept Defaults"
 msgstr "Misingi ya mfumo"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr ""
+#, fuzzy
+msgid "No reason"
+msgstr "Hitilafu isiyojulikana"
 
 #, c-format
-msgid "Error in chat %s"
+msgid "You have been kicked: (%s)"
 msgstr ""
 
-msgid "An error occured on the in-band bytestream transfer\n"
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "(%S)"
+
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr ""
 
 msgid "Transfer was closed."
@@ -5235,9 +5105,6 @@ msgstr ""
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-msgid "Failed to connect to server."
-msgstr ""
-
 msgid "Error retrieving profile"
 msgstr ""
 
@@ -5486,9 +5353,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 
-msgid "Unable to connect"
-msgstr "Haikuweza kuunganishwa"
-
 msgid "Writing error"
 msgstr ""
 
@@ -5501,19 +5365,20 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Our protocol is not supported by the server."
+msgid "Our protocol is not supported by the server"
 msgstr ""
 
-msgid "Error parsing HTTP."
-msgstr ""
+#, fuzzy
+msgid "Error parsing HTTP"
+msgstr "Hitilafu katika kuhifadhi %S"
 
-msgid "You have signed on from another location."
+msgid "You have signed on from another location"
 msgstr ""
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr ""
 
 #, c-format
@@ -5524,10 +5389,6 @@ msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
-#, fuzzy
-msgid "Unknown error."
-msgstr "Hitilafu isiyojulikana"
-
 msgid "Handshaking"
 msgstr ""
 
@@ -5626,6 +5487,10 @@ msgstr ""
 msgid "%s is not a valid group."
 msgstr ""
 
+#, fuzzy
+msgid "Unknown error."
+msgstr "Hitilafu isiyojulikana"
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr ""
@@ -5737,13 +5602,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-#, fuzzy
-msgid "Connected"
-msgstr "Unganisho"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr ""
@@ -5764,16 +5622,6 @@ msgstr ""
 msgid "Invalid input condition"
 msgstr ""
 
-msgid "Read buffer full (2)"
-msgstr ""
-
-msgid "Unparseable message"
-msgstr ""
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr ""
-
 msgid "Failed to add buddy"
 msgstr ""
 
@@ -5858,6 +5706,12 @@ msgstr ""
 msgid "Client Version"
 msgstr "Toleo Jipya"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr ""
 
@@ -6123,9 +5977,9 @@ msgstr ""
 msgid "Unknown error: 0x%X"
 msgstr "Hitilafu isiyojulikana"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Haikuweza kuunganishwa"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6224,10 +6078,6 @@ msgstr ""
 msgid "Authenticating..."
 msgstr ""
 
-#, fuzzy
-msgid "Unable to connect to server."
-msgstr "Imeshindwa kuipata seva wakala"
-
 msgid "Waiting for response..."
 msgstr ""
 
@@ -6249,20 +6099,14 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Ungependa kuhifadhi faili hili?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-
-msgid "Error. SSL support is not installed."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 
 msgid "This conference has been closed. No more messages can be sent."
@@ -6301,11 +6145,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6315,17 +6155,8 @@ msgid "Invalid chat room name"
 msgstr ""
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "Mwenzi SSL imefunga uunganisho huu"
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-
-msgid "Received invalid data on connection with server."
-msgstr ""
+msgid "Received invalid data on connection with server"
+msgstr "Firefox haiwezi kuzindua unganisho katika seva ya %S."
 
 #. *< type
 #. *< ui_requirement
@@ -6374,8 +6205,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Firefox haiwezi kuzindua unganisho katika seva ya %S."
 
 msgid "Direct IM established"
 msgstr ""
@@ -6578,17 +6410,13 @@ msgstr "Jumbe za tahadhari"
 msgid "Buddy Comment"
 msgstr ""
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
+msgstr "Imeshindwa kuipata seva wakala"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Imeshindwa kuipata seva wakala"
 
 #, fuzzy
 msgid "Username sent"
@@ -6603,9 +6431,9 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 
 #, c-format
@@ -6615,28 +6443,21 @@ 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
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "Jina batili la moduli."
+msgid "Username does not exist"
+msgstr "Faili %S halipo"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+msgid "Your account is currently suspended"
 msgstr ""
 
 #. service temporarily unavailable
@@ -6654,7 +6475,7 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid "The SecurID key entered is invalid."
+msgid "The SecurID key entered is invalid"
 msgstr "Nambari mstari iliyoingizwa ni batili."
 
 msgid "Enter SecurID"
@@ -6809,6 +6630,9 @@ msgstr ""
 msgid "Member Since"
 msgstr ""
 
+msgid "Capabilities"
+msgstr ""
+
 msgid "Profile"
 msgstr ""
 
@@ -6968,7 +6792,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6990,7 +6814,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
@@ -6999,7 +6823,7 @@ msgid "(no name)"
 msgstr "(hakuna lakabu)"
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr ""
 
 #, c-format
@@ -7800,8 +7624,9 @@ msgstr ""
 msgid "Update interval (seconds)"
 msgstr ""
 
-msgid "Cannot decrypt server reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt server reply"
+msgstr "Imeshindwa kuipata seva wakala"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
@@ -7826,9 +7651,6 @@ msgstr "Uthibitisho unatakiwa"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
-msgid "Could not decrypt server reply"
-msgstr ""
-
 msgid "Requesting captcha"
 msgstr ""
 
@@ -7862,24 +7684,9 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid "Unable to connect."
-msgstr "Haikuweza kuunganishwa"
-
-#, fuzzy
 msgid "Socket error"
 msgstr "Hitilafu ya hati"
 
-msgid "Unable to read from socket"
-msgstr ""
-
-#, fuzzy
-msgid "Write Error"
-msgstr "Hitilafu ya Printa"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "Unganisho"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "Anza"
@@ -7887,8 +7694,9 @@ msgstr "Anza"
 msgid "Requesting token"
 msgstr ""
 
-msgid "Couldn't resolve host"
-msgstr ""
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Imeshindwa kuipata seva wakala"
 
 msgid "Invalid server or port"
 msgstr ""
@@ -7935,8 +7743,9 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr ""
 
-msgid "Could not decrypt login reply"
-msgstr ""
+#, fuzzy
+msgid "Unable to decrypt login reply"
+msgstr "Haiwezi kufuta moduli"
 
 msgid "Unknown LOGIN CMD"
 msgstr ""
@@ -7955,9 +7764,6 @@ msgstr ""
 msgid "%d canceled the transfer of %s"
 msgstr ""
 
-msgid "Connection closed (writing)"
-msgstr ""
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr ""
@@ -8011,19 +7817,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#, fuzzy
-msgid "Connection reset"
-msgstr "Muunganisho ulikataliwa"
-
-#, fuzzy, c-format
-msgid "Error reading from socket: %s"
-msgstr "Hitilafu ya upakiaji lahamtindo: %S"
-
-#. this is a regular connect, error out
-#, fuzzy
-msgid "Unable to connect to host"
-msgstr "Haikuweza kuunganishwa"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -8048,6 +7841,9 @@ msgstr "Seva"
 msgid "Video Camera"
 msgstr "Kicheza Video"
 
+msgid "File Transfer"
+msgstr ""
+
 msgid "Supports"
 msgstr ""
 
@@ -8841,6 +8637,10 @@ msgid "Network Statistics"
 msgstr ""
 
 #, fuzzy
+msgid "Ping"
+msgstr "Chapisha"
+
+#, fuzzy
 msgid "Ping failed"
 msgstr "Imeshindwa kunakili"
 
@@ -8902,8 +8702,9 @@ msgstr "Aina ya faili isiyo stahimiliwa."
 msgid "Disconnected by server"
 msgstr ""
 
-msgid "Error during connecting to SILC Server"
-msgstr ""
+#, fuzzy
+msgid "Error connecting to SILC Server"
+msgstr "Inaunganisha kwenye seva ya sasisho…"
 
 msgid "Key Exchange failed"
 msgstr ""
@@ -8912,30 +8713,28 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-#, fuzzy
-msgid "Connection failed"
-msgstr "Unganisho Limeshindikana"
-
 msgid "Performing key exchange"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to create connection"
-msgstr "Haikuweza kuunganishwa"
-
-msgid "Could not load SILC key pair"
-msgstr ""
+msgid "Unable to load SILC key pair"
+msgstr "Haiwezi kuongeza moduli"
 
 #. Progress
 #, fuzzy
 msgid "Connecting to SILC Server"
 msgstr "Inaunganisha kwenye seva ya sasisho…"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Haiwezi kufuta moduli"
+
 msgid "Out of memory"
 msgstr "Nje ya kumbukumbu"
 
-msgid "Cannot initialize SILC protocol"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
+msgstr "Haikuweza kuunganishwa"
 
 msgid "Error loading SILC key pair"
 msgstr ""
@@ -9214,8 +9013,9 @@ msgstr ""
 msgid "Creating SILC key pair..."
 msgstr ""
 
-msgid "Cannot create SILC key pair\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to create SILC key pair"
+msgstr "Haikuweza kuunganishwa"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9306,6 +9106,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr ""
 
+msgid "Error during connecting to SILC Server"
+msgstr ""
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -9346,31 +9149,28 @@ msgstr ""
 msgid "Failure: Authentication failed"
 msgstr ""
 
-msgid "Cannot initialize SILC Client connection"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
+msgstr "Haikuweza kuunganishwa"
 
 msgid "John Noname"
 msgstr ""
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr ""
-
-msgid "Could not write"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
+msgstr "Haiwezi kuongeza moduli"
 
 #, fuzzy
-msgid "Could not connect"
-msgstr "\"Haikuweza kupakia: \""
-
-msgid "Unknown server response."
-msgstr ""
+msgid "Unable to create connection"
+msgstr "Haikuweza kuunganishwa"
 
-msgid "Could not create listen socket"
-msgstr ""
+#, fuzzy
+msgid "Unknown server response"
+msgstr "Hitilafu isiyojulikana"
 
-msgid "Could not resolve hostname"
-msgstr ""
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Haikuweza kuunganishwa"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
@@ -9411,6 +9211,77 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr ""
+
+msgid "list: List rooms on the Yahoo network"
+msgstr ""
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+msgid "Yahoo ID..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo! Barua"
+
+msgid "Pager server"
+msgstr ""
+
+#, fuzzy
+msgid "Pager port"
+msgstr "Page Down"
+
+msgid "File transfer server"
+msgstr ""
+
+msgid "File transfer port"
+msgstr ""
+
+msgid "Chat room locale"
+msgstr ""
+
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
+
+msgid "Chat room list URL"
+msgstr ""
+
+msgid "Yahoo Chat server"
+msgstr ""
+
+msgid "Yahoo Chat port"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! Barua"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr ""
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9438,26 +9309,16 @@ msgstr ""
 msgid "Received invalid data"
 msgstr ""
 
-#. Password incorrect
-#, fuzzy
-msgid "Incorrect Password"
-msgstr "Nywila ya sasa hivi:"
-
 #. 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."
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
 msgstr ""
 
-#. the username does not exist
-#, fuzzy
-msgid "Username does not exist"
-msgstr "Faili %S halipo"
-
 #. indicates a lock of some description
 msgid ""
-"Account locked: Unknown reason.\n"
-"Logging into the Yahoo! website may fix this."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 
 #. username or password missing
@@ -9491,35 +9352,28 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-msgid "Could not add buddy to server list"
-msgstr ""
+#, fuzzy
+msgid "Unable to add buddy to server list"
+msgstr "Haiwezi kuongeza moduli"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
 #, fuzzy
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "Mwitiko wa bila kutegemea kutoka kwa seva"
 
-#, fuzzy
-msgid "Connection problem"
-msgstr "Unganisho Limeshindikana"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
+msgstr "Haikuweza kuunganishwa"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Firefox haiwezi kuzindua unganisho katika seva ya %S."
 
 msgid "Not at Home"
 msgstr ""
@@ -9585,74 +9439,16 @@ msgstr ""
 msgid "Open Inbox"
 msgstr "Fungua katika:"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-
-msgid "list: List rooms on the Yahoo network"
-msgstr ""
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-msgid "Yahoo ID..."
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr ""
-
-msgid "Yahoo Japan"
-msgstr ""
-
-msgid "Pager server"
-msgstr ""
-
-msgid "Japan Pager server"
-msgstr ""
-
-#, fuzzy
-msgid "Pager port"
-msgstr "Page Down"
-
-msgid "File transfer server"
-msgstr ""
-
-msgid "Japan file transfer server"
-msgstr ""
-
-msgid "File transfer port"
-msgstr ""
-
-msgid "Chat room locale"
-msgstr ""
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-msgid "Chat room list URL"
-msgstr ""
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-msgid "Yahoo Chat port"
-msgstr ""
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+#, fuzzy
+msgid "Unable to connect."
+msgstr "Haikuweza kuunganishwa"
+
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -9660,6 +9456,10 @@ msgstr ""
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr ""
 
+#, fuzzy
+msgid "Write Error"
+msgstr "Hitilafu ya Printa"
+
 msgid "Yahoo! Japan Profile"
 msgstr ""
 
@@ -9769,20 +9569,19 @@ msgstr ""
 msgid "Webcams"
 msgstr ""
 
+#, fuzzy
+msgid "Connection problem"
+msgstr "Unganisho Limeshindikana"
+
 msgid "Unable to fetch room list."
 msgstr ""
 
 msgid "User Rooms"
 msgstr ""
 
-msgid "Connection problem with the YCHT server."
-msgstr ""
-
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Connection problem with the YCHT server"
+msgstr "Unganisho Limeshindikana"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9903,13 +9702,7 @@ msgid "Exposure"
 msgstr ""
 
 #, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr ""
 
 #, c-format
@@ -9917,16 +9710,13 @@ msgid "HTTP proxy connection error %d"
 msgstr ""
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr "Hitilafu katika kuhifadhi %S"
 
-msgid "Could not resolve host name"
-msgstr ""
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10132,12 +9922,6 @@ msgid "Unable to connect to %s: %s"
 msgstr "Haikuweza kuunganishwa"
 
 #, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-
-#, c-format
 msgid " - %s"
 msgstr ""
 
@@ -10387,7 +10171,10 @@ msgstr ""
 msgid "View _Log"
 msgstr ""
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr ""
+
+msgid "Show When Offline"
 msgstr ""
 
 msgid "_Alias..."
@@ -10893,6 +10680,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr ""
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -10941,7 +10731,7 @@ msgid "Get Away Message"
 msgstr ""
 
 #, fuzzy
-msgid "Last said"
+msgid "Last Said"
 msgstr "Ukurasa wa mwisho"
 
 msgid "Unable to save icon file to disk."
@@ -11832,7 +11622,7 @@ msgstr ""
 msgid "Hyperlink visited color"
 msgstr ""
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 
 msgid "Hyperlink prelight color"
@@ -11868,13 +11658,19 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 msgid "Typing notification color"
 msgstr ""
 
-msgid "The color to use for the typing notification font"
+msgid "The color to use for the typing notification"
 msgstr ""
 
 msgid "Typing notification font"
@@ -12226,6 +12022,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "No message"
+msgstr "Ujumbe"
+
+#, fuzzy
 msgid "Open All Messages"
 msgstr "Fungua kwenye Tabo zote"
 
@@ -12242,10 +12042,6 @@ msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr ""
 
 #, fuzzy
-msgid "No message"
-msgstr "Ujumbe"
-
-#, fuzzy
 msgid "The following plugins will be unloaded."
 msgstr "Programu-jalizi zifuatazo zinapatikana:"
 
@@ -12459,8 +12255,9 @@ msgstr ""
 msgid "On unread messages"
 msgstr ""
 
-msgid "Conversation Window Hiding"
-msgstr ""
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Unganisho"
 
 msgid "_Hide new IM conversations:"
 msgstr ""
@@ -12468,6 +12265,9 @@ msgstr ""
 msgid "When away"
 msgstr ""
 
+msgid "Minimi_ze new conversation windows"
+msgstr ""
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Tabo"
@@ -12529,9 +12329,6 @@ msgstr "Tu&mia ubiringizaji taratibu"
 msgid "F_lash window when IMs are received"
 msgstr ""
 
-msgid "Minimi_ze new conversation windows"
-msgstr ""
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12565,7 +12362,8 @@ msgstr ""
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-msgid "_Autodetect IP address"
+#, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr ""
 
 msgid "Public _IP:"
@@ -12952,34 +12750,19 @@ msgstr ""
 msgid "Status for %s"
 msgstr ""
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "Kipimo cha kaida..."
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
 #, fuzzy
+msgid "Custom Smiley"
+msgstr "Kipimo cha kaida..."
+
+#, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "sifa rudufu"
 
-msgid "Please select an image for the smiley."
-msgstr ""
-
 msgid "Edit Smiley"
 msgstr ""
 
@@ -13086,8 +12869,8 @@ msgid "Cannot send launcher"
 msgstr ""
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -13673,7 +13456,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -13924,7 +13707,7 @@ msgstr ""
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14240,7 +14023,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr ""
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14280,3 +14063,87 @@ msgstr ""
 #. *  description
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
+
+#, fuzzy
+#~ msgid "Cannot open socket"
+#~ msgstr "Haiwezi kufungua %S"
+
+#, fuzzy
+#~ msgid "Unable to read socket"
+#~ msgstr "Haiwezi kuongeza moduli"
+
+#, fuzzy
+#~ msgid "Connection failed."
+#~ msgstr "Unganisho Limeshindikana"
+
+#, fuzzy
+#~ msgid "Write error"
+#~ msgstr "Hitilafu ya Printa"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "Mapali pa &Tawanyiko:"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "Jina la Mtumiaji:"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "Notisi za Mtumiaji"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "Jina la mtumiaji"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "Kuvinjari kwa kareti"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "Jina la Mtumiaji:"
+
+#, fuzzy
+#~ msgid "Hop Check"
+#~ msgstr "Usikague"
+
+#, fuzzy
+#~ msgid "Read Error"
+#~ msgstr "Hitilafu ya Faili"
+
+#, fuzzy
+#~ msgid "Incorrect password."
+#~ msgstr "Nywila ya sasa hivi:"
+
+#, fuzzy
+#~ msgid "Could Not Connect"
+#~ msgstr "Imeshindwa kuunganisha"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "Jina batili la moduli."
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "Unganisho"
+
+#, fuzzy
+#~ msgid "Connection reset"
+#~ msgstr "Muunganisho ulikataliwa"
+
+#, fuzzy
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Hitilafu ya upakiaji lahamtindo: %S"
+
+#, fuzzy
+#~ msgid "Unable to connect to host"
+#~ msgstr "Haikuweza kuunganishwa"
+
+#, fuzzy
+#~ msgid "Could not connect"
+#~ msgstr "\"Haikuweza kupakia: \""
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Nywila ya sasa hivi:"
diff --git a/po/ta.po b/po/ta.po
index 23aa388e19..d01257cd12 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2006-11-28 22:37+0530\n"
 "Last-Translator: drtvasudevan <agnihot3@gmail.com>\n"
 "Language-Team: tamil <Ubuntu-l10n-tam@lists.ubuntu.com>\n"
@@ -2693,7 +2693,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2744,7 +2744,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2992,11 +2992,12 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "உள்வரும் ஐஎம் இணைப்புகளை கவனிக்க இயலவில்லை\n"
 
 msgid ""
@@ -3052,16 +3053,17 @@ msgstr "%s உரையாடலை முடித்துவிட்டா�
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "செய்திகளை அனுப்ப முடியவில்லை. உரையாடலை துவக்க முடியாது."
 
-msgid "Cannot open socket"
-msgstr "கொள் குழியை (சாக்கெட்டை) திறக்க முடியவில்லை "
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "கொள் குழியை (சாக்கெட்டை) உருவாக்குவதில் பிழை"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "கொள் குழியை (சாக்கெட்டை) சொருகுவாய்க்கு பிணைக்க முடியவில்லை!"
 
-#, fuzzy
-msgid "Could not listen on socket"
-msgstr "கொள் குழி (சாக்கெட்) இல் கேட்க இயலவில்லை"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "கொள் குழியை (சாக்கெட்டை) உருவாக்குவதில் பிழை"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3111,13 +3113,16 @@ msgstr "நண்பர் பட்டியலை சேமி..."
 msgid "Load buddylist from file..."
 msgstr "நண்பர் பட்டியலை கோப்பிலிருந்து ஏற்றவும்..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "பதிவுப் புலங்களை நிரப்புக."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "கடவுச்சொற்கள் பொருந்தவில்லை."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "புதிய கணக்கை பதிய இயலவில்லை. பிழை ஏற்பட்டது.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3129,14 +3134,15 @@ msgstr "பதிவு வெற்றிகரமாக முடிந்த�
 msgid "Password"
 msgstr "கடவுச்சொல்"
 
-msgid "Password (retype)"
+msgid "Password (again)"
 msgstr "கடவுச்சொல் (மீண்டும்)"
 
-msgid "Enter current token"
-msgstr "தற்போதைய டோக்கனை உள்ளிவும்"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "தற்போதைய டோக்கன்"
+#, fuzzy
+msgid "Captcha"
+msgstr "படத்தை சேமி"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "புதிய காடு-காடு கணக்கு பதிவு"
@@ -3190,6 +3196,15 @@ msgstr "கடவுச்சொல் வெற்றிகரமாக மா�
 msgid "Current password"
 msgstr "தற்போதைய கடவுச்சொல்"
 
+msgid "Password (retype)"
+msgstr "கடவுச்சொல் (மீண்டும்)"
+
+msgid "Enter current token"
+msgstr "தற்போதைய டோக்கனை உள்ளிவும்"
+
+msgid "Current token"
+msgstr "தற்போதைய டோக்கன்"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 "தயவுசெய்து யுஎன்ஐ (UIN) க்கான தங்களது தற்போதைய மற்றும் புதிய கடவுச்சொல்லை கொடுக்கவும்: "
@@ -3238,7 +3253,8 @@ msgstr "ஒத்துப் போகும் பயனர் யாரைய
 msgid "There are no users matching your search criteria."
 msgstr "உங்கள் தேடல் அளபுருகளுக்கு ஒத்துப் போகும் பயனர் யாரும் இல்லை."
 
-msgid "Unable to read socket"
+#, fuzzy
+msgid "Unable to read from socket"
 msgstr "கொள் குழியை (சாக்கெட்டை) வாசிக்க இயலவில்லை"
 
 msgid "Buddy list downloaded"
@@ -3253,8 +3269,14 @@ msgstr "நண்பர் பட்டியல் மேலேற்றப்
 msgid "Your buddy list was stored on the server."
 msgstr "நண்பர் பட்டியல் சேவையகத்தில் சேமிக்கப் பட்டது."
 
-msgid "Connection failed."
-msgstr "இணைப்பு தவறியது."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "இணைக்கப்பட்டது"
+
+msgid "Connection failed"
+msgstr "இணைப்பு தோல்வியுற்றது."
 
 msgid "Add to chat"
 msgstr "அரட்டையில் சேர்க்க"
@@ -3262,18 +3284,23 @@ msgstr "அரட்டையில் சேர்க்க"
 msgid "Chat _name:"
 msgstr "_ப அரட்டை பெயர்:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "சேவையகத்துடன் இணைக்க முடியவில்லை."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "இணைத்தல்"
+
 msgid "Chat error"
 msgstr "அரட்டை பிழை"
 
 msgid "This chat name is already in use"
 msgstr "இந்த அரட்டை பெயர் ஏற்கனவே உபயோகத்தில் உள்ளது."
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "சேவையகத்துடன் இணைக்கப்படவில்லை."
 
 msgid "Find buddies..."
@@ -3334,7 +3361,7 @@ msgid "File Transfer Failed"
 msgstr "கோப்பு பரிமாற்றம் தவறியது"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "கெய்மால் கவனிக்கக்கூடிய தளத்தை திறக்க முடியவில்லை."
 
 msgid "Error displaying MOTD"
@@ -3350,8 +3377,16 @@ msgstr "இந்த இணைப்புடன் எம்ஓடிடி (MO
 msgid "MOTD for %s"
 msgstr "%s க்கான எம்ஓடிடி (MOTD)"
 
-msgid "Server has disconnected"
-msgstr "சேவையக இணைப்பு துண்டிக்கப்பட்டது"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "சேவையகத்துடன் இணைக்கப்படவில்லை."
 
 msgid "View MOTD"
 msgstr "எம்ஓடிடி (MOTD) ஐ காண"
@@ -3366,22 +3401,20 @@ msgstr "_கடவுச்சொல்:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "ஐஆர்சி புனைப்பெயரில் வெற்றிடமிருக்கக் கூடாது"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "இணைத்தல்"
-
 msgid "SSL support unavailable"
 msgstr "எஸ்எஸ்எல் ஆதரவு கிடைக்கவில்லை"
 
-msgid "Couldn't create socket"
-msgstr "கொள் குழியை (சாக்கெட்டை) உருவாக்க முடியவில்லை"
+msgid "Unable to connect"
+msgstr "இணைக்க முடியவில்லை"
 
-msgid "Couldn't connect to host"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
 msgstr "புரவலருடன் இணைக்க முடியவில்லை"
 
-msgid "Read error"
-msgstr "வாசிப்பதில் பிழை"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "%s உரையாடலை முடித்துவிட்டார்."
 
 msgid "Users"
 msgstr "பயனாளர்கள்"
@@ -3816,12 +3849,13 @@ msgstr "கட்டளை இயலாமையாக்கப்பட்ட�
 msgid "execute"
 msgstr "எதிர்பாராத"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "உள்ளே நுழைய சேவையகத்துக்கு டிஎல்எஸ்/எஸ்எஸ்எல் தேவை. டிஎல்எஸ்/எஸ்எஸ்எல் ஆதரவு ஏதுமில்லை."
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "உள்ளே நுழைய சேவையகத்துக்கு டிஎல்எஸ்/எஸ்எஸ்எல் தேவை. டிஎல்எஸ்/எஸ்எஸ்எல் ஆதரவு ஏதுமில்லை."
 
@@ -3840,7 +3874,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "சாதாரண வாக்கிய உறுதியாக்கல்"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "அனுமதியாக்கல் தவறியது"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "சேவையகத்திலிருந்து செல்லாத பதில்."
 
 msgid "Server does not use any supported authentication method"
@@ -3852,7 +3891,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "சேவையகத்திலிருந்து செல்லாத கூவல்"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "எஸ்ஏஎஸ்எல் (SASL) பிழை"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3871,21 +3911,13 @@ msgid "Unable to establish a connection with the server"
 msgstr "உள் எம்டிஎன்எஸ் (mDNS) சேவையகத்துடன் இணைப்பை தொடங்க இயலவில்லை. அது இயங்குகிறதா?"
 
 #, fuzzy, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+msgid "Unable to establish a connection with the server: %s"
 msgstr "உள் எம்டிஎன்எஸ் (mDNS) சேவையகத்துடன் இணைப்பை தொடங்க இயலவில்லை. அது இயங்குகிறதா?"
 
 #, fuzzy
 msgid "Unable to establish SSL connection"
 msgstr "இணைப்பை உருவாக்க முடியவில்லை"
 
-msgid "Unable to create socket"
-msgstr "கொள் குழியை (சாக்கெட்டை) உருவாக்குவதில் பிழை"
-
-msgid "Write error"
-msgstr "எழுதுவதில் பிழை"
-
 msgid "Full Name"
 msgstr "முழுப்பெயர்"
 
@@ -3956,188 +3988,6 @@ msgstr ""
 msgid "Local Time"
 msgstr "இங்கேயுள்ள கோப்பு:"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "அடைவு தகவல்களை அமை"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "நீட்டித்த முகவரி"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "அரட்டை புனைப்பெயர்"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "பயனருக்கு அடைவு தகவல் இல்லை ."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "கட்டளை"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "ஹெச்டிஎம்எல் (HTML) "
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "பதிவுப் பிழை"
-
-#, fuzzy
-msgid "User Location"
-msgstr "இடம்"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "பயனர் தேடல்"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "நண்பர் நிலை அறிவிப்பு"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "ஆதரிக்கப்படாத பதிப்பு"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "திசை அமைப்பு"
-
-msgid "File Transfer"
-msgstr "கோப்பு பரிமாற்றம்"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "பயன்பாட்டாளர் வகைகள்"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "பயனர் வரையளவு"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "செயல்திறன்"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "பயனாளர் பெயர்"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "ஐஎம் சாவி பரிமாற்றத்துடன்"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "மின்னஞ்சல்"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "எம்எஸ்என் குறுந்தொகுப்பு"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "பிங்"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "பயனர் பெயர்"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "நிகழ் ஒளித்தோற்றம்"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "தகவல் பெறப்பட்டது"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "பொது சொல்லாக்க விசை"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "பயனாளர் விருப்பங்கள்"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "பயன்பாட்டாளர் வகைகள்"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "பயனர் பெயர்"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "பயனர் வரையளவு"
-
-msgid "Ping"
-msgstr "பிங்"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "ட்ரில்லியன் ரகசியமாக்கல்"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "செயல்திறன்"
-
 msgid "Priority"
 msgstr "முன்னுரிமை"
 
@@ -4149,7 +3999,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "ஏற்கனவே நுழையப்பட்டிருக்கிறது"
 
 msgid "Middle Name"
@@ -4335,16 +4185,12 @@ msgid "Roles:"
 msgstr "பங்கு"
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "வெற்று உரை முறை"
 
-msgid "Read Error"
-msgstr "வாசிப்பதில் பிழை"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 #, fuzzy
@@ -4533,9 +4379,6 @@ msgstr "உங்களது கடவுச்சொல் மாற்றப�
 msgid "Error changing password"
 msgstr "கடவுச்சொல்லை மாற்றுவதில் பிழை."
 
-msgid "Password (again)"
-msgstr "கடவுச்சொல் (மீண்டும்)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "கடவுச்சொல்லை மாற்று"
@@ -4930,6 +4773,14 @@ msgstr "எக்ஸ்எம்எல் பகுப்பதில் பி�
 msgid "Unknown Error in presence"
 msgstr "இருப்பில் தெரியாத பிழை"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "அரட்டை %s ல் சேர்வதில் பிழை"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "அரட்டை %s ல் பிழை"
+
 msgid "Create New Room"
 msgstr "புதிய அறையை உருவாக்கு"
 
@@ -4946,16 +4797,20 @@ msgstr "_ற அறையை வரையறு"
 msgid "_Accept Defaults"
 msgstr "_ம முன்னிருப்பை ஏற்றுக்கொள்"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "அரட்டை %s ல் சேர்வதில் பிழை"
+#, fuzzy
+msgid "No reason"
+msgstr "காரணம் கொடுக்கப்படவில்லை."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "அரட்டை %s ல் பிழை"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "நீங்கள் %s ஆல் உதைக்கப்பட்டீர்கள்: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s ஆல் உதைக்கப்பட்டது (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "கோப்பை திறக்கும்பொழுது பிழை ஏற்பட்டது."
 
 #, fuzzy
@@ -5462,9 +5317,6 @@ msgstr ""
 "எம்எஸ்என் க்கு எஸ்எஸ்எல் ஆதரவு தேவைப்படுகிறது. எஸ்எஸ்எல் ஆதரவுள்ள நூலகத்தை தயவுசெய்து "
 "நிறுவவும். மேலும் தகவலுக்கு http://Pidgin.sf.net/faq-ssl.php யை காணவும்."
 
-msgid "Failed to connect to server."
-msgstr "சேவையகத்துடன் இணைக்க தவறியது."
-
 msgid "Error retrieving profile"
 msgstr "குறுந்தொகுப்பை பெறுவதில் பிழை"
 
@@ -5727,9 +5579,6 @@ msgstr "தெரியாத பிழை நேர்ந்ததால் த
 msgid "Message was not sent because an unknown error occurred."
 msgstr "தெரியாத பிழை நேர்ந்ததால் தகவல் அனுப்பப்படாமல் இருக்கலாம்:"
 
-msgid "Unable to connect"
-msgstr "இணைக்க முடியவில்லை"
-
 msgid "Writing error"
 msgstr "எழுதுதல் பிழை"
 
@@ -5744,13 +5593,16 @@ msgstr ""
 "%s சேவையகத்தில் இருந்து இணைப்பு பிழை:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "எங்களது நெறிமுறையை சேவையகம் ஆதரிக்கவில்லை."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "ஹெச்டிடிபி யை பகுப்பதில் பிழை."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "நீங்கள் மற்றொரு இடத்திலிருந்து நுழைந்திருக்கிறீர்கள்."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5758,7 +5610,8 @@ msgstr ""
 "எம்எஸ்என் சேவையகம் தற்காலிகமாக கிடைக்கவில்லை. தயவுசெய்து காத்திருந்து மீண்டும் "
 "முயற்சிக்கவும்."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "எம்எஸ்என் சேவையகம் தற்காலிகமாக செயலிழக்கிறது."
 
 #, c-format
@@ -5771,9 +5624,6 @@ msgstr ""
 "எம்எஸ்என் நண்பர் பட்டியல் தற்காலிகமாக கிடைக்கவில்லை. தயவுசெய்து காத்திருந்து மீண்டும் "
 "முயற்சிக்கவும்."
 
-msgid "Unknown error."
-msgstr "தெரியாத பிழை."
-
 msgid "Handshaking"
 msgstr "கைகுலுக்கல்"
 
@@ -5872,6 +5722,9 @@ msgstr "ஏஐஎம்/ஐசிக்யூ நெறிமுறை சொர
 msgid "%s is not a valid group."
 msgstr "%s என்பது செல்லாத குழு."
 
+msgid "Unknown error."
+msgstr "தெரியாத பிழை."
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s - இதன் மீது %s (%s)"
@@ -5987,12 +5840,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "சேவையகத்திலிருந்து செல்லாத பதில்."
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "இணைக்கப்பட்டது"
-
 #, fuzzy, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "இயக்கம் பிழை எண் %d யை கொடுத்தது"
@@ -6016,18 +5863,6 @@ msgid "Invalid input condition"
 msgstr "இணைப்பை உறுதிப்படுத்துகிறது"
 
 #, fuzzy
-msgid "Read buffer full (2)"
-msgstr "கியூ வரிசை நிறைந்தது"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "தகவலை அலகிட இயலவில்லை"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "புரவலருடன் இணைக்க முடியவில்லை"
-
-#, fuzzy
 msgid "Failed to add buddy"
 msgstr "தோழரை அரட்டையில் சேர்க்க தவறியது"
 
@@ -6123,6 +5958,12 @@ msgstr ""
 msgid "Client Version"
 msgstr "உரையாடலை மூடு"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 #, fuzzy
 msgid "MySpaceIM - Username Available"
 msgstr "சேவை இல்லை"
@@ -6391,9 +6232,9 @@ msgstr "பயனர் வலையிலிருந்து விலகி
 msgid "Unknown error: 0x%X"
 msgstr "தெரியாத பிழை: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "உள்நுழைய இயலவில்லை (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "பயனாளர் %s ஐ தடுக்க இயலவில்லை"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6495,9 +6336,6 @@ msgstr "க்ரூப்வைஸ் கலந்துரையாடல் %
 msgid "Authenticating..."
 msgstr "உறுதிப்படுத்துகிறது..."
 
-msgid "Unable to connect to server."
-msgstr "சேவையகத்துடன் இணைக்க முடியவில்லை."
-
 msgid "Waiting for response..."
 msgstr "பதிலுக்காக காத்திருத்தல்..."
 
@@ -6521,9 +6359,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "உரையாடலில் கலந்து கொள்ள விரும்புகிறீர்களா?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "நீங்கள் வேறு பணியிடத்துள் நுழைந்ததால் வெளியேற்றப் பட்டீர்கள்"
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6531,16 +6366,14 @@ msgstr ""
 "%s வலைப்பின்னலில் இருந்து விலகி இருப்பது போல் உள்ளது. நீங்கள் அனுப்பிய செய்திகளை அவர் "
 "பெறவில்லை."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "சேவையகத்துடன் இணைக்க முடியவில்லை.தயை செய்து நீங்கள் இணைக்க விரும்பும் சேவையகத்தின் "
 "முகவரியை உள்ளிடவும்."
 
-msgid "Error. SSL support is not installed."
-msgstr "பிழை எஸ்எஸ்எல் ஆதரவு நிறுவப்படவில்லை."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "இந்த உரையாடல் முடிக்கப்பட்டது. மேலும் தகவல் அனுப்ப இயலாது."
 
@@ -6579,10 +6412,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "இணைப்பை உருவாக்குவதில் பிழை"
 
-msgid "Incorrect password."
-msgstr "கடவுச்சொல் தவறு."
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, fuzzy
@@ -6594,17 +6424,7 @@ msgid "Invalid chat room name"
 msgstr "செல்லாத அறைப்பெயர்"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "%s உரையாடலை முடித்துவிட்டார்."
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "சேவையகத்துடன் இணைக்கப்படவில்லை."
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "சேவையகத்துடன் எஸ்எஸ்எல். இணைப்பை உருவாக்க இயலவில்லை."
 
 #. *< type
@@ -6657,7 +6477,7 @@ msgid "Received invalid data on connection with remote user."
 msgstr ""
 
 #, fuzzy
-msgid "Could not establish a connection with the remote user."
+msgid "Unable to establish a connection with the remote user."
 msgstr "உள் எம்டிஎன்எஸ் (mDNS) சேவையகத்துடன் இணைப்பை தொடங்க இயலவில்லை. அது இயங்குகிறதா?"
 
 #, fuzzy
@@ -6854,16 +6674,12 @@ msgid "Buddy Comment"
 msgstr "நண்பர் விமரிசனம்"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "அனுப்புவதற்கு இணைக்க முடியவில்லை."
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr "சேவையகத்துடன் இணைக்க தவறியது."
+msgid "Unable to connect to BOS server: %s"
+msgstr "சேவையகத்துடன் இணைக்க முடியவில்லை."
 
 #, fuzzy
 msgid "Username sent"
@@ -6878,9 +6694,9 @@ msgstr "இணைப்பை உறுதிப்படுத்துகி�
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "உள் நுழைய முடியவில்லை.%s ஆக கையெழுத்திட முடியவில்லை. அந்த திரைப் பெயர் செல்லுபடி "
 "ஆகாதது. திரைப் பெயர்கள் ஒரு எழுத்தில்தான் ஆரம்பிக்க வேண்டும்.பின் வெறும் எண்களோ அல்லது "
@@ -6896,30 +6712,23 @@ msgstr ""
 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
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "செல்லுபடியாகாத செல்லப் பெயர்"
+msgid "Username does not exist"
+msgstr "பயனாளர் இல்லை"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "உங்கள் கணக்கு இப்போது தற்காலிகமாக நிறுத்தி வைக்கப் பட்டது."
 
 #. service temporarily unavailable
@@ -6941,7 +6750,8 @@ msgstr ""
 "நீங்கள் அடிக்கடி இணைப்பை பெற்று மற்றும் துண்டித்துள்ளீர்கள். பத்து நிமிடங்கள் பொறுத்து மீண்டும் "
 "தொடங்கவும். தொடர்ந்து முயன்றால் மேலும் அதிக நேரம் காக்க வேண்டியிருக்கும்."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "உள்ளிடப் பட்ட SecurID விசை செல்லுபடி ஆகாது."
 
 msgid "Enter SecurID"
@@ -7108,6 +6918,9 @@ msgstr "இன்னும் இணைப்புடன்"
 msgid "Member Since"
 msgstr "இதிலிருந்து அங்கத்தினர்."
 
+msgid "Capabilities"
+msgstr "செயல்திறன்"
+
 #, fuzzy
 msgid "Profile"
 msgstr "எம்எஸ்என் குறுந்தொகுப்பு"
@@ -7290,7 +7103,7 @@ msgstr "வெளிச்செல் தகவல் மிக நீளமா
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7317,9 +7130,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "அனாதைவரிகள்"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "உங்கள் நண்பர் பட்டியலில் மிகப் பலர் இருப்பதால் நண்பர் %s ஐ  பட்டியலில் சேர்க்க முடியவில்லை. "
@@ -7329,7 +7142,7 @@ msgid "(no name)"
 msgstr "(பெயரற்றது)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "உங்களது கட்டளை தெரியாத காரணத்தினால் தவறியது."
 
 #, fuzzy, c-format
@@ -8203,7 +8016,7 @@ msgid "Update interval (seconds)"
 msgstr "வாசித்தல் பிழை"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "சேவையக தகவலை பெற இயலவில்லை"
 
 #, c-format
@@ -8230,10 +8043,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "சேவையக தகவலை பெற இயலவில்லை"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "உரையாடலை வேண்டுக"
 
@@ -8269,25 +8078,11 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "இணைக்க இயலவில்லை."
-
 #, fuzzy
 msgid "Socket error"
 msgstr "டோக்கன் பிழை"
 
 #, fuzzy
-msgid "Unable to read from socket"
-msgstr "கொள் குழியை (சாக்கெட்டை) வாசிக்க இயலவில்லை"
-
-msgid "Write Error"
-msgstr "எழுதுவதில் பிழை"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "தொடர்பு முடிக்கப்பட்டது"
-
-#, fuzzy
 msgid "Getting server"
 msgstr "பயனாளர் தகவலை அமை..."
 
@@ -8295,8 +8090,9 @@ msgstr "பயனாளர் தகவலை அமை..."
 msgid "Requesting token"
 msgstr "கோரிக்கை நிராகரிக்கப்பட்டது"
 
-msgid "Couldn't resolve host"
-msgstr "புரவலரை நிர்ணயிக்க முடியவில்லை"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "சேவையகத்துடன் இணைக்க முடியவில்லை."
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8347,7 +8143,7 @@ msgid "QQ Qun Command"
 msgstr "கட்டளை"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "சேவையக தகவலை பெற இயலவில்லை"
 
 #, fuzzy
@@ -8370,9 +8166,6 @@ msgstr "கோப்பு அனுப்புதல் தவறியது"
 msgid "%d canceled the transfer of %s"
 msgstr "%s %s பரிமாற்றத்தை நீக்கினார்"
 
-msgid "Connection closed (writing)"
-msgstr "இணைப்பு துண்டிக்கப்பட்டது,(எழுதப்படுகிறது)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>குழுத் தலைப்பு</b> %s<br>"
@@ -8426,17 +8219,6 @@ msgstr "சேவையகம் %s இல்  சேம்டைம் நி�
 msgid "Sametime Administrator Announcement"
 msgstr "சேம்டைம்  கணிணி நிர்வாகி அறிவிப்பு"
 
-msgid "Connection reset"
-msgstr "இணைப்பு மீண்டும் அமைக்கப் பட்டது"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "கொள் குழி (சாக்கெட்) இலிருந்து வாசிப்பதில் பிழை : %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "புரவலருடன் இணைக்க முடியவில்லை"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "%s இலிருந்து அறிவிப்பு"
@@ -8459,6 +8241,9 @@ msgstr "ஒலி பெருக்கிகள்"
 msgid "Video Camera"
 msgstr "விடியோ கேமரா"
 
+msgid "File Transfer"
+msgstr "கோப்பு பரிமாற்றம்"
+
 #, fuzzy
 msgid "Supports"
 msgstr "ஆதரவு"
@@ -9276,6 +9061,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "வலையமைப்பு நிலைமை"
 
+msgid "Ping"
+msgstr "பிங்"
+
 msgid "Ping failed"
 msgstr "பிங் தவறியது"
 
@@ -9340,7 +9128,8 @@ msgstr "ஆதரவில்லா பொதுவிசை வகை"
 msgid "Disconnected by server"
 msgstr "சேவையகம் இணைப்பை துண்டித்து விட்டது"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "எஸ்ஐஎல்சி சேவையகத்துடன் இணைக்கும்பொழுது பிழை"
 
 msgid "Key Exchange failed"
@@ -9352,27 +9141,26 @@ msgstr ""
 "துண்டிக்கப் பட்ட அமர்வை மீட்க இயலவில்லை. மறுபடி புதிய இணைப்பை பெற மீண்டும் இணை "
 "(Reconnect) ஐ அழுத்தவும்."
 
-msgid "Connection failed"
-msgstr "இணைப்பு தோல்வியுற்றது."
-
 msgid "Performing key exchange"
 msgstr "சாவி பரிமாறப்படுகிறது"
 
-msgid "Unable to create connection"
-msgstr "இணைப்பை உருவாக்க முடியவில்லை"
-
 #, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "இந்த விசை ஜோடியை ஏற்ற முடியவில்லை: %s"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "எஸ்ஐஎல்சி சேவயகத்துடன் இணைக்கிறது"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "இந்த விசை ஜோடியை ஏற்ற முடியவில்லை: %s"
+
 msgid "Out of memory"
 msgstr "நினைவகம் போதாது"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "எஸ்ஐஎல்சி செம்மை நடப்பு வழக்கை ( protocol) ஆரம்பிக்க முடியவில்லை"
 
 #, fuzzy
@@ -9675,7 +9463,7 @@ msgid "Creating SILC key pair..."
 msgstr "எஸ்ஐஎல்சி விசை ஜோடியை உருவாக்குகிறது...."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "எஸ்ஐஎல்சி விசை ஜோடியை உருவாக்குகிறது...."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9769,6 +9557,9 @@ msgstr "வெண்பலகை"
 msgid "No server statistics available"
 msgstr "சேவையக நிலைமை கிடைக்கவில்லை"
 
+msgid "Error during connecting to SILC Server"
+msgstr "எஸ்ஐஎல்சி சேவையகத்துடன் இணைக்கும்பொழுது பிழை"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "தோல்வி: பதிப்பு ஒத்துப் போகவில்லை. உங்கள் வாடிக்கையாளரை மேம் படுத்தவும்"
@@ -9809,33 +9600,28 @@ msgstr "தோல்வி: செல்லுபடியாகாத குக
 msgid "Failure: Authentication failed"
 msgstr "தோல்வி: உண்மை நேர்படுத்தல் தோல்வியுற்றது"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "எஸ்ஐஎல்சி வாடிக்கையாளர் இணைப்பை துவக்க முடியவில்லை."
 
 #, fuzzy
 msgid "John Noname"
 msgstr "பெயரற்ற"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "இந்த விசை ஜோடியை ஏற்ற முடியவில்லை: %s"
 
-msgid "Could not write"
-msgstr "எழுத முடியவில்லை"
-
-msgid "Could not connect"
-msgstr "இணைக்க முடியவில்லை"
+msgid "Unable to create connection"
+msgstr "இணைப்பை உருவாக்க முடியவில்லை"
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "தெரியாத சேவையகப் பிழை."
 
-msgid "Could not create listen socket"
-msgstr "கேட்கும் கொள்குழி (சாக்கெட்) ஐ உருவாக்க முடியவில்லை!"
-
 #, fuzzy
-msgid "Could not resolve hostname"
-msgstr "புரவலரை நிர்ணயிக்க முடியவில்லை"
+msgid "Unable to create listen socket"
+msgstr "கொள் குழியை (சாக்கெட்டை) உருவாக்குவதில் பிழை"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -9878,6 +9664,81 @@ msgstr "ஆத் பயனர்"
 msgid "Auth Domain"
 msgstr "ஆத் களப்பெயர்"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "கூறும் &lt;அறை&gt;:யாகூ வலையில் ஒரு அரட்டை அறையில் சேருங்கள்"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "பட்டியல்:  யாகூ வலைப்பின்னலில் உள்ள அறைகளின் பட்டியல்"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "கிறுக்கல்: பயனாளரை கிறுக்கல் நிகழ்ச்சியை ஆரம்பிக்க கோருங்கள்"
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "யாகூ! முகவரி"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "யாகூ நெறிமுறை சொருகுபொருள்"
+
+#, fuzzy
+msgid "Pager server"
+msgstr "பதிலாள் சேவையகம்"
+
+msgid "Pager port"
+msgstr "அழைப்பி தளம்"
+
+#, fuzzy
+msgid "File transfer server"
+msgstr "கோப்பு அனுப்பும் புரவலன்"
+
+msgid "File transfer port"
+msgstr "கோப்பு அனுப்பும் தளம்"
+
+msgid "Chat room locale"
+msgstr "அரட்டை அறை மொழி அமைப்புகள்"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "கூட்டங்கள் மற்றும் அரட்டை அறை அழைப்புகளை உதாசீனப்படுத்தவும்"
+
+msgid "Chat room list URL"
+msgstr "அரட்டைஅறை பட்டியல் யுஆர்எல் "
+
+msgid "Yahoo Chat server"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo Chat port"
+msgstr "யாகூ ஜப்பான்"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "யாகூ! முகவரி"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "யாகூ நெறிமுறை சொருகுபொருள்"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9909,28 +9770,18 @@ msgstr "நண்பர் இணைப்பு மறுக்கப்பட�
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr "தெரியாத பிழை எண் %d. யாகூ! வலைத்தளத்தில் நுழைவதன் மூலம் இதை சரி செய்யலாம்."
 
 #. username or password missing
@@ -9968,11 +9819,12 @@ msgstr "உங்களது கணக்கு பூட்டப்பட்�
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "தெரியாத பிழை எண் %d. யாகூ! வலைத்தளத்தில் நுழைவதன் மூலம் இதை சரி செய்யலாம்."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "%s தோழரை %s குழுவின் %s கணக்கில் உள்ள சேவையகம் பட்டியலில் சேர்க்க இயலவில்லை."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "சேவையகம் பட்டியலில் தோழரை சேர்க்க இயலவில்லை"
 
 #, c-format
@@ -9980,23 +9832,16 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
 #, fuzzy
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "சேவையகத்திலிருந்து செல்லாத பதில்."
 
-msgid "Connection problem"
-msgstr "தொடர்பில் கோளாறு"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "%s உடன் உரையாடல்கள்"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "உள் எம்டிஎன்எஸ் (mDNS) சேவையகத்துடன் இணைப்பை தொடங்க இயலவில்லை. அது இயங்குகிறதா?"
 
 msgid "Not at Home"
 msgstr "வீட்டில் இல்லை"
@@ -10059,79 +9904,15 @@ msgstr "பயனாளருடன் அரட்டையில் சேர.
 msgid "Open Inbox"
 msgstr "ஹாட்மெய்ல் உள்பெட்டியை திற"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "கூறும் &lt;அறை&gt;:யாகூ வலையில் ஒரு அரட்டை அறையில் சேருங்கள்"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "பட்டியல்:  யாகூ வலைப்பின்னலில் உள்ள அறைகளின் பட்டியல்"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "கிறுக்கல்: பயனாளரை கிறுக்கல் நிகழ்ச்சியை ஆரம்பிக்க கோருங்கள்"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "யாகூ! முகவரி"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "யாகூ நெறிமுறை சொருகுபொருள்"
-
-msgid "Yahoo Japan"
-msgstr "யாகூ ஜப்பான்"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "பதிலாள் சேவையகம்"
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "ஜப்பான் அழைப்பி புரவலன்"
-
-msgid "Pager port"
-msgstr "அழைப்பி தளம்"
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "கோப்பு அனுப்பும் புரவலன்"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "ஜப்பான் கோப்பு அனுப்பும் புரவலன்"
-
-msgid "File transfer port"
-msgstr "கோப்பு அனுப்பும் தளம்"
-
-msgid "Chat room locale"
-msgstr "அரட்டை அறை மொழி அமைப்புகள்"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "கூட்டங்கள் மற்றும் அரட்டை அறை அழைப்புகளை உதாசீனப்படுத்தவும்"
-
-msgid "Chat room list URL"
-msgstr "அரட்டைஅறை பட்டியல் யுஆர்எல் "
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "யாகூ ஜப்பான்"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "கிறுக்கலுக்கு கோரிக்கை அனுப்பப்பட்டது."
 
+msgid "Unable to connect."
+msgstr "இணைக்க இயலவில்லை."
+
 msgid "Unable to establish file descriptor."
 msgstr "கோப்பு விவரிப்பை நிர்ணயிக்க முடியவில்லை."
 
@@ -10139,6 +9920,9 @@ msgstr "கோப்பு விவரிப்பை நிர்ணயிக�
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s கோப்பு %s யை அனுப்ப இசைகிறார்"
 
+msgid "Write Error"
+msgstr "எழுதுவதில் பிழை"
+
 msgid "Yahoo! Japan Profile"
 msgstr "யாகூ! ஜப்பான் சுயகுறிப்பு"
 
@@ -10256,21 +10040,19 @@ msgstr "குரல்கள்"
 msgid "Webcams"
 msgstr "வலை புகைப்படகருவிகள்"
 
+msgid "Connection problem"
+msgstr "தொடர்பில் கோளாறு"
+
 msgid "Unable to fetch room list."
 msgstr "அறை பட்டியலை பெற இயலவில்லை."
 
 msgid "User Rooms"
 msgstr "பயனாளர் அறைகள்"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "ஒய்சிஹெச்டி(YCHT) சேவகனில் இணைப்பு பிரச்னை"
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "சேவையகத்துடன் இணைக்கப்படவில்லை."
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10398,13 +10180,7 @@ msgid "Exposure"
 msgstr "வெளிக்காட்டல்"
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "கொள் குழியை (சாக்கெட்டை) உருவாக்குவதில் பிழை"
-
-#, fuzzy, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "\"%s\"வேடத்துக்கு பயனர்: %s ஐ பொருத்த முடியவில்லை."
 
 #, fuzzy, c-format
@@ -10412,17 +10188,13 @@ msgid "HTTP proxy connection error %d"
 msgstr "பதிலாள் இணைப்பு பிழை %d"
 
 #, fuzzy, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "ஏற்பு மறுக்கப்பட்டது: பதிலாள் சேவையகம் தளம் %d யில் கடத்துவதற்கு மறுக்கிறது"
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr "இயக்கும்போது பிழை %s"
 
-#, fuzzy
-msgid "Could not resolve host name"
-msgstr "புரவலரை நிர்ணயிக்க முடியவில்லை"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10634,13 +10406,6 @@ msgstr ""
 msgid "Unable to connect to %s: %s"
 msgstr "புரவலருடன் இணைக்க முடியவில்லை"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"உள்ளே நுழைய சேவையகத்துக்கு டிஎல்எஸ்/எஸ்எஸ்எல் தேவை. டிஎல்எஸ்/எஸ்எஸ்எல் ஆதரவு ஏதுமில்லை."
-
 #, c-format
 msgid " - %s"
 msgstr ""
@@ -10890,7 +10655,11 @@ msgid "View _Log"
 msgstr "_பதிவை காண்"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "இணைப்பற்றபொழுது அனுமதிக்கப்படாது"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "இணைப்பற்றபொழுது அனுமதிக்கப்படாது"
 
 msgid "_Alias..."
@@ -11425,6 +11194,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "இதற்கான பயனாளர் தகவல்களை மாற்று %s "
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11472,7 +11244,8 @@ msgstr "தவிர்"
 msgid "Get Away Message"
 msgstr "வெளியேற்றத் தகவல்"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "கடைசியாக சொன்னது"
 
 msgid "Unable to save icon file to disk."
@@ -12401,7 +12174,7 @@ msgid "Hyperlink visited color"
 msgstr "மீத்தொடர்பு நிறம்"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "சுட்டி மீத்தொடர்பின் மீது இருக்கும்பொழுது மீத்தொடர்பை வரைவதற்கான நிறம்"
 
 msgid "Hyperlink prelight color"
@@ -12439,15 +12212,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "அறிவிப்பு நீக்கல்"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "புதிய அஞ்சல் அறவிப்புகள்"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12864,6 +12644,10 @@ msgid ""
 msgstr ""
 "'கைமுறை'  உலாவி கட்டளை  தேர்வு செய்யப்பட்டுள்ளது, ஆனால் எந்த கட்டளையும் அமைக்கப்படவில்லை."
 
+#, fuzzy
+msgid "No message"
+msgstr "தெரியாத தகவல்"
+
 msgid "Open All Messages"
 msgstr "அனைத்தும் செய்திகளையும் திறக்க"
 
@@ -12881,10 +12665,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\"> உங்களுக்கு அஞ்சல் வந்துள்ளது!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "தெரியாத தகவல்"
-
 msgid "The following plugins will be unloaded."
 msgstr "பின்வரும் சொருகிகள் கீழ் இறக்கப் படும்."
 
@@ -13109,7 +12889,7 @@ msgid "On unread messages"
 msgstr "படிக்காத செய்திகள்"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "ஐஎம் உரையாடல் சாளரங்கள்"
 
 #, fuzzy
@@ -13119,6 +12899,10 @@ msgstr "புதிய ஐஎம் உரையாடல்களை _மற�
 msgid "When away"
 msgstr "வெளிச்செல்லும் பொழுது"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "உரையாடல் சாளரத்தை _உயர்த்து"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -13179,10 +12963,6 @@ msgstr "மென்மையான உருட்டுதலை செயல�
 msgid "F_lash window when IMs are received"
 msgstr "_ஒ தகவல்கள் பெறப்படும்பொழுது சாளரத்தை ஒளிரச்செய்"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "உரையாடல் சாளரத்தை _உயர்த்து"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -13222,7 +13002,8 @@ msgstr "பயனரின் தகவலை பெற இயலவில்ல
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "ஐபி முகவரி _தானியங்கி தேடல்"
 
 msgid "Public _IP:"
@@ -13603,34 +13384,18 @@ msgstr "_ச சேமித்து உபயோகிக்கவும்"
 msgid "Status for %s"
 msgstr "%s ற்கான நிலை"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "குறு நகையி (முகபாவனையை) நுழை"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
 #, fuzzy
-msgid "Duplicate Shortcut"
-msgstr "இரட்டையான நகல் சரிசெய்தல்"
+msgid "Custom Smiley"
+msgstr "குறு நகையி (முகபாவனையை) நுழை"
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "_வ சில கணக்குகளுக்கு வேறுபாடான நிலைகளை பயன்படுத்து"
+msgid "Duplicate Shortcut"
+msgstr "இரட்டையான நகல் சரிசெய்தல்"
 
 #, fuzzy
 msgid "Edit Smiley"
@@ -13751,9 +13516,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "வெளியீட்டாளரை அனுப்ப முடியவில்லை"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "நீங்கள் ஒரு மேல் மேசை துவக்கியை இழுத்தீர்கள். அனேகமாக இந்த துவக்கி எதை துவக்குகிறதோ அதை "
 "அனுப்ப விரும்புகிறீர்கள். துவக்கியை அல்ல."
@@ -14368,9 +14134,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "கூட்டு இசையமைப்பிற்கு இசை செய்தி செருகி"
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "இசை செய்தி செருகி பல பயனர்கள் ஒரே நேரத்தில் ஒரு இசைக்குறியை திருத்துவதால் ஒரு இசை "
 "துணுக்கினை உருவாக்க அனுமதிக்கிறது."
@@ -14643,7 +14410,7 @@ msgstr "ஐஎம் உரையாடல் சாளரங்கள்"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14976,7 +14743,7 @@ msgstr "விண்டோஸ் கெய்மிற்காக மட்ட�
 
 #, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "விண்டோஸ் கெய்மிற்கான விருப்பங்களை கொடுக்கிறது, அதாவது நண்பர் பட்டியல் இணைப்பு மற்றும் "
 "உரையாடல் ஒளிர்தல்."
@@ -15020,6 +14787,286 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
+#~ msgid "Cannot open socket"
+#~ msgstr "கொள் குழியை (சாக்கெட்டை) திறக்க முடியவில்லை "
+
+#, fuzzy
+#~ msgid "Could not listen on socket"
+#~ msgstr "கொள் குழி (சாக்கெட்) இல் கேட்க இயலவில்லை"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "கொள் குழியை (சாக்கெட்டை) வாசிக்க இயலவில்லை"
+
+#~ msgid "Connection failed."
+#~ msgstr "இணைப்பு தவறியது."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "சேவையக இணைப்பு துண்டிக்கப்பட்டது"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "கொள் குழியை (சாக்கெட்டை) உருவாக்க முடியவில்லை"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "புரவலருடன் இணைக்க முடியவில்லை"
+
+#~ msgid "Read error"
+#~ msgstr "வாசிப்பதில் பிழை"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "உள் எம்டிஎன்எஸ் (mDNS) சேவையகத்துடன் இணைப்பை தொடங்க இயலவில்லை. அது இயங்குகிறதா?"
+
+#~ msgid "Write error"
+#~ msgstr "எழுதுவதில் பிழை"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "அடைவு தகவல்களை அமை"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "நீட்டித்த முகவரி"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "அரட்டை புனைப்பெயர்"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "பயனருக்கு அடைவு தகவல் இல்லை ."
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "கட்டளை"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "ஹெச்டிஎம்எல் (HTML) "
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "பதிவுப் பிழை"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "இடம்"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "பயனர் தேடல்"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "நண்பர் நிலை அறிவிப்பு"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "ஆதரிக்கப்படாத பதிப்பு"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "திசை அமைப்பு"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "பயன்பாட்டாளர் வகைகள்"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "பயனர் வரையளவு"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "செயல்திறன்"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "பயனாளர் பெயர்"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "ஐஎம் சாவி பரிமாற்றத்துடன்"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "மின்னஞ்சல்"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "எம்எஸ்என் குறுந்தொகுப்பு"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "பிங்"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "பயனர் பெயர்"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "நிகழ் ஒளித்தோற்றம்"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "தகவல் பெறப்பட்டது"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "பொது சொல்லாக்க விசை"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "பயனாளர் விருப்பங்கள்"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "பயன்பாட்டாளர் வகைகள்"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "பயனர் பெயர்"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "பயனர் வரையளவு"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "ட்ரில்லியன் ரகசியமாக்கல்"
+
+#~ msgid "Read Error"
+#~ msgstr "வாசிப்பதில் பிழை"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "சேவையகத்துடன் இணைக்க தவறியது."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "கியூ வரிசை நிறைந்தது"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "தகவலை அலகிட இயலவில்லை"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "புரவலருடன் இணைக்க முடியவில்லை"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "உள்நுழைய இயலவில்லை (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "சேவையகத்துடன் இணைக்க முடியவில்லை."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "நீங்கள் வேறு பணியிடத்துள் நுழைந்ததால் வெளியேற்றப் பட்டீர்கள்"
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "பிழை எஸ்எஸ்எல் ஆதரவு நிறுவப்படவில்லை."
+
+#~ msgid "Incorrect password."
+#~ msgstr "கடவுச்சொல் தவறு."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "சேவையகத்துடன் இணைக்க தவறியது."
+
+#, fuzzy
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "நீங்கள் இப்போது இணப்பிலிருந்து நீக்கப் படலாம். இது சரியாகும் வரை டிஓசி யை பயன் படுத்த "
+#~ "நினைக்கலாம். மேம்படுத்துவதற்கு %s ஐ பார்க்கவும்."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "இணைக்க முடியவில்லை"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "செல்லுபடியாகாத செல்லப் பெயர்"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "சேவையக தகவலை பெற இயலவில்லை"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "தொடர்பு முடிக்கப்பட்டது"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "புரவலரை நிர்ணயிக்க முடியவில்லை"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "இணைப்பு துண்டிக்கப்பட்டது,(எழுதப்படுகிறது)"
+
+#~ msgid "Connection reset"
+#~ msgstr "இணைப்பு மீண்டும் அமைக்கப் பட்டது"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "கொள் குழி (சாக்கெட்) இலிருந்து வாசிப்பதில் பிழை : %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "புரவலருடன் இணைக்க முடியவில்லை"
+
+#~ msgid "Could not write"
+#~ msgstr "எழுத முடியவில்லை"
+
+#~ msgid "Could not connect"
+#~ msgstr "இணைக்க முடியவில்லை"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "கேட்கும் கொள்குழி (சாக்கெட்) ஐ உருவாக்க முடியவில்லை!"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "புரவலரை நிர்ணயிக்க முடியவில்லை"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "கடவுச்சொல் தவறு."
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "யாகூ ஜப்பான்"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "ஜப்பான் அழைப்பி புரவலன்"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "ஜப்பான் கோப்பு அனுப்பும் புரவலன்"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "சேவையகத்துடன் இணைக்கப்படவில்லை."
+
+#, fuzzy
+#~ msgid "Could not resolve host name"
+#~ msgstr "புரவலரை நிர்ணயிக்க முடியவில்லை"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "உள்ளே நுழைய சேவையகத்துக்கு டிஎல்எஸ்/எஸ்எஸ்எல் தேவை. டிஎல்எஸ்/எஸ்எஸ்எல் ஆதரவு ஏதுமில்லை."
+
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "ஐஎம் உரையாடல் சாளரங்கள்"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "_வ சில கணக்குகளுக்கு வேறுபாடான நிலைகளை பயன்படுத்து"
+
 #, fuzzy
 #~ msgid "Activate which ID?"
 #~ msgstr "எந்த முகப்பை செயல்படுத்த?"
@@ -15640,10 +15687,6 @@ msgstr ""
 #~ msgstr "தற்போதைய டோக்கன்"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "சேவையகத்துடன் இணைக்க முடியவில்லை."
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_தகவல்:"
 
diff --git a/po/te.po b/po/te.po
index 34c68aac68..818c9fd84a 100644
--- a/po/te.po
+++ b/po/te.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin Telugu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2007-11-14 14:05+0530\n"
 "Last-Translator: RKVS Raman <raman@cdacbangalore.in>\n"
 "Language-Team: GIST CDAC Pune / BharateeyaOO.o <info.gist@cdac.in / "
@@ -2705,9 +2705,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "లాగ్ వ్యూవర్ లో ఇతర IM క్లయింట్ల లాగ్ లు కూడా ఉన్నాయి."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2762,8 +2763,9 @@ msgstr "ఆఫ్ లైన్ సందేశం వలె పనిచేయ�
 msgid "Save messages sent to an offline user as pounce."
 msgstr "ఆఫ్ లైన్ వినియోగదారుకు పంపిన సందేశాలను చొచ్చుకొని వచ్చినవిగా సేవ్ చేయండి."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "మిగతా సందేశాలను చొచ్చుకొని వచ్చినవిగా సేవ్ చేయడం జరుగుతుంది. `Buddy Pounce' డైలాగ్ నుంచి మీరు పౌన్స్ "
@@ -3108,11 +3110,12 @@ msgstr ""
 "www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "ఇన్ కమింగ్ IM కనెక్షన్లకు \n"
 
 msgid ""
@@ -3168,14 +3171,17 @@ msgstr "%s తన సంభాషణను ముగించారు."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "సందేశాన్ని పంపలేకపోయాం, సంభాషణను ప్రారంభించలేరు."
 
-msgid "Cannot open socket"
-msgstr "సాకెట్ ను తెరవజాలదు"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "సాకెట్‌ను సృష్టించలేదు"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "పోర్టుకు సాకెట్ ను కలపలేకపోతున్నాం"
 
-msgid "Could not listen on socket"
-msgstr "సాకెట్ పై వినలేకపోతున్నాం"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "సాకెట్‌ను సృష్టించలేదు"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3224,13 +3230,16 @@ msgstr "మిత్రుల జాబితాను సేవ్ చేయం
 msgid "Load buddylist from file..."
 msgstr "ఫైలునుడి మిత్రుల జాబితాను లోడ్ చేయండి..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "నమోదు పత్రంలోని అన్ని ఖాళీలను నింపండి."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "పాస్‌వర్డ్స్ సరిపోలడంలేదు."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "కొత్త అకౌంటును నమోదు చేయలేకపోతున్నాం. లోపం జరిగింది.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3242,14 +3251,15 @@ msgstr "నమోదుచేయడం విజయవంతంగా పూర�
 msgid "Password"
 msgstr "పాస్‌వర్డ్"
 
-msgid "Password (retype)"
-msgstr "పాస్ వర్డ్ ను (మళ్ళీటైప్ చేయండి)"
+msgid "Password (again)"
+msgstr "పాస్‌వర్డ్ (మరోసారి)"
 
-msgid "Enter current token"
-msgstr "ప్రస్తుత టోకెన్ ను ఎంటర్ చేయండి"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "ప్రస్తుత టోకెన్"
+#, fuzzy
+msgid "Captcha"
+msgstr "సచిత్రమును సేవ్ చేయుము."
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "కొత్త Gadu-Gadu అకౌంటును నమోదు చేయండి"
@@ -3302,6 +3312,15 @@ msgstr "పాస్ వర్డ్ ను విజయవంతంగా మ�
 msgid "Current password"
 msgstr "ప్రస్తుత పాస్ వర్డ్"
 
+msgid "Password (retype)"
+msgstr "పాస్ వర్డ్ ను (మళ్ళీటైప్ చేయండి)"
+
+msgid "Enter current token"
+msgstr "ప్రస్తుత టోకెన్ ను ఎంటర్ చేయండి"
+
+msgid "Current token"
+msgstr "ప్రస్తుత టోకెన్"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "UIN:  కోసం దయచేసి మీ ప్రస్తుత పాస్‌వర్డ్‌ను, అలాగే మీ కొత్త పాస్‌వర్డ్‌ను ఎంటర్ చేయండి"
 
@@ -3350,8 +3369,8 @@ msgstr "సరిపోలే వినియోగదారు కనిపి�
 msgid "There are no users matching your search criteria."
 msgstr "మీ అన్వేషణా ప్రాధాన్యతలకు సరిపోలే వినియోగదారులు లేరు."
 
-msgid "Unable to read socket"
-msgstr "సాకెట్‌ను చదవడం సాధ్యంకాదు"
+msgid "Unable to read from socket"
+msgstr "సాకెట్‌ నుంచి రీడ్ చేయడం   సాధ్యం కావడం లేదు "
 
 msgid "Buddy list downloaded"
 msgstr "మిత్రుల జాబితా డౌన్ లోడ్ అయింది"
@@ -3365,8 +3384,14 @@ msgstr "మిత్రుల జాబితా అప్ లోడ్ అయ�
 msgid "Your buddy list was stored on the server."
 msgstr "సర్వర్ లో మీ మిత్రుల జాబితాను నిక్షిప్తపరచింది."
 
-msgid "Connection failed."
-msgstr "కనెక్ట్ అవడంలో వైఫల్యం."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "కనెక్ట్ అయింది "
+
+msgid "Connection failed"
+msgstr "కనెక్షన్ వైఫల్యం "
 
 msgid "Add to chat"
 msgstr "సంభాషణకు చేర్చండి"
@@ -3374,18 +3399,24 @@ msgstr "సంభాషణకు చేర్చండి"
 msgid "Chat _name:"
 msgstr "సంభాషణ_పేరు:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "సెర్వర్‌కు కనెక్ట్‌చేయలేని స్థితి. "
 
+# connect to the server
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "కనెక్ట్ చేస్తున్నది"
+
 msgid "Chat error"
 msgstr "సంభాషణలో పొరపాటు"
 
 msgid "This chat name is already in use"
 msgstr "ఈ సంభాషణ పేరు ఇప్పటికే ఉపయోగంలో ఉంది"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "సర్వర్ కు కనెక్టు కాలేదు."
 
 msgid "Find buddies..."
@@ -3457,7 +3488,8 @@ msgstr "ఏ విషయాన్నీ సెట్ చేయలేదు"
 msgid "File Transfer Failed"
 msgstr "ఫైలు బదిలీలో వైఫల్యం"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "లిజెనింగ్ పోర్టును ప్రారంభించలేదు."
 
 msgid "Error displaying MOTD"
@@ -3473,8 +3505,18 @@ msgstr "ఈ కనెక్షన్‌తో MOTD అనుసంధానమ�
 msgid "MOTD for %s"
 msgstr "%s కోసం MOTD "
 
-msgid "Server has disconnected"
-msgstr "సర్వర్ డిస్‌కనెక్ట్ అయింది"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"సర్వర్ తో కనెక్షన్ పోయింది:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "MOTDని చూడండి"
@@ -3493,23 +3535,20 @@ msgstr "_పాస్‌వర్డ్:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC నిక్స్ లో ఖాళీలేదు"
 
-# connect to the server
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "కనెక్ట్ చేస్తున్నది"
-
 msgid "SSL support unavailable"
 msgstr "SSL సహకారం లభించడంలేదు"
 
-msgid "Couldn't create socket"
-msgstr "సాకెట్‌ను సృష్టించలేదు"
+msgid "Unable to connect"
+msgstr "కనెక్ట్ చేయడంలో అశక్తత "
 
-msgid "Couldn't connect to host"
-msgstr "హోస్ట్‌కు కనెక్ట్ చేయలేదు"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "కనెక్ట్ చేయడంలో అశక్తత "
 
-msgid "Read error"
-msgstr "రీడ్ చేయడంలో పొరపాటు"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "సర్వర్ కనెక్షన్ ను ముగించింది."
 
 msgid "Users"
 msgstr "వినియోగదారులు "
@@ -3949,11 +3988,12 @@ msgstr "కమాండ్ పని చేయడం లేదు"
 msgid "execute"
 msgstr "ఆశించినది కాదు "
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "లాగిన్ చేయాలంటే సర్వర్ కు TLS/SSL అవసరం. TLS/SSL సహకారం లభించలేదు. "
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "లాగిన్ చేయాలంటే సర్వర్ కు TLS/SSL అవసరం. TLS/SSL సహకారం లభించలేదు. "
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3969,7 +4009,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "సాధారణ టెక్స్ట్ ప్రమాణీకరణ"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "ప్రమాణీకరణ వైఫల్యం "
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "సర్వర్‌నుంచి చెల్లని ప్రతి స్పందన."
 
 msgid "Server does not use any supported authentication method"
@@ -3981,7 +4026,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "సర్వర్‌నుంచి చెల్లని సవాలు "
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL పొరపాటు"
 
 msgid "The BOSH connection manager terminated your session."
@@ -4001,10 +4047,8 @@ msgstr ""
 "సర్వర్ తో కనెక్షన్ సాధ్యపడలేదు: \n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "సర్వర్ తో కనెక్షన్ సాధ్యపడలేదు: \n"
 "%s"
@@ -4013,12 +4057,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "కనెక్షన్ ను ప్రారంభించలేకపోతున్నాం"
 
-msgid "Unable to create socket"
-msgstr "సాకెట్‌ను సృష్టించలేదు"
-
-msgid "Write error"
-msgstr "రైట్ చేయడంలో పొరపాటు"
-
 msgid "Full Name"
 msgstr "పూర్తి పేరు "
 
@@ -4088,195 +4126,6 @@ msgstr "ఆపరేటింగ్ సిస్టం"
 msgid "Local Time"
 msgstr "స్థానిక ఫైల్:"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "డైరెక్టరీ సమాచారాన్ని సెట్ చేయండి. "
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "సంపూర్ణ అడ్రస్ "
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "చాట్ మారుపేరు"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "వినియోగాదారునికి డైరెక్టరీ సమాచారం లేదు. "
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "కమాండ్ "
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "నమోదులో పొరపాటు"
-
-#, fuzzy
-msgid "User Location"
-msgstr "ప్రదేశం"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "వినియోగదారు అన్వేషణ"
-
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "మిత్రుడి State Notification"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "సపోర్టులేని వెర్షన్ "
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "దిశ"
-
-msgid "File Transfer"
-msgstr "ఫైల్‌ బదిలీ"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "వినియోగదారుని మోడ్స్ "
-
-#, fuzzy
-msgid "User Activity"
-msgstr "వినియోగదారుని హద్దు "
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "యోగ్యతలు "
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "వినియోగదారు పేరు "
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "కీ ఎక్స్‌చెంజ్‌తో IM "
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "ఇ-మెయిల్ అడ్రస్ "
-
-#, fuzzy
-msgid "User Profile"
-msgstr "ప్రొఫైల్ "
-
-#, fuzzy
-msgid "Jingle"
-msgstr "పింగ్ "
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "వినియోగదారు పేరు "
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "ప్రత్యక్ష వీడియో "
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "సందేశం అందినది"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "పబ్లిక్ కీ బాబిల్ ప్రింట్ "
-
-# Build the user options frame.
-#, fuzzy
-msgid "User Chatting"
-msgstr "వినియోగదారుని ఆప్షన్స్."
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "వినియోగదారుని మోడ్స్ "
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "వినియోగదారు పేరు "
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "వినియోగదారుని హద్దు "
-
-msgid "Ping"
-msgstr "పింగ్ "
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Trillian Encryption"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "యోగ్యతలు "
-
 msgid "Priority"
 msgstr "ప్రాధాన్యత"
 
@@ -4288,7 +4137,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "లాగ్ ఇన్ చేయబడింది"
 
 msgid "Middle Name"
@@ -4479,16 +4328,12 @@ msgid "Roles:"
 msgstr "చేస్తున్న పని "
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "ప్లెయిన్ టెక్స్ట్ "
 
-msgid "Read Error"
-msgstr "రీడ్ చేయడంలో పొరపాటు"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 #, fuzzy
@@ -4684,9 +4529,6 @@ msgstr "మీ పాస్‌వర్డ్ మారినది. "
 msgid "Error changing password"
 msgstr "పాసవర్డ్‌ను మార్చుతున్నప్పుడు పొరపాటు "
 
-msgid "Password (again)"
-msgstr "పాస్‌వర్డ్ (మరోసారి)"
-
 # if (js->protocol_options & CHANGE_PASSWORD) {
 #, fuzzy
 msgid "Change XMPP Password"
@@ -5110,6 +4952,14 @@ msgstr "XML పదవివరణలో పొరపాటు"
 msgid "Unknown Error in presence"
 msgstr "అస్తిత్వంలో అజ్ఞాత పొరపాటు"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "సంభాషణ %sలో పాల్గొనడంలో పొరపాటు"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "సంభాషణ %sలో పొరపాటు "
+
 msgid "Create New Room"
 msgstr "కొత్త రూమ్ ను  సృష్టించండి"
 
@@ -5124,16 +4974,20 @@ msgstr "_కన్ఫిగర్ రూమ్"
 msgid "_Accept Defaults"
 msgstr "_పొరపాట్లను ఆమోదించు "
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "సంభాషణ %sలో పాల్గొనడంలో పొరపాటు"
+#, fuzzy
+msgid "No reason"
+msgstr "కారణం ఇవ్వలేదు. "
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "సంభాషణ %sలో పొరపాటు "
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr " %s: (%s)  ద్వారా మీరు కిక్ చేయబడ్డారు"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s (%s) ద్వారా కిక్ చేయబడ్డారు"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "ఫైలు ఓపెన్ చేయుచున్నప్పుడు పొరపాటు సంభవించింది. "
 
 #, fuzzy
@@ -5661,9 +5515,6 @@ msgstr "_సంభాషణను ప్రారంభించండి"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSNకోసం SSL సహకారం అవసరం. దయచేసి సహకరించే SSL లైబ్రరీని ఏర్పాటు చేయండి."
 
-msgid "Failed to connect to server."
-msgstr "సర్వర్‌కు కనెక్ట్ చేయడంలో వైఫల్యం. "
-
 msgid "Error retrieving profile"
 msgstr "ప్రొఫైల్‌ను బయటకు తీసుకురావడంలో పొరపాటు"
 
@@ -5935,9 +5786,6 @@ msgstr "అజ్ఞాత పొరపాటు సంభవించింద�
 msgid "Message was not sent because an unknown error occurred."
 msgstr "అజ్ఞాత పొరపాటు సంభవించింది, అందుచేత సందేశం వెళ్లియుండకపోవచ్చు. "
 
-msgid "Unable to connect"
-msgstr "కనెక్ట్ చేయడంలో అశక్తత "
-
 msgid "Writing error"
 msgstr "రైట్ చేయడంలో పొరపాటు"
 
@@ -5955,21 +5803,25 @@ msgstr ""
 "%s సర్వర్:\n"
 "%s నుంచి కనెక్షన్ లో పొరపాటు "
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "మన ప్రొటోకాల్‌ను సర్వర్ సపోర్ట్ చేయడంలేదు."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "HTTP పదవిశ్లేషణ లో పొరపాటు."
 
 # MSG_SERVER_GHOST
 # Looks like someone logged in as us! =-O
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "మీరు మరో ప్రదేశంనుండి సైన్ ఆన్ చేశారు."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "MSN సర్వర్లు తాత్కాలికంగా అందుబాటులో లేవు. దయచేసి కొంతసేపు ఆగి మళ్ళీ ప్రయత్నించండి. "
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN సర్వర్లు తాత్కాలికంగా కొంచెంసేపు ఆగిపోనున్నాయి. "
 
 #, c-format
@@ -5980,12 +5832,6 @@ msgid ""
 "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 "హాండ్‌షేకింగ్ "
 
@@ -6093,6 +5939,12 @@ msgstr "MSN ప్రొటోకాల్ ప్లగ్‌ఇన్ "
 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)  #-#-#-#-#
+msgid "Unknown error."
+msgstr "అజ్ఞాత పొరపాటు."
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr " %s (%s) మీద %s "
@@ -6211,12 +6063,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "సర్వర్‌నుంచి చెల్లని ప్రతి స్పందన."
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "కనెక్ట్ అయింది "
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr ""
@@ -6240,18 +6086,6 @@ msgstr ""
 msgid "Invalid input condition"
 msgstr "కనెక్షన్‌ను ఫైనలైజేషన్ జరుగుతున్నది"
 
-#, fuzzy
-msgid "Read buffer full (2)"
-msgstr "పూర్తి క్యూ."
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "సందేశాన్ని పద విశ్లేషణ చేయడంలో అశక్తత"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr ""
-
 # msgstr "లోపం కోడ్ %d ను ప్రక్రియ తిప్పి పంపింది "
 msgid "Failed to add buddy"
 msgstr ""
@@ -6344,6 +6178,12 @@ msgstr ""
 msgid "Client Version"
 msgstr "సంభాషణను క్లోజ్ చేయుము "
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 #, fuzzy
 msgid "MySpaceIM - Username Available"
 msgstr "సర్వీస్ దొరుకుటలేదు"
@@ -6608,9 +6448,9 @@ msgstr "వినియోగదారుడు ఆఫ్‌లైనులో�
 msgid "Unknown error: 0x%X"
 msgstr "తెలియని పొరపాటు: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "లాగిన్ విఫలమైనది (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "వినియోగదారు %s ను నిషేధించలేదు"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6719,9 +6559,6 @@ msgstr "గ్రూప్‌వైజ్ సమావేశం %d"
 msgid "Authenticating..."
 msgstr "ప్రమాణీకరణ జరుగుతోంది ... "
 
-msgid "Unable to connect to server."
-msgstr "సెర్వర్‌కు కనెక్ట్‌చేయలేని స్థితి. "
-
 msgid "Waiting for response..."
 msgstr "జవాబు కోసం ప్రతీక్ష ... "
 
@@ -6747,9 +6584,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "మీరు సంభాషణలో పాల్గొనదల్చుకున్నారా?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "మీరు మరో వర్క్‌స్టేషన్‌లో లాగ్ చేసినారు గాన మిమ్మల్ని లగ్‌ ఔట్ చేయడమైనది."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6758,15 +6592,13 @@ msgstr "%s ఆఫ్‌లైన్‌లో ఉన్నట్లున్న�
 # TODO: Would be nice to prompt if not set!
 # *  Pidgin_request_fields(gc, _("Server Address"),...);
 # ...but for now just error out with a nice message.
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "సర్వర్‌కు కనెక్ట్ చేయడం సాధ్యం కాదు. మీరు కనెక్ట్ చేయదల్చుకున్న సెర్వర్ అడ్రసును ఎంటర్ చేయండి. "
 
-msgid "Error. SSL support is not installed."
-msgstr "పొరపాటు. SSL సపోర్ట్ ఇన్‌స్టాల్ కాలేదు. "
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "ఈ సమావేశం ముగిసింది. ఇంకా సందేశాలు పంపడం సాధ్యం కాదు."
 
@@ -6815,10 +6647,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "కనెక్షన్ ఏర్పాటులో పొరపాటు"
 
-msgid "Incorrect password."
-msgstr "తప్పు పాస్‌వర్డ్."
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, fuzzy
@@ -6829,18 +6658,8 @@ msgstr "కనెక్ట్ చేయడం సాధ్యంమగుట ల
 msgid "Invalid chat room name"
 msgstr "చెల్లని రూమ్ పేరు"
 
-msgid "Server closed the connection."
-msgstr "సర్వర్ కనెక్షన్ ను ముగించింది."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"సర్వర్ తో కనెక్షన్ పోయింది:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "సర్వర్ తో కనెక్షన్ పై చెల్లని డాటా అందింది."
 
 # *< type
@@ -6905,7 +6724,8 @@ msgstr "దూరంలోనున్న వినియోగదారు: <br
 msgid "Received invalid data on connection with remote user."
 msgstr "దూరంలోనున్న వినియోగదారుతో కనెక్షన్ లో ఉన్నప్పుడు చెల్లని డాటా అందింది."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "దూరంలోనున్న వినియోగదారుతో కనెక్షన్ ఏర్పడలేదు."
 
 msgid "Direct IM established"
@@ -7108,21 +6928,15 @@ msgstr "వార్నింగ్ లెవల్"
 msgid "Buddy Comment"
 msgstr "మిత్రుని వ్యాఖ్య "
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "ప్రామాణిక సర్వర్ :\n"
 " కు కనెక్ట్ చేయలేకపోయింది %s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"BOS సర్వర్ :\n"
-" కు కనెక్ట్ చేయలేకపోయింది %s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "సెర్వర్‌కు కనెక్ట్‌చేయలేని స్థితి. "
 
 #, fuzzy
 msgid "Username sent"
@@ -7138,9 +6952,9 @@ msgstr "కనెక్షన్‌ను ఫైనలైజేషన్ జర�
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "లాగిన్ చేయుట సాధ్యపడదు: మీరు %s సంతకం చేయలేరు. ఎందుకంటే స్క్రీన్‌పేరు పనికిరాదు. స్క్రీన్‌పేరు "
 "అక్షరంతోనే ప్రారంభించాలి. పేరులో అక్షరాలు, అంకెలు, స్పేసులు లేదా కేవలం అంకెలుమాత్రం ఉండవచ్చును. "
@@ -7152,27 +6966,22 @@ msgstr "మీరు త్వరలో డిస్కనెక్ట్ కా
 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
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "చెల్లుబాటు కాని పేరు. "
+msgid "Username does not exist"
+msgstr "వినియోగదారు అస్తిత్వంలో లేరు"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "ప్రస్తుతానికి మీ అకౌంట్ సస్పెండ్ చేయబడింది. "
 
 # service temporarily unavailable
@@ -7193,7 +7002,8 @@ msgstr ""
 "మీరు తరచుగా కనెక్ట్ చేస్తున్నారు, డిస్‌కనెక్ట్ చేస్తున్నారు. పది నిమిషాలు ఆగి మరల ప్రయత్నించండి. మీరు "
 "ప్రయత్నాన్ని కొనసాగిస్తే, మీరు ఇంకా ఎక్కువ కాలం ఆగవలసియుంటుంది."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "ఎంటర్ చేసిన SecurID పనికిరాదు."
 
 msgid "Enter SecurID"
@@ -7367,6 +7177,9 @@ msgstr "నుండి ఆన్‌లైన్. "
 msgid "Member Since"
 msgstr "నుండి సభ్యుడు."
 
+msgid "Capabilities"
+msgstr "యోగ్యతలు "
+
 msgid "Profile"
 msgstr "ప్రొఫైల్ "
 
@@ -7540,7 +7353,7 @@ msgstr "దూరంగా ఉన్న సందేశం చాలా పొ�
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7567,9 +7380,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "అనాథలు "
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "మీ మిత్రుల లిస్టులో ఇప్పటికే చాలామంది ఉన్నందువల్ల ఈ మిత్రుని %s చేర్చడం సాధ్యంకాదు. ఒక పేరును తొలగించి "
@@ -7578,9 +7391,9 @@ msgstr ""
 msgid "(no name)"
 msgstr "(పేరు లేదు)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
+msgstr "అజ్ఞాత కారణంవల్ల మీ కమాండ్ విఫలమైనది."
 
 # msgstr "అజ్ఞాత కారణంవల్ల మీ కమాండ్ విఫలమైనది."
 #, fuzzy, c-format
@@ -8445,7 +8258,7 @@ msgid "Update interval (seconds)"
 msgstr "రీడ్ చేయడంలో పొరపాటు"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "సర్వర్ సమాచారం తీసుకురావడం సాధ్యం కాదు "
 
 #, c-format
@@ -8472,10 +8285,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "సర్వర్ సమాచారం తీసుకురావడం సాధ్యం కాదు "
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "అభ్యర్థనా డైలాగ్"
 
@@ -8511,23 +8320,9 @@ msgid ""
 "%s"
 msgstr ""
 
-# we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "కనెక్ట్ చేయడంలో అసమర్థత. "
-
 msgid "Socket error"
 msgstr "సాకెట్ లో లోపం"
 
-msgid "Unable to read from socket"
-msgstr "సాకెట్‌ నుంచి రీడ్ చేయడం   సాధ్యం కావడం లేదు "
-
-msgid "Write Error"
-msgstr "రైట్ చేయడంలో పొరపాటు"
-
-# msgstr "%sను ట్రాన్స్‌ఫర్ చేయడాన్ని %s రద్దు చేశారు."
-msgid "Connection lost"
-msgstr "కనెక్షన్ పోయింది"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "వినియోగదారు సమాచారాన్ని సెట్ చేయండి ..."
@@ -8536,8 +8331,9 @@ msgstr "వినియోగదారు సమాచారాన్ని స�
 msgid "Requesting token"
 msgstr "అభ్యర్థన నిరాకరించబడింది."
 
-msgid "Couldn't resolve host"
-msgstr "హోస్ట్ ను నిశ్చయించలేకపోయాం"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "సెర్వర్‌కు కనెక్ట్‌చేయలేని స్థితి. "
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8592,7 +8388,7 @@ msgid "QQ Qun Command"
 msgstr "కమాండ్ "
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "సర్వర్ సమాచారం తీసుకురావడం సాధ్యం కాదు "
 
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
@@ -8620,9 +8416,6 @@ msgstr "ఫైలును పంపడంజరిగింది"
 msgid "%d canceled the transfer of %s"
 msgstr ""
 
-msgid "Connection closed (writing)"
-msgstr "కనెక్షన్ ముగిసింది (రైటింగ్)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>గ్రూపు శీర్షిక:</b> %s<br>"
@@ -8676,17 +8469,6 @@ msgstr "అదే సమయపు అడ్మిని స్ట్రేటర
 msgid "Sametime Administrator Announcement"
 msgstr "అదే సమయపు అడ్మిని స్ట్రేటర్ ప్రకటన "
 
-msgid "Connection reset"
-msgstr "కనెక్షన్ రీ సెట్ అయింది"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "సాకెట్ : %s నుంచి రీడింగ్ లో లోపం"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "హోస్ట్ కు కనెక్ట్‌ చేయలేని స్థితి "
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "%sనుంచి ప్రకటన"
@@ -8710,6 +8492,9 @@ msgstr "స్పీకర్లు"
 msgid "Video Camera"
 msgstr "వీడియో కెమెరా"
 
+msgid "File Transfer"
+msgstr "ఫైల్‌ బదిలీ"
+
 msgid "Supports"
 msgstr "సపోర్టులు"
 
@@ -9540,6 +9325,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "నెట్‌వర్క్ స్టాటిస్టిక్స్ "
 
+msgid "Ping"
+msgstr "పింగ్ "
+
 msgid "Ping failed"
 msgstr "పింగ్ వైఫల్యం "
 
@@ -9601,7 +9389,8 @@ msgstr "సపోర్టు పొందని పబ్లిక్ కీ �
 msgid "Disconnected by server"
 msgstr "సెర్వర్‌నుండి వేరైనది."
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "SILC సెర్వర్‌కు కనెక్ట్ చేస్తుండగా పొరపాటు. "
 
 msgid "Key Exchange failed"
@@ -9612,17 +9401,11 @@ msgid ""
 msgstr ""
 "వేరుపడిన సెషన్‌ను పునఃప్రారంభించడంలో వైఫల్యం. కొత్త కనెక్షన్‌ను సృష్టించడానికి Reconnectను నొక్కండి."
 
-msgid "Connection failed"
-msgstr "కనెక్షన్ వైఫల్యం "
-
 msgid "Performing key exchange"
 msgstr "కీ ఎక్స్‌చేంజీని నెరవేర్చుతున్నది."
 
-msgid "Unable to create connection"
-msgstr " కనెక్షన్ ఏర్పరచలేని స్థితి "
-
 #, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr " SILC కీ పెయిర్: %s ను లోడ్ చేయలేదు"
 
 # Progress
@@ -9630,10 +9413,15 @@ msgstr " SILC కీ పెయిర్: %s ను లోడ్ చేయలే�
 msgid "Connecting to SILC Server"
 msgstr "SILC సెర్వర్‌కు కనెక్ట్ చేయుచున్నది. "
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr " SILC కీ పెయిర్: %s ను లోడ్ చేయలేదు"
+
 msgid "Out of memory"
 msgstr "మెమొరీ లేదు. "
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "SILC ప్రోటోకాల్ ను ప్రారంభించజాలదు"
 
 #, fuzzy
@@ -9939,7 +9727,7 @@ msgid "Creating SILC key pair..."
 msgstr "SILC కీ జంటను సృష్టించండి ..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "SILC కీ జంటను సృష్టించండి ..."
 
 # Hint for translators: Please check the tabulator width here and in
@@ -10036,6 +9824,9 @@ msgstr "వైట్ బోర్డ్"
 msgid "No server statistics available"
 msgstr "సెర్వర్ స్టాటిస్టిక్స్ లభ్యమగుటలేదు."
 
+msgid "Error during connecting to SILC Server"
+msgstr "SILC సెర్వర్‌కు కనెక్ట్ చేస్తుండగా పొరపాటు. "
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "వైఫల్యం: వెర్షన్ మిస్‌మాచ్, మీ ఖాతాదారుని అప్‌గ్రేడ్ చేయండి."
@@ -10076,34 +9867,30 @@ msgstr "వైఫల్యం: పనికిరాని కుకీ "
 msgid "Failure: Authentication failed"
 msgstr "వైఫల్యం: ప్రమాణీకరణ వైఫల్యం "
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "SILC ఖాతాదారుల కనెక్షన్ ప్రారంభించడం సాధ్యం కాదు."
 
 msgid "John Noname"
 msgstr "జాన్ నోనేమ్"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr " SILC కీ పెయిర్: %s ను లోడ్ చేయలేదు"
 
-msgid "Could not write"
-msgstr "రాయలేక పోతున్నాం"
-
-msgid "Could not connect"
-msgstr "కనెక్ట్ చేయడం సాధ్యంమగుట లేదు. "
+msgid "Unable to create connection"
+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)  #-#-#-#-#
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "అజ్ఞాత తప్పు."
 
-msgid "Could not create listen socket"
-msgstr "వినదగిన సాకెట్ ను సృష్టించలేకపోతున్నాం"
-
-msgid "Could not resolve hostname"
-msgstr "హోస్ట్ పేరును నిశ్చయించలేకపోతున్నాం"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "సాకెట్‌ను సృష్టించలేదు"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -10146,6 +9933,98 @@ msgstr "ప్రమాణీకరణ పొందిన వినియోగ�
 msgid "Auth Domain"
 msgstr "ప్రమాణీకరణ పొందిన డొమైన్"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;గది&gt;:  యాహు నెట్‌వర్క్‌లో సంభాషణ గదిలో చేరుదాం."
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "జాబితా: యాహూ నెట్ వర్క్ లోనున్న రూమ్ ల జాబితా"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "డూడుల్: డూడుల్  సెషన్ ప్రారంభించవలసిందిగా వినియోగదారును అభ్యర్థించు"
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "యాహూ! ID"
+
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
+# *< name
+# *< version
+# *  summary
+# *  description
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo Protocol Plugin"
+
+msgid "Pager server"
+msgstr "పేజర్ సర్వర్"
+
+msgid "Pager port"
+msgstr "పేజర్ పోర్ట్ "
+
+msgid "File transfer server"
+msgstr "ఫైల్ బదిలీ సర్వర్"
+
+msgid "File transfer port"
+msgstr "ఫైల్ ట్రాన్స్‌ఫర్ పోర్ట్"
+
+msgid "Chat room locale"
+msgstr "చాట్ రూమ్ ప్రదేశం "
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "చాట్ రూమ్ మరియు గోష్టులను పట్టించుకోవద్దు"
+
+msgid "Chat room list URL"
+msgstr "చాట్ రూమ్ జాబితా Url"
+
+msgid "Yahoo Chat server"
+msgstr "యాహూ చాట్ సర్వర్"
+
+msgid "Yahoo Chat port"
+msgstr "యాహూ చాట్ పోర్ట్"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "యాహూ! ID"
+
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
+# *< name
+# *< version
+# *  summary
+# *  description
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo Protocol Plugin"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -10174,28 +10053,18 @@ msgstr "మిత్రుణ్ని చేర్చుకోవడాని�
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr "అజ్ఞాత పొరపాటు సంఖ్య %d. యాహూ! లోకి లాగ్-ఇన్ అవుతోంది. దీనిని వెబ్‌సైట్ సరిచేయవచ్చు."
 
 #. username or password missing
@@ -10233,37 +10102,33 @@ msgstr "మీ అకౌంట్ లాక్ అయినది. దయచే�
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "అజ్ఞాత పొరపాటు సంఖ్య %d. యాహూ! లోకి లాగ్-ఇన్ అవుతోంది. దీనిని వెబ్‌సైట్ సరిచేయవచ్చు."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "%s అకౌంట్ లోని సర్వర్ జాబితాకు %s మిత్రుణ్ని %s గ్రూపునకు చేర్చలేకపోయింది."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "సర్వర్ జాబితాకు మిత్రుణ్ని చేర్చడం సాధ్యంకాలేదు. "
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ వినదగిన %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "సర్వర్ నుంచి ఊహించని HTTP ప్రతిస్పందన అందింది."
 
-msgid "Connection problem"
-msgstr "కనెక్షన్ సమస్య"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
-
-# msgstr ""
-# "సర్వర్ తో కనెక్షన్ పోయింది:\n"
-# "%s"
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
+"సర్వర్ తో కనెక్షన్ పోయింది:\n"
 "%s"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
+"సర్వర్ తో కనెక్షన్ సాధ్యపడలేదు: \n"
+"%s"
 
 # msgstr ""
 # "సర్వర్ తో కనెక్షన్ సాధ్యపడలేదు: \n"
@@ -10330,84 +10195,16 @@ msgstr "వినియోగదారుతో చాట్ లో చేరం
 msgid "Open Inbox"
 msgstr "హాట్ మెయిల్ ఇన్ బాక్స్ ను తెరవండి."
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;గది&gt;:  యాహు నెట్‌వర్క్‌లో సంభాషణ గదిలో చేరుదాం."
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "జాబితా: యాహూ నెట్ వర్క్ లోనున్న రూమ్ ల జాబితా"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "డూడుల్: డూడుల్  సెషన్ ప్రారంభించవలసిందిగా వినియోగదారును అభ్యర్థించు"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "యాహూ! ID"
-
-# *< type
-# *< ui_requirement
-# *< flags
-# *< dependencies
-# *< priority
-# *< id
-# *< name
-# *< version
-# *  summary
-# *  description
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo Protocol Plugin"
-
-msgid "Yahoo Japan"
-msgstr "యూహూ జపాన్ "
-
-msgid "Pager server"
-msgstr "పేజర్ సర్వర్"
-
-msgid "Japan Pager server"
-msgstr "జపాన్ పేజర్ సర్వర్"
-
-msgid "Pager port"
-msgstr "పేజర్ పోర్ట్ "
-
-msgid "File transfer server"
-msgstr "ఫైల్ బదిలీ సర్వర్"
-
-msgid "Japan file transfer server"
-msgstr "జపాన్ ఫైల్ బదిలీ సర్వర్"
-
-msgid "File transfer port"
-msgstr "ఫైల్ ట్రాన్స్‌ఫర్ పోర్ట్"
-
-msgid "Chat room locale"
-msgstr "చాట్ రూమ్ ప్రదేశం "
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "చాట్ రూమ్ మరియు గోష్టులను పట్టించుకోవద్దు"
-
-msgid "Chat room list URL"
-msgstr "చాట్ రూమ్ జాబితా Url"
-
-msgid "Yahoo Chat server"
-msgstr "యాహూ చాట్ సర్వర్"
-
-msgid "Yahoo Chat port"
-msgstr "యాహూ చాట్ పోర్ట్"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "డూడుల్ కోసం అభ్యర్థనను పంపించు."
 
+# we didn't successfully connect. tdt->toc_fd is valid here
+msgid "Unable to connect."
+msgstr "కనెక్ట్ చేయడంలో అసమర్థత. "
+
 msgid "Unable to establish file descriptor."
 msgstr "ఫైల్ డెస్క్రిప్టర్‌ను స్థాపించడంలో అసమర్థత."
 
@@ -10415,6 +10212,9 @@ msgstr "ఫైల్ డెస్క్రిప్టర్‌ను స్థ�
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr " %s కు %s  ఫైల్ పంపదలుచుకున్నారు "
 
+msgid "Write Error"
+msgstr "రైట్ చేయడంలో పొరపాటు"
+
 msgid "Yahoo! Japan Profile"
 msgstr "యూహూ జపాన్ ప్రొఫైల్ "
 
@@ -10530,23 +10330,19 @@ msgstr "ధ్వనులు "
 msgid "Webcams"
 msgstr "వెబ్ కెమేరాలు "
 
+msgid "Connection problem"
+msgstr "కనెక్షన్ సమస్య"
+
 msgid "Unable to fetch room list."
 msgstr "గది లిస్టును తీసుకురావడంలో వైఫల్యం. "
 
 msgid "User Rooms"
 msgstr "వినియోగదారుని గదులు "
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "YCHT సెర్వర్‌తో కనెక్షన్ సమస్య."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"సర్వర్ నుంచి కనెక్షన్ తెగిపోయింది \n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10679,15 +10475,9 @@ msgstr "అభిరుచి గల విషయం"
 msgid "Exposure"
 msgstr "చూపించుము."
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-
 # msgstr "సాకెట్‌ను సృష్టించలేదు. "
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr " నుంచి స్పందనను విశ్లేషించలేక పోయింది HTTP ప్రాక్సి: %s\n"
 
 #, c-format
@@ -10696,17 +10486,14 @@ msgstr "ప్రాక్సీ కనెక్షన్ పొరపాటు
 
 # XXX: why in the hell are we calling Pidgin_connection_error() here?
 # Forbidden
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "ప్రవేశం నిషేధం: ప్రాక్సీ సెర్వర్ port %d tunnelling వదిలేస్తోంది."
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "%s నిశ్చయించడంలో పొరపాటు"
 
-msgid "Could not resolve host name"
-msgstr "హోస్ట్ పేరును నిశ్చయించలేకపోతున్నాం"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10938,12 +10725,6 @@ msgstr "%sకు రాయడంలో లోపం: %s"
 msgid "Unable to connect to %s: %s"
 msgstr ""
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "లాగిన్ చేయాలంటే సర్వర్ కు TLS/SSL అవసరం. TLS/SSL సహకారం లభించలేదు. "
-
 #, c-format
 msgid " - %s"
 msgstr ""
@@ -11206,9 +10987,13 @@ msgstr "Buddy _Pounceను చేర్చండి."
 msgid "View _Log"
 msgstr "View _Log"
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
 msgstr ""
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "ఆఫ్ లైన్ లో ఉన్న మిత్రులను చూపించు"
+
 msgid "_Alias..."
 msgstr "_మారుపేరు ..."
 
@@ -11767,6 +11552,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "%s కోసం వినియోగదారు సమాచారాన్ని  మార్చండి. "
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11819,7 +11607,8 @@ msgstr "ఉపేక్ష "
 msgid "Get Away Message"
 msgstr "సందేశానికి దూరంగా"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "చివరిగా చెప్పినది"
 
 msgid "Unable to save icon file to disk."
@@ -12822,7 +12611,7 @@ msgid "Hyperlink visited color"
 msgstr "హైపర్‌లింక్ కలర్ "
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "మౌస్ హైపర్ లింక్ లపై ఉన్నప్పుడు వాటిని చిత్రించడానికి రంగు."
 
 msgid "Hyperlink prelight color"
@@ -12860,16 +12649,23 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 # ---------- "Notification Removals" ----------
 #, fuzzy
 msgid "Typing notification color"
 msgstr "సూచనను తీసివేయడం"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "కొత్త మెయిల్ నోటిఫికేషన్లు "
 
 #, fuzzy
 msgid "Typing notification font"
@@ -13269,6 +13065,13 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 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)  #-#-#-#-#
+#, fuzzy
+msgid "No message"
+msgstr "అజ్ఞాత సందేశం"
+
 msgid "Open All Messages"
 msgstr "అన్ని సందేశాలను తెరవండి"
 
@@ -13293,13 +13096,6 @@ msgstr ""
 "\n"
 "%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)  #-#-#-#-#
-#, fuzzy
-msgid "No message"
-msgstr "అజ్ఞాత సందేశం"
-
 msgid "The following plugins will be unloaded."
 msgstr "ఈ కింది ప్లగ్ ఇన్ లను అన్ లోడ్ అవుతాయి."
 
@@ -13538,8 +13334,10 @@ msgstr "_సిస్టమ్ ట్రే ఐకాన్ ను చూపి�
 msgid "On unread messages"
 msgstr "చదవని సందేశాల పై"
 
-msgid "Conversation Window Hiding"
-msgstr "సంభాషణ విండో దాచబడుతోంది"
+# IM Convo trans options
+#, fuzzy
+msgid "Conversation Window"
+msgstr "IM Conversation Windows"
 
 msgid "_Hide new IM conversations:"
 msgstr "కొత్త IM సంభాషణలను: దాచు _"
@@ -13547,6 +13345,10 @@ msgstr "కొత్త IM సంభాషణలను: దాచు _"
 msgid "When away"
 msgstr "దూరంగా ఉన్నప్పుడు "
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "సంభాషణ విండోను లేవనెత్తు"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "టాబ్ లు"
@@ -13606,10 +13408,6 @@ msgstr "స్మూత్-స్క్రోలింగ్ ను ఉపయో
 msgid "F_lash window when IMs are received"
 msgstr " IM లు అందుకొన్నప్పుడు విండోను ఫ్లాష్ _ చేయు"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "సంభాషణ విండోను లేవనెత్తు"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -13646,8 +13444,8 @@ msgstr "వినియోగదారుని సమాచారం తీస�
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<స్పాన్ స్టైల్=\"ఇటాలిక్\">ఉదాహరణ: stunserver.org</span>"
 
-#, fuzzy
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_ఆటోడిటెక్ట్ IP అడ్రస్  "
 
 msgid "Public _IP:"
@@ -14038,34 +13836,18 @@ msgstr "సేవ్ చేసి, ఉపయోగించు"
 msgid "Status for %s"
 msgstr "%s కోసం స్థాయి "
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "స్మైలీని చేర్చండి."
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
 #, fuzzy
-msgid "Duplicate Shortcut"
-msgstr "డూప్లికేట్ కరక్షన్"
+msgid "Custom Smiley"
+msgstr "స్మైలీని చేర్చండి."
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "స్థాయికోసం ఖాళీగాలేని శీర్షికను దయచేసి ఎంటర్ చేయండి. "
+msgid "Duplicate Shortcut"
+msgstr "డూప్లికేట్ కరక్షన్"
 
 #, fuzzy
 msgid "Edit Smiley"
@@ -14198,9 +13980,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "లాంచర్ ను పంపజాలదు"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "మీరు డెస్క్ టాప్ లాంచర్ ను తెచ్చివేశారు. స్వయంగా ఈ లాంచర్ ను పంపేబదులు లాంచర్ దేన్ని సూచిస్తే దాన్నిపంపాలని "
 "మీరు భావిస్తున్నట్టుంది."
@@ -14891,9 +14674,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "సంయుక్త స్వరకల్పన కోసం మ్యూజిక్ సందేశాల ప్లగ్ ఇన్. "
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "వాస్తవిక సమయంలో ఉమ్మడి స్కోరును ఎడిట్ చేయడం ద్వారా ఒక సంగీతాంశం పై ఒకేసారి అనేకమంది వినియోగదారులు "
 "పనిచేయడానికి మ్యూజిక్ సందేశాల ప్లగ్ ఇన్ వీలుకల్పిస్తుంది."
@@ -15218,7 +15002,7 @@ msgstr "సంభాషణ విండో దాచబడుతోంది"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -15577,8 +15361,9 @@ msgstr "పిడ్గ్విన్ అవకాశాలు"
 msgid "Options specific to Pidgin for Windows."
 msgstr "విండోస్ కోసం పిడ్గ్విన్ కు ప్రత్యేకమైన అవకాశాలు."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "మిత్రుల జాబితా డాకింగ్ తరహాలో విండోస్ కోసం పిడ్గ్విన్ కు ప్రత్యేకమైన అవకాశాలు కల్పిస్తుంది."
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -15620,6 +15405,278 @@ msgstr "కొత్త raw XMPP స్టాంజాలను పంపిం�
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "ఈ ప్లగ్ ఇన్ XMPP సర్వర్ ను లేదా క్లైంట్స్ ను డీబగ్గింగ్ చేయాడానికి ఉపయోగపడుతుంది."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "సాకెట్ ను తెరవజాలదు"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "సాకెట్ పై వినలేకపోతున్నాం"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "సాకెట్‌ను చదవడం సాధ్యంకాదు"
+
+#~ msgid "Connection failed."
+#~ msgstr "కనెక్ట్ అవడంలో వైఫల్యం."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "సర్వర్ డిస్‌కనెక్ట్ అయింది"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "సాకెట్‌ను సృష్టించలేదు"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "హోస్ట్‌కు కనెక్ట్ చేయలేదు"
+
+#~ msgid "Read error"
+#~ msgstr "రీడ్ చేయడంలో పొరపాటు"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "సర్వర్ తో కనెక్షన్ సాధ్యపడలేదు: \n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "రైట్ చేయడంలో పొరపాటు"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "డైరెక్టరీ సమాచారాన్ని సెట్ చేయండి. "
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "సంపూర్ణ అడ్రస్ "
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "చాట్ మారుపేరు"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "వినియోగాదారునికి డైరెక్టరీ సమాచారం లేదు. "
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "కమాండ్ "
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "నమోదులో పొరపాటు"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "ప్రదేశం"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "వినియోగదారు అన్వేషణ"
+
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "మిత్రుడి State Notification"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "సపోర్టులేని వెర్షన్ "
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "దిశ"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "వినియోగదారుని మోడ్స్ "
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "వినియోగదారుని హద్దు "
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "యోగ్యతలు "
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "వినియోగదారు పేరు "
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "కీ ఎక్స్‌చెంజ్‌తో IM "
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "ఇ-మెయిల్ అడ్రస్ "
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "ప్రొఫైల్ "
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "పింగ్ "
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "వినియోగదారు పేరు "
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "ప్రత్యక్ష వీడియో "
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "సందేశం అందినది"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "పబ్లిక్ కీ బాబిల్ ప్రింట్ "
+
+# Build the user options frame.
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "వినియోగదారుని ఆప్షన్స్."
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "వినియోగదారుని మోడ్స్ "
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "వినియోగదారు పేరు "
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "వినియోగదారుని హద్దు "
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Trillian Encryption"
+
+#~ msgid "Read Error"
+#~ msgstr "రీడ్ చేయడంలో పొరపాటు"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "సర్వర్‌కు కనెక్ట్ చేయడంలో వైఫల్యం. "
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "పూర్తి క్యూ."
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "సందేశాన్ని పద విశ్లేషణ చేయడంలో అశక్తత"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "లాగిన్ విఫలమైనది (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "మీరు మరో వర్క్‌స్టేషన్‌లో లాగ్ చేసినారు గాన మిమ్మల్ని లగ్‌ ఔట్ చేయడమైనది."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "పొరపాటు. SSL సపోర్ట్ ఇన్‌స్టాల్ కాలేదు. "
+
+#~ msgid "Incorrect password."
+#~ msgstr "తప్పు పాస్‌వర్డ్."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "BOS సర్వర్ :\n"
+#~ " కు కనెక్ట్ చేయలేకపోయింది %s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "మీరు త్వరలో డిస్కనెక్ట్ కాబోతున్నారు.  అప్ డేట్లకోసం %s చూడండి."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "కనెక్ట్ చేయుట సాధ్యం కాదు"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "చెల్లుబాటు కాని పేరు. "
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "సర్వర్ సమాచారం తీసుకురావడం సాధ్యం కాదు "
+
+# msgstr "%sను ట్రాన్స్‌ఫర్ చేయడాన్ని %s రద్దు చేశారు."
+#~ msgid "Connection lost"
+#~ msgstr "కనెక్షన్ పోయింది"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "హోస్ట్ ను నిశ్చయించలేకపోయాం"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "కనెక్షన్ ముగిసింది (రైటింగ్)"
+
+#~ msgid "Connection reset"
+#~ msgstr "కనెక్షన్ రీ సెట్ అయింది"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "సాకెట్ : %s నుంచి రీడింగ్ లో లోపం"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "హోస్ట్ కు కనెక్ట్‌ చేయలేని స్థితి "
+
+#~ msgid "Could not write"
+#~ msgstr "రాయలేక పోతున్నాం"
+
+#~ msgid "Could not connect"
+#~ msgstr "కనెక్ట్ చేయడం సాధ్యంమగుట లేదు. "
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "వినదగిన సాకెట్ ను సృష్టించలేకపోతున్నాం"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "హోస్ట్ పేరును నిశ్చయించలేకపోతున్నాం"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "తప్పుడు పాస్‌వర్డ్ "
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "యూహూ జపాన్ "
+
+#~ msgid "Japan Pager server"
+#~ msgstr "జపాన్ పేజర్ సర్వర్"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "జపాన్ ఫైల్ బదిలీ సర్వర్"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "సర్వర్ నుంచి కనెక్షన్ తెగిపోయింది \n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "హోస్ట్ పేరును నిశ్చయించలేకపోతున్నాం"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "లాగిన్ చేయాలంటే సర్వర్ కు TLS/SSL అవసరం. TLS/SSL సహకారం లభించలేదు. "
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "సంభాషణ విండో దాచబడుతోంది"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "స్థాయికోసం ఖాళీగాలేని శీర్షికను దయచేసి ఎంటర్ చేయండి. "
+
 #, fuzzy
 #~ msgid "Activate which ID?"
 #~ msgstr "ఏ IDని యాక్టివ్ చేయాలి?"
diff --git a/po/th.po b/po/th.po
index ca939293e2..389a2593a7 100644
--- a/po/th.po
+++ b/po/th.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2006-04-04 15:35+0700\n"
 "Last-Translator: Isriya Paireepairit <markpeak@gmail.com>\n"
 "Language-Team: Thai <l10n@opentle.org>\n"
@@ -2586,7 +2586,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2637,7 +2637,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2880,12 +2880,13 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
+msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2939,15 +2940,17 @@ msgstr ""
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-msgid "Cannot open socket"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
 
-msgid "Could not listen on socket"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr ""
@@ -2994,13 +2997,14 @@ msgstr ""
 msgid "Load buddylist from file..."
 msgstr ""
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "รหัสผ่านไม่ตรงกัน"
 
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr ""
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3012,14 +3016,18 @@ msgstr ""
 msgid "Password"
 msgstr "รหัสผ่าน"
 
-msgid "Password (retype)"
-msgstr "รหัสผ่าน (ใส่อีกครั้ง)"
+msgid "Password (again)"
+msgstr "รหัสผ่าน (ซ้ำ)"
 
-msgid "Enter current token"
+msgid "Enter captcha text"
 msgstr ""
 
-msgid "Current token"
-msgstr ""
+# msgstr ""
+# "เกิดข้อผิดพลาดขณะบันทึกรูป: %s\n"
+# "%s"
+#, fuzzy
+msgid "Captcha"
+msgstr "บันทึกรูปภาพ"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr ""
@@ -3072,6 +3080,15 @@ msgstr ""
 msgid "Current password"
 msgstr ""
 
+msgid "Password (retype)"
+msgstr "รหัสผ่าน (ใส่อีกครั้ง)"
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
@@ -3119,8 +3136,9 @@ msgstr ""
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-msgid "Unable to read socket"
-msgstr ""
+#, fuzzy
+msgid "Unable to read from socket"
+msgstr "ไม่สามารถส่งข้อความได้"
 
 msgid "Buddy list downloaded"
 msgstr ""
@@ -3134,7 +3152,13 @@ msgstr ""
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
-msgid "Connection failed."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr ""
+
+msgid "Connection failed"
 msgstr ""
 
 msgid "Add to chat"
@@ -3143,19 +3167,24 @@ msgstr ""
 msgid "Chat _name:"
 msgstr ""
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "ไม่สามารถส่งข้อความได้"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "กำลังเชื่อมต่อ"
+
 msgid "Chat error"
 msgstr ""
 
 msgid "This chat name is already in use"
 msgstr ""
 
-msgid "Not connected to the server."
-msgstr ""
+#, fuzzy
+msgid "Not connected to the server"
+msgstr "บันทึกการสนทนากับ %s"
 
 msgid "Find buddies..."
 msgstr ""
@@ -3214,8 +3243,9 @@ msgstr "ไม่ได้ตั้งหัวข้อไว้"
 msgid "File Transfer Failed"
 msgstr "การส่งแฟ้มล้มเหลว"
 
-msgid "Could not open a listening port."
-msgstr ""
+#, fuzzy
+msgid "Unable to open a listening port."
+msgstr "ไม่สามารถเปิดแฟ้มได้"
 
 msgid "Error displaying MOTD"
 msgstr ""
@@ -3230,8 +3260,16 @@ msgstr ""
 msgid "MOTD for %s"
 msgstr ""
 
-msgid "Server has disconnected"
-msgstr "การเชื่อมต่อกับเซิร์ฟเวอร์ถูกตัด"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "บันทึกการสนทนากับ %s"
 
 msgid "View MOTD"
 msgstr ""
@@ -3246,22 +3284,20 @@ msgstr "_รหัสผ่าน:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "ชื่อเล่นของ IRC ไม่อนุญาตให้มีช่องว่าง"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "กำลังเชื่อมต่อ"
-
 msgid "SSL support unavailable"
 msgstr ""
 
-msgid "Couldn't create socket"
+msgid "Unable to connect"
 msgstr ""
 
-msgid "Couldn't connect to host"
-msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
 
-msgid "Read error"
-msgstr ""
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "การเชื่อมต่อกับเซิร์ฟเวอร์ถูกตัด"
 
 msgid "Users"
 msgstr "ผู้ใช้"
@@ -3650,10 +3686,10 @@ msgstr ""
 msgid "execute"
 msgstr "ลบ"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3668,8 +3704,13 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr ""
 
-msgid "Invalid response from server."
-msgstr ""
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "เชื่อมต่อล้มเหลว"
+
+#, fuzzy
+msgid "Invalid response from server"
+msgstr "เซิร์ฟเวอร์ไม่ถูกต้อง"
 
 msgid "Server does not use any supported authentication method"
 msgstr ""
@@ -3680,8 +3721,9 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr ""
 
-msgid "SASL error"
-msgstr ""
+#, fuzzy, c-format
+msgid "SASL error: %s"
+msgstr "เซิร์ฟเวอร์"
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -3696,22 +3738,14 @@ msgstr ""
 msgid "Unable to establish a connection with the server"
 msgstr "บันทึกการสนทนากับ %s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "บันทึกการสนทนากับ %s"
 
 #, fuzzy
 msgid "Unable to establish SSL connection"
 msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
 
-msgid "Unable to create socket"
-msgstr ""
-
-msgid "Write error"
-msgstr ""
-
 msgid "Full Name"
 msgstr "ชื่อเต็ม"
 
@@ -3782,177 +3816,6 @@ msgstr ""
 msgid "Local Time"
 msgstr "ที่อยู่:"
 
-msgid "Last Activity"
-msgstr ""
-
-msgid "Service Discovery Info"
-msgstr ""
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "ที่อยู่ (เพิ่มเติม)"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "ตั้งชื่อห้องสนทนา"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "เรียกคำสั่ง"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "เกิดข้อผิดพลาดในการลงทะเบียน"
-
-#, fuzzy
-msgid "User Location"
-msgstr "ตัวเลือกสำหรับผู้ใช้"
-
-msgid "User Avatar"
-msgstr ""
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "การแจ้งเตือนข้อความ"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "บันทึกการสนทนา"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "เริ่มการตรวจสอบผู้ใช้"
-
-msgid "File Transfer"
-msgstr ""
-
-msgid "User Mood"
-msgstr ""
-
-msgid "User Activity"
-msgstr ""
-
-msgid "Entity Capabilities"
-msgstr ""
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "ชื่อผู้ใช้"
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "ที่อยู่อีเมล"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "แฟ้มประวัติ MSN"
-
-msgid "Jingle"
-msgstr ""
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "ชื่อเล่น"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr ""
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "ได้รับข้อความ"
-
-msgid "Public Key Publishing"
-msgstr ""
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "ตัวเลือกสำหรับผู้ใช้"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "คู่สนทนากำลังพิมพ์..."
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "ชื่อผู้ใช้"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "คู่สนทนากำลังพิมพ์..."
-
-msgid "Ping"
-msgstr ""
-
-msgid "Stanza Encryption"
-msgstr ""
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr ""
-
 msgid "Priority"
 msgstr ""
 
@@ -3964,7 +3827,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "ไม่ได้ล็อกอิน"
 
 msgid "Middle Name"
@@ -4148,16 +4011,12 @@ msgid "Roles:"
 msgstr "ตำแหน่ง"
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "ข้อความปกติ"
 
-msgid "Read Error"
-msgstr ""
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4340,9 +4199,6 @@ msgstr "คุณเปลี่ยนรหัสผ่านเรียบร
 msgid "Error changing password"
 msgstr "เกิดปัญหาในการเปลี่ยนรหัสผ่าน"
 
-msgid "Password (again)"
-msgstr "รหัสผ่าน (ซ้ำ)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "เปลี่ยนรหัสผ่าน"
@@ -4725,6 +4581,14 @@ msgstr ""
 msgid "Unknown Error in presence"
 msgstr ""
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr ""
+
+#, c-format
+msgid "Error in chat %s"
+msgstr ""
+
 msgid "Create New Room"
 msgstr "สร้างห้องใหม่"
 
@@ -4739,15 +4603,19 @@ msgstr ""
 msgid "_Accept Defaults"
 msgstr ""
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr ""
+#, fuzzy
+msgid "No reason"
+msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุ"
+
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "%s เปลี่ยนสถานะเป็นไม่ได้ใช้งาน (%s)"
 
 #, c-format
-msgid "Error in chat %s"
+msgid "Kicked (%s)"
 msgstr ""
 
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr ""
 
 #, fuzzy
@@ -5241,9 +5109,6 @@ msgstr "เ_ริ่มสนทนากลุ่ม"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 
-msgid "Failed to connect to server."
-msgstr ""
-
 msgid "Error retrieving profile"
 msgstr "เกิดปัญหาในการอ่านแฟ้มประวัติ"
 
@@ -5488,9 +5353,6 @@ msgstr ""
 msgid "Message was not sent because an unknown error occurred."
 msgstr ""
 
-msgid "Unable to connect"
-msgstr ""
-
 msgid "Writing error"
 msgstr ""
 
@@ -5503,19 +5365,21 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Our protocol is not supported by the server."
+msgid "Our protocol is not supported by the server"
 msgstr ""
 
-msgid "Error parsing HTTP."
-msgstr ""
+#, fuzzy
+msgid "Error parsing HTTP"
+msgstr "เกิดปัญหาในการอ่านแฟ้มประวัติ"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "คุณได้เข้าระบบจากที่อื่น"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "The MSN servers are going down temporarily."
+msgid "The MSN servers are going down temporarily"
 msgstr ""
 
 #, c-format
@@ -5526,9 +5390,6 @@ msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 
-msgid "Unknown error."
-msgstr ""
-
 msgid "Handshaking"
 msgstr ""
 
@@ -5625,6 +5486,9 @@ msgstr "ปลั๊กอิน Jabber"
 msgid "%s is not a valid group."
 msgstr ""
 
+msgid "Unknown error."
+msgstr ""
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr ""
@@ -5736,12 +5600,6 @@ msgstr[0] ""
 msgid "Add contacts from server"
 msgstr ""
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr ""
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr ""
@@ -5763,17 +5621,6 @@ msgstr ""
 msgid "Invalid input condition"
 msgstr ""
 
-msgid "Read buffer full (2)"
-msgstr ""
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "ข้อความที่ไม่ได้อ่าน"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
-
 msgid "Failed to add buddy"
 msgstr ""
 
@@ -5861,6 +5708,12 @@ msgstr ""
 msgid "Client Version"
 msgstr "ปิดการสนทนา"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr ""
 
@@ -6121,9 +5974,9 @@ msgstr ""
 msgid "Unknown error: 0x%X"
 msgstr ""
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6221,9 +6074,6 @@ msgstr ""
 msgid "Authenticating..."
 msgstr ""
 
-msgid "Unable to connect to server."
-msgstr ""
-
 msgid "Waiting for response..."
 msgstr ""
 
@@ -6244,20 +6094,14 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr ""
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr ""
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-
-msgid "Error. SSL support is not installed."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 
 msgid "This conference has been closed. No more messages can be sent."
@@ -6295,10 +6139,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "เกิดปัญหาในการอ่านแฟ้มประวัติ"
 
-msgid "Incorrect password."
-msgstr ""
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, fuzzy
@@ -6310,17 +6151,8 @@ msgid "Invalid chat room name"
 msgstr "ใส่ชื่อห้องไม่ถูกต้อง"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "การเชื่อมต่อกับเซิร์ฟเวอร์ถูกตัด"
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-
-msgid "Received invalid data on connection with server."
-msgstr ""
+msgid "Received invalid data on connection with server"
+msgstr "บันทึกการสนทนากับ %s"
 
 #. *< type
 #. *< ui_requirement
@@ -6369,8 +6201,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "บันทึกการสนทนากับ %s"
 
 msgid "Direct IM established"
 msgstr ""
@@ -6563,16 +6396,12 @@ msgid "Buddy Comment"
 msgstr ""
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
+msgid "Unable to connect to BOS server: %s"
+msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
 
 #, fuzzy
 msgid "Username sent"
@@ -6587,9 +6416,9 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 
 #, fuzzy, c-format
@@ -6599,27 +6428,21 @@ 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
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "ชื่อผู้ใช้ไม่ถูกต้อง"
+msgid "Username does not exist"
+msgstr "ไม่มีชื่อ"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+msgid "Your account is currently suspended"
 msgstr ""
 
 #. service temporarily unavailable
@@ -6636,7 +6459,7 @@ msgid ""
 "try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
-msgid "The SecurID key entered is invalid."
+msgid "The SecurID key entered is invalid"
 msgstr ""
 
 msgid "Enter SecurID"
@@ -6786,6 +6609,9 @@ msgstr ""
 msgid "Member Since"
 msgstr ""
 
+msgid "Capabilities"
+msgstr ""
+
 #, fuzzy
 msgid "Profile"
 msgstr "แฟ้มประวัติ MSN"
@@ -6942,7 +6768,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6965,7 +6791,7 @@ msgstr ""
 
 #, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
@@ -6973,7 +6799,7 @@ msgid "(no name)"
 msgstr ""
 
 #, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr ""
 
 #, fuzzy, c-format
@@ -7806,7 +7632,7 @@ msgid "Update interval (seconds)"
 msgstr "ข้อมูลคู่สนทนา"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "เซิร์ฟเวอร์"
 
 #, c-format
@@ -7832,10 +7658,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "เซิร์ฟเวอร์"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "เหลืออีก"
 
@@ -7873,24 +7695,10 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr ""
-
 msgid "Socket error"
 msgstr ""
 
 #, fuzzy
-msgid "Unable to read from socket"
-msgstr "ไม่สามารถส่งข้อความได้"
-
-msgid "Write Error"
-msgstr ""
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "เกิดข้อผิดพลาดในการเชื่อมต่อ"
-
-#, fuzzy
 msgid "Getting server"
 msgstr "แก้ข้อมูลผู้ใช้..."
 
@@ -7898,8 +7706,9 @@ msgstr "แก้ข้อมูลผู้ใช้..."
 msgid "Requesting token"
 msgstr "เหลืออีก"
 
-msgid "Couldn't resolve host"
-msgstr ""
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "ไม่สามารถส่งข้อความได้"
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -7950,7 +7759,7 @@ msgid "QQ Qun Command"
 msgstr "เรียกคำสั่ง"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "เซิร์ฟเวอร์"
 
 #, fuzzy
@@ -7973,9 +7782,6 @@ msgstr "ล้มเหลว"
 msgid "%d canceled the transfer of %s"
 msgstr "%s ยกเลิกการส่งแฟ้ม %s"
 
-msgid "Connection closed (writing)"
-msgstr ""
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr ""
@@ -8029,17 +7835,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-msgid "Connection reset"
-msgstr ""
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr ""
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr ""
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -8062,6 +7857,9 @@ msgstr ""
 msgid "Video Camera"
 msgstr ""
 
+msgid "File Transfer"
+msgstr ""
+
 #, fuzzy
 msgid "Supports"
 msgstr "พอร์ต"
@@ -8822,6 +8620,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr ""
 
+msgid "Ping"
+msgstr ""
+
 msgid "Ping failed"
 msgstr ""
 
@@ -8880,8 +8681,9 @@ msgstr ""
 msgid "Disconnected by server"
 msgstr ""
 
-msgid "Error during connecting to SILC Server"
-msgstr ""
+#, fuzzy
+msgid "Error connecting to SILC Server"
+msgstr "เซิร์ฟเวอร์"
 
 msgid "Key Exchange failed"
 msgstr ""
@@ -8890,27 +8692,27 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-msgid "Connection failed"
-msgstr ""
-
 msgid "Performing key exchange"
 msgstr ""
 
-msgid "Unable to create connection"
-msgstr ""
-
-msgid "Could not load SILC key pair"
-msgstr ""
+#, fuzzy
+msgid "Unable to load SILC key pair"
+msgstr "ไม่สามารถเปิดแฟ้มได้"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr ""
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "ไม่สามารถเปิดแฟ้มได้"
+
 msgid "Out of memory"
 msgstr ""
 
-msgid "Cannot initialize SILC protocol"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
+msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
 
 msgid "Error loading SILC key pair"
 msgstr ""
@@ -9186,8 +8988,9 @@ msgstr ""
 msgid "Creating SILC key pair..."
 msgstr ""
 
-msgid "Cannot create SILC key pair\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to create SILC key pair"
+msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9275,6 +9078,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr ""
 
+msgid "Error during connecting to SILC Server"
+msgstr ""
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
@@ -9315,33 +9121,28 @@ msgstr ""
 msgid "Failure: Authentication failed"
 msgstr ""
 
-msgid "Cannot initialize SILC Client connection"
-msgstr ""
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
+msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
 
 #, fuzzy
 msgid "John Noname"
 msgstr "ไม่มีชื่อ"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr ""
-
-msgid "Could not write"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
+msgstr "ไม่สามารถเปิดแฟ้มได้"
 
-msgid "Could not connect"
+msgid "Unable to create connection"
 msgstr ""
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุ"
 
-msgid "Could not create listen socket"
-msgstr ""
-
 #, fuzzy
-msgid "Could not resolve hostname"
-msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
+msgid "Unable to create listen socket"
+msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -9384,6 +9185,80 @@ msgstr ""
 msgid "Auth Domain"
 msgstr ""
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr ""
+
+msgid "list: List rooms on the Yahoo network"
+msgstr ""
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "เลือก..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "ปลั๊กอิน Jabber"
+
+#, fuzzy
+msgid "Pager server"
+msgstr "เซิร์ฟเวอร์พร็อกซี"
+
+msgid "Pager port"
+msgstr ""
+
+#, fuzzy
+msgid "File transfer server"
+msgstr "ส่งแฟ้ม"
+
+msgid "File transfer port"
+msgstr ""
+
+msgid "Chat room locale"
+msgstr ""
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "ไม่สนใจคำเชิญร่วมสนทนากลุ่มหรือประชุม"
+
+msgid "Chat room list URL"
+msgstr ""
+
+msgid "Yahoo Chat server"
+msgstr ""
+
+msgid "Yahoo Chat port"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "เลือก..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "ปลั๊กอิน Jabber"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9411,26 +9286,16 @@ msgstr ""
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 
 #. username or password missing
@@ -9465,33 +9330,27 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
 #, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-msgid "Could not add buddy to server list"
-msgstr ""
+#, fuzzy
+msgid "Unable to add buddy to server list"
+msgstr "เพิ่มคู่สนทนาในรายการคู่สนทนาของคุณ?"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-msgid "Received unexpected HTTP response from server."
-msgstr ""
-
-msgid "Connection problem"
+msgid "Received unexpected HTTP response from server"
 msgstr ""
 
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "บันทึกการสนทนากับ %s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "บันทึกการสนทนากับ %s"
 
 msgid "Not at Home"
 msgstr ""
@@ -9554,77 +9413,15 @@ msgstr ""
 msgid "Open Inbox"
 msgstr "เปิดกล่องจดหมายเข้า Hotmail"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-
-msgid "list: List rooms on the Yahoo network"
-msgstr ""
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "เลือก..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr ""
-
-msgid "Yahoo Japan"
-msgstr ""
-
-#, fuzzy
-msgid "Pager server"
-msgstr "เซิร์ฟเวอร์พร็อกซี"
-
-msgid "Japan Pager server"
-msgstr ""
-
-msgid "Pager port"
-msgstr ""
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "ส่งแฟ้ม"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "การส่งแฟ้มสำเร็จ"
-
-msgid "File transfer port"
-msgstr ""
-
-msgid "Chat room locale"
-msgstr ""
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "ไม่สนใจคำเชิญร่วมสนทนากลุ่มหรือประชุม"
-
-msgid "Chat room list URL"
-msgstr ""
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-msgid "Yahoo Chat port"
-msgstr ""
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr ""
+
 msgid "Unable to establish file descriptor."
 msgstr ""
 
@@ -9632,6 +9429,9 @@ msgstr ""
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s ขอส่งแฟ้ม %s ให้คุณ"
 
+msgid "Write Error"
+msgstr ""
+
 msgid "Yahoo! Japan Profile"
 msgstr ""
 
@@ -9736,20 +9536,18 @@ msgstr ""
 msgid "Webcams"
 msgstr ""
 
-msgid "Unable to fetch room list."
+msgid "Connection problem"
 msgstr ""
 
-msgid "User Rooms"
+msgid "Unable to fetch room list."
 msgstr ""
 
-msgid "Connection problem with the YCHT server."
+msgid "User Rooms"
 msgstr ""
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
+#, fuzzy
+msgid "Connection problem with the YCHT server"
+msgstr "บันทึกการสนทนากับ %s"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9868,21 +9666,15 @@ msgid "Exposure"
 msgstr ""
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
 
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "เกิดข้อผิดพลาดในการเชื่อมต่อ"
 
 #, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 
 #, fuzzy, c-format
@@ -9891,9 +9683,6 @@ msgstr ""
 "เกิดข้อผิดพลาดขณะบันทึกรูป: %s\n"
 "%s"
 
-msgid "Could not resolve host name"
-msgstr ""
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10105,12 +9894,6 @@ msgid "Unable to connect to %s: %s"
 msgstr "ไม่สามารถส่งข้อความถึง %s ได้"
 
 #, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-
-#, c-format
 msgid " - %s"
 msgstr ""
 
@@ -10354,7 +10137,11 @@ msgid "View _Log"
 msgstr "ดู_บันทึกการสนทนา"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "ผู้ใช้ออฟไลน์"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "ผู้ใช้ออฟไลน์"
 
 msgid "_Alias..."
@@ -10884,6 +10671,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "เปลี่ยนข้อมูลผู้ใช้ของ %s"
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -10931,7 +10721,8 @@ msgstr "ไม่สนใจ"
 msgid "Get Away Message"
 msgstr ""
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "ตอบล่าสุด"
 
 msgid "Unable to save icon file to disk."
@@ -11830,7 +11621,7 @@ msgstr "สีสำหรับลิงก์"
 msgid "Hyperlink visited color"
 msgstr "สีสำหรับเน้นข้อความ"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 
 msgid "Hyperlink prelight color"
@@ -11868,15 +11659,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "เลิกแจ้งเตือนเมื่อ"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "แจ้งเตือนเมลใหม่"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12239,6 +12037,10 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 
+#, fuzzy
+msgid "No message"
+msgstr "ข้อความ"
+
 msgid "Open All Messages"
 msgstr "เปิดข้อความทั้งหมด"
 
@@ -12256,10 +12058,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">คุณมีเมลใหม่!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "ข้อความ"
-
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -12477,7 +12275,7 @@ msgid "On unread messages"
 msgstr "ข้อความที่ไม่ได้อ่าน"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "บันทึกการสนทนากับ %s"
 
 #, fuzzy
@@ -12487,6 +12285,10 @@ msgstr "_ซ่อนการสนทนาใหม่"
 msgid "When away"
 msgstr "เมื่อไม่อยู่"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "แสดงหน้าต่างสนทนานั้น"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -12546,10 +12348,6 @@ msgstr "ใช้ smooth-scrolling"
 msgid "F_lash window when IMs are received"
 msgstr ""
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "แสดงหน้าต่างสนทนานั้น"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12586,7 +12384,8 @@ msgstr ""
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_หาหมายเลขไอพีอัตโนมัติ"
 
 msgid "Public _IP:"
@@ -12965,35 +12764,19 @@ msgstr "บั_นทึกและใช้"
 msgid "Status for %s"
 msgstr "สถานะของ %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "แทรกหน้าแสดงอารมณ์"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
+#, fuzzy
+msgid "Custom Smiley"
+msgstr "แทรกหน้าแสดงอารมณ์"
+
 msgid "Duplicate Shortcut"
 msgstr ""
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "ใช้สถานะที่_ต่างกันตามแต่ละบัญชี"
-
-#, fuzzy
 msgid "Edit Smiley"
 msgstr "แทรกหน้าแสดงอารมณ์"
 
@@ -13106,8 +12889,8 @@ msgid "Cannot send launcher"
 msgstr ""
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -13690,7 +13473,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -13944,7 +13727,7 @@ msgstr "บันทึกการสนทนากับ %s"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14261,7 +14044,7 @@ msgid "Options specific to Pidgin for Windows."
 msgstr ""
 
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14302,6 +14085,130 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
+#~ msgid "Server has disconnected"
+#~ msgstr "การเชื่อมต่อกับเซิร์ฟเวอร์ถูกตัด"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "ที่อยู่ (เพิ่มเติม)"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "ตั้งชื่อห้องสนทนา"
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "เรียกคำสั่ง"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "เกิดข้อผิดพลาดในการลงทะเบียน"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "ตัวเลือกสำหรับผู้ใช้"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "การแจ้งเตือนข้อความ"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "บันทึกการสนทนา"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "เริ่มการตรวจสอบผู้ใช้"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "ชื่อผู้ใช้"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "ที่อยู่อีเมล"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "แฟ้มประวัติ MSN"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "ชื่อเล่น"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "ได้รับข้อความ"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "ตัวเลือกสำหรับผู้ใช้"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "คู่สนทนากำลังพิมพ์..."
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "ชื่อผู้ใช้"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "คู่สนทนากำลังพิมพ์..."
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "ข้อความที่ไม่ได้อ่าน"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
+
+#, fuzzy
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "คุณถูกตัดการเชื่อมต่อจากเซิร์ฟเวอร์"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "ชื่อผู้ใช้ไม่ถูกต้อง"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "เซิร์ฟเวอร์"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "เกิดข้อผิดพลาดในการเชื่อมต่อ"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "ไม่สามารถติดต่อไปยังโฮสต์ได้"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "รหัสผ่านใหม่"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "การส่งแฟ้มสำเร็จ"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "ใช้สถานะที่_ต่างกันตามแต่ละบัญชี"
+
 #, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "เปิดข้อความทั้งหมด"
diff --git a/po/tr.po b/po/tr.po
index 4041af7cb9..d080fec40f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2007-11-09 00:33+0200\n"
 "Last-Translator: Serdar Soytetir <tulliana@gmail.com>\n"
 "Language-Team:  <tr@li.org>\n"
@@ -2574,7 +2574,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2623,7 +2623,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2866,12 +2866,13 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
-msgstr ""
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
+msgstr "Bağlantı başlatılamadı"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2923,14 +2924,21 @@ msgstr "%s yazışmayı kapattı."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "İletiniz gönderilemedi, yazışma başlatılamadı."
 
-msgid "Cannot open socket"
-msgstr "Soket açılamıyor"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Soket oluşturulamadı:\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Soket porta yönlendirilemedi"
 
-msgid "Could not listen on socket"
-msgstr "Soketten okunamıyor"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Soket oluşturulamadı:\n"
+"%s"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -2980,13 +2988,16 @@ msgstr "Kişi listesi Kaydet..."
 msgid "Load buddylist from file..."
 msgstr "Kişi listesini dosyadan yükle..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Kayıt alanlarını doldurun."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Parolalar çelişiyor."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Yeni hesap kaydedilemedi. Bir hata oluştu.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2998,14 +3009,15 @@ msgstr "Kayıt başarıyla tamamlandı!"
 msgid "Password"
 msgstr "Parola"
 
-msgid "Password (retype)"
-msgstr "Parola (tekrar)"
+msgid "Password (again)"
+msgstr "Yeni parola (tekrar)"
 
-msgid "Enter current token"
-msgstr "Geçerli ifadeyi girin"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Geçerli ifade"
+#, fuzzy
+msgid "Captcha"
+msgstr "Resmi Kaydet"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Yeni Gadu-Gadu Hesabı Oluştur"
@@ -3058,6 +3070,15 @@ msgstr "Parola başarıyla değiştirildi!"
 msgid "Current password"
 msgstr "Şimdiki parola"
 
+msgid "Password (retype)"
+msgstr "Parola (tekrar)"
+
+msgid "Enter current token"
+msgstr "Geçerli ifadeyi girin"
+
+msgid "Current token"
+msgstr "Geçerli ifade"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Lütfen UIN için şimdiki parolanızı ve yeni parolanızı girin:"
 
@@ -3105,8 +3126,8 @@ msgstr "Uygun kullanıcı bulunamadı"
 msgid "There are no users matching your search criteria."
 msgstr "Arama kirterlerinize uyan bir kullanıcı bulunamadı."
 
-msgid "Unable to read socket"
-msgstr "Soket okunamıyor"
+msgid "Unable to read from socket"
+msgstr "Soketten okunamıyor"
 
 msgid "Buddy list downloaded"
 msgstr "Kişi listesi indirildi"
@@ -3120,8 +3141,14 @@ msgstr "Kişi listesi gönderildi"
 msgid "Your buddy list was stored on the server."
 msgstr "Kişi listeniz sunucuya gönderildi."
 
-msgid "Connection failed."
-msgstr "Bağlantı kurulamadı."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Bağlandı"
+
+msgid "Connection failed"
+msgstr "Bağlantı Kurulamıyor"
 
 msgid "Add to chat"
 msgstr "Sohbete ekle"
@@ -3129,18 +3156,23 @@ msgstr "Sohbete ekle"
 msgid "Chat _name:"
 msgstr "Sohbet _adı:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Sunucuya bağlanılamadı."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Bağlanılıyor"
+
 msgid "Chat error"
 msgstr "Sohbet hatası"
 
 msgid "This chat name is already in use"
 msgstr "Bu sohbet adı zaten kullanımda"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Sunucuya bağlı değilsiniz."
 
 msgid "Find buddies..."
@@ -3200,7 +3232,8 @@ msgstr "Konu ayarlanmamış"
 msgid "File Transfer Failed"
 msgstr "Dosya aktarımı başarısız oldu"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Bir dinleme portu açılamadı."
 
 msgid "Error displaying MOTD"
@@ -3216,8 +3249,18 @@ msgstr "Bu bağlantıyla ilgilişkilendirilmiş bir MOTD yok."
 msgid "MOTD for %s"
 msgstr "%s için MOTD"
 
-msgid "Server has disconnected"
-msgstr "Sunucu bağlantısı kesildi"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Sunucu ile bağlantı kesildi:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "MOTD'yi göster"
@@ -3232,22 +3275,20 @@ msgstr "Ş_ifre"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC isimler boşluk karakteri içeremez"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Bağlanılıyor"
-
 msgid "SSL support unavailable"
 msgstr "SSL desteği mevcut değil"
 
-msgid "Couldn't create socket"
-msgstr "Soket yaratılamadı"
+msgid "Unable to connect"
+msgstr "Bağlanılamıyor"
 
-msgid "Couldn't connect to host"
-msgstr "Ana bilgisayara bağlanılamadı"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "%s konumuna bağlanılamadı"
 
-msgid "Read error"
-msgstr "Okuma hatası"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Sunucu bağlantıyı kapattı."
 
 msgid "Users"
 msgstr "Kullanıcılar"
@@ -3671,12 +3712,13 @@ msgstr "Ad-Hoc Komutu Başarısız"
 msgid "execute"
 msgstr "çalıştır"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "Bu sunucu bağlanmak için TLS/SSL gerektirir. Hiç TLS/SSL desteği bulunamadı."
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "Bu sunucu bağlanmak için TLS/SSL gerektirir. Hiç TLS/SSL desteği bulunamadı."
 
@@ -3694,7 +3736,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Şifresiz Metin Yetkilendirmesi"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Kimlik denetimi başarısız"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Hata: sunucudan geçersiz cevap"
 
 msgid "Server does not use any supported authentication method"
@@ -3706,7 +3753,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "Sunucudan geçersiz yanıt"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL hatası"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3726,10 +3774,8 @@ msgstr ""
 "Sunucu ile bağlantı sağlanamadı:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Sunucu ile bağlantı sağlanamadı:\n"
 "%s"
@@ -3738,12 +3784,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "Bağlantı başlatılamadı"
 
-msgid "Unable to create socket"
-msgstr "Soket oluşturulamadı"
-
-msgid "Write error"
-msgstr "Yazma hatası"
-
 msgid "Full Name"
 msgstr "Tam İsim"
 
@@ -3814,159 +3854,6 @@ msgstr "İşletim Sistemi"
 msgid "Local Time"
 msgstr "Yerel Dosya:"
 
-msgid "Last Activity"
-msgstr "Son Etkinlik"
-
-msgid "Service Discovery Info"
-msgstr "Servis Bulma Bilgileri"
-
-msgid "Service Discovery Items"
-msgstr "Servis Bulma Ögeleri"
-
-msgid "Extended Stanza Addressing"
-msgstr "Genişletilmiş Stanza Adreslemesi"
-
-msgid "Multi-User Chat"
-msgstr "Çok Kullanıcılı Sohbet"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr ""
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-msgid "Ad-Hoc Commands"
-msgstr "Ad-Hoc Komutları"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr ""
-
-msgid "User Location"
-msgstr "Kullanıcı Konumu"
-
-msgid "User Avatar"
-msgstr "Kullanıcı Resmi"
-
-msgid "Chat State Notifications"
-msgstr "Sohbet Durum Uyarısı"
-
-msgid "Software Version"
-msgstr "Yazılım Sürümü"
-
-msgid "Stream Initiation"
-msgstr ""
-
-msgid "File Transfer"
-msgstr "Dosya Aktarımı"
-
-msgid "User Mood"
-msgstr "Kullanıcı Modu"
-
-msgid "User Activity"
-msgstr "Kullanıcı Etkinliği"
-
-msgid "Entity Capabilities"
-msgstr ""
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-msgid "User Tune"
-msgstr ""
-
-msgid "Roster Item Exchange"
-msgstr ""
-
-msgid "Reachability Address"
-msgstr "Erişebilirlik Adresi"
-
-msgid "User Profile"
-msgstr "Kullanıcı Profili"
-
-msgid "Jingle"
-msgstr ""
-
-msgid "Jingle Audio"
-msgstr ""
-
-msgid "User Nickname"
-msgstr "Kullanıcı Takma Adı"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr ""
-
-msgid "Jingle DTMF"
-msgstr ""
-
-msgid "Message Receipts"
-msgstr "İleti Alındığında"
-
-msgid "Public Key Publishing"
-msgstr "Genel Anahtar Yayınlama"
-
-msgid "User Chatting"
-msgstr ""
-
-msgid "User Browsing"
-msgstr ""
-
-msgid "User Gaming"
-msgstr ""
-
-msgid "User Viewing"
-msgstr ""
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Stanza Şifrelemesi"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Yetenekler"
-
 msgid "Priority"
 msgstr "Öncelik"
 
@@ -3978,7 +3865,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Çevrimiçi"
 
 msgid "Middle Name"
@@ -4158,16 +4045,12 @@ msgid "Roles:"
 msgstr "Rol"
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "Düz metin"
 
-msgid "Read Error"
-msgstr "Okuma hatası"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4343,9 +4226,6 @@ msgstr "Parolanız değiştirildi."
 msgid "Error changing password"
 msgstr "Parola değiştirilirken hata"
 
-msgid "Password (again)"
-msgstr "Yeni parola (tekrar)"
-
 msgid "Change XMPP Password"
 msgstr "XMPP Parolası Değiştir"
 
@@ -4735,6 +4615,14 @@ msgstr "XML ayrıştırma hatası"
 msgid "Unknown Error in presence"
 msgstr "Bilinmeyen Hata"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "%s sohbetine katılırken hata"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "%s sohbetinde hata"
+
 msgid "Create New Room"
 msgstr "Yeni Oda Oluştur"
 
@@ -4751,16 +4639,20 @@ msgstr "_Odayı Düzenle"
 msgid "_Accept Defaults"
 msgstr "Varsayılanları _Kabul Et"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "%s sohbetine katılırken hata"
+#, fuzzy
+msgid "No reason"
+msgstr "Sebep yazılmamış."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "%s sohbetinde hata"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "%s tarafından atıldınız: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "%s tarafından atıldınız (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Dosyayı açarken bir hata oluştu."
 
 #, fuzzy
@@ -5256,9 +5148,6 @@ msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "MSN için SSL desteği gereklidir. Lütfen geçerli bir SSL kütüphanesi yükleyin."
 
-msgid "Failed to connect to server."
-msgstr "Sunucuya bağlanılamadı"
-
 msgid "Error retrieving profile"
 msgstr "Profil alınırken hata"
 
@@ -5507,9 +5396,6 @@ msgstr "İleti gönderilmemiş olabilir çünkü bilinmeyen bir hata meydana gel
 msgid "Message was not sent because an unknown error occurred."
 msgstr "İleti gönderilmemiş olabilir çünkü bilinmeyen bir hata meydana geldi:"
 
-msgid "Unable to connect"
-msgstr "Bağlanılamıyor"
-
 msgid "Writing error"
 msgstr "Yazma hatası"
 
@@ -5524,13 +5410,16 @@ msgstr ""
 "%s sunucusuna bağlanma hatası:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Bu protokol sunucu tarafından desteklenmiyor."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "HTTP ayrıştırma hatası"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Başka bir programla oturum açtınız."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5538,7 +5427,8 @@ msgstr ""
 "MSN sunucular geçici olarak servis dışıdır. Lütfen bekleyin ve tekrar "
 "deneyin."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN sunucusu geçici olarak kapatılıyor"
 
 #, c-format
@@ -5550,9 +5440,6 @@ msgid ""
 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"
 
@@ -5652,6 +5539,9 @@ msgstr "AIM Protokolü Eklentisi"
 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)"
@@ -5761,12 +5651,6 @@ msgstr[0] ""
 msgid "Add contacts from server"
 msgstr "Sunucudan kişileri ekle"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Bağlandı"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protokol hatası, kod: %d: %s"
@@ -5788,17 +5672,6 @@ msgstr "MySpaceIM Hatası"
 msgid "Invalid input condition"
 msgstr "Geçersiz girdi durumu"
 
-#, fuzzy
-msgid "Read buffer full (2)"
-msgstr "Okuma ara belleği dolu"
-
-msgid "Unparseable message"
-msgstr "Ayrıştırılamayan ileti"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Bilgisayara bağlanılamadı: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Kişi eklenemedi"
 
@@ -5880,6 +5753,12 @@ msgstr "Toplam Arkadaşlar"
 msgid "Client Version"
 msgstr "İstemci Sürümü"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 #, fuzzy
 msgid "MySpaceIM - Username Available"
 msgstr "Geçersiz Sunucu"
@@ -6142,9 +6021,9 @@ msgstr "Kullanıcı çevrimdışı ya da sizi engellemiş"
 msgid "Unknown error: 0x%X"
 msgstr "Bilinmeyen hata: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Oturum açma işlemi başarısız (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "%s kullanıcısına ping atılamadı"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6246,9 +6125,6 @@ msgstr "GroupWise Konferansı %d"
 msgid "Authenticating..."
 msgstr "Kimlik doğrulaması yapılıyor..."
 
-msgid "Unable to connect to server."
-msgstr "Sunucuya bağlanılamadı."
-
 msgid "Waiting for response..."
 msgstr "Sunucudan yanıt bekleniyor..."
 
@@ -6272,22 +6148,17 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Yazışmaya katılmak istiyor musunuz?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Oturumunuz kapandı, çünkü başka bir yerden oturum açtınız."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s çevrimdışı gözüküyor ve henüz gönderdiğiniz iletileri alamıyor."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr "Sunucuya bağlanılamadı. Lütfen bağlanmak istediğiniz adresi giriniz."
 
-msgid "Error. SSL support is not installed."
-msgstr "Hata. SSL desteği kurulmamış."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Bu konferans kapandı. Artık iletiler gönderilmeyecek."
 
@@ -6327,10 +6198,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, fuzzy
@@ -6341,18 +6209,8 @@ msgstr "Bağlanılamadı"
 msgid "Invalid chat room name"
 msgstr "Geçersiz Oda İsmi"
 
-msgid "Server closed the connection."
-msgstr "Sunucu bağlantıyı kapattı."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Sunucu ile bağlantı kesildi:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Sunucu bağlantısından geçersiz veri alındı."
 
 #. *< type
@@ -6400,7 +6258,8 @@ msgstr "Uzak kullanıcı ile bağlantı koptu:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Uzak kullanıcı ile yapılan bağlantı üzerinden geçersiz veri alındı."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Uzak kullanıcı ile bağlantı kurulamıyor."
 
 msgid "Direct IM established"
@@ -6594,21 +6453,15 @@ msgstr "Uyarı Seviyesi"
 msgid "Buddy Comment"
 msgstr "Kişi Hakkında Yorum"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Kimlik doğrulaması için sunucuya bağlanılamıyor:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"BOS sunucuya bağlanılamadı:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Sunucuya bağlanılamadı."
 
 #, fuzzy
 msgid "Username sent"
@@ -6623,9 +6476,9 @@ msgstr "Bağlantı sonlandırılıyor"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Oturum açılamadı: %s olarak bağlanılamadı, çünkü görünen adınız geçerli "
 "değil. Takma adlar bir harfle başlamalı ve harfler, rakamlar, boşluk ile "
@@ -6639,28 +6492,22 @@ msgstr ""
 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
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "Geçersiz ad"
+msgid "Username does not exist"
+msgstr "Kullanıcı mevcut değil"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Hesabınız şuan için durdurulmuştur."
 
 #. service temporarily unavailable
@@ -6681,7 +6528,8 @@ msgstr ""
 "deneyin. Eğer denemeye devam ederseniz daha uzun beklemek zorunda "
 "kalacaksınız."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Girilen SecurID anahtarı geçersiz."
 
 msgid "Enter SecurID"
@@ -6842,6 +6690,9 @@ msgstr "Bağlı olduğu süre:"
 msgid "Member Since"
 msgstr "Üye olduğu süre:"
 
+msgid "Capabilities"
+msgstr "Yetenekler"
+
 msgid "Profile"
 msgstr "Profil"
 
@@ -7013,7 +6864,7 @@ msgstr "Uzakta iletiniz çok uzun."
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7039,9 +6890,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Kimsesizler"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "%s kişisi eklenemedi çünkü kişi listenizde çok kişi var. Bir tanesini silin "
@@ -7050,8 +6901,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(isimsiz)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Bilinmeyen bir sebepten dolayı %s kişisi eklenemedi."
 
 #, fuzzy, c-format
@@ -7888,7 +7739,7 @@ msgid "Update interval (seconds)"
 msgstr "Bilgilerimi güncelle"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Sunucu bilgileri alınamıyor"
 
 #, c-format
@@ -7915,10 +7766,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Sunucu bilgileri alınamıyor"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "İstek Diyaloğu"
 
@@ -7954,21 +7801,9 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "Bağlanılamıyor."
-
 msgid "Socket error"
 msgstr "Soket hatası"
 
-msgid "Unable to read from socket"
-msgstr "Soketten okunamıyor"
-
-msgid "Write Error"
-msgstr "Yazma Hatası"
-
-msgid "Connection lost"
-msgstr "Bağlantı kapandı"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "Kullanıcı Bilgisi Ayarla..."
@@ -7977,8 +7812,9 @@ msgstr "Kullanıcı Bilgisi Ayarla..."
 msgid "Requesting token"
 msgstr "İstek reddedildi"
 
-msgid "Couldn't resolve host"
-msgstr "Ana bilgisayar çözümlenemedi"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Sunucuya bağlanılamadı."
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8029,7 +7865,7 @@ msgid "QQ Qun Command"
 msgstr "Komut"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Sunucu bilgileri alınamıyor"
 
 #, fuzzy
@@ -8051,9 +7887,6 @@ msgstr "Dosya Gönder"
 msgid "%d canceled the transfer of %s"
 msgstr "%d şu dosyayı göndermekten vazgeçti %s"
 
-msgid "Connection closed (writing)"
-msgstr "Bağlantı kapandı (yazılıyor)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Grup Başlığı:</b> %s<br>"
@@ -8107,17 +7940,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Eşzamanlı Yönetici  Duyurusu"
 
-msgid "Connection reset"
-msgstr "Bağlantı kesildi"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Soket okuma hatası: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Ana bilgisayara bağlanılamadı"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "%s kişisinden Anons"
@@ -8140,6 +7962,9 @@ msgstr "Hoparlör"
 msgid "Video Camera"
 msgstr "Video Kamera"
 
+msgid "File Transfer"
+msgstr "Dosya Aktarımı"
+
 msgid "Supports"
 msgstr "Destekler"
 
@@ -8921,6 +8746,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Ağ istatistikleri"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping başarısız oldu"
 
@@ -8985,7 +8813,8 @@ msgstr "Desteklenmeyen anahtar değeri"
 msgid "Disconnected by server"
 msgstr "Sunucu bağlantısı kesildi"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "SILC Sunucusuna bağlanırken hata"
 
 msgid "Key Exchange failed"
@@ -8997,26 +8826,26 @@ msgstr ""
 "Ayrılmış oturuma devam edilemedi. Yeni bir bağlantı oluşturmak için Yeniden "
 "Bağlan'a basınız."
 
-msgid "Connection failed"
-msgstr "Bağlantı Kurulamıyor"
-
 msgid "Performing key exchange"
 msgstr "Anahtar değişimi yapılıyor"
 
-msgid "Unable to create connection"
-msgstr "Bağlantı oluşturulamadı"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "SILC anahtar çifti yüklenemedi"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "SILC sunucusuna bağlanılıyor"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "SILC anahtar çifti yüklenemedi"
+
 msgid "Out of memory"
 msgstr "Bellek Aşımı"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "SILC protokolü başlatılamadı"
 
 msgid "Error loading SILC key pair"
@@ -9309,7 +9138,8 @@ msgstr "Tüm anlık iletileri dijital olarak imzala"
 msgid "Creating SILC key pair..."
 msgstr "SILC anahtar çifti oluşturuluyor..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "SILC anahtar çifti oluşturulamadı\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9403,6 +9233,9 @@ msgstr "Beyaz Tahta"
 msgid "No server statistics available"
 msgstr "Sunucu istatistikleri mevcut değil"
 
+msgid "Error during connecting to SILC Server"
+msgstr "SILC Sunucusuna bağlanırken hata"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Başarısız: Sürüm uyuşmazlığı, programı güncelleştirin"
@@ -9443,30 +9276,27 @@ msgstr "Hata: Geçersiz çerez"
 msgid "Failure: Authentication failed"
 msgstr "Hata: Kimlik denetimi başarısız"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "SILC Client bağlantısı başlatılamadı"
 
 msgid "John Noname"
 msgstr "Serdar İsimsiz"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "SILC anahtar çifti yüklenemedi: %s"
 
-msgid "Could not write"
-msgstr "Yazılamadı"
-
-msgid "Could not connect"
-msgstr "Bağlanılamadı"
+msgid "Unable to create connection"
+msgstr "Bağlantı oluşturulamadı"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Bilinmeyen sunucu yanıtı."
 
-msgid "Could not create listen socket"
-msgstr "Dinleme soketi yaratılamadı"
-
-msgid "Could not resolve hostname"
-msgstr "Makine adı çözümlenemedi"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Soket oluşturulamadı"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -9509,6 +9339,78 @@ msgstr "Kullanıcı Kimliğini Doğrula"
 msgid "Auth Domain"
 msgstr "Makine Kimliğini Doğrula"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;oda&gt;:  Yahoo'daki bir sohbet odasına katıl"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Yahoo ağındaki kanalları listele"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo Protokol Eklentisi"
+
+msgid "Pager server"
+msgstr "Çağrı cihazı sunucusu"
+
+msgid "Pager port"
+msgstr "Çağrı cihazı portu"
+
+msgid "File transfer server"
+msgstr "Dosya aktarım sunucusu"
+
+msgid "File transfer port"
+msgstr "Dosya aktarım portu"
+
+msgid "Chat room locale"
+msgstr "Sohbet Odası Yereli"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Konferans ve sohbet odası davetlerini yok say"
+
+msgid "Chat room list URL"
+msgstr "Sohbet Odası Listesi URL"
+
+msgid "Yahoo Chat server"
+msgstr "Yahoo Sohbet sunucusu"
+
+msgid "Yahoo Chat port"
+msgstr "Yahoo Sohbet portu"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo Protokol Eklentisi"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9537,28 +9439,18 @@ msgstr "Kişi ekleme reddedildi"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  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
@@ -9595,37 +9487,32 @@ msgstr "Kullanıcı hesabınız kilitlendi, lütfen Yahoo! sitesine giriş yapı
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
+msgstr "%s izin verilenler listesine eklenemedi (%s)."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Arkadaşınız sunucu listesine eklenemedi"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Sesli %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Sunucudan beklenmeyen bir HTTP yanıtı alındı."
 
-msgid "Connection problem"
-msgstr "Bağlantı sorunu"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "%s sunucusu ile bağlantı kesildi:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"%s sunucusu ile bağlantı sağlanamadı:\n"
+"Sunucu ile bağlantı sağlanamadı:\n"
 "%s"
 
 msgid "Not at Home"
@@ -9688,74 +9575,15 @@ msgstr "Kullanıcıyla Sohbet Et..."
 msgid "Open Inbox"
 msgstr "Gelen Kutusunu Aç"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;oda&gt;:  Yahoo'daki bir sohbet odasına katıl"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Yahoo ağındaki kanalları listele"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo Protokol Eklentisi"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japon"
-
-msgid "Pager server"
-msgstr "Çağrı cihazı sunucusu"
-
-msgid "Japan Pager server"
-msgstr "Japon Çağrı cihazı sunucusu"
-
-msgid "Pager port"
-msgstr "Çağrı cihazı portu"
-
-msgid "File transfer server"
-msgstr "Dosya aktarım sunucusu"
-
-msgid "Japan file transfer server"
-msgstr "Japon dosya aktarım sunucusu"
-
-msgid "File transfer port"
-msgstr "Dosya aktarım portu"
-
-msgid "Chat room locale"
-msgstr "Sohbet Odası Yereli"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Konferans ve sohbet odası davetlerini yok say"
-
-msgid "Chat room list URL"
-msgstr "Sohbet Odası Listesi URL"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo Sohbet sunucusu"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo Sohbet portu"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "Bağlanılamıyor."
+
 msgid "Unable to establish file descriptor."
 msgstr "Dosya açıklayıcısı (tanımlayıcısı) kurulamadı."
 
@@ -9763,6 +9591,9 @@ msgstr "Dosya açıklayıcısı (tanımlayıcısı) kurulamadı."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s %s dosyasını göndermek istiyor"
 
+msgid "Write Error"
+msgstr "Yazma Hatası"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japon Profili"
 
@@ -9876,23 +9707,19 @@ msgstr "Sesler"
 msgid "Webcams"
 msgstr "Web Kameralar"
 
+msgid "Connection problem"
+msgstr "Bağlantı sorunu"
+
 msgid "Unable to fetch room list."
 msgstr "Oda listesi alınamıyor."
 
 msgid "User Rooms"
 msgstr "Kullanıcı Odaları"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "YCHT sunucusuna bağlantı hatası."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Sunucuyla yapılan bağlantı kesildi\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10014,24 +9841,16 @@ msgstr "Memleket"
 msgid "Exposure"
 msgstr "Açıklık"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Soket oluşturulamadı:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "HTTP proxy yanıtı ayrıştırılamadı: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP Proxy bağlantı hatası %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "Erişim engellendi : HTTP proxy sunucusu %d portunda tünellemeye izin "
 "vermiyor."
@@ -10040,9 +9859,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr "%s çözümleme hatası"
 
-msgid "Could not resolve host name"
-msgstr "Ana makina ismi çözümlenemedi"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10241,13 +10057,6 @@ msgstr "%s konumundan yazma hatası: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "%s konumuna bağlanılamadı: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"Bu sunucu bağlanmak için TLS/SSL gerektirir. Hiç TLS/SSL desteği bulunamadı."
-
 #, c-format
 msgid " - %s"
 msgstr ""
@@ -10498,9 +10307,14 @@ msgstr "Kişi için Uyarıcı E_kle..."
 msgid "View _Log"
 msgstr "_Geçmiş Sohbetleri Göster"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Çevrimdışıyken gizle"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Çevrimdışıyken göster"
+
 msgid "_Alias..."
 msgstr "Kişi İçin _Görünen İsim Ayarla"
 
@@ -11017,6 +10831,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "%s için kullanıcı bilgilerini değiştir"
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL Sunucuları"
@@ -11063,7 +10880,8 @@ msgstr "Yoksay"
 msgid "Get Away Message"
 msgstr "Uzakta İletisi Al"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Son söylenen"
 
 msgid "Unable to save icon file to disk."
@@ -11965,7 +11783,7 @@ msgid "Hyperlink visited color"
 msgstr "Bağlantı rengi"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Bağlantıları fare üzerine geldiğinde renklendir."
 
 msgid "Hyperlink prelight color"
@@ -12003,15 +11821,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "Uyarıyı Kaldırma"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "Yeni e-posta bildirimleri"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12400,6 +12225,10 @@ msgstr ""
 "Tarayıcı yapılandırmasında 'El ile ayarla' seçili, ancak bu seçenek için "
 "komut belirtilmemiş."
 
+#, fuzzy
+msgid "No message"
+msgstr "Bilinmeyen ileti"
+
 msgid "Open All Messages"
 msgstr "Tüm E-postaları Aç"
 
@@ -12417,10 +12246,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Yeni E-postanız var !</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Bilinmeyen ileti"
-
 msgid "The following plugins will be unloaded."
 msgstr "Bu eklentiler kaldırılacak."
 
@@ -12641,8 +12466,9 @@ msgstr "_Sistem çekmecesi simgesini göster:"
 msgid "On unread messages"
 msgstr "Okunmayan iletiler olunca"
 
-msgid "Conversation Window Hiding"
-msgstr "Yazışma Penceresi Gizleme"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Yazışma Penceresi"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Yeni Anında Mesajlaşma yazışmalarını gizle:"
@@ -12650,6 +12476,9 @@ msgstr "_Yeni Anında Mesajlaşma yazışmalarını gizle:"
 msgid "When away"
 msgstr "Uzaktayken"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Yeni yazışma pencerelerini _küçült"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Sekmeler"
@@ -12708,9 +12537,6 @@ msgstr "Yumuşak geçiş kullan"
 msgid "F_lash window when IMs are received"
 msgstr "_Yeni ileti geldiğinde pencereyi canlandır"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Yeni yazışma pencerelerini _küçült"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12745,7 +12571,8 @@ msgstr "Tarayıcı yapılandırma uygulaması başlatılamıyor."
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Örnek: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_IP Adresini Otomatik Bul"
 
 msgid "Public _IP:"
@@ -13119,34 +12946,18 @@ msgstr "Kayde_t & Kullan"
 msgid "Status for %s"
 msgstr "%s için durum"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "Gülenyüz Ekle"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
 #, fuzzy
-msgid "Duplicate Shortcut"
-msgstr "Çift Doğrulama"
+msgid "Custom Smiley"
+msgstr "Gülenyüz Ekle"
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Lütfen kendiniz için yeni bir takma ad belirtin."
+msgid "Duplicate Shortcut"
+msgstr "Çift Doğrulama"
 
 #, fuzzy
 msgid "Edit Smiley"
@@ -13268,9 +13079,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Çalıştırıcı gönderilemiyor"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -13872,7 +13684,7 @@ msgstr "Birlikte beste yapmak için Müzik Mesajlaşma Eklentisi"
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -14136,7 +13948,7 @@ msgstr "Yazışma Penceresi Gizleme"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14462,9 +14274,10 @@ msgstr "Windows Pidgin Seçenekleri"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Windows için Pidgin'e Özel Seçenekler."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "Windows için Pidgin'e Özel Seçenekler."
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Oturum kapatıldı.</font>"
@@ -14505,6 +14318,223 @@ msgstr ""
 "Bu eklenti XMPP sunucularının ve istemcilerinin hatalarını ayıklamak için "
 "kullanışlıdır."
 
+#~ msgid "Cannot open socket"
+#~ msgstr "Soket açılamıyor"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Soketten okunamıyor"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Soket okunamıyor"
+
+#~ msgid "Connection failed."
+#~ msgstr "Bağlantı kurulamadı."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Sunucu bağlantısı kesildi"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Soket yaratılamadı"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Ana bilgisayara bağlanılamadı"
+
+#~ msgid "Read error"
+#~ msgstr "Okuma hatası"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Sunucu ile bağlantı sağlanamadı:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Yazma hatası"
+
+#~ msgid "Last Activity"
+#~ msgstr "Son Etkinlik"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Servis Bulma Bilgileri"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Servis Bulma Ögeleri"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Genişletilmiş Stanza Adreslemesi"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Çok Kullanıcılı Sohbet"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Ad-Hoc Komutları"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "User Location"
+#~ msgstr "Kullanıcı Konumu"
+
+#~ msgid "User Avatar"
+#~ msgstr "Kullanıcı Resmi"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Sohbet Durum Uyarısı"
+
+#~ msgid "Software Version"
+#~ msgstr "Yazılım Sürümü"
+
+#~ msgid "User Mood"
+#~ msgstr "Kullanıcı Modu"
+
+#~ msgid "User Activity"
+#~ msgstr "Kullanıcı Etkinliği"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Erişebilirlik Adresi"
+
+#~ msgid "User Profile"
+#~ msgstr "Kullanıcı Profili"
+
+#~ msgid "User Nickname"
+#~ msgstr "Kullanıcı Takma Adı"
+
+#~ msgid "Message Receipts"
+#~ msgstr "İleti Alındığında"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Genel Anahtar Yayınlama"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Stanza Şifrelemesi"
+
+#~ msgid "Read Error"
+#~ msgstr "Okuma hatası"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Sunucuya bağlanılamadı"
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Okuma ara belleği dolu"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Ayrıştırılamayan ileti"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Bilgisayara bağlanılamadı: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Oturum açma işlemi başarısız (%s)."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Oturumunuz kapandı, çünkü başka bir yerden oturum açtınız."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Hata. SSL desteği kurulmamış."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Yanlış parola."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "BOS sunucuya bağlanılamadı:\n"
+#~ "%s"
+
+#~ 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 "Could Not Connect"
+#~ msgstr "Bağlanılamadı"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "Geçersiz ad"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Sunucu bilgileri alınamıyor"
+
+#~ msgid "Connection lost"
+#~ msgstr "Bağlantı kapandı"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Ana bilgisayar çözümlenemedi"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Bağlantı kapandı (yazılıyor)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Bağlantı kesildi"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Soket okuma hatası: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Ana bilgisayara bağlanılamadı"
+
+#~ msgid "Could not write"
+#~ msgstr "Yazılamadı"
+
+#~ msgid "Could not connect"
+#~ msgstr "Bağlanılamadı"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Dinleme soketi yaratılamadı"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Makine adı çözümlenemedi"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Yanlış parola"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s sunucusu ile bağlantı sağlanamadı:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japon"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Japon Çağrı cihazı sunucusu"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japon dosya aktarım sunucusu"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Sunucuyla yapılan bağlantı kesildi\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Ana makina ismi çözümlenemedi"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Bu sunucu bağlanmak için TLS/SSL gerektirir. Hiç TLS/SSL desteği "
+#~ "bulunamadı."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Yazışma Penceresi Gizleme"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Lütfen kendiniz için yeni bir takma ad belirtin."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Hangi Kimlik etkinleştirilsin?"
 
diff --git a/po/uk.po b/po/uk.po
index 479a4cd86f..4458ae56ab 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2005-08-21 10:43+0300\n"
 "Last-Translator: Maxim V. Dziumanenko <mvd@mylinux.com.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -2684,7 +2684,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2736,7 +2736,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2984,12 +2984,12 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
 #, fuzzy
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr "Не вдається створити нове з'єднання."
 
 msgid ""
@@ -3049,16 +3049,16 @@ msgstr "%s закрив вікно бесіди."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Не вдається відправити повідомлення. Повідомлення завелике."
 
-#, fuzzy
-msgid "Cannot open socket"
-msgstr "Не вдається відкрити сокет"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Не вдається створити сокет"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Не вдається створити сокет"
 
-#, fuzzy
-msgid "Could not listen on socket"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
 msgstr "Не вдається створити сокет"
 
 #, fuzzy
@@ -3117,15 +3117,15 @@ msgstr "Надсилання списку контактів"
 msgid "Load buddylist from file..."
 msgstr "Імпортувати список контактів з сервера"
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
 #, fuzzy
-msgid "Passwords do not match."
+msgid "Passwords do not match"
 msgstr "Нові паролі не співпадають."
 
 #, fuzzy
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Не вдається створити нове з'єднання."
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3138,17 +3138,15 @@ msgstr "Реєстрацію завершено успішно"
 msgid "Password"
 msgstr "Пароль"
 
-#, fuzzy
-msgid "Password (retype)"
-msgstr "Пароль відправлено"
+msgid "Password (again)"
+msgstr "Пароль (ще раз)"
 
-#, fuzzy
-msgid "Enter current token"
-msgstr "%s наразі не у мережі."
+msgid "Enter captcha text"
+msgstr ""
 
 #, fuzzy
-msgid "Current token"
-msgstr "Наразі на"
+msgid "Captcha"
+msgstr "Збереження зображення"
 
 #, fuzzy
 msgid "Register New Gadu-Gadu Account"
@@ -3210,6 +3208,18 @@ msgid "Current password"
 msgstr "Неправильний пароль."
 
 #, fuzzy
+msgid "Password (retype)"
+msgstr "Пароль відправлено"
+
+#, fuzzy
+msgid "Enter current token"
+msgstr "%s наразі не у мережі."
+
+#, fuzzy
+msgid "Current token"
+msgstr "Наразі на"
+
+#, fuzzy
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Введіть ваш поточний пароль та новий пароль."
 
@@ -3263,7 +3273,8 @@ msgstr "Невідповідні вузли"
 msgid "There are no users matching your search criteria."
 msgstr "Введіть новий пароль"
 
-msgid "Unable to read socket"
+#, fuzzy
+msgid "Unable to read from socket"
 msgstr "Не вдається прочитати сокет"
 
 #, fuzzy
@@ -3282,8 +3293,14 @@ msgstr "Відображення користувачів"
 msgid "Your buddy list was stored on the server."
 msgstr "Список контактів, що зберігається на сервері Gadu-Gadu."
 
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
 #, fuzzy
-msgid "Connection failed."
+msgid "Connected"
+msgstr "З'єднатися"
+
+msgid "Connection failed"
 msgstr "Не вдається встановити з'єднання"
 
 #, fuzzy
@@ -3294,11 +3311,15 @@ msgstr "Додати розмову"
 msgid "Chat _name:"
 msgstr "Прізвище:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Не вдається перевірити доступність сервера"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "З'єднання"
+
 #, fuzzy
 msgid "Chat error"
 msgstr "Помилка читання"
@@ -3308,7 +3329,7 @@ msgid "This chat name is already in use"
 msgstr "Такий файл вже існує"
 
 #, fuzzy
-msgid "Not connected to the server."
+msgid "Not connected to the server"
 msgstr "Вас було роз'єднано з сервером."
 
 #, fuzzy
@@ -3377,7 +3398,7 @@ msgid "File Transfer Failed"
 msgstr "Передавання файлу скасовано"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "Pidgin не вдається відрити порт для прослуховування."
 
 msgid "Error displaying MOTD"
@@ -3393,8 +3414,16 @@ msgstr "Немає MOTD пов'язаного з цим з'єднанням."
 msgid "MOTD for %s"
 msgstr "MOTD для %s"
 
-msgid "Server has disconnected"
-msgstr "Сервер розірвав з'єднання"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "Вас було роз'єднано з сервером."
 
 msgid "View MOTD"
 msgstr "Переглянути MOTD"
@@ -3409,22 +3438,20 @@ msgstr "_Пароль:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "Псевдоніми IRC не повинні містити побіли"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "З'єднання"
-
 msgid "SSL support unavailable"
 msgstr "Підтримка SSL недоступна"
 
-msgid "Couldn't create socket"
-msgstr "Не вдається створити сокет"
+msgid "Unable to connect"
+msgstr "Не вдається з'єднатись"
 
-msgid "Couldn't connect to host"
-msgstr "Не вдається з'єднатись з вузлом"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Не вдається з'єднатися з сервером."
 
-msgid "Read error"
-msgstr "Помилка читання"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Помилка при створенні з'єднання"
 
 msgid "Users"
 msgstr "Користувачі"
@@ -3871,12 +3898,13 @@ msgstr "Команда відключена"
 msgid "execute"
 msgstr "Не передбачено"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "Для входу на сервер вимагається TLS/SSL. Підтримку TLS/SSL не знайдено."
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "Для входу на сервер вимагається TLS/SSL. Підтримку TLS/SSL не знайдено."
 
@@ -3895,7 +3923,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Ідентифікація звичайним текстом"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Ідентифікація завершилась невдало"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Недопустима відповідь від сервера."
 
 msgid "Server does not use any supported authentication method"
@@ -3907,8 +3940,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "Неправильний запит з серверу"
 
-#, fuzzy
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Помилка читання"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3926,22 +3959,14 @@ msgstr "Непідтримувана версія"
 msgid "Unable to establish a connection with the server"
 msgstr "Не вдається встановити SSL-з'єднання з сервером."
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Не вдається встановити SSL-з'єднання з сервером."
 
 #, fuzzy
 msgid "Unable to establish SSL connection"
 msgstr "Не вдається створити нове з'єднання."
 
-msgid "Unable to create socket"
-msgstr "Не вдається створити сокет"
-
-msgid "Write error"
-msgstr "Помилка запису"
-
 msgid "Full Name"
 msgstr "Повне ім'я"
 
@@ -4013,188 +4038,6 @@ msgstr "Приховувати операційну систему"
 msgid "Local Time"
 msgstr "Локальний файл:"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "Встановити інформацію каталогу"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "Додаткова адреса"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "Псевдонім розмови"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Користувач не має довідникових даних."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "команда"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "Помилка реєстрації"
-
-#, fuzzy
-msgid "User Location"
-msgstr "Розташування"
-
-msgid "User Avatar"
-msgstr ""
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "Повідомлення про стан користувача"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "Непідтримувана версія"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "Орієнтація"
-
-#, fuzzy
-msgid "File Transfer"
-msgstr "Передавання файлів"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "Режими користувача"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "Межа кількості користувачів"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "Можливості"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "Ім'я користувача"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "IM з обміном ключами"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "Адреса ел.пошти"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "Встановити профіль"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "Ping"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "Прізвисько"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "Живе відео"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "Отримано повідомлення"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "Babbleprint публічного ключа"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "Меню користувача"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "Режими користувача"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "Межа кількості користувачів"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "Межа кількості користувачів"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Кодування Trillian"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Можливості"
-
 #, fuzzy
 msgid "Priority"
 msgstr "Порт"
@@ -4207,7 +4050,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Не у мережі"
 
 msgid "Middle Name"
@@ -4397,16 +4240,12 @@ msgid "Roles:"
 msgstr "Посада"
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "звичайний текст"
 
-msgid "Read Error"
-msgstr "Помилка читання"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 #, fuzzy
@@ -4597,9 +4436,6 @@ msgstr "Пароль було змінено."
 msgid "Error changing password"
 msgstr "Помилка зміни паролю"
 
-msgid "Password (again)"
-msgstr "Пароль (ще раз)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "Зміна паролю"
@@ -4997,6 +4833,14 @@ msgstr "Помилка аналізу XML"
 msgid "Unknown Error in presence"
 msgstr "Невідома помилка стану присутності"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Помилка підключення до розмови %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Помилка у розмові %s"
+
 msgid "Create New Room"
 msgstr "Створення нової кімнати"
 
@@ -5015,16 +4859,20 @@ msgstr "Налаштувати кімнату"
 msgid "_Accept Defaults"
 msgstr "Прийняти типові параметри"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Помилка підключення до розмови %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Причина не вказана."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Помилка у розмові %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Ви були видалені оператором %s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Видалений оператором %s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Помилка при відкриванні файлу."
 
 #, fuzzy
@@ -5547,9 +5395,6 @@ msgstr ""
 "Для MSN необхідна підтримка SSL. Встановіть підтримувану бібліотеку SSL. За "
 "додатковою інформацією звертайтесь на http://Pidgin.sf.net/faq-ssl.php"
 
-msgid "Failed to connect to server."
-msgstr "Не вдається з'єднатися з сервером."
-
 msgid "Error retrieving profile"
 msgstr "Помилка зчитування профілю"
 
@@ -5836,9 +5681,6 @@ msgstr "Неможливо надіслати повідомлення чере�
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Неможливо надіслати повідомлення через невідому помилку:"
 
-msgid "Unable to connect"
-msgstr "Не вдається з'єднатись"
-
 msgid "Writing error"
 msgstr "Помилка запису"
 
@@ -5853,20 +5695,24 @@ msgstr ""
 "Невідома помилка від сервера %s (%s):\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Цей протокол не підтримується сервером."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Помилка розбору HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Ви увійшли з іншого місця."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Сервери MSN тимчасово недоступні. Зачекайте, та пізніше спробуйте ще раз."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Сервери MSN тимчасово вимикаються."
 
 #, c-format
@@ -5879,9 +5725,6 @@ msgstr ""
 "Список контактів MSN тимчасово недоступний. Зачекайте, та пізніше спробуйте "
 "ще раз."
 
-msgid "Unknown error."
-msgstr "Невідома помилка."
-
 msgid "Handshaking"
 msgstr "Встановлення з'єднання"
 
@@ -5981,6 +5824,9 @@ msgstr "Модуль протоколу AIM/ICQ"
 msgid "%s is not a valid group."
 msgstr "%s не є правильною назвою групи."
 
+msgid "Unknown error."
+msgstr "Невідома помилка."
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s на %s (%s)"
@@ -6098,13 +5944,6 @@ msgstr[2] ""
 msgid "Add contacts from server"
 msgstr "Недопустима відповідь від сервера."
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-#, fuzzy
-msgid "Connected"
-msgstr "З'єднатися"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr ""
@@ -6128,18 +5967,6 @@ msgid "Invalid input condition"
 msgstr "Завершення встановлення з'єднання"
 
 #, fuzzy
-msgid "Read buffer full (2)"
-msgstr "Черга повна"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "Не вдається розібрати повідомлення"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Не вдається з'єднатись з вузлом"
-
-#, fuzzy
 msgid "Failed to add buddy"
 msgstr "Не вдається приєднатися до користувача у кімнаті"
 
@@ -6234,6 +6061,12 @@ msgstr ""
 msgid "Client Version"
 msgstr "Закрити бесіду"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 #, fuzzy
 msgid "MySpaceIM - Username Available"
 msgstr "Служба недоступна"
@@ -6504,9 +6337,9 @@ msgstr "Користувач не у мережі або заблокував в
 msgid "Unknown error: 0x%X"
 msgstr "Невідома помилка: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Не вдається увійти у мережу (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Не вдається заборонити користувача %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6614,9 +6447,6 @@ msgstr "Конференція GroupWise %d"
 msgid "Authenticating..."
 msgstr "Ідентифікація..."
 
-msgid "Unable to connect to server."
-msgstr "Не вдається з'єднатися з сервером."
-
 msgid "Waiting for response..."
 msgstr "Очікування відповіді..."
 
@@ -6640,25 +6470,20 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Бажаєте приєднатися до бесіди?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Ви були відключені, тому що увійшли у систему з іншої машини."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 "Ймовірно, %s не у мережі та не отримав повідомлення, яке ви щойно відправили."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Не вдається з'єднатись з сервером. Введіть адресу сервера, з яким ви бажаєте "
 "з'єднатись."
 
-msgid "Error. SSL support is not installed."
-msgstr "Помилка. Підтримку SSL не встановлено."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 "Ця конференція була закрита. Більше неможливо відправити жодного "
@@ -6699,10 +6524,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "Помилка при створенні з'єднання"
 
-msgid "Incorrect password."
-msgstr "Неправильний пароль."
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, fuzzy
@@ -6714,17 +6536,7 @@ msgid "Invalid chat room name"
 msgstr "Неправильна назва кімнати"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "Помилка при створенні з'єднання"
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "Вас було роз'єднано з сервером."
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "Не вдається встановити SSL-з'єднання з сервером."
 
 #. *< type
@@ -6777,8 +6589,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Не вдається встановити SSL-з'єднання з сервером."
 
 #, fuzzy
 msgid "Direct IM established"
@@ -6974,15 +6787,11 @@ msgid "Buddy Comment"
 msgstr "Коментар користувача"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "Не вдається з'єднатися для передавання."
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
+msgid "Unable to connect to BOS server: %s"
 msgstr "Не вдається з'єднатися з сервером."
 
 #, fuzzy
@@ -6998,9 +6807,9 @@ msgstr "Завершення встановлення з'єднання"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Не вдається увійти: Не вдається підписатись на %s, тому що ідентифікатор "
 "користувача неправильний. Ідентифікатор користувача повинен починатись з "
@@ -7017,30 +6826,23 @@ msgstr ""
 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
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "Неправильне ім'я користувача"
+msgid "Username does not exist"
+msgstr "Користувач не існує"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Ваш обліковий запис наразі заблокований."
 
 #. service temporarily unavailable
@@ -7060,7 +6862,8 @@ msgstr ""
 "Ви занадто часто з'єднуєтесь та від'єднуєтесь. Зачекайте 10 хвилин та "
 "спробуйте знову. Якщо ви продовжите спроби, вам доведеться чекати ще довше."
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Ключ SecurID - неправильний."
 
 msgid "Enter SecurID"
@@ -7248,6 +7051,9 @@ msgstr "У мережі з"
 msgid "Member Since"
 msgstr "Член з"
 
+msgid "Capabilities"
+msgstr "Можливості"
+
 msgid "Profile"
 msgstr "Профіль"
 
@@ -7431,7 +7237,7 @@ msgstr "Повідомлення про відсутність надто дов
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7459,9 +7265,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Завислі рядки"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Не вдається додати користувача %s, тому що у вашому списку контактів надто "
@@ -7471,7 +7277,7 @@ msgid "(no name)"
 msgstr "(немає імені)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Вашу команду не виконано з невідомої причини."
 
 #, fuzzy, c-format
@@ -8353,7 +8159,7 @@ msgid "Update interval (seconds)"
 msgstr "Помилка читання"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Не вдається отримати інформацію про сервер"
 
 #, c-format
@@ -8380,10 +8186,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Не вдається отримати інформацію про сервер"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "Неоднозначний запит"
 
@@ -8419,26 +8221,11 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "Не вдається встановити з'єднання."
-
 #, fuzzy
 msgid "Socket error"
 msgstr "Невідома помилка"
 
 #, fuzzy
-msgid "Unable to read from socket"
-msgstr "Не вдається прочитати сокет"
-
-#, fuzzy
-msgid "Write Error"
-msgstr "Помилка запису"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "З'єднання розірвано"
-
-#, fuzzy
 msgid "Getting server"
 msgstr "Встановити інформацію про користувача..."
 
@@ -8447,8 +8234,8 @@ msgid "Requesting token"
 msgstr "Запит заборонено"
 
 #, fuzzy
-msgid "Couldn't resolve host"
-msgstr "Не вдається з'єднатись з вузлом"
+msgid "Unable to resolve hostname"
+msgstr "Не вдається перевірити доступність сервера"
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8499,7 +8286,7 @@ msgid "QQ Qun Command"
 msgstr "команда"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Не вдається отримати інформацію про сервер"
 
 #, fuzzy
@@ -8522,10 +8309,6 @@ msgstr "Не вдається відправити файл"
 msgid "%d canceled the transfer of %s"
 msgstr "%s скасував передавання %s"
 
-#, fuzzy
-msgid "Connection closed (writing)"
-msgstr "З'єднання розірвано"
-
 #, fuzzy, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Користувач:</b> %s<br>"
@@ -8587,19 +8370,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#, fuzzy
-msgid "Connection reset"
-msgstr "З'єднання розірвано"
-
-#, fuzzy, c-format
-msgid "Error reading from socket: %s"
-msgstr "Помилка при зчитуванні з сокету."
-
-#. this is a regular connect, error out
-#, fuzzy
-msgid "Unable to connect to host"
-msgstr "Не вдається з'єднатися з сервером."
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -8627,6 +8397,10 @@ msgid "Video Camera"
 msgstr "Відеорозмова"
 
 #, fuzzy
+msgid "File Transfer"
+msgstr "Передавання файлів"
+
+#, fuzzy
 msgid "Supports"
 msgstr "підтримка"
 
@@ -9462,6 +9236,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Статистика мережі"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Помилка Ping"
 
@@ -9527,7 +9304,8 @@ msgstr "Непідтримуваний тип публічного ключа"
 msgid "Disconnected by server"
 msgstr "З'єднання розірвано сервером"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Помилка при з'єднанні з сервером SILC"
 
 msgid "Key Exchange failed"
@@ -9539,29 +9317,26 @@ msgstr ""
 "Не вдається відновити перерваний сеанс. Щоб створити нове з'єднання "
 "натисніть \"Повторне з'єднання\""
 
-msgid "Connection failed"
-msgstr "Не вдається встановити з'єднання"
-
 msgid "Performing key exchange"
 msgstr "Виконується обмін ключами"
 
 #, fuzzy
-msgid "Unable to create connection"
-msgstr "Не вдається створити нове з'єднання."
-
-#, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "Не вдається завантажити публічний ключ"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "З'єднання з SILC сервером"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Не вдається завантажити публічний ключ"
+
 msgid "Out of memory"
 msgstr "Недостатньо пам'яті"
 
 #, fuzzy
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "Не вдається ініціалізувати з'єднання клієнта SILC"
 
 #, fuzzy
@@ -9879,7 +9654,7 @@ msgid "Creating SILC key pair..."
 msgstr "Створення пари ключів SILC..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "Створення пари ключів SILC..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9973,6 +9748,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr "Немає доступної статистики серверу"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Помилка при з'єднанні з сервером SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Помилка: невідповідність версій. Поновіть власного клієнта"
@@ -10013,7 +9791,8 @@ msgstr "Помилка: неправильний cookie"
 msgid "Failure: Authentication failed"
 msgstr "Помилка: ідентифікація завершилась невдало"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Не вдається ініціалізувати з'єднання клієнта SILC"
 
 #, fuzzy
@@ -10021,29 +9800,22 @@ msgid "John Noname"
 msgstr "Вузол пішов"
 
 #, fuzzy, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "Не вдається завантажити публічний ключ"
 
 #, fuzzy
-msgid "Could not write"
-msgstr "Не вдається відправити"
-
-msgid "Could not connect"
-msgstr "Не вдається встановити з'єднання"
+msgid "Unable to create connection"
+msgstr "Не вдається створити нове з'єднання."
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "Невідома помилка."
 
 #, fuzzy
-msgid "Could not create listen socket"
+msgid "Unable to create listen socket"
 msgstr "Не вдається створити сокет"
 
 #, fuzzy
-msgid "Could not resolve hostname"
-msgstr "Не вдається розв'язати назву вузла."
-
-#, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Псевдоніми IRC не повинні містити побіли"
 
@@ -10091,6 +9863,84 @@ msgstr "Користувач AP"
 msgid "Auth Domain"
 msgstr "автоматично"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;кімната&gt;:  приєднатися до кімнати розмов мережі Yahoo."
+
+#, fuzzy
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Список каналів цієї мережі"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Модуль протоколу Yahoo"
+
+#, fuzzy
+msgid "Pager server"
+msgstr "Проксі-сервер"
+
+msgid "Pager port"
+msgstr "Порт пейджера"
+
+#, fuzzy
+msgid "File transfer server"
+msgstr "Вузол передавання файлів"
+
+msgid "File transfer port"
+msgstr "Порт передавання файлів"
+
+#, fuzzy
+msgid "Chat room locale"
+msgstr "Локаль кімнати розмов"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
+
+#, fuzzy
+msgid "Chat room list URL"
+msgstr "Url переліку розмов"
+
+msgid "Yahoo Chat server"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo Chat port"
+msgstr "Yahoo Japan"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Модуль протоколу Yahoo"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -10120,29 +9970,19 @@ msgstr "У додаванні користувача відмовлено"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 "Невідома помилка з номером %d. Вхід з веб-сторінки Yahoo! може це виправити."
 
@@ -10184,11 +10024,12 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Невідома помилка з номером %d. Вхід з веб-сторінки Yahoo! може це виправити."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "Не вдається додати користувача %s у групу %s у список на сервері %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Не вдається додати користувача у список на сервері"
 
 #, c-format
@@ -10196,23 +10037,16 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
 #, fuzzy
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "Недопустима відповідь від сервера."
 
-msgid "Connection problem"
-msgstr "Проблема зв'язку"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "Бесіда з %s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Не вдається встановити SSL-з'єднання з сервером."
 
 #, fuzzy
 msgid "Not at Home"
@@ -10283,82 +10117,15 @@ msgstr "Приєднатися до користувача у розмові..."
 msgid "Open Inbox"
 msgstr ""
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;кімната&gt;:  приєднатися до кімнати розмов мережі Yahoo."
-
-#, fuzzy
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Список каналів цієї мережі"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Модуль протоколу Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "Проксі-сервер"
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "Japan вузол пейджера"
-
-msgid "Pager port"
-msgstr "Порт пейджера"
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "Вузол передавання файлів"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "Japan вузол передавання файлів"
-
-msgid "File transfer port"
-msgstr "Порт передавання файлів"
-
-#, fuzzy
-msgid "Chat room locale"
-msgstr "Локаль кімнати розмов"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-#, fuzzy
-msgid "Chat room list URL"
-msgstr "Url переліку розмов"
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "Yahoo Japan"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "Не вдається встановити з'єднання."
+
 msgid "Unable to establish file descriptor."
 msgstr "Не вдається встановити дескриптор файлу."
 
@@ -10366,6 +10133,10 @@ msgstr "Не вдається встановити дескриптор файл
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "Пропозиція надіслати %s до %s"
 
+#, fuzzy
+msgid "Write Error"
+msgstr "Помилка запису"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Профіль Yahoo! Japan"
 
@@ -10484,21 +10255,19 @@ msgstr "Голос"
 msgid "Webcams"
 msgstr "Веб-камери"
 
+msgid "Connection problem"
+msgstr "Проблема зв'язку"
+
 msgid "Unable to fetch room list."
 msgstr "Не вдається завантажити перелік кімнат."
 
 msgid "User Rooms"
 msgstr "Кімнати користувача"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Проблема зв'язку з сервером YCHT."
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "Вас було роз'єднано з сервером."
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10641,31 +10410,21 @@ msgid "Exposure"
 msgstr "Експозиція"
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "Не вдається створити сокет"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Не вдається відправити повідомлення: %s"
 
 #, fuzzy, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Помилка з'єднання з проксі %d"
 
 #, fuzzy, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Доступ заборонено: проксі-сервер забороняє тунелювання порту %d."
 
 #, fuzzy, c-format
 msgid "Error resolving %s"
 msgstr "Помилка підключення до розмови %s"
 
-#, fuzzy
-msgid "Could not resolve host name"
-msgstr "Не вдається розв'язати назву вузла."
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10887,13 +10646,6 @@ msgstr ""
 msgid "Unable to connect to %s: %s"
 msgstr "Не вдається з'єднатися з сервером."
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"Для входу на сервер вимагається TLS/SSL. Підтримку TLS/SSL не знайдено."
-
 #, c-format
 msgid " - %s"
 msgstr ""
@@ -11152,7 +10904,11 @@ msgid "View _Log"
 msgstr "Переглянути _журнал"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "Не допускається не у мережі"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "Не допускається не у мережі"
 
 msgid "_Alias..."
@@ -11717,6 +11473,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Зміна інформації про %s"
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11769,7 +11528,7 @@ msgid "Get Away Message"
 msgstr "Нове повідомлення про відсутність"
 
 #, fuzzy
-msgid "Last said"
+msgid "Last Said"
 msgstr "Прізвище:"
 
 msgid "Unable to save icon file to disk."
@@ -12724,7 +12483,7 @@ msgid "Hyperlink visited color"
 msgstr "Колір гіперпосилання"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Колір для відображення гіперпосилань"
 
 #, fuzzy
@@ -12764,15 +12523,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "Видалення сповіщень"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "Сповіщення про нову пошту"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -13155,6 +12921,10 @@ msgid ""
 msgstr "Було вибрано веб-переглядач \"інший\", але команду не було задано."
 
 #, fuzzy
+msgid "No message"
+msgstr "(1 повідомлення)"
+
+#, fuzzy
 msgid "Open All Messages"
 msgstr "Надсилання повідомлення"
 
@@ -13179,10 +12949,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, fuzzy
-msgid "No message"
-msgstr "(1 повідомлення)"
-
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -13421,7 +13187,7 @@ msgid "On unread messages"
 msgstr "Надіслати пові_домлення"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "Вікна бесід"
 
 #, fuzzy
@@ -13431,6 +13197,10 @@ msgstr "Закрити бесіду"
 msgid "When away"
 msgstr "при відсутності"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "Вікна бесід"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -13495,10 +13265,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr "_Блимати вікном, при отриманні повідомлення"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "Вікна бесід"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -13537,8 +13303,8 @@ msgstr "Не вдається отримати інформацію про ко�
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-#, fuzzy
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Автоматично визначати IP-адресу"
 
 msgid "Public _IP:"
@@ -13932,34 +13698,18 @@ msgstr "Зберегти _та застосувати"
 msgid "Status for %s"
 msgstr "Стан: %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "Вставити посмішку"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
 #, fuzzy
-msgid "Duplicate Shortcut"
-msgstr "Файл публічного ключа"
+msgid "Custom Smiley"
+msgstr "Вставити посмішку"
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Введіть нову назву для обраної групи."
+msgid "Duplicate Shortcut"
+msgstr "Файл публічного ключа"
 
 #, fuzzy
 msgid "Edit Smiley"
@@ -14082,8 +13832,8 @@ msgid "Cannot send launcher"
 msgstr "Не вдається надіслати файл"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -14716,7 +14466,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -14995,7 +14745,7 @@ msgstr "Вікна бесід"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -15336,9 +15086,10 @@ msgstr "Параметри входу"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Специфічні для Windows параметри Pidgin."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "Специфічні для Windows параметри Pidgin."
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr ""
@@ -15380,6 +15131,284 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Cannot open socket"
+#~ msgstr "Не вдається відкрити сокет"
+
+#, fuzzy
+#~ msgid "Could not listen on socket"
+#~ msgstr "Не вдається створити сокет"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Не вдається прочитати сокет"
+
+#, fuzzy
+#~ msgid "Connection failed."
+#~ msgstr "Не вдається встановити з'єднання"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Сервер розірвав з'єднання"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Не вдається створити сокет"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Не вдається з'єднатись з вузлом"
+
+#~ msgid "Read error"
+#~ msgstr "Помилка читання"
+
+#~ msgid "Write error"
+#~ msgstr "Помилка запису"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "Встановити інформацію каталогу"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Додаткова адреса"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "Псевдонім розмови"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Користувач не має довідникових даних."
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "команда"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "Помилка реєстрації"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "Розташування"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "Повідомлення про стан користувача"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "Непідтримувана версія"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "Орієнтація"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "Режими користувача"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "Межа кількості користувачів"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "Можливості"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "Ім'я користувача"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "IM з обміном ключами"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "Адреса ел.пошти"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "Встановити профіль"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "Ping"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "Прізвисько"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "Живе відео"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "Отримано повідомлення"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "Babbleprint публічного ключа"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "Меню користувача"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "Режими користувача"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "Межа кількості користувачів"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "Межа кількості користувачів"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Кодування Trillian"
+
+#~ msgid "Read Error"
+#~ msgstr "Помилка читання"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Не вдається з'єднатися з сервером."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Черга повна"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "Не вдається розібрати повідомлення"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Не вдається з'єднатись з вузлом"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Не вдається увійти у мережу (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Не вдається з'єднатися з сервером."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Ви були відключені, тому що увійшли у систему з іншої машини."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Помилка. Підтримку SSL не встановлено."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Неправильний пароль."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "Не вдається з'єднатися з сервером."
+
+#, fuzzy
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "Незабаром ви можете бути від'єднані. Можливо, ви захочете використати "
+#~ "TOC, доки це не буде виправлено. Перевірте оновлення на %s."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Не вдається з'єднатися"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "Неправильне ім'я користувача"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Не вдається отримати інформацію про сервер"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "З'єднання розірвано"
+
+#, fuzzy
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Не вдається з'єднатись з вузлом"
+
+#, fuzzy
+#~ msgid "Connection closed (writing)"
+#~ msgstr "З'єднання розірвано"
+
+#, fuzzy
+#~ msgid "Connection reset"
+#~ msgstr "З'єднання розірвано"
+
+#, fuzzy
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Помилка при зчитуванні з сокету."
+
+#, fuzzy
+#~ msgid "Unable to connect to host"
+#~ msgstr "Не вдається з'єднатися з сервером."
+
+#, fuzzy
+#~ msgid "Could not write"
+#~ msgstr "Не вдається відправити"
+
+#~ msgid "Could not connect"
+#~ msgstr "Не вдається встановити з'єднання"
+
+#, fuzzy
+#~ msgid "Could not create listen socket"
+#~ msgstr "Не вдається створити сокет"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Не вдається розв'язати назву вузла."
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Неправильний пароль."
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "Japan вузол пейджера"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japan вузол передавання файлів"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "Вас було роз'єднано з сервером."
+
+#, fuzzy
+#~ msgid "Could not resolve host name"
+#~ msgstr "Не вдається розв'язати назву вузла."
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Для входу на сервер вимагається TLS/SSL. Підтримку TLS/SSL не знайдено."
+
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Вікна бесід"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Введіть нову назву для обраної групи."
+
+#, fuzzy
 #~ msgid "Activate which ID?"
 #~ msgstr "Активувати який ID?"
 
@@ -16011,10 +16040,6 @@ msgstr ""
 #~ msgstr "Наразі на"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Не вдається з'єднатися з сервером."
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_Повідомлення:"
 
diff --git a/po/ur.po b/po/ur.po
index bdb800e981..f6cd584169 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin Urdu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2007-11-14 14:00+0530\n"
 "Last-Translator: RKVS Raman <raman@cdacbangalore.in>\n"
 "Language-Team: C-DAC,Gist,Urdu Team / BharateeyaOO.o <info.gist@cdac.in / "
@@ -2644,9 +2644,10 @@ msgid "Includes other IM clients' logs in the log viewer."
 msgstr "لاگ ویورمیں  IMكلائنٹس كےدیگرلاگس شامل كرتاہے۔"
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2702,7 +2703,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2949,11 +2950,12 @@ msgstr ""
 "چاہتے ہیں ، ایكٹیوTCL انسٹال كروfrom http://www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "آنے والے IM كنیكشنس كو سننے میں نااہل\n"
 
 msgid ""
@@ -3008,14 +3010,17 @@ msgstr "%sنےگفتگوبند كردی۔"
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "پیام بھیجا نہیں جاسكا،گفتگو شروع نہیں ہو سكی۔"
 
-msgid "Cannot open socket"
-msgstr "ساكیٹ نہیں كھول سكتا"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "ساكیٹ كی تخلیق  نا ممكن :n%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "ساكیٹ كوپورٹ كےلیےباندھ نہیں سكا"
 
-msgid "Could not listen on socket"
-msgstr "ساكیٹ پر سنا نہیں جا سكا"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "ساكیٹ كی تخلیق  نا ممكن :n%s"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3066,13 +3071,16 @@ msgstr "بڈی فہرست محفوظ کرو۔۔۔"
 msgid "Load buddylist from file..."
 msgstr "فائل سے بڈی لسٹ لوڈ كریں۔۔۔"
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "رجسٹریشن شعبے میں بھرو۔"
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "خفیہ لفظ میل نہیں کھاتا۔"
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "نیا اکاؤنٹ رجسٹر کرنے میں ناقابل۔ خامی واقع ہوگئی۔\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3084,14 +3092,15 @@ msgstr "رجسٹریشن کامیابی سےمکمل ہوا!"
 msgid "Password"
 msgstr "خفیہ لفظ"
 
-msgid "Password (retype)"
-msgstr "خفیہ لفظ (دوبارہ ٹائپ کرو)"
+msgid "Password (again)"
+msgstr "خفیہ لفظ(دوبارہ)"
 
-msgid "Enter current token"
-msgstr "حالیہ ٹوکن داخل کرو"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "خالیہ ٹوکن"
+#, fuzzy
+msgid "Captcha"
+msgstr "امیج محفوظ کرو"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "نیا گڈو- گڈو اکاؤنٹ رجسٹر کریں"
@@ -3144,6 +3153,15 @@ msgstr "خفیہ لفظ کامیابی سے تبدیل ہوگيا!"
 msgid "Current password"
 msgstr "حالیہ خفیہ لفظ"
 
+msgid "Password (retype)"
+msgstr "خفیہ لفظ (دوبارہ ٹائپ کرو)"
+
+msgid "Enter current token"
+msgstr "حالیہ ٹوکن داخل کرو"
+
+msgid "Current token"
+msgstr "خالیہ ٹوکن"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "براہ کرم، UINاپنا حالیہ خفیہ لفظ اورنیا خفیہ لفظ داخل کریں:"
 
@@ -3191,8 +3209,8 @@ msgstr "كوئی مماثل صارفین نہیں ملے"
 msgid "There are no users matching your search criteria."
 msgstr "آپ كی تلاش كرائٹیریا سے كوئی بھی صارفین میل  نہیں ركھتےہیں۔"
 
-msgid "Unable to read socket"
-msgstr "ساکیٹ پڑھنے میں نا قابل"
+msgid "Unable to read from socket"
+msgstr " ساكیٹ سے پڑھنا ناممكن"
 
 msgid "Buddy list downloaded"
 msgstr "بڈی لسٹ ڈاؤن لوڈكی گئی"
@@ -3206,8 +3224,14 @@ msgstr "بڈی لسٹ اپ لوڈكی گئی"
 msgid "Your buddy list was stored on the server."
 msgstr "آپ كی بڈی لسٹ سرورپر اسٹوركی گئی تھی۔"
 
-msgid "Connection failed."
-msgstr "کنیکشن ناکام۔"
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "كنیكٹ كیا گیا"
+
+msgid "Connection failed"
+msgstr "کنیکشن ناکام ہوا"
 
 msgid "Add to chat"
 msgstr "گفتگو میں ملاؤ"
@@ -3215,18 +3239,23 @@ msgstr "گفتگو میں ملاؤ"
 msgid "Chat _name:"
 msgstr "گفتگو - نام:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "سرورکوکنیکٹ کرنے میں نا قا بل۔"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "کنیکٹ کررہا ہے"
+
 msgid "Chat error"
 msgstr "گفتگو خامی"
 
 msgid "This chat name is already in use"
 msgstr "یہ گفتگو نام پہلے سے استعمال میں"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "سرور سے کنیکٹ نہیں ہوا۔"
 
 msgid "Find buddies..."
@@ -3287,7 +3316,7 @@ msgid "File Transfer Failed"
 msgstr "فائل ٹرانسفر  ناکام ہوا"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "گائم سننے والے پورٹ کھول نہیں سکا۔"
 
 msgid "Error displaying MOTD"
@@ -3303,8 +3332,18 @@ msgstr "اس کنیکشن کے ساتھ MOTDمتعلقہ نہیں ہے۔"
 msgid "MOTD for %s"
 msgstr "MOTDکے لئے%s"
 
-msgid "Server has disconnected"
-msgstr "سرور منقطع ہوگیا"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"سرور كے ساتھ كنیكشن گم ہوا:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "دیکھو  MOTD"
@@ -3319,22 +3358,20 @@ msgstr "خفیہ لفظ:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRCنکس سفید اسپیس سے وابستہ نہیں ہوگی"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "کنیکٹ کررہا ہے"
-
 msgid "SSL support unavailable"
 msgstr "SSL  تعاون غیر دستیاب"
 
-msgid "Couldn't create socket"
-msgstr "ساکیٹ تخلیق نہیں کر سکا"
+msgid "Unable to connect"
+msgstr "کنیکٹ ہونے میں نا قابل"
 
-msgid "Couldn't connect to host"
-msgstr "ہاسٹ سے کنیکٹ نہیں ہو سکا"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "کنیکٹ ہونے میں نا قابل"
 
-msgid "Read error"
-msgstr "پڑھو خامی"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "سرورنےرابطہ بندكردیا۔"
 
 msgid "Users"
 msgstr "صارفین  "
@@ -3769,11 +3806,12 @@ msgstr "خامی نا قابل ہوئي"
 msgid "execute"
 msgstr "توقع نہیں"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "سرور کو ضرورت ہے TLS/SSL لاگ ان کے لئے۔  کوئی TLS/SSL تعاون نہیں ملا۔"
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "سرور کو ضرورت ہے TLS/SSL لاگ ان کے لئے۔  کوئی TLS/SSL تعاون نہیں ملا۔"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3789,7 +3827,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "سادہ متن تصدیق"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "تصدیق نا کام"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "سرور سے غیر معتبر رد عمل۔"
 
 msgid "Server does not use any supported authentication method"
@@ -3801,7 +3844,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "سرور سے غیر معتبر چیلینج"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL خامی"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3821,10 +3865,8 @@ msgstr ""
 "سرور كے ساتھ كوئی كنیكشن اسٹابلیش نہیں كیا جاسكتا:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "سرور كے ساتھ كوئی كنیكشن اسٹابلیش نہیں كیا جاسكتا:\n"
 "%s"
@@ -3833,12 +3875,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr " كنیكشن كی شروعات نا ممكن"
 
-msgid "Unable to create socket"
-msgstr "ساکیٹ تخلیق کرنےمیں نا قابل"
-
-msgid "Write error"
-msgstr "لکھو خامی"
-
 msgid "Full Name"
 msgstr "پورا نام"
 
@@ -3910,188 +3946,6 @@ msgstr "آپریٹینگ سسٹم"
 msgid "Local Time"
 msgstr "لوکل فائل:"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "ڈائریکٹری معلومات سیٹ کرو"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "توسیع شدہ ایڈریس"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "عرفیت گفتگو  "
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "صارف کے پاس کوئی ڈائریکٹری معلومات نہیں۔"
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "کمانڈ  "
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "رجسٹریشن خامی"
-
-#, fuzzy
-msgid "User Location"
-msgstr "مقام"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "صارف تلاش"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "بڈی اسٹیٹ اطلاع"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "غیر معاون ورجن"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "رخ بندی"
-
-msgid "File Transfer"
-msgstr "فائل تبادلہ"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "صارف موڈس"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "صارف حد"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "صلاحیتیں"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "صارف کا نام"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "IMکے ساتھ کلید ایکسچینج"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "ای میل ایڈریس"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "پروفائل"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "پینگ  "
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "صارف كا نام"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "جاری ویڈیو"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "پیام موصول ہوا"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "پبلک کلید بیبل پرنٹ"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "صارف آپشنس"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "صارف موڈس"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "صارف كا نام"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "صارف حد"
-
-msgid "Ping"
-msgstr "پینگ  "
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "ٹری لیئن اینکریپشن"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "صلاحیتیں"
-
 msgid "Priority"
 msgstr "ترجیح"
 
@@ -4103,7 +3957,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "لاگڈ ان"
 
 msgid "Middle Name"
@@ -4290,16 +4144,12 @@ msgid "Roles:"
 msgstr "رول"
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "سادہ متن"
 
-msgid "Read Error"
-msgstr "پڑھو خامی"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 #, fuzzy
@@ -4489,9 +4339,6 @@ msgstr "آپ کا خفیہ لفظ تبدیل کیا جا چکا ہے۔"
 msgid "Error changing password"
 msgstr "خامی خفیہ لفظ تبدیل کرنا"
 
-msgid "Password (again)"
-msgstr "خفیہ لفظ(دوبارہ)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "خفیہ لفظ تبدیل کرو"
@@ -4888,6 +4735,14 @@ msgstr "XMLتصریف خامی"
 msgid "Unknown Error in presence"
 msgstr "حال میں نامعلوم خامی"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "خامی گفتگو میں حصہ لے رہاہے %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "گفتگو میں خامی%s"
+
 msgid "Create New Room"
 msgstr "نیا کمرہ تخلیق کرو"
 
@@ -4904,16 +4759,20 @@ msgstr "_ہیئتی كمرہ"
 msgid "_Accept Defaults"
 msgstr "ـڈیفالٹس قبول كریں"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "خامی گفتگو میں حصہ لے رہاہے %s"
+#, fuzzy
+msgid "No reason"
+msgstr "کوئی وجہ نہیں دی گئی۔"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "گفتگو میں خامی%s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "آپ  کو%s: (%s)کے ذریعے ٹھوکر ماری گئی۔"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr " %s (%s)کے ذریعے ٹھوکر ماری گئی"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "فائل کھولنےکےدوران  خامی واقع ہوگئی۔"
 
 #, fuzzy
@@ -5425,9 +5284,6 @@ msgstr ""
 "MSNکےلئےSSLتعاون کی ضرورت ہے۔براہ کرم تعاون دیا گیا SSLکتب خانہ انسٹال "
 "کریں۔مزید معلومات کے لئے دیکھیے http://Pidgin.sf.net/faq-ssl.php "
 
-msgid "Failed to connect to server."
-msgstr "سرور سے کنیکٹ ہونے میں ناکام۔"
-
 msgid "Error retrieving profile"
 msgstr "خامی دوبارہ فائل حاصل کرنے کی کوشش کررہا ہے"
 
@@ -5689,9 +5545,6 @@ msgstr "پیام نہیں بھیجا جا سکا کیونکہ نا معلوم خ
 msgid "Message was not sent because an unknown error occurred."
 msgstr "پیام نہیں بھیجا جا سکا کیونکہ نا معلوم خامی واقع ہوگئی:"
 
-msgid "Unable to connect"
-msgstr "کنیکٹ ہونے میں نا قابل"
-
 msgid "Writing error"
 msgstr "لکھ رہا ہے خامی"
 
@@ -5706,13 +5559,16 @@ msgstr ""
 "سےكنیكشن خامی%s server:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "ہمارا  پروٹوکال سرور کے ذریعے معارن نہیں ہے۔"
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "خامی تصریف کررہی ہے HTTP۔"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "آپ نے دوسرے لوکیشن سے سائنڈ آن کیا ہے۔"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
@@ -5720,7 +5576,8 @@ msgstr ""
 "MSNسرورز عارضی طور پر غیر دستیاب ہیں۔ براہ کرم انتظار کریں اور دوبارہ کوشش "
 "کریں۔"
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN سرورز عارضی طور پر نیچے جارہے ہیں۔"
 
 #, c-format
@@ -5733,9 +5590,6 @@ msgstr ""
 "آپ کی MSN  بڈی فہرست عارضی طور پر غیر دستیاب ہے۔ براہ کرم انتظار کریں اور "
 "دوبارہ کوشش کریں۔"
 
-msgid "Unknown error."
-msgstr "نا معلوم خامی۔"
-
 msgid "Handshaking"
 msgstr "مصافحہ کرنا"
 
@@ -5833,6 +5687,9 @@ msgstr "MSN  پروٹو کال پلگ ان"
 msgid "%s is not a valid group."
 msgstr "%s معتبر گروپ نہیں ہے۔"
 
+msgid "Unknown error."
+msgstr "نا معلوم خامی۔"
+
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s پر %s (%s)"
@@ -5951,12 +5808,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "سرور سے غیر معتبر رد عمل۔"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "كنیكٹ كیا گیا"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr ""
@@ -5979,18 +5830,6 @@ msgstr ""
 msgid "Invalid input condition"
 msgstr "کنیکشن فائنل کررہا ہے"
 
-#, fuzzy
-msgid "Read buffer full (2)"
-msgstr "قطار فل"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "پیام  کی تصریف میں ناقابل"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr ""
-
 # msgstr "پروسیس لوٹایا گيا خامی کوڈ %d"
 msgid "Failed to add buddy"
 msgstr ""
@@ -6082,6 +5921,12 @@ msgstr ""
 msgid "Client Version"
 msgstr "مکالمہ بند کرو"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 #, fuzzy
 msgid "MySpaceIM - Username Available"
 msgstr "سروس غیر دستیاب"
@@ -6347,9 +6192,9 @@ msgstr "صارف آف لائن ہے یا آپ بلاک ہوگئے ہیں"
 msgid "Unknown error: 0x%X"
 msgstr "نا معلوم خامی:0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "لاگ ان ناکا م ہوئی(%s)۔"
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "%sصارف کو بین کرنے میں ناقابل"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6451,9 +6296,6 @@ msgstr "گروپ وائز کانفرنس %d"
 msgid "Authenticating..."
 msgstr "تصدیق کررہا ہے۔۔۔"
 
-msgid "Unable to connect to server."
-msgstr "سرورکوکنیکٹ کرنے میں نا قا بل۔"
-
 msgid "Waiting for response..."
 msgstr "در عمل کے لئے انتظار کررہا ہے۔۔۔"
 
@@ -6477,24 +6319,19 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "کیا آپ مکالمے میں شرکت کرنا پسند کریں گے؟"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "آپ لاگڈ آؤٹ کئے جاچکے ہیں کیونکہ آپ نےدوسرے ورک اسٹیشن میں لاگڈ کیا۔"
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr " %sآف لائن  نظر آتا ہے اور آپ نے ابھی بھیجا ہوا پیام موصول نہیں کیا۔"
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "سرور سے کنیکٹ ہونے میں ناقابل۔براہ کرم سرور کا ایڈریس داخل کریں  جس سےآپ "
 "کنیکٹ ہونا چاہتے ہیں۔"
 
-msgid "Error. SSL support is not installed."
-msgstr "خامی۔ SSL تعاون انسٹال نہیں کیا گیا ہے۔"
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "یہ کانفرنس بند کیا جا چکا ہے۔ مزید پیاماتنہیں بھیجے جاسکتے۔"
 
@@ -6534,10 +6371,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "خامی رابطہ قائم کررہی ہے"
 
-msgid "Incorrect password."
-msgstr "غلط خفیہ لفظ۔"
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, fuzzy
@@ -6548,18 +6382,8 @@ msgstr "كنیكٹ نہیں ہوسكا"
 msgid "Invalid chat room name"
 msgstr "غیر معتبر کمرہ نام"
 
-msgid "Server closed the connection."
-msgstr "سرورنےرابطہ بندكردیا۔"
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"سرور كے ساتھ كنیكشن گم ہوا:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "سروركےساتھ كنیكشن پرغیرمعتبرڈاٹاموصول ہوا۔"
 
 #. *< type
@@ -6609,7 +6433,8 @@ msgstr "ریموٹ صارف كے ساتھ آخری كنیكشن:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "ریموٹ صارف كے ساتھ كنیكشن پر غیرمعتبرڈاٹاموصول ہوا۔"
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "ریموٹ صارف كے ساتھ رابطہ قائم نہیں ہو سكا۔"
 
 msgid "Direct IM established"
@@ -6807,21 +6632,15 @@ msgstr "آگہی سطح"
 msgid "Buddy Comment"
 msgstr "بڈی رائے"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 " ایك تصدیق كئے گئے سرور سے كنیكٹ نہيں  كیا جاسكتا:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"BOS سرور سے رابطہ نہیں كیا جاسكتا:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "سرورکوکنیکٹ کرنے میں نا قا بل۔"
 
 #, fuzzy
 msgid "Username sent"
@@ -6836,9 +6655,9 @@ msgstr "کنیکشن فائنل کررہا ہے"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "لاگ ان کرنے میں ناقابل:%sکے طور پر سائن نہیں کرسکا کیونکہ اسکرین نام غیر "
 "معتبر ہے۔اسکرین نام یا حرف کے ساتھ شروع ہونا چاہیے یا صرف حروف  ،نمبرز اور "
@@ -6852,28 +6671,23 @@ msgstr "آپ كچھ دیركےلیےمنقطع ہوسكتےہیں۔اپ ڈیٹس
 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
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "نا درست نام "
+msgid "Username does not exist"
+msgstr "صارف موجود نہیں"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "آپ کا اکاؤنٹ فی الحال معطل کر دیا گیا ہے۔"
 
 #. service temporarily unavailable
@@ -6894,7 +6708,8 @@ msgstr ""
 "کوشش کریں۔ اگر آپ جاری رکھنے کی کوشش کرتے ہیں تو، آپ کو اور زیادہ دیر تک "
 "انظار کرنے کی ضرورت ہے۔"
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "داخل کی گئی سیکیور IDکلید غیر معتبر ہے۔"
 
 msgid "Enter SecurID"
@@ -7064,6 +6879,9 @@ msgstr "آن لائن جب تک "
 msgid "Member Since"
 msgstr "ممبر جب تک"
 
+msgid "Capabilities"
+msgstr "صلاحیتیں"
+
 msgid "Profile"
 msgstr "پروفائل"
 
@@ -7247,7 +7065,7 @@ msgstr "دور پیام بہت طویل۔"
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7274,9 +7092,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "یتیم"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "بڈی %s شامل نہیں کرسکا کیو نکہ آپ کے پاس آپ کی بڈی لسٹ میں بہت سارے بڈیز "
@@ -7285,9 +7103,9 @@ msgstr ""
 msgid "(no name)"
 msgstr "(کوئی نام نہیں)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
+msgstr "آپ کا کمانڈ نا معلوم سبب کے لئے ناکام ہوا۔"
 
 # msgstr "آپ کا کمانڈ نا معلوم سبب کے لئے ناکام ہوا۔"
 #, fuzzy, c-format
@@ -8137,7 +7955,7 @@ msgid "Update interval (seconds)"
 msgstr "پڑھ رہا ہے خامی"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "سرور معلومات نہیں لے سکتا"
 
 #, c-format
@@ -8164,10 +7982,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "سرور معلومات نہیں لے سکتا"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "درخواست ڈائیلاگ"
 
@@ -8203,22 +8017,9 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "کنیکٹ ہونے میں ناقابل۔"
-
 msgid "Socket error"
 msgstr "ساكیٹ خامی"
 
-msgid "Unable to read from socket"
-msgstr " ساكیٹ سے پڑھنا ناممكن"
-
-msgid "Write Error"
-msgstr "خامی لكھیں"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "كنیكشن گم   ہوگیا!"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "صارف معلومات سیٹ کرو۔۔۔"
@@ -8227,8 +8028,9 @@ msgstr "صارف معلومات سیٹ کرو۔۔۔"
 msgid "Requesting token"
 msgstr "درخواست انکار کی گئی"
 
-msgid "Couldn't resolve host"
-msgstr "ہوسٹ كوہم آہنگ نہیں كرسكا"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "سرورکوکنیکٹ کرنے میں نا قا بل۔"
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8279,7 +8081,7 @@ msgid "QQ Qun Command"
 msgstr "کمانڈ  "
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "سرور معلومات نہیں لے سکتا"
 
 #, fuzzy
@@ -8301,9 +8103,6 @@ msgstr "فائل بھیجی گئي"
 msgid "%d canceled the transfer of %s"
 msgstr "%dٹرانسفر  منسوخ كیا گیا%s"
 
-msgid "Connection closed (writing)"
-msgstr "رابطہ بندہوا(لكھ رہا ہے)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>گروپ عنوان:</b> %s<br>"
@@ -8357,17 +8156,6 @@ msgstr "اسی وقت كے منتظم نےسرور %sپرمندرجہ ذیل ا�
 msgid "Sametime Administrator Announcement"
 msgstr "ایك ہی وقت میں اعلانِ منتظم"
 
-msgid "Connection reset"
-msgstr "رابطہ دوبارہ سیٹ كیا گیا"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "ساكیٹ سےخامی پڑھ رہاہے:%s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "ہوسٹ سےكنیكٹ ہونے میں نااہل"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "%sكی طرف سے اعلان"
@@ -8390,6 +8178,9 @@ msgstr "اسپیكرز"
 msgid "Video Camera"
 msgstr "وڈیوكیمرہ"
 
+msgid "File Transfer"
+msgstr "فائل تبادلہ"
+
 msgid "Supports"
 msgstr "سپورٹس"
 
@@ -9210,6 +9001,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "نیٹ ورک شماریات"
 
+msgid "Ping"
+msgstr "پینگ  "
+
 msgid "Ping failed"
 msgstr "پینگ ناکام ہوا"
 
@@ -9273,7 +9067,8 @@ msgstr "غیر معاون شدہ پبلک کلید ٹائپ"
 msgid "Disconnected by server"
 msgstr "سرور سے منقطع کیا گیا"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "SILC سرور سے کنیکٹ ہرنے کے دوران خامی"
 
 msgid "Key Exchange failed"
@@ -9285,27 +9080,26 @@ msgstr ""
 "ریزیومینگ سیشن   ملاحدہ کرنا ناکام ہوا۔ نیا کنیکشن تخلیق کرنے کے لئے ری "
 "کنیکٹ پر پریس کریں۔"
 
-msgid "Connection failed"
-msgstr "کنیکشن ناکام ہوا"
-
 msgid "Performing key exchange"
 msgstr "کلید ایکسچینج  پر عمل کررہا "
 
-msgid "Unable to create connection"
-msgstr "رابطہ تخلیق میں نااہل"
-
 #, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr " SILCكلیدجوڑی لوڈنہیں كر سكا:%s"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr " SILC  سرور سے کنیکٹ کررہا ہے"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr " SILCكلیدجوڑی لوڈنہیں كر سكا:%s"
+
 msgid "Out of memory"
 msgstr "میمری سے باہر"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "SILCپروٹوكال كومقدم نہیں كرسكا"
 
 #, fuzzy
@@ -9599,7 +9393,7 @@ msgid "Creating SILC key pair..."
 msgstr "SILCکلید جوڑی تخلیق کررہا ہے"
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "SILCکلید جوڑی تخلیق کررہا ہے"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9693,6 +9487,9 @@ msgstr "سفیدبورڈ"
 msgid "No server statistics available"
 msgstr "کوئی سرور شماریات دستیاب نہیں"
 
+msgid "Error during connecting to SILC Server"
+msgstr "SILC سرور سے کنیکٹ ہرنے کے دوران خامی"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "ناکامی: ورجن میل نہیں کھاتا، اپنے کلائنٹ کو اپ گریڈ کریں"
@@ -9733,32 +9530,28 @@ msgstr "ناکام: غیر معتبر کوکی"
 msgid "Failure: Authentication failed"
 msgstr "ناکام: تصدیق ناکام ہوا"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr " SILC کلائنٹ کنیکشن انیشیئلائز نہیں کرسکتے۔"
 
 #, fuzzy
 msgid "John Noname"
 msgstr "كوئی نام نہیں"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr " SILCكلیدجوڑی لوڈنہیں كر سكا:%s"
 
-msgid "Could not write"
-msgstr "نہیں لكھ سكا"
-
-msgid "Could not connect"
-msgstr "كنیكٹ نہیں ہوسكا"
+msgid "Unable to create connection"
+msgstr "رابطہ تخلیق میں نااہل"
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "نامعلوم خامی سرور"
 
-msgid "Could not create listen socket"
-msgstr "سننے والاساكٹتخلیق نہیں ہوسكا"
-
-msgid "Could not resolve hostname"
-msgstr "ہوسٹ نام ریزولو نہيں كیا جاسكتا"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "ساکیٹ تخلیق کرنےمیں نا قابل"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -9801,6 +9594,78 @@ msgstr "مستندصارف"
 msgid "Auth Domain"
 msgstr "مستندڈومین"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "جوائن&یہ؛کمرہ&gt؛:  یاہو نیٹ ورک پر کمرہ گفتگو میں شرکت کریں۔"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "لسٹ:لسٹ رومز پرYahooنیٹ ورك"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "چیستان:صارف کو چیستان سیشن شروع کرنے کی درخواست کریں"
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "یا ہو! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "یا ہو پروٹوکال پلگ ان"
+
+msgid "Pager server"
+msgstr "پیجرسرور"
+
+msgid "Pager port"
+msgstr "پیج رپورٹ"
+
+msgid "File transfer server"
+msgstr "فائل ٹرانسفرسرور"
+
+msgid "File transfer port"
+msgstr " فائل ٹرانسفر پورٹ"
+
+msgid "Chat room locale"
+msgstr "كمرہِ گفتگولوكیل"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "كانفرنس اورچیٹ روم دعوتیں نظراندازكریں"
+
+msgid "Chat room list URL"
+msgstr "چیٹ روم لسٹ URL"
+
+msgid "Yahoo Chat server"
+msgstr "Yahoo Chat سرور"
+
+msgid "Yahoo Chat port"
+msgstr "Yahoo Chatپورٹ"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "یا ہو! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "یا ہو پروٹوکال پلگ ان"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9833,29 +9698,19 @@ msgstr "مسترد کئے گئے بڈی ملاؤ"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 "نامعلوم خامی نمبر %d۔یا ہو! ویب سائٹ ميں لاگینگ کریں جو اسے فکس کرے گی۔"
 
@@ -9897,37 +9752,33 @@ msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "نامعلوم خامی نمبر %d۔یا ہو! ویب سائٹ ميں لاگینگ کریں جو اسے فکس کرے گی۔"
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "بڈی کو نہیں ملا سکتے %s  گروپ کو %s سرور فہرست کو اکاؤنٹ پر%s۔"
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "سرور لسٹ میں بڈی لسٹ نہیں ملا سکا"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "غیر قبول   HTTP رسپانس سرور سے وصول كیا جاتا ہے۔"
 
-msgid "Connection problem"
-msgstr "کنیکشن پریشانی"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
-
-# msgstr ""
-# "سرور كے ساتھ كنیكشن گم ہوا:\n"
-# "%s"
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
+"سرور كے ساتھ كنیكشن گم ہوا:\n"
 "%s"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
+"سرور كے ساتھ كوئی كنیكشن اسٹابلیش نہیں كیا جاسكتا:\n"
+"%s"
 
 # msgstr ""
 # "سرور كے ساتھ كوئی كنیكشن اسٹابلیش نہیں كیا جاسكتا:\n"
@@ -9994,74 +9845,15 @@ msgstr "صارف كو گفتگومیں شامل كریں۔۔۔"
 msgid "Open Inbox"
 msgstr "ہاٹ میل ان باکس کھولیں"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "جوائن&یہ؛کمرہ&gt؛:  یاہو نیٹ ورک پر کمرہ گفتگو میں شرکت کریں۔"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "لسٹ:لسٹ رومز پرYahooنیٹ ورك"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "چیستان:صارف کو چیستان سیشن شروع کرنے کی درخواست کریں"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "یا ہو! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "یا ہو پروٹوکال پلگ ان"
-
-msgid "Yahoo Japan"
-msgstr "یا ہو جاپان"
-
-msgid "Pager server"
-msgstr "پیجرسرور"
-
-msgid "Japan Pager server"
-msgstr "جاپان پیجرسرور"
-
-msgid "Pager port"
-msgstr "پیج رپورٹ"
-
-msgid "File transfer server"
-msgstr "فائل ٹرانسفرسرور"
-
-msgid "Japan file transfer server"
-msgstr "جاپان فائل ٹرانسفرسرور"
-
-msgid "File transfer port"
-msgstr " فائل ٹرانسفر پورٹ"
-
-msgid "Chat room locale"
-msgstr "كمرہِ گفتگولوكیل"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "كانفرنس اورچیٹ روم دعوتیں نظراندازكریں"
-
-msgid "Chat room list URL"
-msgstr "چیٹ روم لسٹ URL"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo Chat سرور"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo Chatپورٹ"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "ڈوڈل درخواست بھیجی گئی۔"
 
+msgid "Unable to connect."
+msgstr "کنیکٹ ہونے میں ناقابل۔"
+
 msgid "Unable to establish file descriptor."
 msgstr "فائل ڈسکریپٹر قائم کرنے میں نا قابل۔"
 
@@ -10069,6 +9861,9 @@ msgstr "فائل ڈسکریپٹر قائم کرنے میں نا قابل۔"
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s  پیش کش کررہا ہے%s کو فائل بھیجنے کی"
 
+msgid "Write Error"
+msgstr "خامی لكھیں"
+
 msgid "Yahoo! Japan Profile"
 msgstr "یاہو! جاپان پروفائل"
 
@@ -10185,23 +9980,19 @@ msgstr "آوازیں"
 msgid "Webcams"
 msgstr "ویب کیمس"
 
+msgid "Connection problem"
+msgstr "کنیکشن پریشانی"
+
 msgid "Unable to fetch room list."
 msgstr "کمرہ فہرست فیچ کرنے میں ناقابل۔"
 
 msgid "User Rooms"
 msgstr "صارف کمرے"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "YCHT سرور کے ساتھ کنیکشن پریشانی۔"
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"سرور كے ساتھ گم شدہ كنیكشن\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10323,31 +10114,22 @@ msgstr "Realm"
 msgid "Exposure"
 msgstr "انکشاف"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "ساكیٹ كی تخلیق  نا ممكن :n%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "HTTP پراكسی سے پارس ریفرینس  نا ممكن :%s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP پراكسی كنیكشن خامی %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "اسیس انكار كی گئي: HTTP پراكسی سرور فاربیڈس پورٹ %d ٹنیلینگ۔"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "خامی %s ریزول كررہا ہے"
 
-msgid "Could not resolve host name"
-msgstr "ہوسٹ نام ریزولو نہيں كیا جاسكتا"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10564,12 +10346,6 @@ msgstr ""
 msgid "Unable to connect to %s: %s"
 msgstr ""
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "سرور کو ضرورت ہے TLS/SSL لاگ ان کے لئے۔  کوئی TLS/SSL تعاون نہیں ملا۔"
-
 #, c-format
 msgid " - %s"
 msgstr ""
@@ -10827,9 +10603,13 @@ msgstr "بڈی ملائیے- پاؤنس"
 msgid "View _Log"
 msgstr "دیکھو - لاگ"
 
-msgid "Hide when offline"
+msgid "Hide When Offline"
 msgstr ""
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "آف لائن بڈیس دكھاؤ"
+
 msgid "_Alias..."
 msgstr "_عرفیت۔۔۔"
 
@@ -11367,6 +11147,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr " %sکے لئے صارف معلومات تبدیل کریں"
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11415,7 +11198,8 @@ msgstr "نظراندازکرو"
 msgid "Get Away Message"
 msgstr "پیام سے  دور ہو"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "آخری كہا گیا"
 
 msgid "Unable to save icon file to disk."
@@ -12325,7 +12109,7 @@ msgid "Hyperlink visited color"
 msgstr "ہائپر لنک رنگ"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "ہائپر لنکس ڈراؤ کرنے کے لئے رنگ جب ماؤس اس پر ہو۔"
 
 msgid "Hyperlink prelight color"
@@ -12363,15 +12147,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "نوٹیفیکیشن ریمول"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "نئی میل اطلاعات"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12783,6 +12574,10 @@ msgid ""
 msgstr ""
 "'مینیول'براؤزر کمانڈ منتخب کئے گئے ہیں، لیکن کوئی کمانڈ سیٹ نہیں کیا گيا ۔"
 
+#, fuzzy
+msgid "No message"
+msgstr "نا معلوم پیام"
+
 msgid "Open All Messages"
 msgstr "تمام پیامات كھولیں"
 
@@ -12800,10 +12595,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "نا معلوم پیام"
-
 msgid "The following plugins will be unloaded."
 msgstr "مندرجہ ذیل پلگ انس لوڈنہیں كيےجائےگے۔"
 
@@ -13027,8 +12818,9 @@ msgstr "سسٹم ٹرے آئي كن دكھاؤ:"
 msgid "On unread messages"
 msgstr "نا پڑھے ہوئے میسیجیس پر"
 
-msgid "Conversation Window Hiding"
-msgstr "گفتگو ونڈو چھپارہا ہے"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "IMمکالمہ ونڈوز"
 
 msgid "_Hide new IM conversations:"
 msgstr "_نئی IM گفتگویں چھپاؤ:"
@@ -13036,6 +12828,10 @@ msgstr "_نئی IM گفتگویں چھپاؤ:"
 msgid "When away"
 msgstr "جب دور ہو"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "مکالمہ ونڈ وبڑھاؤ"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "ٹیبس"
@@ -13095,10 +12891,6 @@ msgstr "اسموتھ ۔اسكرولنگ استعمال كریں"
 msgid "F_lash window when IMs are received"
 msgstr " جب IMs وصول ہوتا ہے فلیش ونڈو"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "مکالمہ ونڈ وبڑھاؤ"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -13137,7 +12929,8 @@ msgstr "صارف معلومات نہیں مل سکتی"
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Example: stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_خودكاری سی پكڑاگیاIPایڈریس"
 
 msgid "Public _IP:"
@@ -13516,34 +13309,18 @@ msgstr "Sa_ve & استعمال كریں"
 msgid "Status for %s"
 msgstr " %sكےلیےاسٹیٹس"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "اسمائلی داخل کرو"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
 #, fuzzy
-msgid "Duplicate Shortcut"
-msgstr "ڈوپلیکیٹ اصلاح"
+msgid "Custom Smiley"
+msgstr "اسمائلی داخل کرو"
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr " براہ كرم اسٹیٹس كے لیے ایك نا خالی عنوان داخل كیجیے۰"
+msgid "Duplicate Shortcut"
+msgstr "ڈوپلیکیٹ اصلاح"
 
 #, fuzzy
 msgid "Edit Smiley"
@@ -13672,9 +13449,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "لاؤنچر کو نہیں بھیج سکتے"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr "                               "
 
 #, c-format
@@ -14298,9 +14076,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "مجموعی مضمون كےلیے میوزك میسیجینگ پلگ ان۔"
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "یہ میوزك میسیجینگ پلگ ان بہت سے صارفین كوبیك وقت حقیقی ۔وقت میں كامن اسكور "
 "مرتب كرنے كے ذریعے میوزك كے پیس پر كام كرنےكی اجازت دیتاہے۔"
@@ -14569,7 +14348,7 @@ msgstr "گفتگو ونڈو چھپارہا ہے"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -14905,7 +14684,7 @@ msgstr "ونڈوز گائم کے لئے آپشنس مخصوص۔"
 
 #, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "ونڈوز گائم كو  مخصوص آپشنس مہیا كرتا ہے، جیسے بڈی فہرست ڈاكینگ۔"
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14947,6 +14726,273 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
+#~ msgid "Cannot open socket"
+#~ msgstr "ساكیٹ نہیں كھول سكتا"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "ساكیٹ پر سنا نہیں جا سكا"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "ساکیٹ پڑھنے میں نا قابل"
+
+#~ msgid "Connection failed."
+#~ msgstr "کنیکشن ناکام۔"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "سرور منقطع ہوگیا"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "ساکیٹ تخلیق نہیں کر سکا"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "ہاسٹ سے کنیکٹ نہیں ہو سکا"
+
+#~ msgid "Read error"
+#~ msgstr "پڑھو خامی"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "سرور كے ساتھ كوئی كنیكشن اسٹابلیش نہیں كیا جاسكتا:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "لکھو خامی"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "ڈائریکٹری معلومات سیٹ کرو"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "توسیع شدہ ایڈریس"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "عرفیت گفتگو  "
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "صارف کے پاس کوئی ڈائریکٹری معلومات نہیں۔"
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "کمانڈ  "
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "رجسٹریشن خامی"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "مقام"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "صارف تلاش"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "بڈی اسٹیٹ اطلاع"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "غیر معاون ورجن"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "رخ بندی"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "صارف موڈس"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "صارف حد"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "صلاحیتیں"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "صارف کا نام"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "IMکے ساتھ کلید ایکسچینج"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "ای میل ایڈریس"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "پروفائل"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "پینگ  "
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "صارف كا نام"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "جاری ویڈیو"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "پیام موصول ہوا"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "پبلک کلید بیبل پرنٹ"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "صارف آپشنس"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "صارف موڈس"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "صارف كا نام"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "صارف حد"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "ٹری لیئن اینکریپشن"
+
+#~ msgid "Read Error"
+#~ msgstr "پڑھو خامی"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "سرور سے کنیکٹ ہونے میں ناکام۔"
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "قطار فل"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "پیام  کی تصریف میں ناقابل"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "لاگ ان ناکا م ہوئی(%s)۔"
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr ""
+#~ "آپ لاگڈ آؤٹ کئے جاچکے ہیں کیونکہ آپ نےدوسرے ورک اسٹیشن میں لاگڈ کیا۔"
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "خامی۔ SSL تعاون انسٹال نہیں کیا گیا ہے۔"
+
+#~ msgid "Incorrect password."
+#~ msgstr "غلط خفیہ لفظ۔"
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "BOS سرور سے رابطہ نہیں كیا جاسكتا:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "آپ كچھ دیركےلیےمنقطع ہوسكتےہیں۔اپ ڈیٹس كے لیے%sجانچیے۔"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "کنیکٹ نہیں ہو سکا"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "نا درست نام "
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "سرور معلومات نہیں لے سکتا"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "كنیكشن گم   ہوگیا!"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "ہوسٹ كوہم آہنگ نہیں كرسكا"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "رابطہ بندہوا(لكھ رہا ہے)"
+
+#~ msgid "Connection reset"
+#~ msgstr "رابطہ دوبارہ سیٹ كیا گیا"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "ساكیٹ سےخامی پڑھ رہاہے:%s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "ہوسٹ سےكنیكٹ ہونے میں نااہل"
+
+#~ msgid "Could not write"
+#~ msgstr "نہیں لكھ سكا"
+
+#~ msgid "Could not connect"
+#~ msgstr "كنیكٹ نہیں ہوسكا"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "سننے والاساكٹتخلیق نہیں ہوسكا"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "ہوسٹ نام ریزولو نہيں كیا جاسكتا"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "غیر  صحیح پاس ورڈ"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "یا ہو جاپان"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "جاپان پیجرسرور"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "جاپان فائل ٹرانسفرسرور"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "سرور كے ساتھ گم شدہ كنیكشن\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "ہوسٹ نام ریزولو نہيں كیا جاسكتا"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "سرور کو ضرورت ہے TLS/SSL لاگ ان کے لئے۔  کوئی TLS/SSL تعاون نہیں ملا۔"
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "گفتگو ونڈو چھپارہا ہے"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr " براہ كرم اسٹیٹس كے لیے ایك نا خالی عنوان داخل كیجیے۰"
+
 #, fuzzy
 #~ msgid "Activate which ID?"
 #~ msgstr "فعال کونسا  ID؟"
diff --git a/po/vi.po b/po/vi.po
index 8668d2e4fb..3ea2ea9cbd 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CVS Version of Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2008-06-22 21:58+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -2587,9 +2587,10 @@ msgstr ""
 "Bao gồm trong bộ xem bản ghi các bản ghi của ứng dụng khách tin nhắn khác."
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2643,8 +2644,9 @@ msgstr "Mô phỏng tin nhẳn ngoại tuyến"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Lưu dạng thông báo các tin nhẳn được gửi cho người dùng chưa kết nối."
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Phần còn lại của các tin nhẳn sẽ được lưu dạng thông báo. Bạn cũng có thể "
@@ -2897,14 +2899,16 @@ msgstr ""
 "Không thể phát hiện bản cài đặt ActiveTCL. Muốn sử dụng phần bổ sung TCL thì "
 "cài đặt ActiveTCL từ địa chỉ « http://www.activestate.com ».\n"
 
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "Không tìm thấy bộ công cụ Apple Bonjour For Windows, xem FAQ (Hỏi Đáp) ở địa "
 "chỉ « http://d.pidgin.im/BonjourWindows » để tìm chi tiết."
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "Không thể lắng nghe kết nối tin nhắn gửi đến\n"
 
 msgid ""
@@ -2958,14 +2962,21 @@ msgstr "%s đã đóng cửa sổ cuộc thoại."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Không thể gửi tin, vì không thể bắt đầu nói chuyện."
 
-msgid "Cannot open socket"
-msgstr "Không thể mở ổ cắm."
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"Không thể tạo ổ cắm\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Không thể đóng kết ổ cắm tới cổng"
 
-msgid "Could not listen on socket"
-msgstr "Không thể lắng nghe trên ổ cắm"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"Không thể tạo ổ cắm\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Lỗi liên lạc với cơ chế đáp ứng DNS mDNSResponder cục bộ."
@@ -3013,13 +3024,16 @@ msgstr "Lưu danh sách bạn bè..."
 msgid "Load buddylist from file..."
 msgstr "Nạp danh sách bạn bè từ tập tin..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "Đìên vào các trường đăng ký."
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "Hai mật khẩu không trùng."
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Không thể đăng ký tài khoản mới. Lỗi xảy ra.\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3031,14 +3045,15 @@ msgstr "Đăng ký thành công."
 msgid "Password"
 msgstr "Mật khẩu"
 
-msgid "Password (retype)"
-msgstr "Mật khẩu (gõ lại)"
+msgid "Password (again)"
+msgstr "Nhập lại mật khẩu"
 
-msgid "Enter current token"
-msgstr "Nhập hiệu bài hiện có"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "Hiệu bài hiện có"
+#, fuzzy
+msgid "Captcha"
+msgstr "Lưu ảnh"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Đăng ký tài khoản Gadu-Gadu mới"
@@ -3091,6 +3106,15 @@ msgstr "Đổi thành công mật khẩu."
 msgid "Current password"
 msgstr "Mật khẩu hiện tại"
 
+msgid "Password (retype)"
+msgstr "Mật khẩu (gõ lại)"
+
+msgid "Enter current token"
+msgstr "Nhập hiệu bài hiện có"
+
+msgid "Current token"
+msgstr "Hiệu bài hiện có"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Hãy nhập mật khẩu hiện tại và mật khẩu mới của bạn cho UIN: "
 
@@ -3138,8 +3162,8 @@ msgstr "Không tìm thấy người dùng tương ứng"
 msgid "There are no users matching your search criteria."
 msgstr "Không có người dùng tương ứng với tiêu chuẩn tìm kiếm bạn đã xác định."
 
-msgid "Unable to read socket"
-msgstr "Không thể đọc ổ cắm"
+msgid "Unable to read from socket"
+msgstr "Không thể đọc từ ổ cắm"
 
 msgid "Buddy list downloaded"
 msgstr "Danh sách bạn bè đã tải xuống"
@@ -3153,8 +3177,14 @@ msgstr "Danh sách bạn bè đã tải lên"
 msgid "Your buddy list was stored on the server."
 msgstr "Danh sách bạn bè của bạn đã được cất giữ trên máy phục vụ."
 
-msgid "Connection failed."
-msgstr "Lỗi kết nối."
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Đã kết nối"
+
+msgid "Connection failed"
+msgstr "Kết nối bị lỗi"
 
 msgid "Add to chat"
 msgstr "Thêm vào chát"
@@ -3162,18 +3192,23 @@ msgstr "Thêm vào chát"
 msgid "Chat _name:"
 msgstr "Tê_n chát:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Không thể kết nối đến máy phục vụ."
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Đang kết nối"
+
 msgid "Chat error"
 msgstr "Lỗi chát"
 
 msgid "This chat name is already in use"
 msgstr "Tên chát này đang được dùng"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "Không phải có kết nối tới máy phục vụ."
 
 msgid "Find buddies..."
@@ -3234,7 +3269,8 @@ msgstr "Chưa lập chủ đề"
 msgid "File Transfer Failed"
 msgstr "Lỗi truyền tập tin"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "Không thể mở cổng lắng nghe."
 
 # MOTD: Message Of The Day: thông điệp của hôm nay
@@ -3251,8 +3287,18 @@ msgstr "Không có MOTD (thông điệp của hôm nay) liên quan đến kết
 msgid "MOTD for %s"
 msgstr "MOTD cho %s"
 
-msgid "Server has disconnected"
-msgstr "Máy phục vụ đã ngắt kết nối"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"Mất kết nối với máy phục vụ :\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "Xem MOTD"
@@ -3267,22 +3313,20 @@ msgstr "_Mật khẩu :"
 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
-#. connect to the server
-msgid "Connecting"
-msgstr "Đang kết nối"
-
 msgid "SSL support unavailable"
 msgstr "Hiện không có hỗ trợ SSL"
 
-msgid "Couldn't create socket"
-msgstr "Không thể tạo ổ cắm"
+msgid "Unable to connect"
+msgstr "Không thể kết nối"
 
-msgid "Couldn't connect to host"
-msgstr "Không thể kết nối với máy phục vụ"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Không thể kết nối tới %s"
 
-msgid "Read error"
-msgstr "Lỗi đọc"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Máy phục vụ đã đóng kết nối."
 
 msgid "Users"
 msgstr "Người dùng"
@@ -3713,12 +3757,14 @@ msgstr "Lệnh như thế đã bị lỗi"
 msgid "execute"
 msgstr "thực hiện"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "Máy phục vụ yêu cầu TLS/SSL để đăng nhập. Không tìm thấy khả năng hỗ trợ TLS/"
 "SSL."
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Bạn cần chức năng mật mã, nhưng không tìm thấy hỗ trợ TLS/SSL."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3736,7 +3782,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Xác thực nhập thô"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Không xác thực được"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Máy phục vụ trả lời không hợp lệ."
 
 msgid "Server does not use any supported authentication method"
@@ -3748,7 +3799,8 @@ 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ệ"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Lỗi SASL"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3768,10 +3820,8 @@ msgstr ""
 "Không thể thiết lập kết nối đến máy phục vụ :\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "Không thể thiết lập kết nối đến máy phục vụ :\n"
 "%s"
@@ -3780,12 +3830,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "Không thể khởi tạo kết nối"
 
-msgid "Unable to create socket"
-msgstr "Không thể tạo ổ cắm"
-
-msgid "Write error"
-msgstr "Lỗi ghi"
-
 msgid "Full Name"
 msgstr "Tên đầy đủ"
 
@@ -3854,161 +3898,6 @@ msgstr "Hệ điều hành"
 msgid "Local Time"
 msgstr "Tập tin cục bộ :"
 
-msgid "Last Activity"
-msgstr "Hoạt động cuối cùng"
-
-msgid "Service Discovery Info"
-msgstr "Thông tin phát hiện dịch vụ"
-
-msgid "Service Discovery Items"
-msgstr "Mục phát hiện dịch vụ"
-
-msgid "Extended Stanza Addressing"
-msgstr "Đặt địa chỉ kiểu đoạn dòng mở rộng"
-
-msgid "Multi-User Chat"
-msgstr "Chat đa người dùng"
-
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Thông tin về mặt ở đã mở rộng cho chat đa người dùng"
-
-msgid "In-Band Bytestreams"
-msgstr "Luồng byte bên trong dải"
-
-msgid "Ad-Hoc Commands"
-msgstr "Lệnh như thế"
-
-msgid "PubSub Service"
-msgstr "Dịch vụ PubSub"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "Luồng byte SOCKS5"
-
-msgid "Out of Band Data"
-msgstr "Dữ liệu bên ngoài dải"
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "Đăng ký bên trong dải"
-
-msgid "User Location"
-msgstr "Nơi ở người dùng"
-
-msgid "User Avatar"
-msgstr "Ảnh riêng người dùng"
-
-msgid "Chat State Notifications"
-msgstr "Thông báo tình trạng chat"
-
-msgid "Software Version"
-msgstr "Phiên bản phần mềm"
-
-msgid "Stream Initiation"
-msgstr "Khởi tạo luồng"
-
-msgid "File Transfer"
-msgstr "Truyền tập tin"
-
-msgid "User Mood"
-msgstr "Tâm trạng người dùng"
-
-msgid "User Activity"
-msgstr "Hoạt động người dùng"
-
-msgid "Entity Capabilities"
-msgstr "Khả năng thực thể"
-
-msgid "Encrypted Session Negotiations"
-msgstr "Dàn xếp phiên bản đã mật mã"
-
-msgid "User Tune"
-msgstr "Điệu người dùng"
-
-msgid "Roster Item Exchange"
-msgstr "Trao đổi mục bản liệt kê"
-
-msgid "Reachability Address"
-msgstr "Địa chỉ có thể tới"
-
-msgid "User Profile"
-msgstr "Lý lịch người dùng"
-
-# Name: don't translate/Tên: đừng dịch
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Âm thanh Jingle"
-
-msgid "User Nickname"
-msgstr "Tên hiệu người dùng"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr "Jingle Raw UDP"
-
-msgid "Jingle Video"
-msgstr "Ảnh động Jingle"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "Người nhận tin nhẳn"
-
-msgid "Public Key Publishing"
-msgstr "Xuất bản khoá công"
-
-msgid "User Chatting"
-msgstr "Người dùng nói chuyện"
-
-msgid "User Browsing"
-msgstr "Người dùng duyệt"
-
-msgid "User Gaming"
-msgstr "Người dùng chơi trò"
-
-msgid "User Viewing"
-msgstr "Người dùng xem"
-
-# Name: don't translate/Tên: đừng dịch
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "Mật mã đoạn dòng"
-
-msgid "Entity Time"
-msgstr "Thời gian thực thể"
-
-msgid "Delayed Delivery"
-msgstr "Phát trễ"
-
-msgid "Collaborative Data Objects"
-msgstr "Đối tượng dữ liệu hợp tác"
-
-msgid "File Repository and Sharing"
-msgstr "Kho lưu tập tin và chia sẻ"
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "Phát hiện dịch vụ STUN cho Jingle"
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "Dàn xếp phiên chạy mật mã đơn giản"
-
-msgid "Hop Check"
-msgstr "Kiểm tra bước"
-
-msgid "Capabilities"
-msgstr "Khả năng"
-
 msgid "Priority"
 msgstr "Ưu tiên"
 
@@ -4020,7 +3909,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Đã đăng xuất"
 
 msgid "Middle Name"
@@ -4203,16 +4092,13 @@ msgstr "Không tìm thấy người dùng tương ứng"
 msgid "Roles:"
 msgstr "Vị trí"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Quá hạn ping"
 
-msgid "Read Error"
-msgstr "Lỗi đọc"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4390,9 +4276,6 @@ msgstr "Mật khẩu của bạn đã được thay đổi."
 msgid "Error changing password"
 msgstr "Lỗi khi thay đổi mật khẩu"
 
-msgid "Password (again)"
-msgstr "Nhập lại mật khẩu"
-
 msgid "Change XMPP Password"
 msgstr "Đổi mật khẩu XMPP"
 
@@ -4788,6 +4671,14 @@ msgstr "Lỗi phân tích XML"
 msgid "Unknown Error in presence"
 msgstr "Gặp lỗi không rõ trong sự có mặt"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Lỗi vào chát %s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Lỗi trong chát %s"
+
 msgid "Create New Room"
 msgstr "Tạo phòng mới"
 
@@ -4804,16 +4695,20 @@ msgstr "_Cấu hình phòng"
 msgid "_Accept Defaults"
 msgstr "Chấp nhận _mặc định"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Lỗi vào chát %s"
+#, fuzzy
+msgid "No reason"
+msgstr "Không nêu lý do."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Lỗi trong chát %s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Bạn bị %s đá: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Bị %s đá (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Gặp lỗi trong khi mở tập tin."
 
 #, fuzzy
@@ -5313,9 +5208,6 @@ msgstr "Khởi tạo _Chát"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN yêu cầu có hỗ trợ SSL. Hãy cài đặt thư viện SSL được hỗ trợ."
 
-msgid "Failed to connect to server."
-msgstr "Không kết nối được với máy phục vụ."
-
 msgid "Error retrieving profile"
 msgstr "Lỗi lấy lý lịch"
 
@@ -5566,9 +5458,6 @@ msgstr "Thông điệp không gửi đi được vì có lỗi không rõ :"
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Thông điệp không gửi đi được vì có lỗi không rõ :"
 
-msgid "Unable to connect"
-msgstr "Không thể kết nối"
-
 msgid "Writing error"
 msgstr "Lỗi ghi"
 
@@ -5583,20 +5472,24 @@ msgstr ""
 "Lỗi kết nối từ máy phục vụ %s:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "Giao thức này không được hỗ trợ bởi trình phục vụ."
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "Lỗi phân tích HTTP."
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Bạn đã đăng nhập từ một vị trí khác."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Các máy phục vụ MSN tạm thời không sẵn sàng. Vui lòng chờ và thử lại lần nữa."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Các máy phục vụ MSN tạm thời bị ngừng."
 
 #, c-format
@@ -5609,9 +5502,6 @@ 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ệ"
 
@@ -5710,6 +5600,9 @@ msgstr "Phần bổ sung giao thức MSN"
 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)"
@@ -5823,12 +5716,6 @@ msgstr[0] ""
 msgid "Add contacts from server"
 msgstr "Thêm liên lạc từ máy phục vụ"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "Đã kết nối"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Lỗi giao thức, mã %d: %s"
@@ -5852,16 +5739,6 @@ msgstr "Lỗi MySpaceIM"
 msgid "Invalid input condition"
 msgstr "Điều kiện nhập không hợp lệ"
 
-msgid "Read buffer full (2)"
-msgstr "Bộ đệm đọc đã đầy (2)"
-
-msgid "Unparseable message"
-msgstr "Thông điệp không thể phân tích"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Không thể kết nối đến máy: %s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "Không thêm được bạn thân"
 
@@ -5946,6 +5823,12 @@ msgstr "Tổng bạn bè"
 msgid "Client Version"
 msgstr "Phiên bản khách"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM — Tên người dùng sẵn sàng"
 
@@ -6203,9 +6086,9 @@ msgstr "Người dùng này đang ngoại tuyến hoặc bạn đã bị chặn
 msgid "Unknown error: 0x%X"
 msgstr "Lỗi không rõ : 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Không đăng nhập được (%s)"
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Không thể đăng nhập"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6309,9 +6192,6 @@ msgstr "Hội thảo GroupWise %d"
 msgid "Authenticating..."
 msgstr "Đang xác thực..."
 
-msgid "Unable to connect to server."
-msgstr "Không thể kết nối đến máy phục vụ."
-
 msgid "Waiting for response..."
 msgstr "Đợi hồi âm..."
 
@@ -6335,24 +6215,19 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Bạn có muốn tham gia cuộc thoại này không?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Bạn bị đăng xuất vì bạn cũng đăng nhập bằng một máy trạm khác."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s có vẻ là đang ngoại tuyến nên không thể nhận tin bạn vừa gửi."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Không thể kết nối đến máy phục vụ. Hãy nhập địa chỉ của máy phục vụ tới đó "
 "bạn muốn kết nối."
 
-msgid "Error. SSL support is not installed."
-msgstr "Lỗi: chưa cài đặt khả năng hỗ trợ SSL."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Cuộc hội thảo này đã đóng nên không thể gửi thêm tin nào."
 
@@ -6391,10 +6266,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6403,18 +6275,8 @@ msgstr "Không thể tham gia phòng trò chuyện"
 msgid "Invalid chat room name"
 msgstr "Tên phòng trò chuyện không hợp lệ"
 
-msgid "Server closed the connection."
-msgstr "Máy phục vụ đã đóng kết nối."
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"Mất kết nối với máy phục vụ :\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "Nhận dữ liệu không hợp lệ khi kết nối tới máy phục vụ."
 
 # AIM là mạng trò chuyện khác.
@@ -6464,7 +6326,8 @@ msgstr "Mất kết nối với người dùng từ xa:<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "Nhận dữ liệu không hợp lệ khi kết nối với người dùng từ xa."
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "Không thể thiết lập kết nối với người dùng từ xa."
 
 msgid "Direct IM established"
@@ -6666,21 +6529,15 @@ msgstr "Mức cảnh báo"
 msgid "Buddy Comment"
 msgstr "Chú thích bạn thân"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "Không thể kết nối tới máy phục vụ xác thực:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"Không thể kết nối tới máy phục vụ BOS:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "Không thể kết nối đến máy phục vụ."
 
 msgid "Username sent"
 msgstr "Tên người dùng đã được gửi"
@@ -6692,11 +6549,11 @@ msgstr "Kết nối được thiết lập, đã gửi cookie"
 msgid "Finalizing connection"
 msgstr "Đang hoàn tất kết nối"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Không thể đăng nhập. Không thể đăng nhập dưới %s vì tên người dùng không hợp "
 "lệ. Tên người dùng phải là một địa chỉ thư điện tử hợp lệ, hoặc bắt đầu với "
@@ -6711,27 +6568,22 @@ msgstr ""
 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."
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "Người dùng đó không tồn tại."
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "Tài khoản của bạn tạm thời bị đình chỉ."
 
 #. service temporarily unavailable
@@ -6752,7 +6604,8 @@ msgstr ""
 "lại. Nếu bạn tiếp tục kết nối, bạn sẽ phải đợi lâu hơn."
 
 # SecurID là tên: đừng dịch
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "Khoá SecurID nhập vào không hợp lệ."
 
 msgid "Enter SecurID"
@@ -6915,6 +6768,9 @@ msgstr "Đã kết nối từ"
 msgid "Member Since"
 msgstr "Là thành viên từ"
 
+msgid "Capabilities"
+msgstr "Khả năng"
+
 msgid "Profile"
 msgstr "Lý lịch"
 
@@ -7082,9 +6938,9 @@ msgstr[0] ""
 msgid "Away message too long."
 msgstr "Thông báo vắng mặt quá dài."
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7110,9 +6966,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Thừa"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Không thể thêm bạn chát %s vì danh sách của bạn có quá nhiều bạn chát. Hãy "
@@ -7121,8 +6977,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(không tên)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Không thể thêm bạn chát %s vì lý do không rõ."
 
 #, c-format
@@ -7966,7 +7822,7 @@ msgid "Update interval (seconds)"
 msgstr "Lỗi giữ cho kết nối hoạt động"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Không thể lấy thông tin về máy phục vụ"
 
 #, c-format
@@ -7993,10 +7849,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Không thể lấy thông tin về máy phục vụ"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "Đang yêu cầu sự chú ý của %s..."
 
@@ -8034,21 +7886,9 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "Không thể kết nối."
-
 msgid "Socket error"
 msgstr "Lỗi ổ cắm"
 
-msgid "Unable to read from socket"
-msgstr "Không thể đọc từ ổ cắm"
-
-msgid "Write Error"
-msgstr "Lỗi ghi"
-
-msgid "Connection lost"
-msgstr "Kết nối bị mất"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "Lập thông tin người dùng..."
@@ -8057,8 +7897,9 @@ msgstr "Lập thông tin người dùng..."
 msgid "Requesting token"
 msgstr "Yêu cầu bị từ chối"
 
-msgid "Couldn't resolve host"
-msgstr "Không thể giải quyết máy"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "Không thể kết nối đến máy phục vụ."
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8109,7 +7950,7 @@ msgid "QQ Qun Command"
 msgstr "Lệnh"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Không thể lấy thông tin về máy phục vụ"
 
 #, fuzzy
@@ -8131,9 +7972,6 @@ msgstr "Gửi tập tin"
 msgid "%d canceled the transfer of %s"
 msgstr "%d đã thôi truyền %s"
 
-msgid "Connection closed (writing)"
-msgstr "Kết nối bị đóng (đang ghi)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Tên nhóm:</b> %s<br>"
@@ -8187,17 +8025,6 @@ msgstr "Một quản trị Sametime đã thông báo như theo đây trên máy
 msgid "Sametime Administrator Announcement"
 msgstr "Thông báo Quản trị Sametime"
 
-msgid "Connection reset"
-msgstr "Kết nối bị đặt lại"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "Lỗi đọc từ ổ cắm: %s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "Không thể kết nối đến máy"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "Thông báo từ %s"
@@ -8220,6 +8047,9 @@ msgstr "Loa"
 msgid "Video Camera"
 msgstr "Máy ảnh động"
 
+msgid "File Transfer"
+msgstr "Truyền tập tin"
+
 msgid "Supports"
 msgstr "Hỗ trợ"
 
@@ -9042,6 +8872,10 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Thống kê mạng"
 
+# Name: don't translate/Tên: đừng dịch
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping thất bại"
 
@@ -9105,7 +8939,8 @@ msgstr "Kiểu khoá công không được hỗ trợ"
 msgid "Disconnected by server"
 msgstr "Bị máy phục vụ ngắt kết nối"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Gặp lỗi trong khi kết nối tới máy phục vụ SILC"
 
 msgid "Key Exchange failed"
@@ -9117,26 +8952,26 @@ msgstr ""
 "Phục hồi phiên chạy tách rời đã thất bại. Nhấn « Tái kết nối » để tạo kết nối "
 "mới."
 
-msgid "Connection failed"
-msgstr "Kết nối bị lỗi"
-
 msgid "Performing key exchange"
 msgstr "Đang thực hiện trao đổi mã khoá"
 
-msgid "Unable to create connection"
-msgstr "Không thể tạo kết nối"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "Không thể nạp cặp khoá SILC"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Đang kết nối tới máy phục vụ SILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Không thể nạp cặp khoá SILC"
+
 msgid "Out of memory"
 msgstr "Tràn bộ nhớ"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "Không thể khởi tạo giao thức SILC"
 
 msgid "Error loading SILC key pair"
@@ -9442,7 +9277,8 @@ msgstr "Ký điện và thẩm tra mọi thông điệp"
 msgid "Creating SILC key pair..."
 msgstr "Đang tạo cặp khoá SILC..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "Không thể tạo cặp khoá SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9538,6 +9374,9 @@ msgstr "Bảng trắng"
 msgid "No server statistics available"
 msgstr "Không có sẵn thống kê máy phục vụ"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Gặp lỗi trong khi kết nối tới máy phục vụ SILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Thất bại: Phiên bản không tương thích, nên nâng cấp trình khách"
@@ -9578,30 +9417,27 @@ msgstr "Thất bại: Cookie không hợp lệ"
 msgid "Failure: Authentication failed"
 msgstr "Thất bại: Không xác thực được"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Không thể khởi tạo kết nối Khách SILC"
 
 msgid "John Noname"
 msgstr "Tham gia Không_tên"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "Không thể nạp cặp khoá SILC: %s"
 
-msgid "Could not write"
-msgstr "Không thể ghi"
-
-msgid "Could not connect"
-msgstr "Không thể kết nối"
+msgid "Unable to create connection"
+msgstr "Không thể tạo kết nối"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "Không rõ đáp ứng từ máy phục vụ"
 
-msgid "Could not create listen socket"
-msgstr "Không thể tạo ổ cắm lắng nghe"
-
-msgid "Could not resolve hostname"
-msgstr "Không thể giải quyết tên máy"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "Không thể tạo ổ cắm"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Tên người dùng SIP không được chứa dấu cách hay ký hiệu @"
@@ -9643,6 +9479,78 @@ msgstr "Xác thực người dùng"
 msgid "Auth Domain"
 msgstr "Xác thực miền"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;phòng&gt;: Tham gia một phòng chát trên mạng Yahoo"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Liệt kê các phòng trên mạng Yahoo"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: Yêu cầu người dùng bắt đầu vẽ hình"
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "ID Yahoo"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Phần bổ sung giao thức Yahoo"
+
+msgid "Pager server"
+msgstr "Máy phục vụ nhắn tin"
+
+msgid "Pager port"
+msgstr "Cổng nhắn tin"
+
+msgid "File transfer server"
+msgstr "Máy phục vụ truyền tập tin"
+
+msgid "File transfer port"
+msgstr "Cổng truyền tập tin"
+
+msgid "Chat room locale"
+msgstr "Miền địa phương phòng chát"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "Lời đi các lời mời vào hội thảo hay phòng chát"
+
+msgid "Chat room list URL"
+msgstr "URL đến danh sách phòng chát"
+
+msgid "Yahoo Chat server"
+msgstr "Máy phục vụ chát Yahoo"
+
+msgid "Yahoo Chat port"
+msgstr "Cổng chát Yahoo"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "ID Yahoo"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Phần bổ sung giao thức Yahoo"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9675,30 +9583,20 @@ msgstr "Thêm bạn chát bị từ chối"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  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."
@@ -9740,13 +9638,14 @@ 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."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Không thể thêm bạn chát %s vào nhóm %s trong danh sach máy phục vụ của tài "
 "khoản %s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Không thể thêm bạn chát vào danh sách máy phục vụ"
 
 # Audible là nhà cung cấp thông tin bằng âm thanh: tên, đừng dịch.
@@ -9754,26 +9653,20 @@ msgstr "Không thể thêm bạn chát vào danh sách máy phục vụ"
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "Nhận được đáp ứng HTTP bất thường từ máy phục vụ."
 
-msgid "Connection problem"
-msgstr "Kết nối có vấn đề"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "Mất kết nối với %s:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Không thể thiết lập kết nối với %s:\n"
+"Không thể thiết lập kết nối đến máy phục vụ :\n"
 "%s"
 
 msgid "Not at Home"
@@ -9836,74 +9729,15 @@ msgstr "Tham gia với người dùng trong chat..."
 msgid "Open Inbox"
 msgstr "Mở hộp thư đến"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;phòng&gt;: Tham gia một phòng chát trên mạng Yahoo"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: Liệt kê các phòng trên mạng Yahoo"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Yêu cầu người dùng bắt đầu vẽ hình"
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "ID Yahoo"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Phần bổ sung giao thức Yahoo"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Nhật bản"
-
-msgid "Pager server"
-msgstr "Máy phục vụ nhắn tin"
-
-msgid "Japan Pager server"
-msgstr "Máy phục vụ nhắn tin Nhật bản"
-
-msgid "Pager port"
-msgstr "Cổng nhắn tin"
-
-msgid "File transfer server"
-msgstr "Máy phục vụ truyền tập tin"
-
-msgid "Japan file transfer server"
-msgstr "Máy phục vụ truyền tập tin Nhật bản"
-
-msgid "File transfer port"
-msgstr "Cổng truyền tập tin"
-
-msgid "Chat room locale"
-msgstr "Miền địa phương phòng chát"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "Lời đi các lời mời vào hội thảo hay phòng chát"
-
-msgid "Chat room list URL"
-msgstr "URL đến danh sách phòng chát"
-
-msgid "Yahoo Chat server"
-msgstr "Máy phục vụ chát Yahoo"
-
-msgid "Yahoo Chat port"
-msgstr "Cổng chát Yahoo"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "Đã gửi yêu cầu vẽ hình."
 
+msgid "Unable to connect."
+msgstr "Không thể kết nối."
+
 msgid "Unable to establish file descriptor."
 msgstr "Không thể thiết lập bộ mô tả tập tin."
 
@@ -9911,6 +9745,9 @@ msgstr "Không thể thiết lập bộ mô tả tập tin."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s đang thử gửi cho bạn một tập hợp %d tập tin.\n"
 
+msgid "Write Error"
+msgstr "Lỗi ghi"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Lý lịch Yahoo Nhật bản"
 
@@ -10028,23 +9865,19 @@ msgstr "Thoại"
 msgid "Webcams"
 msgstr "Máy ảnh Web"
 
+msgid "Connection problem"
+msgstr "Kết nối có vấn đề"
+
 msgid "Unable to fetch room list."
 msgstr "Không thể lấy danh sách phòng."
 
 msgid "User Rooms"
 msgstr "Phòng người dùng"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Kết nối có vấn đề với máy phục vụ YCHT."
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"Mất kết nối với máy phục vụ\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10171,24 +10004,16 @@ msgstr "Địa hạt"
 msgid "Exposure"
 msgstr "Phơi sáng"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"Không thể tạo ổ cắm\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Không thể phân tích đáp ứng từ ủy nhiệm HTTP: %s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Lỗi kết nối ủy nhiệm HTTP %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "Truy cập bị từ chối: máy phục vụ ủy nhiệm HTTP cấm đào đường hầm xuyên qua "
 "cổng %d."
@@ -10197,9 +10022,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr "Lỗi giải quyết %s"
 
-msgid "Could not resolve host name"
-msgstr "Không thể giải quyết tên máy."
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Đang yêu cầu sự chú ý của %s..."
@@ -10395,14 +10217,6 @@ msgstr "Lỗi ghi từ %s: %s"
 msgid "Unable to connect to %s: %s"
 msgstr "Không thể kết nối tới %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr ""
-"Máy phục vụ yêu cầu TLS/SSL để đăng nhập. Không tìm thấy khả năng hỗ trợ TLS/"
-"SSL."
-
 #, c-format
 msgid " - %s"
 msgstr " - %s"
@@ -10649,9 +10463,14 @@ msgstr "Thêm thông _báo bạn chát..."
 msgid "View _Log"
 msgstr "_Xem bản ghi"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "Ẩn khi ngoại tuyến"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "Hiện khi ngoại tuyến"
+
 msgid "_Alias..."
 msgstr "_Bí danh..."
 
@@ -11154,6 +10973,10 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Đổi thông tin người dùng cho %s"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "Gõ tên máy cho đó có chứng nhận này."
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Máy phục vụ SSL"
@@ -11201,7 +11024,8 @@ msgstr "Lờ"
 msgid "Get Away Message"
 msgstr "Lấy thông điệp vắng mặt"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "Nói lần cuối"
 
 msgid "Unable to save icon file to disk."
@@ -12088,7 +11912,7 @@ msgid "Hyperlink visited color"
 msgstr "Màu siêu liên kết"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Màu siêu liên kết nổi bật khi rê chuột qua"
 
 msgid "Hyperlink prelight color"
@@ -12124,13 +11948,22 @@ msgstr "Màu để vẽ tên của tin nhẳn hành động."
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Màu tên tin nhẳn hành động cho tin nhẳn thì thầm"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "Màu để vẽ tên của tin nhẳn hành động."
+
 msgid "Whisper Message Name Color"
 msgstr "Màu tên tin nhẳn thì thầm"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "Màu để vẽ tên của tin nhẳn hành động."
+
 msgid "Typing notification color"
 msgstr "Màu thông báo đang gõ"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "Màu cần dùng cho phông chữ thông báo đang gõ"
 
 msgid "Typing notification font"
@@ -12528,6 +12361,10 @@ msgid ""
 msgstr ""
 "Đã chọn lệnh chạy trình duyệt « Bằng tay », nhưng không cung cấp lệnh nào."
 
+#, fuzzy
+msgid "No message"
+msgstr "Thông điệp không rõ"
+
 msgid "Open All Messages"
 msgstr "Mở mọi tin nhẳn"
 
@@ -12545,10 +12382,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Có thư mới !</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "Thông điệp không rõ"
-
 msgid "The following plugins will be unloaded."
 msgstr "Những phần bổ sung theo đây sẽ được bỏ nạp."
 
@@ -12764,8 +12597,9 @@ msgstr "_Hiện biểu tượng trên khay:"
 msgid "On unread messages"
 msgstr "Khi có tin nhẳn chưa đọc"
 
-msgid "Conversation Window Hiding"
-msgstr "Ẩn cửa sổ cuộc thoại"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "Cửa sổ cuộc thoại Tin Nhắn"
 
 msgid "_Hide new IM conversations:"
 msgstr "Ẩn cuộc t_hoại Tin Nhắn mới:"
@@ -12773,6 +12607,9 @@ msgstr "Ẩn cuộc t_hoại Tin Nhắn mới:"
 msgid "When away"
 msgstr "Khi vắng mặt"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "Th_u nhỏ cửa sổ cuộc thoại mới"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "Thẻ"
@@ -12831,9 +12668,6 @@ msgstr "Cuộn mịn"
 msgid "F_lash window when IMs are received"
 msgstr "Nhấp nhá_y cửa sổ khi nhận tin nhắn"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "Th_u nhỏ cửa sổ cuộc thoại mới"
-
 msgid "Minimum input area height in lines:"
 msgstr "Bề cao vùng nhập tối thiểu theo dòng:"
 
@@ -12868,7 +12702,8 @@ msgstr "Không thể khởi chạy chương trình cấu hình trình duyệt."
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Thí dụ : stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "Tự động tìm r_a địa chỉ IP"
 
 msgid "Public _IP:"
@@ -13248,33 +13083,18 @@ msgstr "Lưu _và Dùng"
 msgid "Status for %s"
 msgstr "Trạng thái cho %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "Hình cười tự chọn"
-
-msgid "More Data needed"
-msgstr "Cần thêm dữ liệu"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Hãy cung cấp một lối tắt cần liên quan đến hình cười đó."
-
 #, fuzzy, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 "Đã có một hình cười tự chọn cho lối tắt đã chọn. Hãy ghi rõ một lối tắt khác."
 
+msgid "Custom Smiley"
+msgstr "Hình cười tự chọn"
+
 msgid "Duplicate Shortcut"
 msgstr "Nhân đôi lối tắt"
 
-msgid "Please select an image for the smiley."
-msgstr "Hãy chọn một ảnh cho hình cười đó."
-
 msgid "Edit Smiley"
 msgstr "Sửa hình cười"
 
@@ -13390,9 +13210,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "Không thể gửi bộ khởi chạy"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "Bạn đã kéo một bộ khởi chạy của môi trường. Rất có thể là bạn muốn gửi đích "
 "của bộ khởi chạy, hơn là bộ khởi chạy chính nó."
@@ -13994,9 +13815,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Phần bổ sung tin nhẳn nhạc để soạn nhạc một cách hợp tác."
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "Phần bổ sung tin nhẳn nhạc thì cho phép một số người dùng soạn cùng thời một "
 "bản nhạc bằng cách chỉnh sửa một bản dàn bè chung trong thời gian thực."
@@ -14255,9 +14077,10 @@ msgid "Conversation Window Send Button."
 msgstr "Cái nút Gửi trong Cửa sổ Cuộc thoại."
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 "Thêm một cái nút Gửi vào vùng nhập của cửa sổ cuộc thoát. Dự định cho trường "
 "hợp không có bàn phím vật lý."
@@ -14589,8 +14412,9 @@ msgstr "Tùy chọn Pidgin Windows"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Tùy chọn riêng cho Pidgin trên Windows."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "Cung cấo thiết lập đặc biệt cho Windows Pidgin, chẳng hạn như neo danh sách "
 "bạn bè."
@@ -14633,6 +14457,315 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 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 "Cannot open socket"
+#~ msgstr "Không thể mở ổ cắm."
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "Không thể lắng nghe trên ổ cắm"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Không thể đọc ổ cắm"
+
+#~ msgid "Connection failed."
+#~ msgstr "Lỗi kết nối."
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Máy phục vụ đã ngắt kết nối"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Không thể tạo ổ cắm"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Không thể kết nối với máy phục vụ"
+
+#~ msgid "Read error"
+#~ msgstr "Lỗi đọc"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Không thể thiết lập kết nối đến máy phục vụ :\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "Lỗi ghi"
+
+#~ msgid "Last Activity"
+#~ msgstr "Hoạt động cuối cùng"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "Thông tin phát hiện dịch vụ"
+
+#~ msgid "Service Discovery Items"
+#~ msgstr "Mục phát hiện dịch vụ"
+
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "Đặt địa chỉ kiểu đoạn dòng mở rộng"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "Chat đa người dùng"
+
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Thông tin về mặt ở đã mở rộng cho chat đa người dùng"
+
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "Luồng byte bên trong dải"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Lệnh như thế"
+
+#~ msgid "PubSub Service"
+#~ msgstr "Dịch vụ PubSub"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "Luồng byte SOCKS5"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "Dữ liệu bên ngoài dải"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "Đăng ký bên trong dải"
+
+#~ msgid "User Location"
+#~ msgstr "Nơi ở người dùng"
+
+#~ msgid "User Avatar"
+#~ msgstr "Ảnh riêng người dùng"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "Thông báo tình trạng chat"
+
+#~ msgid "Software Version"
+#~ msgstr "Phiên bản phần mềm"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "Khởi tạo luồng"
+
+#~ msgid "User Mood"
+#~ msgstr "Tâm trạng người dùng"
+
+#~ msgid "User Activity"
+#~ msgstr "Hoạt động người dùng"
+
+#~ msgid "Entity Capabilities"
+#~ msgstr "Khả năng thực thể"
+
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "Dàn xếp phiên bản đã mật mã"
+
+#~ msgid "User Tune"
+#~ msgstr "Điệu người dùng"
+
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Trao đổi mục bản liệt kê"
+
+#~ msgid "Reachability Address"
+#~ msgstr "Địa chỉ có thể tới"
+
+#~ msgid "User Profile"
+#~ msgstr "Lý lịch người dùng"
+
+# Name: don't translate/Tên: đừng dịch
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Âm thanh Jingle"
+
+#~ msgid "User Nickname"
+#~ msgstr "Tên hiệu người dùng"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Raw UDP"
+#~ msgstr "Jingle Raw UDP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Ảnh động Jingle"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "Người nhận tin nhẳn"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "Xuất bản khoá công"
+
+#~ msgid "User Chatting"
+#~ msgstr "Người dùng nói chuyện"
+
+#~ msgid "User Browsing"
+#~ msgstr "Người dùng duyệt"
+
+#~ msgid "User Gaming"
+#~ msgstr "Người dùng chơi trò"
+
+#~ msgid "User Viewing"
+#~ msgstr "Người dùng xem"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "Mật mã đoạn dòng"
+
+#~ msgid "Entity Time"
+#~ msgstr "Thời gian thực thể"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "Phát trễ"
+
+#~ msgid "Collaborative Data Objects"
+#~ msgstr "Đối tượng dữ liệu hợp tác"
+
+#~ msgid "File Repository and Sharing"
+#~ msgstr "Kho lưu tập tin và chia sẻ"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "Phát hiện dịch vụ STUN cho Jingle"
+
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "Dàn xếp phiên chạy mật mã đơn giản"
+
+#~ msgid "Hop Check"
+#~ msgstr "Kiểm tra bước"
+
+#~ msgid "Read Error"
+#~ msgstr "Lỗi đọc"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Không kết nối được với máy phục vụ."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Bộ đệm đọc đã đầy (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Thông điệp không thể phân tích"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Không thể kết nối đến máy: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Không đăng nhập được (%s)"
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Bạn bị đăng xuất vì bạn cũng đăng nhập bằng một máy trạm khác."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Lỗi: chưa cài đặt khả năng hỗ trợ SSL."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Mật khẩu sai."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Không thể kết nối tới máy phục vụ BOS:\n"
+#~ "%s"
+
+#~ 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 "Could Not Connect"
+#~ msgstr "Không thể kết nối"
+
+#~ msgid "Invalid username."
+#~ msgstr "Tên người dùng sai."
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Không thể lấy thông tin về máy phục vụ"
+
+#~ msgid "Connection lost"
+#~ msgstr "Kết nối bị mất"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Không thể giải quyết máy"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Kết nối bị đóng (đang ghi)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Kết nối bị đặt lại"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Lỗi đọc từ ổ cắm: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Không thể kết nối đến máy"
+
+#~ msgid "Could not write"
+#~ msgstr "Không thể ghi"
+
+#~ msgid "Could not connect"
+#~ msgstr "Không thể kết nối"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Không thể tạo ổ cắm lắng nghe"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Không thể giải quyết tên máy"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "Mật khẩu sai"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Không thể thiết lập kết nối với %s:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Nhật bản"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Máy phục vụ nhắn tin Nhật bản"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Máy phục vụ truyền tập tin Nhật bản"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Mất kết nối với máy phục vụ\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Không thể giải quyết tên máy."
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Máy phục vụ yêu cầu TLS/SSL để đăng nhập. Không tìm thấy khả năng hỗ trợ "
+#~ "TLS/SSL."
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Ẩn cửa sổ cuộc thoại"
+
+#~ msgid "More Data needed"
+#~ msgstr "Cần thêm dữ liệu"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "Hãy cung cấp một lối tắt cần liên quan đến hình cười đó."
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Hãy chọn một ảnh cho hình cười đó."
+
 #~ msgid "Activate which ID?"
 #~ msgstr "Kích hoạt ID nào ?"
 
@@ -15121,9 +15254,6 @@ msgstr ""
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "Không thể đăng nhập, hãy kiểm tra sổ theo dõi gỡ lỗi"
 
-#~ msgid "Unable to login"
-#~ msgstr "Không thể đăng nhập"
-
 #, fuzzy
 #~ msgid "Failed room reply"
 #~ msgstr "Không đăng nhập được, không có đáp ứng"
diff --git a/po/xh.po b/po/xh.po
index 1d87e3e44a..6fd221081d 100644
--- a/po/xh.po
+++ b/po/xh.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2005-03-23 12:21+0200\n"
 "Last-Translator: Canonical Ltd <translations@canonical.com>\n"
 "Language-Team: Xhosa <xh-translate@ubuntu.com>\n"
@@ -2692,7 +2692,7 @@ msgstr ""
 #. * description
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2744,7 +2744,7 @@ msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2992,12 +2992,12 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
 #, fuzzy
-msgid "Unable to listen for incoming IM connections\n"
+msgid "Unable to listen for incoming IM connections"
 msgstr "Akukwazeki ukuyila unxibelelwano olutsha."
 
 msgid ""
@@ -3057,17 +3057,17 @@ msgstr "%s umenyiwe kule ncoko."
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Akukwazeki ukuthumela umyalezo. Umyalezo mkhulu kakhulu."
 
-#, fuzzy
-msgid "Cannot open socket"
-msgstr "Akukwazeki ukuvula isokethi"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Akukwazeki ukuyila isokethi"
 
-#, fuzzy
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "Akukwazekanga ukuyila isokhethi"
 
-#, fuzzy
-msgid "Could not listen on socket"
-msgstr "Akukwazekanga ukuyila isokhethi"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr "Akukwazeki ukuyila isokethi"
 
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
@@ -3126,15 +3126,15 @@ msgstr "Thumela uLuhlu Lobuhlobo"
 msgid "Load buddylist from file..."
 msgstr "Ngenisa uLuhlu lomHlobo ukusuka kwiSeva"
 
-msgid "Fill in the registration fields."
+msgid "You must fill in all registration fields"
 msgstr ""
 
 #, fuzzy
-msgid "Passwords do not match."
+msgid "Passwords do not match"
 msgstr "Ii-password ezintsha azingqamani."
 
 #, fuzzy
-msgid "Unable to register new account. Error occurred.\n"
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "Akukwazeki ukuyila unxibelelwano olutsha."
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3147,17 +3147,15 @@ msgstr "Impumelelo yoBhaliso"
 msgid "Password"
 msgstr "I-Password"
 
-#, fuzzy
-msgid "Password (retype)"
-msgstr "Ukuthunyelwa kwepassword"
+msgid "Password (again)"
+msgstr "I-Password (kwakhona)"
 
-#, fuzzy
-msgid "Enter current token"
-msgstr "I-%s ayingenanga ngokwangoku."
+msgid "Enter captcha text"
+msgstr ""
 
 #, fuzzy
-msgid "Current token"
-msgstr "Iyasebenza ngeli thuba"
+msgid "Captcha"
+msgstr "Gcina umFanekiso"
 
 #, fuzzy
 msgid "Register New Gadu-Gadu Account"
@@ -3219,6 +3217,18 @@ msgid "Current password"
 msgstr "I-Password ephosakeleyo."
 
 #, fuzzy
+msgid "Password (retype)"
+msgstr "Ukuthunyelwa kwepassword"
+
+#, fuzzy
+msgid "Enter current token"
+msgstr "I-%s ayingenanga ngokwangoku."
+
+#, fuzzy
+msgid "Current token"
+msgstr "Iyasebenza ngeli thuba"
+
+#, fuzzy
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Nceda ufake i-password yakho yangoku kunye ne-password yakho entsha."
 
@@ -3272,7 +3282,8 @@ msgstr "Akukho baQuquzeleli banoNgqamaniso"
 msgid "There are no users matching your search criteria."
 msgstr "Nceda ufake i-password yakho entsha"
 
-msgid "Unable to read socket"
+#, fuzzy
+msgid "Unable to read from socket"
 msgstr "Akukwazeki ukufunda isokethi"
 
 #, fuzzy
@@ -3291,8 +3302,14 @@ msgstr "Bonisa umHlobo"
 msgid "Your buddy list was stored on the server."
 msgstr "Akukho Luhlu lomHlobo olugcinwe kwiseva yeGadu-Gadu."
 
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
 #, fuzzy
-msgid "Connection failed."
+msgid "Connected"
+msgstr "Ukunxulumana"
+
+msgid "Connection failed"
 msgstr "Unxibelelwano luqhawukile"
 
 #, fuzzy
@@ -3303,11 +3320,15 @@ msgstr "Ngenela inCoko"
 msgid "Chat _name:"
 msgstr "iFani:"
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "Akukwazeki ukunika iseva isandi"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Ukunxulumana"
+
 #, fuzzy
 msgid "Chat error"
 msgstr "ImPazamo efundiweyo"
@@ -3317,7 +3338,7 @@ msgid "This chat name is already in use"
 msgstr "Loo fayili sele ikhona"
 
 #, fuzzy
-msgid "Not connected to the server."
+msgid "Not connected to the server"
 msgstr "Ubuqhawukile kwiseva."
 
 #, fuzzy
@@ -3386,7 +3407,7 @@ msgid "File Transfer Failed"
 msgstr "Udluliso lwefayili seluqalile"
 
 #, fuzzy
-msgid "Could not open a listening port."
+msgid "Unable to open a listening port."
 msgstr "I-Pidgin ayikwazanga ukuvula isiqhagamsheli esimiselweyo."
 
 msgid "Error displaying MOTD"
@@ -3402,8 +3423,16 @@ msgstr "Akukho MOTD enxulumene nolu nxibelelwano."
 msgid "MOTD for %s"
 msgstr "I-MOTD ye%s"
 
-msgid "Server has disconnected"
-msgstr "Iseva iqhawule unxibelelwano"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr "Ubuqhawukile kwiseva."
 
 msgid "View MOTD"
 msgstr "Jonga iMOTD"
@@ -3418,22 +3447,20 @@ msgstr "I-_Password:"
 msgid "IRC nick and server may not contain whitespace"
 msgstr "Izikhewu zeIRC kunokwenzeka zingabinazo izithuba ezimhlophe"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "Ukunxulumana"
-
 msgid "SSL support unavailable"
 msgstr "Inkxaso engafumanekiyo yeSSL"
 
-msgid "Couldn't create socket"
-msgstr "Akukwazekanga ukuyila isokhethi"
+msgid "Unable to connect"
+msgstr "Akukwazeki ukunxulumana"
 
-msgid "Couldn't connect to host"
-msgstr "Akukwazekanga ukunxulumana nomququzeleli"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Akwazeki ukunxulumana neseva"
 
-msgid "Read error"
-msgstr "ImPazamo efundiweyo"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Impazamo yokudala unxibelelwano"
 
 msgid "Users"
 msgstr "Abasebenzisi"
@@ -3889,11 +3916,11 @@ msgid "execute"
 msgstr "Engalindelekanga"
 
 #, fuzzy
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "Iseva ifuna i-SSL ukuze ingene"
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Iseva ifuna i-SSL ukuze ingene"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3910,7 +3937,12 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Uqinisekiso lombhalo ocacileyo"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Ukuqinisekisa akuphumelelanga"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "Impendulo engasebenziyo evela kwiseva."
 
 msgid "Server does not use any supported authentication method"
@@ -3922,8 +3954,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "Ukucela umngeni okungasebenziyo okuvela kwiseva"
 
-#, fuzzy
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "ImPazamo efundiweyo"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3941,22 +3973,14 @@ msgstr "INguqulelo engaXhaswanga"
 msgid "Unable to establish a connection with the server"
 msgstr "Akukwazeki ukwenza unxibelelwano lweSSL kwiseva."
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "Akukwazeki ukwenza unxibelelwano lweSSL kwiseva."
 
 #, fuzzy
 msgid "Unable to establish SSL connection"
 msgstr "Akukwazeki ukuyila unxibelelwano olutsha."
 
-msgid "Unable to create socket"
-msgstr "Akukwazeki ukuyila isokethi"
-
-msgid "Write error"
-msgstr "Impazamo yokuBhala"
-
 msgid "Full Name"
 msgstr "iGama ngokuPheleleyo"
 
@@ -4030,188 +4054,6 @@ msgstr "UkuFihla iNkqubo yokuSebenza"
 msgid "Local Time"
 msgstr "Abasebenzisi baseKhaya"
 
-msgid "Last Activity"
-msgstr ""
-
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "Misela uLwazi Ngqo"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "iDilesi Eyandisiweyo"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "Ncokola noneLinye igama"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Umsebenzisi akanalo ulwazi ngovimba weefayili."
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "Umyalelo"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "i-HTML"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "Impazamo yoBhaliso"
-
-#, fuzzy
-msgid "User Location"
-msgstr "Indawo"
-
-msgid "User Avatar"
-msgstr ""
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "Imo yesaZiso somHlobo"
-
-#, fuzzy
-msgid "Software Version"
-msgstr "INguqulelo engaXhaswanga"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "iGama lomButho"
-
-#, fuzzy
-msgid "File Transfer"
-msgstr "uDlluliso lweFayili"
-
-#, fuzzy
-msgid "User Mood"
-msgstr "Izimo zomSebenzisi"
-
-#, fuzzy
-msgid "User Activity"
-msgstr "Umda womSebenzisi"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "Izakhono"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "Igama lomsebenzisi"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "Unaniselwano oluPhambili neIM"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "Idilesi ye-iMeyile"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "Ingqokelela yeempawu"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "I-Ping"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "Igama lesiqhulo"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "IVidiyo eSebenzayo"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "Umyalezo wamkelwe"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "IQhosha likaWonke-wonke lomZila ongaCacanga"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "Iindlela zokuKhetha zomSebenzisi"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "Izimo zomSebenzisi"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "Umda womSebenzisi"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "Umda womSebenzisi"
-
-msgid "Ping"
-msgstr "I-Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "I-Trillian Encryption (umbhalo ontsonkothileyo)"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "Izakhono"
-
 #, fuzzy
 msgid "Priority"
 msgstr "Isiqhagamsheli"
@@ -4224,7 +4066,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "Phuma"
 
 msgid "Middle Name"
@@ -4414,16 +4256,12 @@ msgid "Roles:"
 msgstr "INdima"
 
 #, fuzzy
-msgid "Ping timeout"
+msgid "Ping timed out"
 msgstr "Umbhalo ocacileyo"
 
-msgid "Read Error"
-msgstr "Impazamo yokuFunda"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 #, fuzzy
@@ -4614,9 +4452,6 @@ msgstr "I-password yakho itshintshile."
 msgid "Error changing password"
 msgstr "ImPazamo yokutshintsha i-password"
 
-msgid "Password (again)"
-msgstr "I-Password (kwakhona)"
-
 #, fuzzy
 msgid "Change XMPP Password"
 msgstr "UkuTshintsha i-Password"
@@ -5015,6 +4850,14 @@ msgstr "Impazamo yokwaHlula i-XML ngeziJungqe"
 msgid "Unknown Error in presence"
 msgstr "Ubukho bempazamo engaziwayo"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Impazamo yokungenela incoko eyi%s"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "Impazamo kwincoko ye%s"
+
 msgid "Create New Room"
 msgstr "Ukuyila iGumbi eliTsha"
 
@@ -5033,16 +4876,20 @@ msgstr "ISimo seGumbi"
 msgid "_Accept Defaults"
 msgstr "Yamkela eziMiselweyo"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Impazamo yokungenela incoko eyi%s"
+#, fuzzy
+msgid "No reason"
+msgstr "Akukho sizathu sinikiweyo."
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "Impazamo kwincoko ye%s"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "Ukhatyiwe yi-%s: (%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "Ukukhatywa nge %s (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Kwenzeke impazamo xeshikweni uvula ifayili."
 
 #, fuzzy
@@ -5567,10 +5414,6 @@ msgstr ""
 "yeSSL. Jonga kwi-http://Pidgin.sf.net/faq-ssl.php ukuzuza iinkcukacha ezithe "
 "vetshe."
 
-#, fuzzy
-msgid "Failed to connect to server."
-msgstr "Akukwazeki ukunxulumana neseva."
-
 msgid "Error retrieving profile"
 msgstr "Impazamo yokufumana inkangeleko"
 
@@ -5854,9 +5697,6 @@ msgstr "Umyalezo kunokwenzeka awuthunyelwanga ngenxa yempazamo engaziwayo:"
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Umyalezo kunokwenzeka awuthunyelwanga ngenxa yempazamo engaziwayo:"
 
-msgid "Unable to connect"
-msgstr "Akukwazeki ukunxulumana"
-
 #, fuzzy
 msgid "Writing error"
 msgstr "Impazamo yokuBhala"
@@ -5872,14 +5712,15 @@ msgid ""
 msgstr "Impazamo engaziwayo kwiseva ngama %s"
 
 #, fuzzy
-msgid "Our protocol is not supported by the server."
+msgid "Our protocol is not supported by the server"
 msgstr "Lo mthetho wokusebenza awuwaxhasi amagumbi encoko."
 
 #, fuzzy
-msgid "Error parsing HTTP."
+msgid "Error parsing HTTP"
 msgstr "Impazamo yokubonisa iMOTD"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "Usayine ukwenye indawo."
 
 #, fuzzy
@@ -5888,7 +5729,8 @@ msgstr ""
 "Uluhlu lwakho lweMSN lomhlobo %s alifumaneki okwethutyana. Nceda uzame "
 "kwakhona."
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "Iiseva zeMSN ziza kucima okwethutyana."
 
 #, fuzzy, c-format
@@ -5902,10 +5744,6 @@ msgstr ""
 "Uluhlu lwakho lweMSN lomhlobo %s alifumaneki okwethutyana. Nceda uzame "
 "kwakhona."
 
-#, fuzzy
-msgid "Unknown error."
-msgstr "Impazamo engaziwayo"
-
 msgid "Handshaking"
 msgstr ""
 
@@ -6013,6 +5851,10 @@ msgstr "Imithetho yokuSebenza yokuNgenisa i-AIM/ICQ"
 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"
@@ -6132,13 +5974,6 @@ msgstr[1] ""
 msgid "Add contacts from server"
 msgstr "Impendulo engasebenziyo evela kwiseva."
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-#, fuzzy
-msgid "Connected"
-msgstr "Ukunxulumana"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr ""
@@ -6162,18 +5997,6 @@ msgid "Invalid input condition"
 msgstr "Ukugqibezela uNxulumano"
 
 #, fuzzy
-msgid "Read buffer full (2)"
-msgstr "Ukrozo luzele"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "Akukwazeki ukwahlula umyalezo ngezijungqe"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "Akukwazekanga ukunxulumana nomququzeleli"
-
-#, fuzzy
 msgid "Failed to add buddy"
 msgstr "Akuphumelelanga ukudibana nomhlobo kwincoko"
 
@@ -6268,6 +6091,12 @@ msgstr ""
 msgid "Client Version"
 msgstr "Vala iNcoko"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 #, fuzzy
 msgid "MySpaceIM - Username Available"
 msgstr "Inkonzo ayiFumaneki"
@@ -6538,9 +6367,9 @@ msgstr "Mhlawumbe umsebenzisi usebenza engekho kuthungelwano okanye uthintelwe"
 msgid "Unknown error: 0x%X"
 msgstr "Impazamo engaziwayo: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "Ukungena akuphumelelanga (%s)."
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "Akukwazeki ukugxotha i-%s yomsebenzisi"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6645,9 +6474,6 @@ msgstr "Ingqungquthela yeGroupWise %d"
 msgid "Authenticating..."
 msgstr "Ukuqinisekisa..."
 
-msgid "Unable to connect to server."
-msgstr "Akukwazeki ukunxulumana neseva."
-
 msgid "Waiting for response..."
 msgstr "Ukulinda impendulo..."
 
@@ -6671,9 +6497,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "Ingaba unqwenela ukungenela incoko?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "Ukhutshiwe ngenxa yokuba ubungene kwesinye isikhululo."
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6681,16 +6504,14 @@ msgstr ""
 "%s ukhangeleka engekho kunxibelelwano ngako ke akawufumananga umyalezo "
 "osandula ukuwuthumela."
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr ""
 "Akukwazeki ukunxulumana neseva. Nceda ufake idilesi yeseva ofuna "
 "ukunxibelelana kuyo."
 
-msgid "Error. SSL support is not installed."
-msgstr "Impazamo. Inkxaso yeSSL ayifakelwanga."
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Ingqungquthela ivaliwe. Akusekho miyalezo inokuthunyelwa."
 
@@ -6730,10 +6551,7 @@ msgstr ""
 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."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, fuzzy
@@ -6745,17 +6563,7 @@ msgid "Invalid chat room name"
 msgstr "iGama elingaSebenziyo leGumbi"
 
 #, fuzzy
-msgid "Server closed the connection."
-msgstr "Impazamo yokudala unxibelelwano"
-
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr "Ubuqhawukile kwiseva."
-
-#, fuzzy
-msgid "Received invalid data on connection with server."
+msgid "Received invalid data on connection with server"
 msgstr "Akukwazeki ukwenza unxibelelwano lweSSL kwiseva."
 
 #. *< type
@@ -6808,8 +6616,9 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
-msgstr ""
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
+msgstr "Akukwazeki ukwenza unxibelelwano lweSSL kwiseva."
 
 #, fuzzy
 msgid "Direct IM established"
@@ -7005,16 +6814,12 @@ msgid "Buddy Comment"
 msgstr "Izimvo zomHlobo"
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+msgid "Unable to connect to authentication server: %s"
 msgstr "Akukwazekanga ukunxibelelana ukuze kudluliswe."
 
 #, fuzzy, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr "Akukwazeki ukunxulumana neseva."
+msgid "Unable to connect to BOS server: %s"
+msgstr "Akwazeki ukunxulumana neseva"
 
 #, fuzzy
 msgid "Username sent"
@@ -7029,9 +6834,9 @@ msgstr "Ukugqibezela uNxulumano"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "Akukwazeki ukungena: Akwazekanga ukungena %s ngenxa yokuba igama leskrini "
 "alisebenzi.  Amagama eskrini kufuneka aqale ngoonombumba okanye abe "
@@ -7049,30 +6854,23 @@ 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
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "IGama lomSebenzisi elingaSebenziyo"
+msgid "Username does not exist"
+msgstr "Akakho umsebenzisi onjalo"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "I-akhawunti yakho ngokwangoku ixhonyiwe."
 
 #. service temporarily unavailable
@@ -7093,8 +6891,9 @@ msgstr ""
 "elishumi ze uzame kwakhona. Ukuba uyaqhubeka ukuzama, kuya kufuneka ulinde "
 "ixesha elidana nangakumbi."
 
-msgid "The SecurID key entered is invalid."
-msgstr ""
+#, fuzzy
+msgid "The SecurID key entered is invalid"
+msgstr "Ulungiselelo olutsha alusebenzi."
 
 msgid "Enter SecurID"
 msgstr ""
@@ -7267,6 +7066,9 @@ msgstr "Kunxibelelwano ukusuka"
 msgid "Member Since"
 msgstr "Lilungu ukusukela"
 
+msgid "Capabilities"
+msgstr "Izakhono"
+
 msgid "Profile"
 msgstr "Inkangeleko"
 
@@ -7453,7 +7255,7 @@ msgstr "Umyalezo wokungabikho mde kakhulu."
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7481,9 +7283,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "Iinkedama"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Akukwazekanga ukongeza umhlobo %s ngenxa yokuba unabahlobo abaninzi kakhulu "
@@ -7493,7 +7295,7 @@ msgid "(no name)"
 msgstr "(akukho gama)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Umyalelo wakho awuphumelelanga ngenxa yesizathu esingaziwayo."
 
 #, fuzzy, c-format
@@ -8376,7 +8178,7 @@ msgid "Update interval (seconds)"
 msgstr "ImPazamo efundiweyo"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Akukwazeki ukufumana ulwazi ngeseva"
 
 #, c-format
@@ -8403,10 +8205,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Akukwazeki ukufumana ulwazi ngeseva"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "Isicelo simbaxa"
 
@@ -8442,26 +8240,11 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "Akukwazeki ukunxulumana."
-
 #, fuzzy
 msgid "Socket error"
 msgstr "Impazamo engaziwayo"
 
 #, fuzzy
-msgid "Unable to read from socket"
-msgstr "Akukwazeki ukufunda isokethi"
-
-#, fuzzy
-msgid "Write Error"
-msgstr "Impazamo yokuBhala"
-
-#, fuzzy
-msgid "Connection lost"
-msgstr "Unxibelelwano luvaliwe"
-
-#, fuzzy
 msgid "Getting server"
 msgstr "Ulwazi oluMiselweyo lomSebenzisi..."
 
@@ -8470,8 +8253,8 @@ msgid "Requesting token"
 msgstr "Isicelo silandulwe"
 
 #, fuzzy
-msgid "Couldn't resolve host"
-msgstr "Akukwazekanga ukunxulumana nomququzeleli"
+msgid "Unable to resolve hostname"
+msgstr "Akukwazeki ukunika iseva isandi"
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -8522,7 +8305,7 @@ msgid "QQ Qun Command"
 msgstr "Umyalelo"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Akukwazeki ukufumana ulwazi ngeseva"
 
 #, fuzzy
@@ -8545,10 +8328,6 @@ msgstr "AkuPhumelelenga ukuThumela iFayili"
 msgid "%d canceled the transfer of %s"
 msgstr "%s icime udluliso lwe %s"
 
-#, fuzzy
-msgid "Connection closed (writing)"
-msgstr "Unxibelelwano luvaliwe"
-
 #, fuzzy, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>UmSebenzisi:</b> %s<br>"
@@ -8610,19 +8389,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#, fuzzy
-msgid "Connection reset"
-msgstr "Unxibelelwano luvaliwe"
-
-#, fuzzy, c-format
-msgid "Error reading from socket: %s"
-msgstr "Impazamo xeshikweni kufundwa kwi-sokhethi."
-
-#. this is a regular connect, error out
-#, fuzzy
-msgid "Unable to connect to host"
-msgstr "Akwazeki ukunxulumana neseva"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
@@ -8650,6 +8416,10 @@ msgid "Video Camera"
 msgstr "InCoko ngeVidiyo"
 
 #, fuzzy
+msgid "File Transfer"
+msgstr "uDlluliso lweFayili"
+
+#, fuzzy
 msgid "Supports"
 msgstr "inkxaso"
 
@@ -9491,6 +9261,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "Ingqokelela yamaNani oThungelwano"
 
+msgid "Ping"
+msgstr "I-Ping"
+
 msgid "Ping failed"
 msgstr "Isilumkiso asiphumelelanga"
 
@@ -9558,7 +9331,8 @@ msgstr "Uhlobo olungaxhaswa lweqhosha likawonke-wonke"
 msgid "Disconnected by server"
 msgstr "Ukhutshwe kunxibelelwano yiseva"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "Impazamo ngelixa lonxulumano neSeva yeSILC"
 
 msgid "Key Exchange failed"
@@ -9570,29 +9344,26 @@ msgstr ""
 "Ukungaphumeleli kokuqalisa kwakhona indibano ehlukanisiweyo. Cofa "
 "uNxibelelwano kwakhona ukuyila unxibelelwano olutsha."
 
-msgid "Connection failed"
-msgstr "Unxibelelwano luqhawukile"
-
 msgid "Performing key exchange"
 msgstr "Ukuphumeza unaniselwano oluphambili"
 
 #, fuzzy
-msgid "Unable to create connection"
-msgstr "Akukwazeki ukuyila unxibelelwano olutsha."
-
-#, fuzzy
-msgid "Could not load SILC key pair"
+msgid "Unable to load SILC key pair"
 msgstr "Akukwazekanga ukufaka iqhosha likawonke-wonke"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Ukunxibelelana neSeva yeSILC"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "Akukwazekanga ukufaka iqhosha likawonke-wonke"
+
 msgid "Out of memory"
 msgstr "Uvimba weefayili awusebenzi"
 
 #, fuzzy
-msgid "Cannot initialize SILC protocol"
+msgid "Unable to initialize SILC protocol"
 msgstr "Akukwazeki ukuqalisa unxibelelwano nomXumi weSILC"
 
 #, fuzzy
@@ -9918,7 +9689,7 @@ msgid "Creating SILC key pair..."
 msgstr "Ukudala iqhosa eliyiperi leSILC..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "Ukudala iqhosa eliyiperi leSILC..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -10012,6 +9783,9 @@ msgstr ""
 msgid "No server statistics available"
 msgstr "Ingqokelela yamanani eseva ayifumaneki"
 
+msgid "Error during connecting to SILC Server"
+msgstr "Impazamo ngelixa lonxulumano neSeva yeSILC"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Ukungaphumeleli: Ukungahambelani kwenguqulelo, hlaziya umxumi wakho"
@@ -10054,7 +9828,8 @@ msgstr "Ukungaphumeleli: I-cookie engasebenziyo"
 msgid "Failure: Authentication failed"
 msgstr "Ukungaphumeleli: Ukungaphumeleli kokuqinisekisa"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "Akukwazeki ukuqalisa unxibelelwano nomXumi weSILC"
 
 #, fuzzy
@@ -10062,27 +9837,20 @@ msgid "John Noname"
 msgstr "iFani:"
 
 #, fuzzy, c-format
-msgid "Could not load SILC key pair: %s"
+msgid "Unable to load SILC key pair: %s"
 msgstr "Akukwazekanga ukufaka iqhosha likawonke-wonke"
 
 #, fuzzy
-msgid "Could not write"
-msgstr "Akukwazeki ukuthumela"
-
-msgid "Could not connect"
-msgstr "Akukwazeki ukunxulumana"
+msgid "Unable to create connection"
+msgstr "Akukwazeki ukuyila unxibelelwano olutsha."
 
 #, fuzzy
-msgid "Unknown server response."
+msgid "Unknown server response"
 msgstr "Impazamo engaziwayo"
 
 #, fuzzy
-msgid "Could not create listen socket"
-msgstr "Akukwazekanga ukuyila isokhethi"
-
-#, fuzzy
-msgid "Could not resolve hostname"
-msgstr "Akukwazeki ukusombulula igama lomququzeleli."
+msgid "Unable to create listen socket"
+msgstr "Akukwazeki ukuyila isokethi"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -10132,6 +9900,85 @@ msgstr "Umsebenzisi we-AP"
 msgid "Auth Domain"
 msgstr "Ngokuzenzekela"
 
+#, fuzzy
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;igumbi&gt; [iseva]:  Ngenela incoko kule seva."
+
+#, fuzzy
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:  Yenza uluhlu lweziqhagamshelanisi koku thungelwano"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Isazisi seYahoo!"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Imithetho yokuSebenza yoNgeniso lweYahoo"
+
+#, fuzzy
+msgid "Pager server"
+msgstr "Iseva yoMqobo"
+
+msgid "Pager port"
+msgstr "IsiQhagamsheli sePager"
+
+#, fuzzy
+msgid "File transfer server"
+msgstr "Umququzeleli wokudlulisa ifayili"
+
+msgid "File transfer port"
+msgstr "IsiQhagamshelanisi sokudlulisa ifayili"
+
+#, fuzzy
+msgid "Chat room locale"
+msgstr "Uluhlu lwe-Url lweGumbi leNcoko"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
+
+#, fuzzy
+msgid "Chat room list URL"
+msgstr "Uluhlu lwe-Url lweGumbi leNcoko"
+
+msgid "Yahoo Chat server"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo Chat port"
+msgstr "U-Yahoo eJapan"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Isazisi seYahoo!"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Imithetho yokuSebenza yoNgeniso lweYahoo"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -10164,30 +10011,20 @@ msgstr "Ukongeza umhlobo kukhatyiwe"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr ""
 "Impazamo engaziwayo yenani %d. Ukungena kunxibelelwano kwi-website kaYahoo! "
 "kungakulungisa oku."
@@ -10230,13 +10067,14 @@ msgstr ""
 "Impazamo engaziwayo yenani %d. Ukungena kunxibelelwano kwi-website kaYahoo! "
 "kungakulungisa oku."
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Akukwazekanga ukongeza umhlobo %s kwiqela %s kuluhlu lweseva ngenxa yokuba %"
 "s."
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "Akukwazekanga ukongeza umhlobo kuluhlu lweseva"
 
 #, c-format
@@ -10244,23 +10082,16 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
 #, fuzzy
-msgid "Received unexpected HTTP response from server."
+msgid "Received unexpected HTTP response from server"
 msgstr "Impendulo engasebenziyo evela kwiseva."
 
-msgid "Connection problem"
-msgstr "INgxaki yokuNxulumana"
-
 #, fuzzy, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+msgid "Lost connection with %s: %s"
 msgstr "Iincoko nge %s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
+msgstr "Akukwazeki ukwenza unxibelelwano lweSSL kwiseva."
 
 #, fuzzy
 msgid "Not at Home"
@@ -10331,83 +10162,15 @@ msgstr "Dibana nomsebenzisi wencoko..."
 msgid "Open Inbox"
 msgstr ""
 
-#, fuzzy
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;igumbi&gt; [iseva]:  Ngenela incoko kule seva."
-
-#, fuzzy
-msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Yenza uluhlu lweziqhagamshelanisi koku thungelwano"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Isazisi seYahoo!"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Imithetho yokuSebenza yoNgeniso lweYahoo"
-
-msgid "Yahoo Japan"
-msgstr "U-Yahoo eJapan"
-
-#, fuzzy
-msgid "Pager server"
-msgstr "Iseva yoMqobo"
-
-#, fuzzy
-msgid "Japan Pager server"
-msgstr "Umququzeleli wemiNxeba waseJapan"
-
-msgid "Pager port"
-msgstr "IsiQhagamsheli sePager"
-
-#, fuzzy
-msgid "File transfer server"
-msgstr "Umququzeleli wokudlulisa ifayili"
-
-#, fuzzy
-msgid "Japan file transfer server"
-msgstr "Umququzeleli wokudlulisa ifayili waseJapan"
-
-msgid "File transfer port"
-msgstr "IsiQhagamshelanisi sokudlulisa ifayili"
-
-#, fuzzy
-msgid "Chat room locale"
-msgstr "Uluhlu lwe-Url lweGumbi leNcoko"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-#, fuzzy
-msgid "Chat room list URL"
-msgstr "Uluhlu lwe-Url lweGumbi leNcoko"
-
-msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo Chat port"
-msgstr "U-Yahoo eJapan"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "Akukwazeki ukunxulumana."
+
 msgid "Unable to establish file descriptor."
 msgstr "Akukwazeki ukuseka isichazi sefayili."
 
@@ -10415,6 +10178,10 @@ msgstr "Akukwazeki ukuseka isichazi sefayili."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "Nikela ukuthumela %s ku %s"
 
+#, fuzzy
+msgid "Write Error"
+msgstr "Impazamo yokuBhala"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Inkangeleko yeYahoo! yaseJapan"
 
@@ -10538,21 +10305,19 @@ msgstr "Amazwi"
 msgid "Webcams"
 msgstr "Ii-webcam"
 
+msgid "Connection problem"
+msgstr "INgxaki yokuNxulumana"
+
 msgid "Unable to fetch room list."
 msgstr "Akukwazeki ukulanda uluhlu lwegumbi."
 
 msgid "User Rooms"
 msgstr "AmaGumbi omSebenzisi"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "Ingxaki yonxulumano neseva yeYCHT."
 
-#, fuzzy, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr "Ubuqhawukile kwiseva."
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10687,21 +10452,15 @@ msgid "Exposure"
 msgstr "Ukutyhileka"
 
 #, fuzzy, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr "Akukwazeki ukuyila isokethi"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr ""
+msgid "Unable to parse response from HTTP proxy: %s"
+msgstr "Akukwazeki ukuthumela umyalezo: %s:"
 
 #, fuzzy, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Impazamo yonxibelelwano yomqobo we-%d"
 
 #, fuzzy, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "Ukwalelwa ukufikelela: iseva engumqobo ithintela isiqhagamsheli %d ityhalela."
 
@@ -10709,10 +10468,6 @@ msgstr ""
 msgid "Error resolving %s"
 msgstr "Impazamo yokungenela incoko eyi%s"
 
-#, fuzzy
-msgid "Could not resolve host name"
-msgstr "Akukwazeki ukusombulula igama lomququzeleli."
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
@@ -10924,12 +10679,6 @@ msgstr ""
 msgid "Unable to connect to %s: %s"
 msgstr "Akwazeki ukunxulumana neseva ngama %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "Iseva ifuna i-SSL ukuze ingene"
-
 #, c-format
 msgid " - %s"
 msgstr ""
@@ -11187,7 +10936,11 @@ msgid "View _Log"
 msgstr "Jonga _ukuNgena"
 
 #, fuzzy
-msgid "Hide when offline"
+msgid "Hide When Offline"
+msgstr "Akuvumelekanga xa kungekho unxulumano"
+
+#, fuzzy
+msgid "Show When Offline"
 msgstr "Akuvumelekanga xa kungekho unxulumano"
 
 msgid "_Alias..."
@@ -11750,6 +11503,9 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "Tshintsha ulwazi lomsebenzisi lwe-%s"
 
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11800,7 +11556,7 @@ msgid "Get Away Message"
 msgstr "UmYalezo omTsha wokuNgabikho"
 
 #, fuzzy
-msgid "Last said"
+msgid "Last Said"
 msgstr "iFani:"
 
 msgid "Unable to save icon file to disk."
@@ -12757,7 +12513,7 @@ msgid "Hyperlink visited color"
 msgstr "Umbala woQhagamshelwano"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Umbala wokuzoba uqhagamshelwano."
 
 #, fuzzy
@@ -12797,15 +12553,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "UkuSusa isaZiso"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "Izaziso ngemeyile entsha"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -13178,6 +12941,10 @@ msgstr ""
 "umiselweyo."
 
 #, fuzzy
+msgid "No message"
+msgstr "(umyalezo 1)"
+
+#, fuzzy
 msgid "Open All Messages"
 msgstr "Thumela umYalezo"
 
@@ -13202,10 +12969,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, fuzzy
-msgid "No message"
-msgstr "(umyalezo 1)"
-
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -13444,7 +13207,7 @@ msgid "On unread messages"
 msgstr "Thumela um_yalezo"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "Iifestile zeNcoko zeIM"
 
 #, fuzzy
@@ -13454,6 +13217,10 @@ msgstr "Vala iNcoko"
 msgid "When away"
 msgstr "Xa ungekho"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "Iifestile zeNcoko zeIM"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -13518,10 +13285,6 @@ msgstr ""
 msgid "F_lash window when IMs are received"
 msgstr "_Bhanyazisa iFestile xa imiyalezo isamkelwa"
 
-#, fuzzy
-msgid "Minimi_ze new conversation windows"
-msgstr "Iifestile zeNcoko zeIM"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -13560,8 +13323,8 @@ msgstr "Alufumaneki ulwazi lomsebenzisi"
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr ""
 
-#, fuzzy
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "_Ukuziphawulela iDilesi ye-IP"
 
 msgid "Public _IP:"
@@ -13958,34 +13721,18 @@ msgstr "Gci_na & uSebenzise"
 msgid "Status for %s"
 msgstr "uBume: %s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "Fakela okuNcumisayo"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
 #, fuzzy
-msgid "Duplicate Shortcut"
-msgstr "Ifayili ePhambili yoLuntu"
+msgid "Custom Smiley"
+msgstr "Fakela okuNcumisayo"
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Nceda ufake igama elitsha leqela elikhethiweyo."
+msgid "Duplicate Shortcut"
+msgstr "Ifayili ePhambili yoLuntu"
 
 #, fuzzy
 msgid "Edit Smiley"
@@ -14108,8 +13855,8 @@ msgid "Cannot send launcher"
 msgstr "Akukwazeki ukuthumela ifayili"
 
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 
 #, c-format
@@ -14742,7 +14489,7 @@ msgstr ""
 #. *  summary
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 
 #. ---------- "Notify For" ----------
@@ -15023,7 +14770,7 @@ msgstr "Iifestile zeNcoko zeIM"
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr ""
 
 msgid "Duplicate Correction"
@@ -15364,9 +15111,10 @@ msgstr "IinDlela zokuKhetha zokuNgena"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Izinto ezizodwa okunokukhethwa kuzo kwiiFestile zePidgin."
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr "Izinto ezizodwa okunokukhethwa kuzo kwiiFestile zePidgin."
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr ""
@@ -15408,6 +15156,285 @@ msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Cannot open socket"
+#~ msgstr "Akukwazeki ukuvula isokethi"
+
+#, fuzzy
+#~ msgid "Could not listen on socket"
+#~ msgstr "Akukwazekanga ukuyila isokhethi"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "Akukwazeki ukufunda isokethi"
+
+#, fuzzy
+#~ msgid "Connection failed."
+#~ msgstr "Unxibelelwano luqhawukile"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "Iseva iqhawule unxibelelwano"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "Akukwazekanga ukuyila isokhethi"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "Akukwazekanga ukunxulumana nomququzeleli"
+
+#~ msgid "Read error"
+#~ msgstr "ImPazamo efundiweyo"
+
+#~ msgid "Write error"
+#~ msgstr "Impazamo yokuBhala"
+
+#, fuzzy
+#~ msgid "Service Discovery Info"
+#~ msgstr "Misela uLwazi Ngqo"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "iDilesi Eyandisiweyo"
+
+#, fuzzy
+#~ msgid "Multi-User Chat"
+#~ msgstr "Ncokola noneLinye igama"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "Umsebenzisi akanalo ulwazi ngovimba weefayili."
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "Umyalelo"
+
+#, fuzzy
+#~ msgid "XHTML-IM"
+#~ msgstr "i-HTML"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "Impazamo yoBhaliso"
+
+#, fuzzy
+#~ msgid "User Location"
+#~ msgstr "Indawo"
+
+#, fuzzy
+#~ msgid "Chat State Notifications"
+#~ msgstr "Imo yesaZiso somHlobo"
+
+#, fuzzy
+#~ msgid "Software Version"
+#~ msgstr "INguqulelo engaXhaswanga"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "iGama lomButho"
+
+#, fuzzy
+#~ msgid "User Mood"
+#~ msgstr "Izimo zomSebenzisi"
+
+#, fuzzy
+#~ msgid "User Activity"
+#~ msgstr "Umda womSebenzisi"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "Izakhono"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "Igama lomsebenzisi"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "Unaniselwano oluPhambili neIM"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "Idilesi ye-iMeyile"
+
+#, fuzzy
+#~ msgid "User Profile"
+#~ msgstr "Ingqokelela yeempawu"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "I-Ping"
+
+#, fuzzy
+#~ msgid "User Nickname"
+#~ msgstr "Igama lesiqhulo"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "IVidiyo eSebenzayo"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "Umyalezo wamkelwe"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "IQhosha likaWonke-wonke lomZila ongaCacanga"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "Iindlela zokuKhetha zomSebenzisi"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "Izimo zomSebenzisi"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "Umda womSebenzisi"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "Umda womSebenzisi"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "I-Trillian Encryption (umbhalo ontsonkothileyo)"
+
+#~ msgid "Read Error"
+#~ msgstr "Impazamo yokuFunda"
+
+#, fuzzy
+#~ msgid "Failed to connect to server."
+#~ msgstr "Akukwazeki ukunxulumana neseva."
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Ukrozo luzele"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "Akukwazeki ukwahlula umyalezo ngezijungqe"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Akukwazekanga ukunxulumana nomququzeleli"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Ukungena akuphumelelanga (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Akukwazeki ukunxulumana neseva."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Ukhutshiwe ngenxa yokuba ubungene kwesinye isikhululo."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Impazamo. Inkxaso yeSSL ayifakelwanga."
+
+#~ msgid "Incorrect password."
+#~ msgstr "I-Password ephosakeleyo."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr "Akukwazeki ukunxulumana neseva."
+
+#, fuzzy
+#~ 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."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Akukwazeki ukunxulumana"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "IGama lomSebenzisi elingaSebenziyo"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Akukwazeki ukufumana ulwazi ngeseva"
+
+#, fuzzy
+#~ msgid "Connection lost"
+#~ msgstr "Unxibelelwano luvaliwe"
+
+#, fuzzy
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Akukwazekanga ukunxulumana nomququzeleli"
+
+#, fuzzy
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Unxibelelwano luvaliwe"
+
+#, fuzzy
+#~ msgid "Connection reset"
+#~ msgstr "Unxibelelwano luvaliwe"
+
+#, fuzzy
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Impazamo xeshikweni kufundwa kwi-sokhethi."
+
+#, fuzzy
+#~ msgid "Unable to connect to host"
+#~ msgstr "Akwazeki ukunxulumana neseva"
+
+#, fuzzy
+#~ msgid "Could not write"
+#~ msgstr "Akukwazeki ukuthumela"
+
+#~ msgid "Could not connect"
+#~ msgstr "Akukwazeki ukunxulumana"
+
+#, fuzzy
+#~ msgid "Could not create listen socket"
+#~ msgstr "Akukwazekanga ukuyila isokhethi"
+
+#, fuzzy
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Akukwazeki ukusombulula igama lomququzeleli."
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "I-Password ephosakeleyo."
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "U-Yahoo eJapan"
+
+#, fuzzy
+#~ msgid "Japan Pager server"
+#~ msgstr "Umququzeleli wemiNxeba waseJapan"
+
+#, fuzzy
+#~ msgid "Japan file transfer server"
+#~ msgstr "Umququzeleli wokudlulisa ifayili waseJapan"
+
+#, fuzzy
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr "Ubuqhawukile kwiseva."
+
+#, fuzzy
+#~ msgid "Could not resolve host name"
+#~ msgstr "Akukwazeki ukusombulula igama lomququzeleli."
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "Iseva ifuna i-SSL ukuze ingene"
+
+#, fuzzy
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Iifestile zeNcoko zeIM"
+
+#, fuzzy
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "Nceda ufake igama elitsha leqela elikhethiweyo."
+
+#, fuzzy
 #~ msgid "Activate which ID?"
 #~ msgstr "Sesiphi Isazisi esisebenzayo?"
 
@@ -16035,10 +16062,6 @@ msgstr ""
 #~ msgstr "Iyasebenza ngeli thuba"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Akwazeki ukunxulumana neseva"
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_Umyalezo:"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f6d398b704..cbb8111c3b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-04 15:17-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2009-04-23 00:32+0800\n"
 "Last-Translator: Aron Xu <aronmalache@163.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -2774,11 +2774,12 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "无法监听连入的 IM 连接\n"
 
 msgid ""
@@ -2830,14 +2831,21 @@ msgstr "%s 已经关闭了对话。"
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "无法发送消息，无法开始对话。"
 
-msgid "Cannot open socket"
-msgstr "无法打开套接字"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"无法创建套接字：\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "无法将套接字绑定到端口"
 
-msgid "Could not listen on socket"
-msgstr "无法在套接字上监听"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"无法创建套接字：\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "与本地 DNS 服务通讯出错"
@@ -2884,13 +2892,16 @@ msgstr "保存好友列表..."
 msgid "Load buddylist from file..."
 msgstr "从文件装入好友列表..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "填入注册字段。"
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "密码不匹配。"
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "无法创建新账户。发生了错误。\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2902,14 +2913,15 @@ msgstr "注册成功！"
 msgid "Password"
 msgstr "密码"
 
-msgid "Password (retype)"
-msgstr "密码(重新输入)"
+msgid "Password (again)"
+msgstr "再次输入新密码"
 
-msgid "Enter current token"
-msgstr "输入当前令牌"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "当前令牌"
+#, fuzzy
+msgid "Captcha"
+msgstr "保存图像"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "注册新的 Gadu-Gadu 账户"
@@ -2962,6 +2974,15 @@ msgstr "密码成功更改！"
 msgid "Current password"
 msgstr "当前密码"
 
+msgid "Password (retype)"
+msgstr "密码(重新输入)"
+
+msgid "Enter current token"
+msgstr "输入当前令牌"
+
+msgid "Current token"
+msgstr "当前令牌"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "请输入您目前 UIN 的密码和新密码："
 
@@ -3009,7 +3030,7 @@ msgstr "未找到匹配的用户"
 msgid "There are no users matching your search criteria."
 msgstr "没有与您的搜索条件匹配的用户。"
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "无法读取套接字"
 
 msgid "Buddy list downloaded"
@@ -3024,8 +3045,14 @@ msgstr "好友列表已上传"
 msgid "Your buddy list was stored on the server."
 msgstr "您的好友列表存储于服务器上。"
 
-msgid "Connection failed."
-msgstr "连接失败。"
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "已连接"
+
+msgid "Connection failed"
+msgstr "连接失败"
 
 msgid "Add to chat"
 msgstr "添加到聊天"
@@ -3033,18 +3060,23 @@ msgstr "添加到聊天"
 msgid "Chat _name:"
 msgstr "聊天名(_N)："
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "无法连接到服务器。"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "正连接"
+
 msgid "Chat error"
 msgstr "聊天错误"
 
 msgid "This chat name is already in use"
 msgstr "此聊天名已经在使用中"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "未连接到服务器。"
 
 msgid "Find buddies..."
@@ -3104,7 +3136,8 @@ msgstr "未设定话题"
 msgid "File Transfer Failed"
 msgstr "文件传送失败"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "无法打开监听端口。"
 
 msgid "Error displaying MOTD"
@@ -3120,8 +3153,18 @@ msgstr "没有与此连接关联的 MOTD"
 msgid "MOTD for %s"
 msgstr "%s 的 MOTD"
 
-msgid "Server has disconnected"
-msgstr "服务器已断开连接"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"失去与服务器的连接：\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "查看 MOTD"
@@ -3136,22 +3179,20 @@ msgstr "密码(_P)："
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC 昵称不能包含空格"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "正连接"
-
 msgid "SSL support unavailable"
 msgstr "SSL 支持不可用"
 
-msgid "Couldn't create socket"
-msgstr "无法创建套接字"
+msgid "Unable to connect"
+msgstr "无法连接"
 
-msgid "Couldn't connect to host"
-msgstr "无法连接到主机"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "无法连接到 %s"
 
-msgid "Read error"
-msgstr "读取错误"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "服务器关闭了连接。"
 
 msgid "Users"
 msgstr "用户"
@@ -3551,10 +3592,12 @@ msgstr "命令已禁用"
 msgid "execute"
 msgstr "未期待"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "服务器需要 TLS/SSL 才能登录。没有找到 TLS/SSL 支持。"
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "您要求 TLS/SSL 登录，但没有找到 TLS/SSL 支持。"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3569,7 +3612,12 @@ msgstr "服务器需要在不加密流上使用纯文本验证。允许这么做
 msgid "Plaintext Authentication"
 msgstr "纯文本认证"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "认证失败"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "服务器的响应无效。"
 
 msgid "Server does not use any supported authentication method"
@@ -3581,7 +3629,8 @@ msgstr ""
 msgid "Invalid challenge from server"
 msgstr "服务器的挑战无效"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL 错误"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3596,23 +3645,13 @@ msgstr "不支持 BOSH 协议的版本"
 msgid "Unable to establish a connection with the server"
 msgstr "无法与服务器建立连接"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"无法建立与服务器：\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "无法与服务器建立连接"
 
 msgid "Unable to establish SSL connection"
 msgstr "无法建立 SSL 连接"
 
-msgid "Unable to create socket"
-msgstr "无法创建套接字"
-
-msgid "Write error"
-msgstr "写错误"
-
 msgid "Full Name"
 msgstr "全名"
 
@@ -3680,178 +3719,6 @@ msgstr "操作系统"
 msgid "Local Time"
 msgstr "本地时间"
 
-msgid "Last Activity"
-msgstr "最近活动"
-
-msgid "Service Discovery Info"
-msgstr "服务目录信息"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "额外地址"
-
-msgid "Multi-User Chat"
-msgstr "多用户聊天"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "用户没有目录信息。"
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "命令"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "注册错误"
-
-msgid "User Location"
-msgstr "用户位置"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "用户搜索"
-
-msgid "Chat State Notifications"
-msgstr "聊天状态通知"
-
-msgid "Software Version"
-msgstr "软件版本"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "方向"
-
-msgid "File Transfer"
-msgstr "文件传送"
-
-msgid "User Mood"
-msgstr "用户心情"
-
-msgid "User Activity"
-msgstr "用户活动"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "能力"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "用户名"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "带密钥交换开聊"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "电子邮件地址"
-
-msgid "User Profile"
-msgstr "用户资料"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "加入"
-
-msgid "Jingle Audio"
-msgstr ""
-
-msgid "User Nickname"
-msgstr "用户昵称"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "实时视频"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "消息已收到"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "公钥漏印"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "用户选项"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "用户模式"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "用户名"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "允许限制"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Trillian 加密"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "能力"
-
 msgid "Priority"
 msgstr "优先级"
 
@@ -3863,7 +3730,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "已登入"
 
 msgid "Middle Name"
@@ -4043,16 +3910,13 @@ msgstr "未找到匹配的用户"
 msgid "Roles:"
 msgstr "角色："
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Ping 超时"
 
-msgid "Read Error"
-msgstr "读取错误"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4234,9 +4098,6 @@ msgstr "您的密码已更改。"
 msgid "Error changing password"
 msgstr "更改密码出错"
 
-msgid "Password (again)"
-msgstr "再次输入新密码"
-
 msgid "Change XMPP Password"
 msgstr "更改 XMPP 密码"
 
@@ -4619,6 +4480,14 @@ msgstr "XML 分析错误"
 msgid "Unknown Error in presence"
 msgstr "出现未知错误"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "加入聊天 %s 出错"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "聊天 %s 出错"
+
 msgid "Create New Room"
 msgstr "创建新房间"
 
@@ -4633,13 +4502,17 @@ msgstr "配置房间(_C)"
 msgid "_Accept Defaults"
 msgstr "接受默认值(_A)"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "加入聊天 %s 出错"
+#, fuzzy
+msgid "No reason"
+msgstr "没有给出理由。"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "聊天 %s 出错"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "您被 %s: %s 踢出了"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "被 %s (%s) 踢出"
 
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
@@ -5147,9 +5020,6 @@ msgstr "发起聊天(_C)"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 需要 SSL 支持。请安装本软件支持的 SSL 库。"
 
-msgid "Failed to connect to server."
-msgstr "连接到服务器失败。"
-
 msgid "Error retrieving profile"
 msgstr "获取配置文件出错"
 
@@ -5405,9 +5275,6 @@ msgstr "消息未发出，因为发生了未知错误："
 msgid "Message was not sent because an unknown error occurred."
 msgstr "消息未发出，因为发生了未知错误："
 
-msgid "Unable to connect"
-msgstr "无法连接"
-
 msgid "Writing error"
 msgstr "写入错误"
 
@@ -5422,19 +5289,23 @@ msgstr ""
 "%s 服务器的连接错误：\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "服务器不支持此协议。"
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "分析 HTTP 出错。"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "您在其它位置用此用户名登入了。"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "MSN 服务器临时不可用。请稍候再试一次。"
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN 服务器目前维护中。"
 
 #, c-format
@@ -5445,9 +5316,6 @@ msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "您的 MSN 好友列表临时不可用。请稍候再试一次。"
 
-msgid "Unknown error."
-msgstr "未知错误。"
-
 msgid "Handshaking"
 msgstr "握手"
 
@@ -5546,6 +5414,9 @@ msgstr "AIM 协议插件"
 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"
@@ -5661,12 +5532,6 @@ msgstr[0] ""
 msgid "Add contacts from server"
 msgstr "服务器的响应无效。"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "已连接"
-
 #, fuzzy, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "进程返回了错误代码 %d"
@@ -5690,18 +5555,6 @@ msgid "Invalid input condition"
 msgstr "完成连接"
 
 #, fuzzy
-msgid "Read buffer full (2)"
-msgstr "队列满"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "无法处理消息"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "无法连接到主机"
-
-#, fuzzy
 msgid "Failed to add buddy"
 msgstr "在聊天中加入好友失败"
 
@@ -5793,6 +5646,12 @@ msgstr ""
 msgid "Client Version"
 msgstr "关闭对话"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 #, fuzzy
 msgid "MySpaceIM - Username Available"
 msgstr "服务不可用"
@@ -6056,9 +5915,9 @@ msgstr "用户或者离线，或者已经屏蔽了您"
 msgid "Unknown error: 0x%X"
 msgstr "未知错误: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "登录失败(%s)。"
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "无法 ping 用户 %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6156,9 +6015,6 @@ msgstr "GroupWise 会议 %d"
 msgid "Authenticating..."
 msgstr "正在认证..."
 
-msgid "Unable to connect to server."
-msgstr "无法连接到服务器。"
-
 msgid "Waiting for response..."
 msgstr "正在等候响应..."
 
@@ -6182,9 +6038,6 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "您是否想要加入对话？"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "您已被注销，因为您已从其它计算机上登录。"
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6196,9 +6049,6 @@ msgid ""
 "you wish to connect."
 msgstr "无法连接到服务器。请输入您想要连接的服务器的地址。"
 
-msgid "Error. SSL support is not installed."
-msgstr "出错。SSL 支持未安装。"
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "此会议已关筹。不会再送出消息。"
 
@@ -6237,10 +6087,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "请求登录令牌出错"
 
-msgid "Incorrect password."
-msgstr "密码不对。"
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 #, fuzzy
@@ -6251,18 +6098,8 @@ msgstr "无法连接"
 msgid "Invalid chat room name"
 msgstr "无效的房间名"
 
-msgid "Server closed the connection."
-msgstr "服务器关闭了连接。"
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"失去与服务器的连接：\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "在与服务器的连接中收到了无效的数据。"
 
 #. *< type
@@ -6310,7 +6147,8 @@ msgstr "失去与远程用户的连接：<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "无法建立与远程用户的连接。"
 
 msgid "Direct IM established"
@@ -6503,21 +6341,15 @@ msgstr "警告级别"
 msgid "Buddy Comment"
 msgstr "好友注释"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "无法连接到身份验证服务器：\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"无法连接到 BOS 服务器：\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "无法连接到服务器。"
 
 #, fuzzy
 msgid "Username sent"
@@ -6532,9 +6364,9 @@ msgstr "完成连接"
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "无法登入: 无法以 %s 登入，原因是用户名无效。用户名必须是有效的电子邮件地址，"
 "或者以字母开头，且只能包含字母、数字和空格，或者只包含数字。"
@@ -6546,27 +6378,22 @@ 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
 #. the username does not exist
 #, fuzzy
 msgid "Username does not exist"
 msgstr "用户不存在"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "您的账户被停用。"
 
 #. service temporarily unavailable
@@ -6586,7 +6413,8 @@ msgstr ""
 "您连接和断开得太频繁。请等十分钟，然后再试一次。如果您继续重试，您等的时间可"
 "能会更长。"
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "输入的 SecurID 密钥无效。"
 
 msgid "Enter SecurID"
@@ -6751,6 +6579,9 @@ msgstr "上线时间"
 msgid "Member Since"
 msgstr "注册时间"
 
+msgid "Capabilities"
+msgstr "能力"
+
 msgid "Profile"
 msgstr "个人资料"
 
@@ -6910,7 +6741,7 @@ msgstr "离开消息太长。"
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6936,9 +6767,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "孤儿"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "无法将 %s 加为好友，原因是您的好友太多。请删除其中一个好友，然后再试一次。"
@@ -6947,7 +6778,7 @@ msgid "(no name)"
 msgstr "(无名称)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "您的命令失败，原因未知。"
 
 #, fuzzy, c-format
@@ -7786,7 +7617,7 @@ msgid "Update interval (seconds)"
 msgstr "保持在线错误"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "无法获取服务器信息"
 
 #, c-format
@@ -7813,10 +7644,6 @@ msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "无法获取服务器信息"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "正在请求 %s 的注意..."
 
@@ -7843,11 +7670,6 @@ msgstr ""
 msgid "Enter the text from the image"
 msgstr "请输入组名称"
 
-#. uid is not exist
-#, fuzzy
-msgid "Invalid username."
-msgstr "名称无效"
-
 #, c-format
 msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
@@ -7858,21 +7680,9 @@ msgid ""
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "无法连接。"
-
 msgid "Socket error"
 msgstr "套接字错误"
 
-msgid "Unable to read from socket"
-msgstr "无法读取套接字"
-
-msgid "Write Error"
-msgstr "写错误"
-
-msgid "Connection lost"
-msgstr "连接丢失"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "设置用户信息..."
@@ -7881,8 +7691,9 @@ msgstr "设置用户信息..."
 msgid "Requesting token"
 msgstr "请求被禁止"
 
-msgid "Couldn't resolve host"
-msgstr "无法解析主机"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "无法连接到服务器。"
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -7933,7 +7744,7 @@ msgid "QQ Qun Command"
 msgstr "命令"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "无法获取服务器信息"
 
 #, fuzzy
@@ -7955,9 +7766,6 @@ msgstr "发送文件"
 msgid "%d canceled the transfer of %s"
 msgstr "%d 取消了 %s 的传送"
 
-msgid "Connection closed (writing)"
-msgstr "连接已关闭(写入)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>组标题：</b> %s<br>"
@@ -8011,17 +7819,6 @@ msgstr ""
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime 管理员通知"
 
-msgid "Connection reset"
-msgstr "连接重置"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "从套接字读取时出错：%s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "无法连接到主机"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "来自 %s 的通知"
@@ -8045,6 +7842,9 @@ msgstr "扬声器"
 msgid "Video Camera"
 msgstr "摄像头"
 
+msgid "File Transfer"
+msgstr "文件传送"
+
 msgid "Supports"
 msgstr "支持"
 
@@ -8829,6 +8629,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "网络统计"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping 失败"
 
@@ -8890,7 +8693,8 @@ msgstr "不支持的公钥类型"
 msgid "Disconnected by server"
 msgstr "服务器断开连接"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "连接到 SILC 服务器时出错"
 
 msgid "Key Exchange failed"
@@ -8900,26 +8704,26 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "恢复脱离的会话失败。请按[重新连接]以创建新连接。"
 
-msgid "Connection failed"
-msgstr "连接失败"
-
 msgid "Performing key exchange"
 msgstr "执行密钥交换"
 
-msgid "Unable to create connection"
-msgstr "无法创建连接"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "无法装入 SILC 密钥对"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "连接到 SILC 服务器"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "无法装入 SILC 密钥对"
+
 msgid "Out of memory"
 msgstr "内存溢出"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "无法初始化 SILC 协议"
 
 msgid "Error loading SILC key pair"
@@ -9205,7 +9009,7 @@ msgid "Creating SILC key pair..."
 msgstr "创建 SILC 密钥对..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "创建 SILC 密钥对..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9299,6 +9103,9 @@ msgstr "白板"
 msgid "No server statistics available"
 msgstr "没有可用的服务器统计"
 
+msgid "Error during connecting to SILC Server"
+msgstr "连接到 SILC 服务器时出错"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失败: 版本不匹配，请升级您的客户端"
@@ -9339,30 +9146,27 @@ msgstr "失败: 无效的 cookie"
 msgid "Failure: Authentication failed"
 msgstr "失败: 身份验证失败"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "无法初始化 SILC 客户连接"
 
 msgid "John Noname"
 msgstr "张三"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "无法装入 SILC 密钥对: %s"
 
-msgid "Could not write"
-msgstr "无法写入"
-
-msgid "Could not connect"
-msgstr "无法连接"
+msgid "Unable to create connection"
+msgstr "无法创建连接"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "未知的服务器响应。"
 
-msgid "Could not create listen socket"
-msgstr "无法创建监听套接字"
-
-msgid "Could not resolve hostname"
-msgstr "无法解析主机名"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "无法创建套接字"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -9405,6 +9209,78 @@ msgstr "认证用户"
 msgid "Auth Domain"
 msgstr "认证域"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;房间&gt;: 加入 Yahoo 网络上的聊天室"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: 列出 Yahoo 网络上的房间"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo 协议插件"
+
+msgid "Pager server"
+msgstr "寻呼服务器"
+
+msgid "Pager port"
+msgstr "寻呼端口"
+
+msgid "File transfer server"
+msgstr "文件传送服务器"
+
+msgid "File transfer port"
+msgstr "文件传送端口"
+
+msgid "Chat room locale"
+msgstr "聊天房间语系"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "忽略会议和聊天室邀请"
+
+msgid "Chat room list URL"
+msgstr "聊天房间列表 URL"
+
+msgid "Yahoo Chat server"
+msgstr "Yahoo 聊天服务器"
+
+msgid "Yahoo Chat port"
+msgstr "Yahoo 聊天端口"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo 协议插件"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9433,22 +9309,18 @@ msgstr "添加拒绝的好友"
 msgid "Received invalid data"
 msgstr "在与服务器的连接中收到了无效的数据。"
 
-#, 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."
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
 msgstr "位置错误号 %d。登录到 Yahoo! 网站可能修复。"
 
 #. indicates a lock of some description
 #, fuzzy
 msgid ""
-"Account locked: Unknown reason.\n"
-"Logging into the Yahoo! website may fix this."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr "位置错误号 %d。登录到 Yahoo! 网站可能修复。"
 
 #. username or password missing
@@ -9485,38 +9357,31 @@ msgstr "您的账户已锁定，请登录到 Yahoo! 网站。"
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "位置错误号 %d。登录到 Yahoo! 网站可能修复。"
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "无法将好友 %s 添加到账户 %s 位于服务器列表上的组 %s。"
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "无法将好友添加到服务器列表"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "从服务器收到了意外的 HTTP 响应。"
 
-msgid "Connection problem"
-msgstr "连接问题"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "失去与 %s 的连接：\n"
 "%s"
 
 #, fuzzy, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"无法建立与服务器：\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
+msgstr "无法与服务器建立连接"
 
 msgid "Not at Home"
 msgstr "不在家"
@@ -9580,74 +9445,15 @@ msgstr "在聊天中加入用户..."
 msgid "Open Inbox"
 msgstr "打开收件箱"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;房间&gt;: 加入 Yahoo 网络上的聊天室"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: 列出 Yahoo 网络上的房间"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo 协议插件"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo 日本"
-
-msgid "Pager server"
-msgstr "寻呼服务器"
-
-msgid "Japan Pager server"
-msgstr "日本寻呼服务器"
-
-msgid "Pager port"
-msgstr "寻呼端口"
-
-msgid "File transfer server"
-msgstr "文件传送服务器"
-
-msgid "Japan file transfer server"
-msgstr "日本文件传送服务器"
-
-msgid "File transfer port"
-msgstr "文件传送端口"
-
-msgid "Chat room locale"
-msgstr "聊天房间语系"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "忽略会议和聊天室邀请"
-
-msgid "Chat room list URL"
-msgstr "聊天房间列表 URL"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo 聊天服务器"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo 聊天端口"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "无法连接。"
+
 msgid "Unable to establish file descriptor."
 msgstr "无法建立文件描述符。"
 
@@ -9655,6 +9461,9 @@ msgstr "无法建立文件描述符。"
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s 正在发送文件 %s"
 
+msgid "Write Error"
+msgstr "写错误"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo 日本资料"
 
@@ -9762,23 +9571,19 @@ msgstr "语音"
 msgid "Webcams"
 msgstr "摄像头"
 
+msgid "Connection problem"
+msgstr "连接问题"
+
 msgid "Unable to fetch room list."
 msgstr "无法获取房间列表。"
 
 msgid "User Rooms"
 msgstr "用户房间"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "YCHT 服务器连接出现问题。"
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"丢失与服务器的连接\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -9899,33 +9704,22 @@ msgstr "域"
 msgid "Exposure"
 msgstr "暴露"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"无法创建套接字：\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "无法从 HTTP 代理分析响应：%s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP 代理服务器连接错误 %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "访问被禁止: HTTP 代理服务器禁止端口 %d 流过。"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "解析 %s 出错"
 
-msgid "Could not resolve host name"
-msgstr "无法解析主机名"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "正在请求 %s 的注意..."
@@ -10128,12 +9922,6 @@ msgstr "写入 %s 出错：%s"
 msgid "Unable to connect to %s: %s"
 msgstr "无法连接到 %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "服务器需要 TLS/SSL 才能登录。没有找到 TLS/SSL 支持。"
-
 #, c-format
 msgid " - %s"
 msgstr ""
@@ -10379,9 +10167,14 @@ msgstr "添加好友千里眼(_P)..."
 msgid "View _Log"
 msgstr "查看日志(_L)"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "离线时隐藏"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "离线时显示"
+
 msgid "_Alias..."
 msgstr "别名(_A)..."
 
@@ -10942,7 +10735,8 @@ msgstr "忽略"
 msgid "Get Away Message"
 msgstr "获得离开消息"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "上次说道"
 
 msgid "Unable to save icon file to disk."
@@ -12500,8 +12294,9 @@ msgstr "显示系统托盘图标(_S):"
 msgid "On unread messages"
 msgstr "有未读消息时"
 
-msgid "Conversation Window Hiding"
-msgstr "对话窗口隐藏"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "即时消息对话窗口"
 
 msgid "_Hide new IM conversations:"
 msgstr "隐藏新的 IM 对话(_H):"
@@ -12509,6 +12304,9 @@ msgstr "隐藏新的 IM 对话(_H):"
 msgid "When away"
 msgstr "离开时"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "最小化对话窗口(_Z)"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "标签"
@@ -12567,9 +12365,6 @@ msgstr "使用平滑滚动"
 msgid "F_lash window when IMs are received"
 msgstr "收到信息时闪烁窗口(_L)"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "最小化对话窗口(_Z)"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -14297,6 +14092,274 @@ msgstr "发送和接受原始 XMPP 节。"
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "此插件用于调试 XMPP 服务器或客户端。"
 
+#~ msgid "Cannot open socket"
+#~ msgstr "无法打开套接字"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "无法在套接字上监听"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "无法读取套接字"
+
+#~ msgid "Connection failed."
+#~ msgstr "连接失败。"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "服务器已断开连接"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "无法创建套接字"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "无法连接到主机"
+
+#~ msgid "Read error"
+#~ msgstr "读取错误"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "无法建立与服务器：\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "写错误"
+
+#~ msgid "Last Activity"
+#~ msgstr "最近活动"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "服务目录信息"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "额外地址"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "多用户聊天"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "用户没有目录信息。"
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "命令"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "注册错误"
+
+#~ msgid "User Location"
+#~ msgstr "用户位置"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "用户搜索"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "聊天状态通知"
+
+#~ msgid "Software Version"
+#~ msgstr "软件版本"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "方向"
+
+#~ msgid "User Mood"
+#~ msgstr "用户心情"
+
+#~ msgid "User Activity"
+#~ msgstr "用户活动"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "能力"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "用户名"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "带密钥交换开聊"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "电子邮件地址"
+
+#~ msgid "User Profile"
+#~ msgstr "用户资料"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "加入"
+
+#~ msgid "User Nickname"
+#~ msgstr "用户昵称"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "实时视频"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "消息已收到"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "公钥漏印"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "用户选项"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "用户模式"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "用户名"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "允许限制"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Trillian 加密"
+
+#~ msgid "Read Error"
+#~ msgstr "读取错误"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "连接到服务器失败。"
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "队列满"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "无法处理消息"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "无法连接到主机"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "登录失败(%s)。"
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "无法连接到服务器。"
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "您已被注销，因为您已从其它计算机上登录。"
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "出错。SSL 支持未安装。"
+
+#~ msgid "Incorrect password."
+#~ msgstr "密码不对。"
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "无法连接到 BOS 服务器：\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "您即将被断开。请检查 %s 上的更新。"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "无法连接"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "无法获取服务器信息"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "名称无效"
+
+#~ msgid "Connection lost"
+#~ msgstr "连接丢失"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "无法解析主机"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "连接已关闭(写入)"
+
+#~ msgid "Connection reset"
+#~ msgstr "连接重置"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "从套接字读取时出错：%s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "无法连接到主机"
+
+#~ msgid "Could not write"
+#~ msgstr "无法写入"
+
+#~ msgid "Could not connect"
+#~ msgstr "无法连接"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "无法创建监听套接字"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "无法解析主机名"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "密码不对"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "无法建立与服务器：\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo 日本"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "日本寻呼服务器"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "日本文件传送服务器"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "丢失与服务器的连接\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "无法解析主机名"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "服务器需要 TLS/SSL 才能登录。没有找到 TLS/SSL 支持。"
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "对话窗口隐藏"
+
 #~ msgid "Activate which ID?"
 #~ msgstr "激活哪个 ID？"
 
@@ -14754,10 +14817,6 @@ msgstr "此插件用于调试 XMPP 服务器或客户端。"
 #~ msgid "Windows Live ID authentication Failed"
 #~ msgstr "失败: 身份验证失败"
 
-#, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "无法连接到服务器。"
-
 #~ msgid "Unable to make SSL connection to server."
 #~ msgstr "无法通过 SSL 连接到服务器。"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index f77c55cd07..deffa4dc49 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -51,7 +51,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2009-02-25 09:57-0500\n"
 "Last-Translator: Ambrose Li <ambrose.li@gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
@@ -2663,9 +2663,10 @@ msgstr "在日誌瀏覽器中包含其他即時訊息用戶端日誌。"
 
 # XXX 譯文有待改進（第二段） - 20061025
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2716,8 +2717,9 @@ msgstr "離線訊息模擬模組"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "好友離線時，利用「好友狀態捕捉」功能儲存送出的訊息。"
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "未能送出的訊息將會儲存成「好友狀態捕捉」。如有需要，訊息可在「好友狀態捕捉」"
@@ -2967,14 +2969,16 @@ msgstr ""
 "com 下載及安裝 ActiveTCL。\n"
 
 # FIXME 沒有譯「toolkit」- 20071023 acli
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "找不到 Apple 的 Bonjour For Windows toolkit，詳情請到網址 http://d.pidgin.im/"
 "BonjourWindows 查閱 FAQ 部分。"
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "無法接收連入的即時訊息連線\n"
 
 msgid ""
@@ -3029,14 +3033,21 @@ msgstr "%s 已經關閉這個交談。"
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "無法送出訊息，交談無法開始。"
 
-msgid "Cannot open socket"
-msgstr "無法開啟Socket"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"無法建立 Socket：\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "無法聯結 Socket 到通訊埠"
 
-msgid "Could not listen on socket"
-msgstr "無法監聽 Socket"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"無法建立 Socket：\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "和本地端的mDNSResponder溝通時發生錯誤"
@@ -3084,13 +3095,16 @@ msgstr "儲存好友清單..."
 msgid "Load buddylist from file..."
 msgstr "自檔案讀取好友清單..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "填寫註冊資料欄位。"
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "新密碼並不相符。"
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "無法註冊新帳號。錯誤發生。\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3102,14 +3116,15 @@ msgstr "註冊成功！"
 msgid "Password"
 msgstr "密碼"
 
-msgid "Password (retype)"
-msgstr "密碼（再次輸入）"
+msgid "Password (again)"
+msgstr "舊密碼（再次確認）"
 
-msgid "Enter current token"
-msgstr "輸入目前的密碼"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "目前密碼"
+#, fuzzy
+msgid "Captcha"
+msgstr "驗證圖片"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "註冊新的 Gadu-Gadu 帳號"
@@ -3162,6 +3177,15 @@ msgstr "密碼修改成功！"
 msgid "Current password"
 msgstr "舊密碼"
 
+msgid "Password (retype)"
+msgstr "密碼（再次輸入）"
+
+msgid "Enter current token"
+msgstr "輸入目前的密碼"
+
+msgid "Current token"
+msgstr "目前密碼"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "請輸入你的舊密碼及你的新密碼："
 
@@ -3210,7 +3234,7 @@ msgstr "找不到符合的使用者"
 msgid "There are no users matching your search criteria."
 msgstr "無法根據搜尋條件找到相符的使用者。"
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "無法讀取 Socket"
 
 msgid "Buddy list downloaded"
@@ -3225,8 +3249,15 @@ msgstr "上傳好友清單"
 msgid "Your buddy list was stored on the server."
 msgstr "你的好友清單已被存放於伺服器上。"
 
-msgid "Connection failed."
-msgstr "連線失敗。"
+# TODO 要覆查 - 20061027
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "已連結"
+
+msgid "Connection failed"
+msgstr "連線失敗"
 
 msgid "Add to chat"
 msgstr "新增到聊天室"
@@ -3234,18 +3265,23 @@ msgstr "新增到聊天室"
 msgid "Chat _name:"
 msgstr "聊天室名稱(_N)："
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "無法連線到伺服器。"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "連線中"
+
 msgid "Chat error"
 msgstr "聊天錯誤"
 
 msgid "This chat name is already in use"
 msgstr "聊天室名稱正在使用中"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "尚未連線到伺服器。"
 
 msgid "Find buddies..."
@@ -3305,7 +3341,8 @@ msgstr "沒有設定主題"
 msgid "File Transfer Failed"
 msgstr "檔案傳輸失敗"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "無法開啟監聽埠。"
 
 msgid "Error displaying MOTD"
@@ -3321,8 +3358,18 @@ msgstr "這個連結沒有相關的是日訊息。"
 msgid "MOTD for %s"
 msgstr "%s 的是日訊息"
 
-msgid "Server has disconnected"
-msgstr "伺服器已停止連線"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"與伺服器之間的連線突然中斷:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "顯示是日訊息 (MOTD)"
@@ -3337,24 +3384,21 @@ msgstr "密碼(_P)："
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC 網名不可含有空白字符"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "連線中"
-
 # XXX 暫譯
 msgid "SSL support unavailable"
 msgstr "沒有 SSL 支援"
 
-msgid "Couldn't create socket"
-msgstr "無法建立 Socket"
+msgid "Unable to connect"
+msgstr "無法連線"
 
-msgid "Couldn't connect to host"
-msgstr "無法連到伺服器"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "無法連線到「%s」"
 
-# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-msgid "Read error"
-msgstr "讀取錯誤"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "伺服器關閉連線。"
 
 msgid "Users"
 msgstr "使用者"
@@ -3789,10 +3833,12 @@ msgstr "臨時指令失敗"
 msgid "execute"
 msgstr "執行"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "登入這個伺服器需要使用 TLS/SSL，但找不到 TLS/SSL 支援。"
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "你指定必須加密，但找不到 TLS/SSL 支援。"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3807,7 +3853,12 @@ msgstr "%s 需要經由未經加密的串流進行明文認證。允許並繼續
 msgid "Plaintext Authentication"
 msgstr "明文認證"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "認證失敗"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "伺服器送來了無效的回應。"
 
 msgid "Server does not use any supported authentication method"
@@ -3821,7 +3872,8 @@ msgid "Invalid challenge from server"
 msgstr "伺服器送來了無效的驗證挑戰"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL 錯誤"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3843,10 +3895,8 @@ msgstr ""
 "無法與伺服器建立連線:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "無法與伺服器建立連線:\n"
 "%s"
@@ -3855,12 +3905,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "無法初始化連結"
 
-msgid "Unable to create socket"
-msgstr "無法建立 Socket"
-
-msgid "Write error"
-msgstr "寫入錯誤"
-
 msgid "Full Name"
 msgstr "全名"
 
@@ -3932,186 +3976,6 @@ msgstr "作業系統"
 msgid "Local Time"
 msgstr "本地端檔案："
 
-# NOTE 這是功能名稱（直譯）
-msgid "Last Activity"
-msgstr "最近活動"
-
-msgid "Service Discovery Info"
-msgstr "服務探尋資訊"
-
-#  FIXME acli 2070914
-msgid "Service Discovery Items"
-msgstr "服務探尋項目"
-
-# NOTE 這是功能名稱（直譯）
-msgid "Extended Stanza Addressing"
-msgstr "延伸段落定址"
-
-# NOTE 這是功能名稱
-msgid "Multi-User Chat"
-msgstr "多用戶聊天"
-
-# NOTE 這是功能名稱（直譯）
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "多用戶聊天延伸上線狀態資訊"
-
-# NOTE Cf http://host.cc.ntu.edu.tw/iicm/term/termb_I.htm
-msgid "In-Band Bytestreams"
-msgstr "帶內位元組串流"
-
-msgid "Ad-Hoc Commands"
-msgstr "臨時指令"
-
-msgid "PubSub Service"
-msgstr "PubSub 服務"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 位元組串流"
-
-msgid "Out of Band Data"
-msgstr "帶外數據"
-
-#  NOTE Untranslated
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "帶內註冊"
-
-msgid "User Location"
-msgstr "使用者所在位置"
-
-msgid "User Avatar"
-msgstr "使用者化身"
-
-msgid "Chat State Notifications"
-msgstr "聊天狀態通知"
-
-# NOTE Jabber 協定中 Stream Error 的一種，即 <unsupported-version/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-msgid "Software Version"
-msgstr "軟件版本"
-
-msgid "Stream Initiation"
-msgstr "開始串流"
-
-msgid "File Transfer"
-msgstr "檔案傳輸"
-
-msgid "User Mood"
-msgstr "使用者情緒"
-
-# XXX may be wrong
-msgid "User Activity"
-msgstr "使用者活動狀態"
-
-#  NOTE 直譯：個體能力
-#  FIXME 譯文有待改進 - acli 20070918
-msgid "Entity Capabilities"
-msgstr "個體能力"
-
-#  FIXME 這聽來不對 - acli 20070913
-msgid "Encrypted Session Negotiations"
-msgstr "加密工作階段協商"
-
-msgid "User Tune"
-msgstr "使用者樂曲"
-
-#  NOTE「Roster」指「名冊」，但Open Source software似乎一般譯「好友清單」、「成員列表」等
-#  FIXME 譯文有待改進 - acli 20070918
-msgid "Roster Item Exchange"
-msgstr "好友清單項目交換"
-
-#  NOTE 參見 http://jabber.org/protocol/reach
-#  NOTE「Reachability Address」指即時通訊以外的通訊方式所用的「位址」（例如電話號碼）
-#  NOTE 直譯：可抵達性位址
-#  XXX 是否譯「其他通訊方法」較好？但要先看上下文 - acli 20070918
-msgid "Reachability Address"
-msgstr "可抵達性位址"
-
-msgid "User Profile"
-msgstr "使用者資料"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle 音訊"
-
-msgid "User Nickname"
-msgstr "使用者網名"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr "Jingle 視像"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "收到的訊息"
-
-msgid "Public Key Publishing"
-msgstr "發佈公開密碼匙"
-
-# NOTE Jabber 新功能規格
-msgid "User Chatting"
-msgstr ""
-
-# NOTE Jabber 新功能規格
-msgid "User Browsing"
-msgstr "使用者瀏覽"
-
-# NOTE Jabber 新功能規格
-msgid "User Gaming"
-msgstr ""
-
-# NOTE Jabber 新功能規格
-msgid "User Viewing"
-msgstr ""
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "段落加密"
-
-# NOTE http://www.xmpp.org/extensions/xep-0202.html
-msgid "Entity Time"
-msgstr ""
-
-#  XXX 暫譯- acli 20070913
-msgid "Delayed Delivery"
-msgstr "延遲送出"
-
-# NOTE http://www.xmpp.org/extensions/xep-0204.html
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "Jingle 用的 STUN 服務偵測"
-
-# FIXME 這聽來不對
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "簡化加密工作階段協商"
-
-msgid "Hop Check"
-msgstr "中繼段檢查"
-
-msgid "Capabilities"
-msgstr "兼容性"
-
 msgid "Priority"
 msgstr "優先次序"
 
@@ -4128,7 +3992,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "已登入"
 
 # NOTE: 法、德文均譯「第二個名」，芬蘭文譯「其他名」，日文音譯了事
@@ -4323,16 +4187,13 @@ msgstr "找不到符合的使用者"
 msgid "Roles:"
 msgstr "職責"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Ping逾時"
 
-msgid "Read Error"
-msgstr "讀取錯誤"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4525,9 +4386,6 @@ msgstr "成功修改了你的密碼。"
 msgid "Error changing password"
 msgstr "修改密碼期間出現錯誤"
 
-msgid "Password (again)"
-msgstr "舊密碼（再次確認）"
-
 msgid "Change XMPP Password"
 msgstr "修改 XMPP 密碼"
 
@@ -4980,6 +4838,14 @@ msgstr "XML 分析錯誤"
 msgid "Unknown Error in presence"
 msgstr "不明的上線狀態錯誤"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "加入聊天室 %s 時發生錯誤"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "聊天室 %s 發生錯誤"
+
 msgid "Create New Room"
 msgstr "建立新聊天室"
 
@@ -4994,16 +4860,20 @@ msgstr "設定聊天室(_C)"
 msgid "_Accept Defaults"
 msgstr "使用預設值(_A)"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "加入聊天室 %s 時發生錯誤"
+#, fuzzy
+msgid "No reason"
+msgstr "沒有給予原因"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "聊天室 %s 發生錯誤"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "你被 %s 踢出：(%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "被 %s 踢出 (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "開啟檔案途中發生錯誤。"
 
 #, fuzzy
@@ -5517,9 +5387,6 @@ msgstr "開啟聊天室(_C)"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 需要 SSL 程式庫的支援，請安裝一個受支援的 SSL 程式庫。"
 
-msgid "Failed to connect to server."
-msgstr "無法連線到伺服器。"
-
 msgid "Error retrieving profile"
 msgstr "取得個人資料時發生錯誤"
 
@@ -5774,9 +5641,6 @@ msgstr "因為發生不明的編碼錯誤，訊息無法送出："
 msgid "Message was not sent because an unknown error occurred."
 msgstr "因為發生不明的錯誤，訊息無法送出。"
 
-msgid "Unable to connect"
-msgstr "無法連線"
-
 msgid "Writing error"
 msgstr "寫入錯誤"
 
@@ -5793,20 +5657,24 @@ msgstr ""
 "%s 伺服器傳來一個連線錯誤：\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "這個伺服器不支援我們使用的通訊協定。"
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "解析 HTTP 途中發生錯誤。"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "你由其他的地方登入。"
 
 #  XXX
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "暫時無法使用 MSN 使服器，請過一會後重試。"
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN 伺服器將暫時關閉。"
 
 #, c-format
@@ -5817,9 +5685,6 @@ msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "暫時無法取得你的好友清單，請過一會後重試。"
 
-msgid "Unknown error."
-msgstr "未知錯誤。"
-
 # See cnscode.org.tw
 msgid "Handshaking"
 msgstr "交握中"
@@ -5918,6 +5783,9 @@ msgstr "MSN 協定模組"
 msgid "%s is not a valid group."
 msgstr "%s 不是一個有效的羣組。"
 
+msgid "Unknown error."
+msgstr "未知錯誤。"
+
 # NOTE: 第二個 %s 為使用者名稱，第三個 %s 為通訊協定名稱
 # NOTE: 第一個 %s 似乎係錯誤訊息摘要（整個字串為視窗標題）
 #, c-format
@@ -6035,13 +5903,6 @@ msgstr[1] "從伺服器新增或更新了 %d 個好友（包括伺服器上已�
 msgid "Add contacts from server"
 msgstr "從伺服器加入聯絡人"
 
-# TODO 要覆查 - 20061027
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "已連結"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "通訊協定錯誤，代碼 %d：%s"
@@ -6069,16 +5930,6 @@ msgstr "MySpaceIM 錯誤"
 msgid "Invalid input condition"
 msgstr "輸入狀況無效"
 
-msgid "Read buffer full (2)"
-msgstr "讀取用的暫存區滿了（代號2）"
-
-msgid "Unparseable message"
-msgstr "無法解析訊息"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "無法連到伺服器：%s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "無法新增好友"
 
@@ -6165,6 +6016,12 @@ msgstr "好友總數"
 msgid "Client Version"
 msgstr "客戶端版本"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM：可取得此使用者名稱"
 
@@ -6428,9 +6285,9 @@ msgstr "該使用者可能是離線，或者你已被他（她）拒絕"
 msgid "Unknown error: 0x%X"
 msgstr "未知錯誤：0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "登入失敗 (%s)。"
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "無法 Ping 使用者 %s"
 
 #  XXX 暫譯
 #, c-format
@@ -6532,9 +6389,6 @@ msgstr "GroupWise 會議 %d"
 msgid "Authenticating..."
 msgstr "認證中..."
 
-msgid "Unable to connect to server."
-msgstr "無法連線到伺服器。"
-
 msgid "Waiting for response..."
 msgstr "等待回覆中..."
 
@@ -6559,23 +6413,17 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "你要加入個這交談嗎？"
 
-# XXX 暫譯
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "你已經被登出，因為你已在其他電腦上登入。"
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s 目前似乎離線，所以不會收到你剛才送出的訊息。"
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr "無法連線至伺服器。請輸入你希望連線至的伺服器的位址。"
 
-msgid "Error. SSL support is not installed."
-msgstr "錯誤：沒有安裝 SSL 支援。"
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "這個會議已經關閉。無法繼續送出任何訊息。"
 
@@ -6615,10 +6463,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "解析 %s 途中發生了錯誤"
 
-msgid "Incorrect password."
-msgstr "密碼錯誤。"
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6627,18 +6472,8 @@ msgstr "無法加入聊天室"
 msgid "Invalid chat room name"
 msgstr "聊天室名稱無效"
 
-msgid "Server closed the connection."
-msgstr "伺服器關閉連線。"
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"與伺服器之間的連線突然中斷:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "連線至伺服器時收到無效的資料。"
 
 #. *< type
@@ -6686,7 +6521,8 @@ msgstr "與遠端使用者的連線突然中斷：<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "在與遠端使用者的連線上收到無交的資料。"
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "無法與遠端使用者建立連線。"
 
 msgid "Direct IM established"
@@ -6906,21 +6742,15 @@ msgstr "警告等級"
 msgid "Buddy Comment"
 msgstr "好友說明"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "無法連線至認證伺服器：\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"無法連線到 BOS 伺服器：\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "無法連線到伺服器。"
 
 msgid "Username sent"
 msgstr "已送出使用者名稱"
@@ -6932,11 +6762,11 @@ msgstr "成功建立連線，並已送出 Cookie"
 msgid "Finalizing connection"
 msgstr "完成連線中"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "無法登入：無法以 %s 身份登入，因為這個帳號是無效的。帳號必須為有效電郵地址；"
 "或者以英文字母起始，並只含英文字母、數字及空白；或者只由數字組成。"
@@ -6948,26 +6778,22 @@ 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 "使用者名稱無效。"
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "使用者不存在"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "你的帳號目前停用中。"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
@@ -6990,7 +6816,8 @@ msgstr ""
 "你的連線／斷線動作太過頻繁。請等待十分鐘後再行重試。如果你依然繼續嘗試連線，"
 "那麼你的等待時間將會更加的延長。"
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "你所輸入的 SecurID 碼無效。"
 
 msgid "Enter SecurID"
@@ -7157,6 +6984,9 @@ msgstr "上線自"
 msgid "Member Since"
 msgstr "成為成員的時間"
 
+msgid "Capabilities"
+msgstr "兼容性"
+
 msgid "Profile"
 msgstr "個人資料"
 
@@ -7319,9 +7149,9 @@ msgstr[1] "離開訊息的長度超出了 %d 個位元組的上限，過長部�
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7344,9 +7174,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "孤兒們"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "因為你的好友法單中有太多的好友，所以沒有辦法加入好友 %s。請在移除部份好友後重"
@@ -7355,8 +7185,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "無法把 %s 加入好友清單，原因不明。"
 
 # XXX 好像有些不順 - acli 20080508
@@ -8180,7 +8010,8 @@ msgstr "每隔多少秒送出 Keep Alive"
 msgid "Update interval (seconds)"
 msgstr "每隔多少秒更新"
 
-msgid "Cannot decrypt server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "無法解密伺服器回應"
 
 #, c-format
@@ -8205,9 +8036,6 @@ msgstr "必須啟動帳號"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "無法登入，不明回應碼「0x%02X」"
 
-msgid "Could not decrypt server reply"
-msgstr "無法解密伺服器回應"
-
 msgid "Requesting captcha"
 msgstr "要求驗證圖片中"
 
@@ -8242,21 +8070,9 @@ msgstr ""
 "登入時，傳回未知的回覆碼「0x%02X」：\n"
 "%s"
 
-msgid "Unable to connect."
-msgstr "無法連線。"
-
 msgid "Socket error"
 msgstr "Socket 錯誤"
 
-msgid "Unable to read from socket"
-msgstr "無法讀取 Socket"
-
-msgid "Write Error"
-msgstr "寫入錯誤"
-
-msgid "Connection lost"
-msgstr "連線中斷"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "設定使用者資訊..."
@@ -8265,8 +8081,9 @@ msgstr "設定使用者資訊..."
 msgid "Requesting token"
 msgstr "請求符記中"
 
-msgid "Couldn't resolve host"
-msgstr "無法解析主機"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "無法連線到伺服器。"
 
 msgid "Invalid server or port"
 msgstr "伺服器或通訊埠無效"
@@ -8321,7 +8138,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "QQ 羣組指令"
 
-msgid "Could not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "無法解密伺服器回應"
 
 msgid "Unknown LOGIN CMD"
@@ -8341,9 +8159,6 @@ msgstr "傳送檔案"
 msgid "%d canceled the transfer of %s"
 msgstr "%d 取消了「%s」的傳送"
 
-msgid "Connection closed (writing)"
-msgstr "連線關閉（寫入）"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>羣組名稱：</b>%s<br>"
@@ -8403,17 +8218,6 @@ msgstr "在伺服器「%s」上，有 Sametime 管理人發出了下列通告"
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime 管理人通告"
 
-msgid "Connection reset"
-msgstr "連線重置"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "讀取 Socket 時發生錯誤；%s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "無法連線到主機"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "自 %s 發佈"
@@ -8437,6 +8241,9 @@ msgstr "喇叭"
 msgid "Video Camera"
 msgstr "視像"
 
+msgid "File Transfer"
+msgstr "檔案傳輸"
+
 msgid "Supports"
 msgstr "支援"
 
@@ -9257,6 +9064,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "網絡統計資料"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping 失敗"
 
@@ -9321,7 +9131,8 @@ msgstr "不支援的公開密碼匙類型"
 msgid "Disconnected by server"
 msgstr "伺服器中斷了連線"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "連線至 SILC 伺服器時發生錯誤"
 
 msgid "Key Exchange failed"
@@ -9331,26 +9142,26 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "恢復連線失敗，請按「重新連線」建立新的連線。"
 
-msgid "Connection failed"
-msgstr "連線失敗"
-
 msgid "Performing key exchange"
 msgstr "交換密碼匙中"
 
-msgid "Unable to create connection"
-msgstr "無法建立連結"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "無法讀取 SILC 配對密碼匙"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "連線至 SILC 伺服器中"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "無法讀取 SILC 配對密碼匙"
+
 msgid "Out of memory"
 msgstr "記憶體不夠"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "無法初始化 SILC 協定"
 
 msgid "Error loading SILC key pair"
@@ -9650,7 +9461,8 @@ msgstr "數碼簽署所有即時訊息"
 msgid "Creating SILC key pair..."
 msgstr "產生 SILC 配對密碼匙中..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "無法產生 SILC 配對密碼匙\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9744,6 +9556,9 @@ msgstr "白板"
 msgid "No server statistics available"
 msgstr "伺服器沒有統計資料"
 
+msgid "Error during connecting to SILC Server"
+msgstr "連線至 SILC 伺服器時發生錯誤"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失敗：版本不符，請更新你的用戶端程式"
@@ -9786,31 +9601,28 @@ msgstr "失敗：無效的 Cookie"
 msgid "Failure: Authentication failed"
 msgstr "失敗：認證失敗"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "無法初始化 SILC 的用戶端連線"
 
 # NOTE 香港會寫「陳大文」，台灣人會看不明（寫「老張」一類，港人看見會覺得很怪），頭痛 :P
 msgid "John Noname"
 msgstr "無名氏"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "無法讀取 SILC 配對密碼匙：%s"
 
-msgid "Could not write"
-msgstr "無法寫入"
-
-msgid "Could not connect"
-msgstr "無法連結"
+msgid "Unable to create connection"
+msgstr "無法建立連結"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "不明的伺服器回應。"
 
-msgid "Could not create listen socket"
-msgstr "無法建立 Socket 監聽"
-
-msgid "Could not resolve hostname"
-msgstr "無法解析主機"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "無法建立 Socket"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP 的帳號不可含有空白字符或「@」符號"
@@ -9851,6 +9663,78 @@ msgstr "認證使用者"
 msgid "Auth Domain"
 msgstr "認證域名"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt聊天室&gt;：加入位於 Yahoo! 網絡的一個聊天室"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list：列出Yahoo網絡上的聊天室清單"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: 要求使用者開始 Doodle Session"
+
+msgid "Yahoo ID..."
+msgstr "Yahoo 帳號"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo 協定模組"
+
+msgid "Pager server"
+msgstr "傳呼伺服器"
+
+msgid "Pager port"
+msgstr "傳呼系統通訊埠"
+
+msgid "File transfer server"
+msgstr "檔案傳輸伺服器"
+
+msgid "File transfer port"
+msgstr "檔案傳輸通訊埠"
+
+#  XXX 無劃一譯法，有譯「地區」、「區域」甚至「場所」(?!)
+msgid "Chat room locale"
+msgstr "聊天室區域 (Locale)"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "忽略會議室與聊天室邀請"
+
+msgid "Chat room list URL"
+msgstr "聊天室清單所在網址"
+
+msgid "Yahoo Chat server"
+msgstr "Yahoo 聊天伺服器"
+
+msgid "Yahoo Chat port"
+msgstr "Yahoo 聊天室通訊埠"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo 帳號"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo 協定模組"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9883,28 +9767,18 @@ msgstr "新增好友被拒"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!，官方網站上可能已經修正這個錯誤。"
 
 #. username or password missing
@@ -9942,11 +9816,12 @@ msgstr "你的帳戶目前被暫時關閉。請你登入 Yahoo! 網站。"
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!，官方網站上可能已經修正這個錯誤。"
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "無法將好友「%1$s」新增至帳號「%3$s」在伺服器上的清單內的羣組「%2$s」。"
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
 #, c-format
@@ -9954,26 +9829,20 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ 音效檔 %s/%s/%s.swf ] %s"
 
 # XXX 暫譯 - 20061025
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "伺服器發出了奇怪的 HTTP 回應。"
 
-msgid "Connection problem"
-msgstr "連線錯誤"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "與 %s 之間的連線突然中斷:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"無法與 %s 建立連線:\n"
+"無法與伺服器建立連線:\n"
 "%s"
 
 msgid "Not at Home"
@@ -10048,74 +9917,15 @@ msgstr "加入好友目前所在的聊天室..."
 msgid "Open Inbox"
 msgstr "開啟收件匣"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt聊天室&gt;：加入位於 Yahoo! 網絡的一個聊天室"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list：列出Yahoo網絡上的聊天室清單"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: 要求使用者開始 Doodle Session"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo 帳號"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo 協定模組"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-msgid "Pager server"
-msgstr "傳呼伺服器"
-
-msgid "Japan Pager server"
-msgstr "傳呼伺服器（日本地區）"
-
-msgid "Pager port"
-msgstr "傳呼系統通訊埠"
-
-msgid "File transfer server"
-msgstr "檔案傳輸伺服器"
-
-msgid "Japan file transfer server"
-msgstr "檔案傳輸伺服器（日本地區）"
-
-msgid "File transfer port"
-msgstr "檔案傳輸通訊埠"
-
-#  XXX 無劃一譯法，有譯「地區」、「區域」甚至「場所」(?!)
-msgid "Chat room locale"
-msgstr "聊天室區域 (Locale)"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "忽略會議室與聊天室邀請"
-
-msgid "Chat room list URL"
-msgstr "聊天室清單所在網址"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo 聊天伺服器"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo 聊天室通訊埠"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "送出 Doodle 要求。"
 
+msgid "Unable to connect."
+msgstr "無法連線。"
+
 # TODO - 覆查譯文 - 20061028
 msgid "Unable to establish file descriptor."
 msgstr "無法建立檔案介紹。"
@@ -10124,6 +9934,9 @@ msgstr "無法建立檔案介紹。"
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s 提出一次過傳送 %d 個檔案。\n"
 
+msgid "Write Error"
+msgstr "寫入錯誤"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan 個人資料"
 
@@ -10234,6 +10047,9 @@ msgstr "可語音聊天"
 msgid "Webcams"
 msgstr "可視像聊天"
 
+msgid "Connection problem"
+msgstr "連線錯誤"
+
 msgid "Unable to fetch room list."
 msgstr "無法取得聊天室清單。"
 
@@ -10243,17 +10059,10 @@ msgstr "無法取得聊天室清單。"
 msgid "User Rooms"
 msgstr "使用者建立之聊天室"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "與 YCHT 伺服器出現連線錯誤"
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"與伺服器之間的連線突然中斷\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10404,33 +10213,22 @@ msgstr "域名"
 msgid "Exposure"
 msgstr "現身程度"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"無法建立 Socket：\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "無法解析 HTTP 代理伺服應的回應：%s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP 代理伺服器連線錯誤 %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "拒絕存取：HTTP 代理伺服器禁止通訊埠 %d 的資料傳送。"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "解析 %s 途中發生了錯誤"
 
-msgid "Could not resolve host name"
-msgstr "無法解析主機"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "要求 %s 的注意中..."
@@ -10636,12 +10434,6 @@ msgstr "寫入 %s 途中發生了錯誤：%s"
 msgid "Unable to connect to %s: %s"
 msgstr "無法連線到 %s：%s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "登入這個伺服器需要使用 TLS/SSL，但找不到 TLS/SSL 支援。"
-
 #, c-format
 msgid " - %s"
 msgstr " - %s"
@@ -10895,9 +10687,14 @@ msgstr "加入好友狀態捕捉(_P)..."
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "離線時隱藏"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "離線時顯示"
+
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
@@ -11409,6 +11206,11 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "更改 %s 的個人資料"
 
+# XXX 譯文有待改進 - acli 20070913
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "請輸入這張證書所屬的主機名稱。"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL 伺服器"
@@ -11457,7 +11259,8 @@ msgstr "忽略"
 msgid "Get Away Message"
 msgstr "取得離開訊息"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "上次提到"
 
 msgid "Unable to save icon file to disk."
@@ -12423,7 +12226,8 @@ msgstr "顯示連結時所用的顏色。"
 msgid "Hyperlink visited color"
 msgstr "瀏覽過的連結顏色"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+#, fuzzy
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "當滑鼠經過瀏覽過（或已啟動）的連結時的連結顏色。"
 
 msgid "Hyperlink prelight color"
@@ -12460,13 +12264,22 @@ msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 "收到的訊息是對方以「輕聲的說」這種動作發出的訊息時，用來顯示對方帳號的顏色"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "收到的訊息是代表對方發出的一個動作時，用來顯示對帳號的顏色。"
+
 msgid "Whisper Message Name Color"
 msgstr "輕聲訊息帳號顏色"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "收到的訊息是代表對方發出的一個動作時，用來顯示對帳號的顏色。"
+
 msgid "Typing notification color"
 msgstr "輸入通知顏色"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "用來顯示輸入通知的顏色"
 
 msgid "Typing notification font"
@@ -12858,6 +12671,10 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "你選用了「使用者自定瀏覽器」，卻未有設定指令。"
 
+#, fuzzy
+msgid "No message"
+msgstr "不明的訊息"
+
 msgid "Open All Messages"
 msgstr "開啟所有訊息"
 
@@ -12875,10 +12692,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">你有郵件！</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "不明的訊息"
-
 msgid "The following plugins will be unloaded."
 msgstr "以下的模組將會被卸載。"
 
@@ -13096,8 +12909,9 @@ msgstr "顯示系統工作匣圖示(_S)："
 msgid "On unread messages"
 msgstr "有未讀訊息時"
 
-msgid "Conversation Window Hiding"
-msgstr "隱藏即時訊息交談視窗"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "即時訊息交談視窗"
 
 msgid "_Hide new IM conversations:"
 msgstr "隱藏新的即時訊息交談(_H)："
@@ -13105,6 +12919,9 @@ msgstr "隱藏新的即時訊息交談(_H)："
 msgid "When away"
 msgstr "離開期間"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "最小化所有新交談視窗(_Z)"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "分頁"
@@ -13165,9 +12982,6 @@ msgstr "使用平滑捲軸"
 msgid "F_lash window when IMs are received"
 msgstr "收到即時訊息後閃動視窗(_F)"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "最小化所有新交談視窗(_Z)"
-
 msgid "Minimum input area height in lines:"
 msgstr "文字輸入區的最少行數："
 
@@ -13203,7 +13017,8 @@ msgstr "無法啟動瀏覽器設定程式。"
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">例：stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "自動偵測 IP 位址(_A)"
 
 msgid "Public _IP:"
@@ -13573,33 +13388,18 @@ msgstr "儲存並使用(_V)"
 msgid "Status for %s"
 msgstr "狀態：%s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "自選表情"
-
-msgid "More Data needed"
-msgstr "需要進一步的資料"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "請給這個表情給定一個相關的捷徑。"
-
 # XXX 20080810 acli - 暫譯
 #, fuzzy, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr "指定的捷徑已有相關的自選表情，請指定另一個捷徑。"
 
+msgid "Custom Smiley"
+msgstr "自選表情"
+
 msgid "Duplicate Shortcut"
 msgstr "重覆的表情定義"
 
-msgid "Please select an image for the smiley."
-msgstr "請給這個表情選擇一個圖像。"
-
 msgid "Edit Smiley"
 msgstr "修改表情"
 
@@ -13712,9 +13512,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "無法傳送啟動器"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr "你拖曳了一個啟動器；你大概想傳送啟動器要啟動的檔案，而不是啟動器本身。"
 
 #, c-format
@@ -14336,9 +14137,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "集體作曲用的音樂訊息模組"
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "音樂訊息模組為音樂編寫提供即時傳訊功能，讓多個使用者能同時編輯同一份樂譜。"
 
@@ -14604,9 +14406,10 @@ msgstr "交談視窗的「傳送」按紐"
 
 # XXX 譯文有待改進 - acli 20080508
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr "在交談視窗的輸入欄位加添一個「傳送」按紐，適用於沒有連接鍵盤時使用。"
 
 # FIXME 譯文有譯改進 - 20061027
@@ -14944,8 +14747,9 @@ msgstr "Windows 版 Pidgin 選項"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Windows 版 Pidgin 的相關選項。"
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "提供 Windows 版 Pidgin 的相關選項，例如好友清單的停駐功能。"
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14987,6 +14791,312 @@ msgstr "送出、讀取未加工的 XMPP 段落。"
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
+#~ msgid "Cannot open socket"
+#~ msgstr "無法開啟Socket"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "無法監聽 Socket"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "無法讀取 Socket"
+
+#~ msgid "Connection failed."
+#~ msgstr "連線失敗。"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "伺服器已停止連線"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "無法建立 Socket"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "無法連到伺服器"
+
+# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
+#~ msgid "Read error"
+#~ msgstr "讀取錯誤"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "無法與伺服器建立連線:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "寫入錯誤"
+
+# NOTE 這是功能名稱（直譯）
+#~ msgid "Last Activity"
+#~ msgstr "最近活動"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "服務探尋資訊"
+
+#  FIXME acli 2070914
+#~ msgid "Service Discovery Items"
+#~ msgstr "服務探尋項目"
+
+# NOTE 這是功能名稱（直譯）
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "延伸段落定址"
+
+# NOTE 這是功能名稱
+#~ msgid "Multi-User Chat"
+#~ msgstr "多用戶聊天"
+
+# NOTE 這是功能名稱（直譯）
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "多用戶聊天延伸上線狀態資訊"
+
+# NOTE Cf http://host.cc.ntu.edu.tw/iicm/term/termb_I.htm
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "帶內位元組串流"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "臨時指令"
+
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub 服務"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5 位元組串流"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "帶外數據"
+
+#  NOTE Untranslated
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "帶內註冊"
+
+#~ msgid "User Location"
+#~ msgstr "使用者所在位置"
+
+#~ msgid "User Avatar"
+#~ msgstr "使用者化身"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "聊天狀態通知"
+
+# NOTE Jabber 協定中 Stream Error 的一種，即 <unsupported-version/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
+#~ msgid "Software Version"
+#~ msgstr "軟件版本"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "開始串流"
+
+#~ msgid "User Mood"
+#~ msgstr "使用者情緒"
+
+# XXX may be wrong
+#~ msgid "User Activity"
+#~ msgstr "使用者活動狀態"
+
+#  NOTE 直譯：個體能力
+#  FIXME 譯文有待改進 - acli 20070918
+#~ msgid "Entity Capabilities"
+#~ msgstr "個體能力"
+
+#  FIXME 這聽來不對 - acli 20070913
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "加密工作階段協商"
+
+#~ msgid "User Tune"
+#~ msgstr "使用者樂曲"
+
+#  NOTE「Roster」指「名冊」，但Open Source software似乎一般譯「好友清單」、「成員列表」等
+#  FIXME 譯文有待改進 - acli 20070918
+#~ msgid "Roster Item Exchange"
+#~ msgstr "好友清單項目交換"
+
+#  NOTE 參見 http://jabber.org/protocol/reach
+#  NOTE「Reachability Address」指即時通訊以外的通訊方式所用的「位址」（例如電話號碼）
+#  NOTE 直譯：可抵達性位址
+#  XXX 是否譯「其他通訊方法」較好？但要先看上下文 - acli 20070918
+#~ msgid "Reachability Address"
+#~ msgstr "可抵達性位址"
+
+#~ msgid "User Profile"
+#~ msgstr "使用者資料"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Jingle 音訊"
+
+#~ msgid "User Nickname"
+#~ msgstr "使用者網名"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Jingle 視像"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "收到的訊息"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "發佈公開密碼匙"
+
+# NOTE Jabber 新功能規格
+#~ msgid "User Browsing"
+#~ msgstr "使用者瀏覽"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "段落加密"
+
+#  XXX 暫譯- acli 20070913
+#~ msgid "Delayed Delivery"
+#~ msgstr "延遲送出"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "Jingle 用的 STUN 服務偵測"
+
+# FIXME 這聽來不對
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "簡化加密工作階段協商"
+
+#~ msgid "Hop Check"
+#~ msgstr "中繼段檢查"
+
+#~ msgid "Read Error"
+#~ msgstr "讀取錯誤"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "無法連線到伺服器。"
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "讀取用的暫存區滿了（代號2）"
+
+#~ msgid "Unparseable message"
+#~ msgstr "無法解析訊息"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "無法連到伺服器：%s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "登入失敗 (%s)。"
+
+# XXX 暫譯
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "你已經被登出，因為你已在其他電腦上登入。"
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "錯誤：沒有安裝 SSL 支援。"
+
+#~ msgid "Incorrect password."
+#~ msgstr "密碼錯誤。"
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "無法連線到 BOS 伺服器：\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "你可能會在短時間內中斷連線。請到 %s 看看有沒有更新。"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "無法連線"
+
+#~ msgid "Invalid username."
+#~ msgstr "使用者名稱無效。"
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "無法解密伺服器回應"
+
+#~ msgid "Connection lost"
+#~ msgstr "連線中斷"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "無法解析主機"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "連線關閉（寫入）"
+
+#~ msgid "Connection reset"
+#~ msgstr "連線重置"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "讀取 Socket 時發生錯誤；%s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "無法連線到主機"
+
+#~ msgid "Could not write"
+#~ msgstr "無法寫入"
+
+#~ msgid "Could not connect"
+#~ msgstr "無法連結"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "無法建立 Socket 監聽"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "無法解析主機"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "密碼錯誤"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "無法與 %s 建立連線:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "傳呼伺服器（日本地區）"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "檔案傳輸伺服器（日本地區）"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "與伺服器之間的連線突然中斷\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "無法解析主機"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "登入這個伺服器需要使用 TLS/SSL，但找不到 TLS/SSL 支援。"
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "隱藏即時訊息交談視窗"
+
+#~ msgid "More Data needed"
+#~ msgstr "需要進一步的資料"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "請給這個表情給定一個相關的捷徑。"
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "請給這個表情選擇一個圖像。"
+
 #~ msgid "Activate which ID?"
 #~ msgstr "啟用哪一個 ID？"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index fdfd69af68..a0172226f8 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -49,7 +49,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
 "PO-Revision-Date: 2009-02-25 09:57-0500\n"
 "Last-Translator: Ambrose Li <ambrose.li@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
@@ -2661,9 +2661,10 @@ msgstr "在日誌瀏覽器中包含其他即時訊息用戶端日誌。"
 
 # XXX 譯文有待改進（第二段） - 20061025
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2714,8 +2715,9 @@ msgstr "離線訊息模擬模組"
 msgid "Save messages sent to an offline user as pounce."
 msgstr "好友離線時，利用「好友狀態捕捉」功能儲存送出的訊息。"
 
+#, fuzzy
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "未能送出的訊息將會儲存成「好友狀態捕捉」。如有需要，訊息可在「好友狀態捕捉」"
@@ -2965,14 +2967,16 @@ msgstr ""
 "com 下載及安裝 ActiveTCL。\n"
 
 # FIXME 沒有譯「toolkit」- 20071023 acli
+#, fuzzy
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
 msgstr ""
 "找不到 Apple 的 Bonjour For Windows toolkit，詳情請到網址 http://d.pidgin.im/"
 "BonjourWindows 查閱 FAQ 部分。"
 
-msgid "Unable to listen for incoming IM connections\n"
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "無法接收連入的即時訊息連線\n"
 
 msgid ""
@@ -3027,14 +3031,21 @@ msgstr "%s 已經關閉這個交談。"
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "無法送出訊息，交談無法開始。"
 
-msgid "Cannot open socket"
-msgstr "無法開啟Socket"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"無法建立 Socket：\n"
+"%s"
 
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "無法聯結 Socket 到通訊埠"
 
-msgid "Could not listen on socket"
-msgstr "無法監聽 Socket"
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"無法建立 Socket：\n"
+"%s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "和本地端的mDNSResponder溝通時發生錯誤"
@@ -3082,13 +3093,16 @@ msgstr "儲存好友清單..."
 msgid "Load buddylist from file..."
 msgstr "自檔案讀取好友清單..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "填寫註冊資料欄位。"
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "新密碼並不相符。"
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "無法註冊新帳號。錯誤發生。\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -3100,14 +3114,15 @@ msgstr "註冊成功！"
 msgid "Password"
 msgstr "密碼"
 
-msgid "Password (retype)"
-msgstr "密碼（再次輸入）"
+msgid "Password (again)"
+msgstr "舊密碼（再次確認）"
 
-msgid "Enter current token"
-msgstr "輸入目前的密碼"
+msgid "Enter captcha text"
+msgstr ""
 
-msgid "Current token"
-msgstr "目前密碼"
+#, fuzzy
+msgid "Captcha"
+msgstr "驗證圖片"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "註冊新的 Gadu-Gadu 帳號"
@@ -3160,6 +3175,15 @@ msgstr "密碼修改成功！"
 msgid "Current password"
 msgstr "舊密碼"
 
+msgid "Password (retype)"
+msgstr "密碼（再次輸入）"
+
+msgid "Enter current token"
+msgstr "輸入目前的密碼"
+
+msgid "Current token"
+msgstr "目前密碼"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "請輸入您的舊密碼及你的新密碼："
 
@@ -3208,7 +3232,7 @@ msgstr "找不到符合的使用者"
 msgid "There are no users matching your search criteria."
 msgstr "無法依照搜尋條件找到相符的使用者。"
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "無法讀取 Socket"
 
 msgid "Buddy list downloaded"
@@ -3223,8 +3247,15 @@ msgstr "上傳好友清單"
 msgid "Your buddy list was stored on the server."
 msgstr "您的好友清單已被存放於伺服器上。"
 
-msgid "Connection failed."
-msgstr "連線失敗。"
+# TODO 要覆查 - 20061027
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "已連結"
+
+msgid "Connection failed"
+msgstr "連線失敗"
 
 msgid "Add to chat"
 msgstr "新增到聊天室"
@@ -3232,18 +3263,23 @@ msgstr "新增到聊天室"
 msgid "Chat _name:"
 msgstr "聊天室名稱(_N)："
 
-#. should this be a settings error?
-#, fuzzy
-msgid "Unable to resolve server"
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
 msgstr "無法連線到伺服器。"
 
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "連線中"
+
 msgid "Chat error"
 msgstr "聊天錯誤"
 
 msgid "This chat name is already in use"
 msgstr "聊天室名稱正在使用中"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "尚未連線到伺服器。"
 
 msgid "Find buddies..."
@@ -3303,7 +3339,8 @@ msgstr "沒有設定主題"
 msgid "File Transfer Failed"
 msgstr "檔案傳輸失敗"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "無法開啟監聽埠。"
 
 msgid "Error displaying MOTD"
@@ -3319,8 +3356,18 @@ msgstr "這個連結沒有相關的是日訊息。"
 msgid "MOTD for %s"
 msgstr "%s 的是日訊息"
 
-msgid "Server has disconnected"
-msgstr "伺服器已停止連線"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. TODO: what to do here - do we really have to disconnect?
+#. TODO: do we really want to disconnect on a failure to write?
+#, fuzzy, c-format
+msgid "Lost connection with server: %s"
+msgstr ""
+"與伺服器之間的連線突然中斷:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "顯示是日訊息 (MOTD)"
@@ -3335,24 +3382,21 @@ msgstr "密碼(_P)："
 msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC 暱稱不可含有空白字元"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "連線中"
-
 # XXX 暫譯
 msgid "SSL support unavailable"
 msgstr "沒有 SSL 支援"
 
-msgid "Couldn't create socket"
-msgstr "無法建立 Socket"
+msgid "Unable to connect"
+msgstr "無法連線"
 
-msgid "Couldn't connect to host"
-msgstr "無法連到伺服器"
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "無法連線到「%s」"
 
-# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-msgid "Read error"
-msgstr "讀取錯誤"
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "伺服器關閉連線。"
 
 msgid "Users"
 msgstr "使用者"
@@ -3787,10 +3831,12 @@ msgstr "臨時指令失敗"
 msgid "execute"
 msgstr "執行"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "登入這個伺服器需要使用 TLS/SSL，但找不到 TLS/SSL 支援。"
 
-msgid "You require encryption, but no TLS/SSL support found."
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "您指定必須加密，但找不到 TLS/SSL 支援。"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -3805,7 +3851,12 @@ msgstr "%s 需要經由未經加密的串流進行明文認證。允許並繼續
 msgid "Plaintext Authentication"
 msgstr "明文認證"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "認證失敗"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "伺服器送來了無效的回應。"
 
 msgid "Server does not use any supported authentication method"
@@ -3819,7 +3870,8 @@ msgid "Invalid challenge from server"
 msgstr "伺服器送來了無效的驗證挑戰"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL 錯誤"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3841,10 +3893,8 @@ msgstr ""
 "無法與伺服器建立連線:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
 msgstr ""
 "無法與伺服器建立連線:\n"
 "%s"
@@ -3853,12 +3903,6 @@ msgstr ""
 msgid "Unable to establish SSL connection"
 msgstr "無法初始化連結"
 
-msgid "Unable to create socket"
-msgstr "無法建立 Socket"
-
-msgid "Write error"
-msgstr "寫入錯誤"
-
 msgid "Full Name"
 msgstr "全名"
 
@@ -3930,186 +3974,6 @@ msgstr "作業系統"
 msgid "Local Time"
 msgstr "本地端檔案："
 
-# NOTE 這是功能名稱（直譯）
-msgid "Last Activity"
-msgstr "最近活動"
-
-msgid "Service Discovery Info"
-msgstr "服務探尋資訊"
-
-#  FIXME acli 2070914
-msgid "Service Discovery Items"
-msgstr "服務探尋項目"
-
-# NOTE 這是功能名稱（直譯）
-msgid "Extended Stanza Addressing"
-msgstr "延伸段落定址"
-
-# NOTE 這是功能名稱
-msgid "Multi-User Chat"
-msgstr "多用戶聊天"
-
-# NOTE 這是功能名稱（直譯）
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "多用戶聊天延伸上線狀態資訊"
-
-# NOTE Cf http://host.cc.ntu.edu.tw/iicm/term/termb_I.htm
-msgid "In-Band Bytestreams"
-msgstr "帶內位元組串流"
-
-msgid "Ad-Hoc Commands"
-msgstr "臨時指令"
-
-msgid "PubSub Service"
-msgstr "PubSub 服務"
-
-msgid "SOCKS5 Bytestreams"
-msgstr "SOCKS5 位元組串流"
-
-msgid "Out of Band Data"
-msgstr "帶外數據"
-
-#  NOTE Untranslated
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-msgid "In-Band Registration"
-msgstr "帶內註冊"
-
-msgid "User Location"
-msgstr "使用者所在位置"
-
-msgid "User Avatar"
-msgstr "使用者化身"
-
-msgid "Chat State Notifications"
-msgstr "聊天狀態通知"
-
-# NOTE Jabber 協定中 Stream Error 的一種，即 <unsupported-version/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-msgid "Software Version"
-msgstr "軟體版本"
-
-msgid "Stream Initiation"
-msgstr "開始串流"
-
-msgid "File Transfer"
-msgstr "檔案傳輸"
-
-msgid "User Mood"
-msgstr "使用者情緒"
-
-# XXX may be wrong
-msgid "User Activity"
-msgstr "使用者活動狀態"
-
-#  NOTE 直譯：個體能力
-#  FIXME 譯文有待改進 - acli 20070918
-msgid "Entity Capabilities"
-msgstr "個體能力"
-
-#  FIXME 這聽來不對 - acli 20070913
-msgid "Encrypted Session Negotiations"
-msgstr "加密工作階段協商"
-
-msgid "User Tune"
-msgstr "使用者樂曲"
-
-#  NOTE「Roster」指「名冊」，但Open Source software似乎一般譯「好友清單」、「成員列表」等
-#  FIXME 譯文有待改進 - acli 20070918
-msgid "Roster Item Exchange"
-msgstr "好友清單項目交換"
-
-#  NOTE 參見 http://jabber.org/protocol/reach
-#  NOTE「Reachability Address」指即時通訊以外的通訊方式所用的「位址」（例如電話號碼）
-#  NOTE 直譯：可抵達性位址
-#  XXX 是否譯「其他通訊方法」較好？但要先看上下文 - acli 20070918
-msgid "Reachability Address"
-msgstr "可抵達性位址"
-
-msgid "User Profile"
-msgstr "使用者資料"
-
-msgid "Jingle"
-msgstr "Jingle"
-
-msgid "Jingle Audio"
-msgstr "Jingle 音訊"
-
-msgid "User Nickname"
-msgstr "使用者暱稱"
-
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
-
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-msgid "Jingle Video"
-msgstr "Jingle 視訊"
-
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
-
-msgid "Message Receipts"
-msgstr "收到的訊息"
-
-msgid "Public Key Publishing"
-msgstr "發佈公鑰"
-
-# NOTE Jabber 新功能規格
-msgid "User Chatting"
-msgstr ""
-
-# NOTE Jabber 新功能規格
-msgid "User Browsing"
-msgstr "使用者瀏覽"
-
-# NOTE Jabber 新功能規格
-msgid "User Gaming"
-msgstr ""
-
-# NOTE Jabber 新功能規格
-msgid "User Viewing"
-msgstr ""
-
-msgid "Ping"
-msgstr "Ping"
-
-msgid "Stanza Encryption"
-msgstr "段落加密"
-
-# NOTE http://www.xmpp.org/extensions/xep-0202.html
-msgid "Entity Time"
-msgstr ""
-
-#  XXX 暫譯- acli 20070913
-msgid "Delayed Delivery"
-msgstr "延遲送出"
-
-# NOTE http://www.xmpp.org/extensions/xep-0204.html
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr "Jingle 用的 STUN 服務偵測"
-
-# FIXME 這聽來不對
-msgid "Simplified Encrypted Session Negotiation"
-msgstr "簡化加密工作階段協商"
-
-msgid "Hop Check"
-msgstr "中繼段檢查"
-
-msgid "Capabilities"
-msgstr "相容性"
-
 msgid "Priority"
 msgstr "優先次序"
 
@@ -4126,7 +3990,7 @@ msgid "%s ago"
 msgstr ""
 
 #, fuzzy
-msgid "Logged off"
+msgid "Logged Off"
 msgstr "已登入"
 
 # NOTE: 法、德文均譯「第二個名」，芬蘭文譯「其他名」，日文音譯了事
@@ -4321,16 +4185,13 @@ msgstr "找不到符合的使用者"
 msgid "Roles:"
 msgstr "職責"
 
-msgid "Ping timeout"
+#, fuzzy
+msgid "Ping timed out"
 msgstr "Ping逾時"
 
-msgid "Read Error"
-msgstr "讀取錯誤"
-
-#, c-format
 msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4523,9 +4384,6 @@ msgstr "成功修改了您的密碼。"
 msgid "Error changing password"
 msgstr "修改密碼期間出現錯誤"
 
-msgid "Password (again)"
-msgstr "舊密碼（再次確認）"
-
 msgid "Change XMPP Password"
 msgstr "修改 XMPP 密碼"
 
@@ -4978,6 +4836,14 @@ msgstr "XML 分析錯誤"
 msgid "Unknown Error in presence"
 msgstr "不明的上線狀態錯誤"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "加入聊天室 %s 時發生錯誤"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "聊天室 %s 發生錯誤"
+
 msgid "Create New Room"
 msgstr "建立新聊天室"
 
@@ -4992,16 +4858,20 @@ msgstr "設定聊天室(_C)"
 msgid "_Accept Defaults"
 msgstr "使用預設值(_A)"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "加入聊天室 %s 時發生錯誤"
+#, fuzzy
+msgid "No reason"
+msgstr "沒有給予原因"
 
-#, c-format
-msgid "Error in chat %s"
-msgstr "聊天室 %s 發生錯誤"
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "您被 %s 踢出：(%s)"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "被 %s 踢出 (%s)"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "開啟檔案途中發生錯誤。"
 
 #, fuzzy
@@ -5515,9 +5385,6 @@ msgstr "開啟聊天室(_C)"
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 需要 SSL 程式庫的支援，請安裝一個受支援的 SSL 程式庫。"
 
-msgid "Failed to connect to server."
-msgstr "無法連線到伺服器。"
-
 msgid "Error retrieving profile"
 msgstr "取得個人資訊時發生錯誤"
 
@@ -5772,9 +5639,6 @@ msgstr "因為發生不明的編碼錯誤，訊息無法送出："
 msgid "Message was not sent because an unknown error occurred."
 msgstr "因為發生不明的錯誤，訊息無法送出。"
 
-msgid "Unable to connect"
-msgstr "無法連線"
-
 msgid "Writing error"
 msgstr "寫入錯誤"
 
@@ -5791,20 +5655,24 @@ msgstr ""
 "%s 伺服器傳來一個連線錯誤：\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "這個伺服器不支援我們使用的通訊協定。"
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "解析 HTTP 途中發生錯誤。"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "您由其他的地方登入。"
 
 #  XXX
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "暫時無法使用 MSN 使服器，請過一會後重試。"
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN 伺服器將暫時關閉。"
 
 #, c-format
@@ -5815,9 +5683,6 @@ msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "暫時無法取得您的好友清單，請過一會後重試。"
 
-msgid "Unknown error."
-msgstr "未知錯誤。"
-
 # See cnscode.org.tw
 msgid "Handshaking"
 msgstr "交握中"
@@ -5916,6 +5781,9 @@ msgstr "MSN 協定模組"
 msgid "%s is not a valid group."
 msgstr "%s 不是一個有效的群組。"
 
+msgid "Unknown error."
+msgstr "未知錯誤。"
+
 # NOTE: 第二個 %s 為使用者名稱，第三個 %s 為通訊協定名稱
 # NOTE: 第一個 %s 似乎係錯誤訊息摘要（整個字串為視窗標題）
 #, c-format
@@ -6033,13 +5901,6 @@ msgstr[1] "從伺服器新增或更新了 %d 個好友（包括伺服器上已�
 msgid "Add contacts from server"
 msgstr "從伺服器加入聯絡人"
 
-# TODO 要覆查 - 20061027
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "已連結"
-
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "通訊協定錯誤，代碼 %d：%s"
@@ -6067,16 +5928,6 @@ msgstr "MySpaceIM 錯誤"
 msgid "Invalid input condition"
 msgstr "輸入狀況無效"
 
-msgid "Read buffer full (2)"
-msgstr "讀取用的暫存區滿了（代號2）"
-
-msgid "Unparseable message"
-msgstr "無法解析訊息"
-
-#, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "無法連到伺服器：%s (%d)"
-
 msgid "Failed to add buddy"
 msgstr "無法新增好友"
 
@@ -6163,6 +6014,12 @@ msgstr "好友總數"
 msgid "Client Version"
 msgstr "客戶端版本"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM：可取得此使用者名稱"
 
@@ -6426,9 +6283,9 @@ msgstr "該使用者可能是離線，或者您已被他（她）拒絕"
 msgid "Unknown error: 0x%X"
 msgstr "未知錯誤：0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "登入失敗 (%s)。"
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "無法 Ping 使用者 %s"
 
 #  XXX 暫譯
 #, c-format
@@ -6530,9 +6387,6 @@ msgstr "GroupWise 會議 %d"
 msgid "Authenticating..."
 msgstr "認證中..."
 
-msgid "Unable to connect to server."
-msgstr "無法連線到伺服器。"
-
 msgid "Waiting for response..."
 msgstr "等待回覆中..."
 
@@ -6557,23 +6411,17 @@ msgstr ""
 msgid "Would you like to join the conversation?"
 msgstr "您要加入個這交談嗎？"
 
-# XXX 暫譯
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "您已經被登出，因為您已在其他電腦上登入。"
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s 目前似乎離線，所以不會收到您剛才送出的訊息。"
 
+#, fuzzy
 msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr "無法連線至伺服器。請輸入您希望連線至的伺服器的位址。"
 
-msgid "Error. SSL support is not installed."
-msgstr "錯誤：沒有安裝 SSL 支援。"
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "這個會議已經關閉。無法繼續送出任何訊息。"
 
@@ -6613,10 +6461,7 @@ msgstr ""
 msgid "Error requesting "
 msgstr "解析 %s 途中發生了錯誤"
 
-msgid "Incorrect password."
-msgstr "密碼錯誤。"
-
-msgid "AOL does not allow your screen name to authenticate via this site."
+msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
 msgid "Could not join chat room"
@@ -6625,18 +6470,8 @@ msgstr "無法加入聊天室"
 msgid "Invalid chat room name"
 msgstr "聊天室名稱無效"
 
-msgid "Server closed the connection."
-msgstr "伺服器關閉連線。"
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"與伺服器之間的連線突然中斷:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "連線至伺服器時收到無效的資料。"
 
 #. *< type
@@ -6684,7 +6519,8 @@ msgstr "與遠端使用者的連線突然中斷：<br>%s"
 msgid "Received invalid data on connection with remote user."
 msgstr "在與遠端使用者的連線上收到無交的資料。"
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "無法與遠端使用者建立連線。"
 
 msgid "Direct IM established"
@@ -6904,21 +6740,15 @@ msgstr "警告等級"
 msgid "Buddy Comment"
 msgstr "好友說明"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "無法連線至認證伺服器：\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"無法連線到 BOS 伺服器：\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "無法連線到伺服器。"
 
 msgid "Username sent"
 msgstr "已送出使用者名稱"
@@ -6930,11 +6760,11 @@ msgstr "成功建立連線，並已送出 Cookie"
 msgid "Finalizing connection"
 msgstr "完成連線中"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the username is invalid.  "
-"Usernames must be a valid email address, or start with a letter and contain "
-"only letters, numbers and spaces, or contain only numbers."
+"Unable to sign on as %s because the username is invalid.  Usernames must be "
+"a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
 msgstr ""
 "無法登入：無法以 %s 身份登入，因為這個帳號是無效的。帳號必須為有效電郵地址；"
 "或者以英文字母起始，並只含英文字母、數字及空白；或者只由數字組成。"
@@ -6946,26 +6776,22 @@ 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 "使用者名稱無效。"
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "使用者不存在"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "您的帳號目前停用中。"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
@@ -6988,7 +6814,8 @@ msgstr ""
 "您的連線／斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
 "線，那麼您的等待時間將會更加的延長。"
 
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "您所輸入的 SecurID 碼無效。"
 
 msgid "Enter SecurID"
@@ -7155,6 +6982,9 @@ msgstr "上線自"
 msgid "Member Since"
 msgstr "成為成員的時間"
 
+msgid "Capabilities"
+msgstr "相容性"
+
 msgid "Profile"
 msgstr "個人資料"
 
@@ -7317,9 +7147,9 @@ msgstr[1] "離開訊息的長度超出了 %d 個位元組的上限，過長部�
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -7342,9 +7172,9 @@ msgstr ""
 msgid "Orphans"
 msgstr "孤兒們"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+"Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "因為您的好友法單中有太多的好友，所以沒有辦法加入好友 %s。請在移除部份好友後重"
@@ -7353,8 +7183,8 @@ msgstr ""
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+#, fuzzy, c-format
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "無法把 %s 加入好友清單，原因不明。"
 
 # XXX 好像有些不順 - acli 20080508
@@ -8178,7 +8008,8 @@ msgstr "每隔多少秒送出 Keep Alive"
 msgid "Update interval (seconds)"
 msgstr "每隔多少秒更新"
 
-msgid "Cannot decrypt server reply"
+#, fuzzy
+msgid "Unable to decrypt server reply"
 msgstr "無法解密伺服器回應"
 
 #, c-format
@@ -8203,9 +8034,6 @@ msgstr "必須啟動帳號"
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr "無法登入，不明回應碼「0x%02X」"
 
-msgid "Could not decrypt server reply"
-msgstr "無法解密伺服器回應"
-
 msgid "Requesting captcha"
 msgstr "要求驗證圖片中"
 
@@ -8240,21 +8068,9 @@ msgstr ""
 "登入時，傳回未知的回覆碼「0x%02X」：\n"
 "%s"
 
-msgid "Unable to connect."
-msgstr "無法連線。"
-
 msgid "Socket error"
 msgstr "Socket 錯誤"
 
-msgid "Unable to read from socket"
-msgstr "無法讀取 Socket"
-
-msgid "Write Error"
-msgstr "寫入錯誤"
-
-msgid "Connection lost"
-msgstr "連線中斷"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "設定使用者資訊..."
@@ -8263,8 +8079,9 @@ msgstr "設定使用者資訊..."
 msgid "Requesting token"
 msgstr "請求符記中"
 
-msgid "Couldn't resolve host"
-msgstr "無法解析主機"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "無法連線到伺服器。"
 
 msgid "Invalid server or port"
 msgstr "伺服器或通訊埠無效"
@@ -8319,7 +8136,8 @@ msgstr ""
 msgid "QQ Qun Command"
 msgstr "QQ 群組指令"
 
-msgid "Could not decrypt login reply"
+#, fuzzy
+msgid "Unable to decrypt login reply"
 msgstr "無法解密伺服器回應"
 
 msgid "Unknown LOGIN CMD"
@@ -8339,9 +8157,6 @@ msgstr "傳送檔案"
 msgid "%d canceled the transfer of %s"
 msgstr "%d 取消了「%s」的傳送"
 
-msgid "Connection closed (writing)"
-msgstr "連線關閉（寫入）"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>群組名稱：</b>%s<br>"
@@ -8401,17 +8216,6 @@ msgstr "在伺服器「%s」上，有 Sametime 管理人發出了下列通告"
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime 管理人通告"
 
-msgid "Connection reset"
-msgstr "連線重置"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "讀取 Socket 時發生錯誤；%s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "無法連線到主機"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "自 %s 發佈"
@@ -8435,6 +8239,9 @@ msgstr "喇叭"
 msgid "Video Camera"
 msgstr "視訊"
 
+msgid "File Transfer"
+msgstr "檔案傳輸"
+
 msgid "Supports"
 msgstr "支援"
 
@@ -9253,6 +9060,9 @@ msgstr ""
 msgid "Network Statistics"
 msgstr "網路統計資料"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping 失敗"
 
@@ -9315,7 +9125,8 @@ msgstr "不支援的公鑰類型"
 msgid "Disconnected by server"
 msgstr "伺服器中斷了連線"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "連線至 SILC 伺服器時發生錯誤"
 
 msgid "Key Exchange failed"
@@ -9325,26 +9136,26 @@ msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "恢復連線失敗，請按「重新連線」建立新的連線。"
 
-msgid "Connection failed"
-msgstr "連線失敗"
-
 msgid "Performing key exchange"
 msgstr "交換密鑰中"
 
-msgid "Unable to create connection"
-msgstr "無法建立連結"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 msgstr "無法讀取 SILC 密鑰對"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "連線至 SILC 伺服器中"
 
+#, fuzzy
+msgid "Unable to not load SILC key pair"
+msgstr "無法讀取 SILC 密鑰對"
+
 msgid "Out of memory"
 msgstr "記憶體不夠"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "無法初始化 SILC 協定"
 
 msgid "Error loading SILC key pair"
@@ -9644,7 +9455,8 @@ msgstr "數位簽署所有即時訊息"
 msgid "Creating SILC key pair..."
 msgstr "產生 SILC 密鑰對中..."
 
-msgid "Cannot create SILC key pair\n"
+#, fuzzy
+msgid "Unable to create SILC key pair"
 msgstr "無法產生 SILC 密鑰對\n"
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9738,6 +9550,9 @@ msgstr "白板"
 msgid "No server statistics available"
 msgstr "伺服器沒有統計資料"
 
+msgid "Error during connecting to SILC Server"
+msgstr "連線至 SILC 伺服器時發生錯誤"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失敗：版本不符，請更新您的用戶端程式"
@@ -9780,31 +9595,28 @@ msgstr "失敗：無效的 Cookie"
 msgid "Failure: Authentication failed"
 msgstr "失敗：認證失敗"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "無法初始化 SILC 的用戶端連線"
 
 # NOTE 香港會寫「陳大文」，台灣人會看不明（寫「老張」一類，港人看見會覺得很怪），頭痛 :P
 msgid "John Noname"
 msgstr "無名氏"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "無法讀取 SILC 密鑰對：%s"
 
-msgid "Could not write"
-msgstr "無法寫入"
-
-msgid "Could not connect"
-msgstr "無法連結"
+msgid "Unable to create connection"
+msgstr "無法建立連結"
 
-msgid "Unknown server response."
+#, fuzzy
+msgid "Unknown server response"
 msgstr "不明的伺服器回應。"
 
-msgid "Could not create listen socket"
-msgstr "無法建立 Socket 監聽"
-
-msgid "Could not resolve hostname"
-msgstr "無法解析主機"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "無法建立 Socket"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP 的帳號不可含有空白字元或「@」符號"
@@ -9845,6 +9657,78 @@ msgstr "認證使用者"
 msgid "Auth Domain"
 msgstr "認證域名"
 
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt聊天室&gt;：加入位於 Yahoo! 網路的一個聊天室"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list：列出Yahoo網路上的聊天室清單"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr "doodle: 要求使用者開始 Doodle Session"
+
+msgid "Yahoo ID..."
+msgstr "Yahoo 帳號"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo 協定模組"
+
+msgid "Pager server"
+msgstr "傳呼伺服器"
+
+msgid "Pager port"
+msgstr "傳呼系統通訊埠"
+
+msgid "File transfer server"
+msgstr "檔案傳輸伺服器"
+
+msgid "File transfer port"
+msgstr "檔案傳輸通訊埠"
+
+#  XXX 無劃一譯法，有譯「地區」、「區域」甚至「場所」(?!)
+msgid "Chat room locale"
+msgstr "聊天室區域 (Locale)"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "忽略會議室與聊天室邀請"
+
+msgid "Chat room list URL"
+msgstr "聊天室清單所在網址"
+
+msgid "Yahoo Chat server"
+msgstr "Yahoo 聊天伺服器"
+
+msgid "Yahoo Chat port"
+msgstr "Yahoo 聊天室通訊埠"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo 帳號"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo 協定模組"
+
 msgid "Your SMS was not delivered"
 msgstr ""
 
@@ -9877,28 +9761,18 @@ msgstr "新增好友被拒"
 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."
+"Account locked: Too many failed login attempts.  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."
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!，官方網站上可能已經修正這個錯誤。"
 
 #. username or password missing
@@ -9936,11 +9810,12 @@ msgstr "你的帳戶目前被暫時關閉。請您登入 Yahoo! 網站。"
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!，官方網站上可能已經修正這個錯誤。"
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "無法將好友「%1$s」新增至帳號「%3$s」在伺服器上的清單內的群組「%2$s」。"
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
 #, c-format
@@ -9948,26 +9823,20 @@ msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ 音效檔 %s/%s/%s.swf ] %s"
 
 # XXX 暫譯 - 20061025
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "伺服器發出了奇怪的 HTTP 回應。"
 
-msgid "Connection problem"
-msgstr "連線錯誤"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "與 %s 之間的連線突然中斷:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"無法與 %s 建立連線:\n"
+"無法與伺服器建立連線:\n"
 "%s"
 
 msgid "Not at Home"
@@ -10042,74 +9911,15 @@ msgstr "加入好友目前所在的聊天室..."
 msgid "Open Inbox"
 msgstr "開啟收件匣"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt聊天室&gt;：加入位於 Yahoo! 網路的一個聊天室"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list：列出Yahoo網路上的聊天室清單"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: 要求使用者開始 Doodle Session"
-
-msgid "Yahoo ID..."
-msgstr "Yahoo 帳號"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo 協定模組"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-msgid "Pager server"
-msgstr "傳呼伺服器"
-
-msgid "Japan Pager server"
-msgstr "傳呼伺服器（日本地區）"
-
-msgid "Pager port"
-msgstr "傳呼系統通訊埠"
-
-msgid "File transfer server"
-msgstr "檔案傳輸伺服器"
-
-msgid "Japan file transfer server"
-msgstr "檔案傳輸伺服器（日本地區）"
-
-msgid "File transfer port"
-msgstr "檔案傳輸通訊埠"
-
-#  XXX 無劃一譯法，有譯「地區」、「區域」甚至「場所」(?!)
-msgid "Chat room locale"
-msgstr "聊天室區域 (Locale)"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "忽略會議室與聊天室邀請"
-
-msgid "Chat room list URL"
-msgstr "聊天室清單所在網址"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo 聊天伺服器"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo 聊天室通訊埠"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr "送出 Doodle 要求。"
 
+msgid "Unable to connect."
+msgstr "無法連線。"
+
 # TODO - 覆查譯文 - 20061028
 msgid "Unable to establish file descriptor."
 msgstr "無法建立檔案介紹。"
@@ -10118,6 +9928,9 @@ msgstr "無法建立檔案介紹。"
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s 提出一次過傳送 %d 個檔案。\n"
 
+msgid "Write Error"
+msgstr "寫入錯誤"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan 個人資料"
 
@@ -10228,6 +10041,9 @@ msgstr "可語音聊天"
 msgid "Webcams"
 msgstr "可視像聊天"
 
+msgid "Connection problem"
+msgstr "連線錯誤"
+
 msgid "Unable to fetch room list."
 msgstr "無法取得聊天室清單。"
 
@@ -10237,17 +10053,10 @@ msgstr "無法取得聊天室清單。"
 msgid "User Rooms"
 msgstr "使用者建立之聊天室"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "與 YCHT 伺服器出現連線錯誤"
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"與伺服器之間的連線突然中斷\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10398,33 +10207,22 @@ msgstr "域名"
 msgid "Exposure"
 msgstr "現身程度"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"無法建立 Socket：\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "無法解析 HTTP 代理伺服應的回應：%s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP 代理伺服器連線錯誤 %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "拒絕存取：HTTP 代理伺服器禁止通訊埠 %d 的資料傳送。"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "解析 %s 途中發生了錯誤"
 
-msgid "Could not resolve host name"
-msgstr "無法解析主機"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "要求 %s 的注意中..."
@@ -10630,12 +10428,6 @@ msgstr "寫入 %s 途中發生了錯誤：%s"
 msgid "Unable to connect to %s: %s"
 msgstr "無法連線到 %s：%s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "登入這個伺服器需要使用 TLS/SSL，但找不到 TLS/SSL 支援。"
-
 #, c-format
 msgid " - %s"
 msgstr " - %s"
@@ -10889,9 +10681,14 @@ msgstr "加入好友狀態捕捉(_P)..."
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "離線時隱藏"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "離線時顯示"
+
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
@@ -11403,6 +11200,11 @@ msgstr ""
 msgid "The text information for a buddy's status"
 msgstr "更改 %s 的個人資訊"
 
+# XXX 譯文有待改進 - acli 20070913
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "請輸入這張憑證所屬的主機名稱。"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL 伺服器"
@@ -11451,7 +11253,8 @@ msgstr "忽略"
 msgid "Get Away Message"
 msgstr "取得離開訊息"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "上次提到"
 
 msgid "Unable to save icon file to disk."
@@ -12417,7 +12220,8 @@ msgstr "顯示連結時所用的顏色。"
 msgid "Hyperlink visited color"
 msgstr "瀏覽過的連結顏色"
 
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+#, fuzzy
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "當滑鼠經過瀏覽過（或已啟動）的連結時的連結顏色。"
 
 msgid "Hyperlink prelight color"
@@ -12454,13 +12258,22 @@ msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 "收到的訊息是對方以「輕聲的說」這種動作發出的訊息時，用來顯示對方帳號的顏色"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered action message."
+msgstr "收到的訊息是代表對方發出的一個動作時，用來顯示對帳號的顏色。"
+
 msgid "Whisper Message Name Color"
 msgstr "輕聲訊息帳號顏色"
 
+#, fuzzy
+msgid "Color to draw the name of a whispered message."
+msgstr "收到的訊息是代表對方發出的一個動作時，用來顯示對帳號的顏色。"
+
 msgid "Typing notification color"
 msgstr "輸入通知顏色"
 
-msgid "The color to use for the typing notification font"
+#, fuzzy
+msgid "The color to use for the typing notification"
 msgstr "用來顯示輸入通知的顏色"
 
 msgid "Typing notification font"
@@ -12852,6 +12665,10 @@ msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "您選用了「使用者自定瀏覽器」，卻未有設定指令。"
 
+#, fuzzy
+msgid "No message"
+msgstr "不明的訊息"
+
 msgid "Open All Messages"
 msgstr "開啟所有訊息"
 
@@ -12869,10 +12686,6 @@ msgstr ""
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">您有郵件！</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "不明的訊息"
-
 msgid "The following plugins will be unloaded."
 msgstr "以下的模組將會被卸載。"
 
@@ -13090,8 +12903,9 @@ msgstr "顯示系統工作匣圖示(_S)："
 msgid "On unread messages"
 msgstr "有未讀訊息時"
 
-msgid "Conversation Window Hiding"
-msgstr "隱藏即時訊息交談視窗"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "即時訊息交談視窗"
 
 msgid "_Hide new IM conversations:"
 msgstr "隱藏新的即時訊息交談(_H)："
@@ -13099,6 +12913,9 @@ msgstr "隱藏新的即時訊息交談(_H)："
 msgid "When away"
 msgstr "離開期間"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "最小化所有新交談視窗(_Z)"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "分頁"
@@ -13159,9 +12976,6 @@ msgstr "使用平滑捲軸"
 msgid "F_lash window when IMs are received"
 msgstr "收到即時訊息後閃動視窗(_F)"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "最小化所有新交談視窗(_Z)"
-
 msgid "Minimum input area height in lines:"
 msgstr "文字輸入區的最少行數："
 
@@ -13197,7 +13011,8 @@ msgstr "無法啟動瀏覽器設定程式。"
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">例：stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "自動偵測 IP 位址(_A)"
 
 msgid "Public _IP:"
@@ -13567,33 +13382,18 @@ msgstr "儲存並使用(_V)"
 msgid "Status for %s"
 msgstr "狀態：%s"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-msgid "Custom Smiley"
-msgstr "自訂表情"
-
-msgid "More Data needed"
-msgstr "需要進一步的資料"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "請給這個表情給定一個相關的捷徑。"
-
 # XXX 20080810 acli - 暫譯
 #, fuzzy, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr "給定的捷徑已有相關的自訂表情，請指定另一個捷徑。"
 
+msgid "Custom Smiley"
+msgstr "自訂表情"
+
 msgid "Duplicate Shortcut"
 msgstr "重覆的表情定義"
 
-msgid "Please select an image for the smiley."
-msgstr "請給這個表情選擇一個圖像。"
-
 msgid "Edit Smiley"
 msgstr "修改表情"
 
@@ -13706,9 +13506,10 @@ msgstr ""
 msgid "Cannot send launcher"
 msgstr "無法傳送啟動器"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr "您拖曳了一個啟動器；您大概想傳送啟動器要啟動的檔案，而不是啟動器本身。"
 
 #, c-format
@@ -14330,9 +14131,10 @@ msgid "Music Messaging Plugin for collaborative composition."
 msgstr "集體作曲用的音樂訊息模組"
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr ""
 "音樂訊息模組為音樂編寫提供即時傳訊功能，讓多個使用者能同時編輯同一份樂譜。"
 
@@ -14598,9 +14400,10 @@ msgstr "交談視窗的「傳送」按紐"
 
 # XXX 譯文有待改進 - acli 20080508
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
+"for use when no physical keyboard is present."
 msgstr "在交談視窗的輸入欄位加添一個「傳送」按紐，適用於沒有連接鍵盤時使用。"
 
 # FIXME 譯文有譯改進 - 20061027
@@ -14938,8 +14741,9 @@ msgstr "Windows 版 Pidgin 選項"
 msgid "Options specific to Pidgin for Windows."
 msgstr "Windows 版 Pidgin 的相關選項。"
 
+#, fuzzy
 msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "提供 Windows 版 Pidgin 的相關選項，例如好友清單的停駐功能。"
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14981,6 +14785,312 @@ msgstr "送出、讀取未加工的 XMPP 段落。"
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
+#~ msgid "Cannot open socket"
+#~ msgstr "無法開啟Socket"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "無法監聽 Socket"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "無法讀取 Socket"
+
+#~ msgid "Connection failed."
+#~ msgstr "連線失敗。"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "伺服器已停止連線"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "無法建立 Socket"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "無法連到伺服器"
+
+# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
+#~ msgid "Read error"
+#~ msgstr "讀取錯誤"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "無法與伺服器建立連線:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "寫入錯誤"
+
+# NOTE 這是功能名稱（直譯）
+#~ msgid "Last Activity"
+#~ msgstr "最近活動"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "服務探尋資訊"
+
+#  FIXME acli 2070914
+#~ msgid "Service Discovery Items"
+#~ msgstr "服務探尋項目"
+
+# NOTE 這是功能名稱（直譯）
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "延伸段落定址"
+
+# NOTE 這是功能名稱
+#~ msgid "Multi-User Chat"
+#~ msgstr "多用戶聊天"
+
+# NOTE 這是功能名稱（直譯）
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "多用戶聊天延伸上線狀態資訊"
+
+# NOTE Cf http://host.cc.ntu.edu.tw/iicm/term/termb_I.htm
+#~ msgid "In-Band Bytestreams"
+#~ msgstr "帶內位元組串流"
+
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "臨時指令"
+
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub 服務"
+
+#~ msgid "SOCKS5 Bytestreams"
+#~ msgstr "SOCKS5 位元組串流"
+
+#~ msgid "Out of Band Data"
+#~ msgstr "帶外數據"
+
+#  NOTE Untranslated
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#~ msgid "In-Band Registration"
+#~ msgstr "帶內註冊"
+
+#~ msgid "User Location"
+#~ msgstr "使用者所在位置"
+
+#~ msgid "User Avatar"
+#~ msgstr "使用者化身"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "聊天狀態通知"
+
+# NOTE Jabber 協定中 Stream Error 的一種，即 <unsupported-version/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
+#~ msgid "Software Version"
+#~ msgstr "軟體版本"
+
+#~ msgid "Stream Initiation"
+#~ msgstr "開始串流"
+
+#~ msgid "User Mood"
+#~ msgstr "使用者情緒"
+
+# XXX may be wrong
+#~ msgid "User Activity"
+#~ msgstr "使用者活動狀態"
+
+#  NOTE 直譯：個體能力
+#  FIXME 譯文有待改進 - acli 20070918
+#~ msgid "Entity Capabilities"
+#~ msgstr "個體能力"
+
+#  FIXME 這聽來不對 - acli 20070913
+#~ msgid "Encrypted Session Negotiations"
+#~ msgstr "加密工作階段協商"
+
+#~ msgid "User Tune"
+#~ msgstr "使用者樂曲"
+
+#  NOTE「Roster」指「名冊」，但Open Source software似乎一般譯「好友清單」、「成員列表」等
+#  FIXME 譯文有待改進 - acli 20070918
+#~ msgid "Roster Item Exchange"
+#~ msgstr "好友清單項目交換"
+
+#  NOTE 參見 http://jabber.org/protocol/reach
+#  NOTE「Reachability Address」指即時通訊以外的通訊方式所用的「位址」（例如電話號碼）
+#  NOTE 直譯：可抵達性位址
+#  XXX 是否譯「其他通訊方法」較好？但要先看上下文 - acli 20070918
+#~ msgid "Reachability Address"
+#~ msgstr "可抵達性位址"
+
+#~ msgid "User Profile"
+#~ msgstr "使用者資料"
+
+#~ msgid "Jingle"
+#~ msgstr "Jingle"
+
+#~ msgid "Jingle Audio"
+#~ msgstr "Jingle 音訊"
+
+#~ msgid "User Nickname"
+#~ msgstr "使用者暱稱"
+
+#~ msgid "Jingle ICE UDP"
+#~ msgstr "Jingle ICE UDP"
+
+#~ msgid "Jingle ICE TCP"
+#~ msgstr "Jingle ICE TCP"
+
+#~ msgid "Jingle Video"
+#~ msgstr "Jingle 視訊"
+
+#~ msgid "Jingle DTMF"
+#~ msgstr "Jingle DTMF"
+
+#~ msgid "Message Receipts"
+#~ msgstr "收到的訊息"
+
+#~ msgid "Public Key Publishing"
+#~ msgstr "發佈公鑰"
+
+# NOTE Jabber 新功能規格
+#~ msgid "User Browsing"
+#~ msgstr "使用者瀏覽"
+
+#~ msgid "Stanza Encryption"
+#~ msgstr "段落加密"
+
+#  XXX 暫譯- acli 20070913
+#~ msgid "Delayed Delivery"
+#~ msgstr "延遲送出"
+
+#~ msgid "STUN Service Discovery for Jingle"
+#~ msgstr "Jingle 用的 STUN 服務偵測"
+
+# FIXME 這聽來不對
+#~ msgid "Simplified Encrypted Session Negotiation"
+#~ msgstr "簡化加密工作階段協商"
+
+#~ msgid "Hop Check"
+#~ msgstr "中繼段檢查"
+
+#~ msgid "Read Error"
+#~ msgstr "讀取錯誤"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "無法連線到伺服器。"
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "讀取用的暫存區滿了（代號2）"
+
+#~ msgid "Unparseable message"
+#~ msgstr "無法解析訊息"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "無法連到伺服器：%s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "登入失敗 (%s)。"
+
+# XXX 暫譯
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "您已經被登出，因為您已在其他電腦上登入。"
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "錯誤：沒有安裝 SSL 支援。"
+
+#~ msgid "Incorrect password."
+#~ msgstr "密碼錯誤。"
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "無法連線到 BOS 伺服器：\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "您可能會在短時間內中斷連線。請到 %s 看看有沒有更新。"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "無法連線"
+
+#~ msgid "Invalid username."
+#~ msgstr "使用者名稱無效。"
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "無法解密伺服器回應"
+
+#~ msgid "Connection lost"
+#~ msgstr "連線中斷"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "無法解析主機"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "連線關閉（寫入）"
+
+#~ msgid "Connection reset"
+#~ msgstr "連線重置"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "讀取 Socket 時發生錯誤；%s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "無法連線到主機"
+
+#~ msgid "Could not write"
+#~ msgstr "無法寫入"
+
+#~ msgid "Could not connect"
+#~ msgstr "無法連結"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "無法建立 Socket 監聽"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "無法解析主機"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "密碼錯誤"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "無法與 %s 建立連線:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "傳呼伺服器（日本地區）"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "檔案傳輸伺服器（日本地區）"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "與伺服器之間的連線突然中斷\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "無法解析主機"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr "登入這個伺服器需要使用 TLS/SSL，但找不到 TLS/SSL 支援。"
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "隱藏即時訊息交談視窗"
+
+#~ msgid "More Data needed"
+#~ msgstr "需要進一步的資料"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "請給這個表情給定一個相關的捷徑。"
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "請給這個表情選擇一個圖像。"
+
 #~ msgid "Activate which ID?"
 #~ msgstr "啟用哪一個 ID？"