diff po/en_AU.po @ 27666:a08e84032814

merge of '2348ff22f0ff3453774b8b25b36238465580c609' and 'e76f11543c2a4aa05bdf584f087cbe3439029661'
author Paul Aurich <paul@darkrain42.org>
date Sun, 12 Jul 2009 05:43:38 +0000
parents b9790d3e2a0a
children bfe511f69e93
line wrap: on
line diff
--- a/po/en_AU.po	Sun Jul 12 05:42:40 2009 +0000
+++ b/po/en_AU.po	Sun Jul 12 05:43:38 2009 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:37-0400\n"
+"POT-Creation-Date: 2009-07-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"
@@ -1865,6 +1865,8 @@
 msgid "+++ %s signed off"
 msgstr "%s signed off"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "Unknown error"
 
@@ -2254,6 +2256,10 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "Error creating connection"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -2671,7 +2677,7 @@
 #. * 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!"
@@ -2723,7 +2729,7 @@
 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 ""
 
@@ -2971,12 +2977,12 @@
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
-msgstr ""
-
-#, fuzzy
-msgid "Unable to listen for incoming IM connections\n"
+"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"
 msgstr "Unable to create new connection."
 
 msgid ""
@@ -3036,17 +3042,17 @@
 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
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Unable to create socket"
+
+#, 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."
@@ -3105,15 +3111,15 @@
 msgid "Load buddylist from file..."
 msgstr "Import Buddy List from Server"
 
-msgid "Fill in the registration fields."
-msgstr ""
-
-#, fuzzy
-msgid "Passwords do not match."
+msgid "You must fill in all registration fields"
+msgstr ""
+
+#, fuzzy
+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"
@@ -3126,17 +3132,15 @@
 msgid "Password"
 msgstr "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"
+msgid "Password (again)"
+msgstr "Password (again)"
+
+msgid "Enter captcha text"
+msgstr ""
+
+#, fuzzy
+msgid "Captcha"
+msgstr "Save Image"
 
 #, fuzzy
 msgid "Register New Gadu-Gadu Account"
@@ -3198,6 +3202,18 @@
 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."
 
@@ -3251,7 +3267,8 @@
 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
@@ -3270,8 +3287,14 @@
 msgid "Your buddy list was stored on the server."
 msgstr "There is no Buddy List stored on the Gadu-Gadu server."
 
-#, fuzzy
-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).
+#, fuzzy
+msgid "Connected"
+msgstr "Connect"
+
+msgid "Connection failed"
 msgstr "Connection failed"
 
 #, fuzzy
@@ -3282,6 +3305,15 @@
 msgid "Chat _name:"
 msgstr "Last name:"
 
+#, 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"
@@ -3291,7 +3323,7 @@
 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
@@ -3340,6 +3372,10 @@
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu Search Engine"
 
+#, fuzzy
+msgid "GG server"
+msgstr "Set User Info..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Unknown command: %s"
@@ -3356,7 +3392,7 @@
 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"
@@ -3372,8 +3408,16 @@
 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"
@@ -3384,25 +3428,24 @@
 msgid "_Password:"
 msgstr "_Password:"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC nicks may not contain whitespace"
 
-#. 1. connect to server
-#. 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 "Couldn't connect to host"
-msgstr "Couldn't connect to host"
-
-msgid "Read error"
-msgstr "Read error"
+msgid "Unable to connect"
+msgstr "Unable to connect"
+
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "Unable to connect to server."
+
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "Error creating connection"
 
 msgid "Users"
 msgstr "Users"
@@ -3843,11 +3886,12 @@
 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"
@@ -3864,17 +3908,25 @@
 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"
 msgstr "Server does not use any supported authentication method"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "Invalid challenge from server"
 
-#, fuzzy
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "Read error"
 
 msgid "The BOSH connection manager terminated your session."
@@ -3892,22 +3944,14 @@
 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"
 
@@ -3980,188 +4024,6 @@
 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"
@@ -4169,6 +4031,14 @@
 msgid "Resource"
 msgstr "Resource"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "Logged out"
+
 msgid "Middle Name"
 msgstr "Middle Name"
 
@@ -4343,20 +4213,25 @@
 msgid "Find Rooms"
 msgstr "Find Rooms"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
-
-#, fuzzy
-msgid "Ping timeout"
+#, fuzzy
+msgid "Affiliations:"
+msgstr "Alias:"
+
+#, fuzzy
+msgid "No users found"
+msgstr "Non-matching Hosts"
+
+#, fuzzy
+msgid "Roles:"
+msgstr "Role"
+
+#, fuzzy
+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"
+msgid ""
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4366,7 +4241,7 @@
 msgstr ""
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "Unable to connect to server."
 
 #, c-format
@@ -4395,9 +4270,6 @@
 msgid "Unregistration Failed"
 msgstr "Registration Failed"
 
-msgid "Already Registered"
-msgstr "Already Registered"
-
 msgid "State"
 msgstr "State"
 
@@ -4411,6 +4283,9 @@
 msgid "Date"
 msgstr "Date"
 
+msgid "Already Registered"
+msgstr "Already Registered"
+
 #, fuzzy
 msgid "Unregister"
 msgstr "Register"
@@ -4442,6 +4317,10 @@
 msgstr "Registration Error"
 
 #, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "Unable to connect to server."
+
+#, fuzzy
 msgid "Error unregistering account"
 msgstr "Error Changing Account Info"
 
@@ -4541,9 +4420,6 @@
 msgid "Error changing password"
 msgstr "Error changing password"
 
-msgid "Password (again)"
-msgstr "Password (again)"
-
 msgid "Change XMPP Password"
 msgstr "Change XMPP Password"
 
@@ -4816,13 +4692,13 @@
 msgstr "ban &lt;user&gt; [room]:  Ban a user from the room."
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
-msgstr ""
-
-msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
+msgstr ""
+
+msgid ""
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with an role or set users' role with the room."
 msgstr ""
 
 #, fuzzy
@@ -4890,6 +4766,9 @@
 msgid "File transfer proxies"
 msgstr "File transfer port"
 
+msgid "BOSH URL"
+msgstr ""
+
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
@@ -4928,6 +4807,14 @@
 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"
 
@@ -4946,16 +4833,20 @@
 msgid "_Accept Defaults"
 msgstr "Accept Defaults"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "Error joining chat %s"
-
-#, c-format
-msgid "Error in chat %s"
-msgstr "Error in chat %s"
-
-#, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+#, fuzzy
+msgid "No reason"
+msgstr "No reason given."
+
+#, 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 occurred on the in-band bytestream transfer\n"
 msgstr "An error occurred while opening the file."
 
 #, fuzzy
@@ -5300,6 +5191,10 @@
 msgid "Non-IM Contacts"
 msgstr "Remove Contact"
 
+#, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr ""
+
 msgid "Nudge"
 msgstr ""
 
@@ -5469,10 +5364,6 @@
 "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"
 
@@ -5686,67 +5577,29 @@
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Normal authentication failed!"
 
-#, c-format
-msgid "%s is not a valid group."
-msgstr "%s is not a valid group."
-
-msgid "Unknown error."
-msgstr "Unknown error."
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%s on %s (%s)"
-
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s wants to send you a file"
 
-#. char *adl = g_strndup(payload, len);
-#, fuzzy, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "Unknown error"
 
 #, fuzzy
 msgid "Unable to add user"
 msgstr "Unable to ban user %s"
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "Unknown error"
+
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "Unable to add user on %s (%s)"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "Unable to block user on %s (%s)"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "Unable to permit user on %s (%s)"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s could not be added because your buddy list is full."
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s is not a valid passport account."
-
-#, fuzzy
-msgid "Service Temporarily Unavailable."
-msgstr "Service Temporarily Unavailable"
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "Message could not be sent because the user is offline:"
 
-msgid "Unable to rename group"
-msgstr "Unable to rename group"
-
-msgid "Unable to delete group"
-msgstr "Unable to delete group"
-
 #, fuzzy, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5804,9 +5657,6 @@
 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,13 +5671,16 @@
 "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
@@ -5835,7 +5688,8 @@
 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
@@ -5865,6 +5719,14 @@
 msgid "Retrieving buddy list"
 msgstr "Retrieving buddy list"
 
+#, c-format
+msgid "%s requests to view your webcam, but this request is not yet supported."
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
 msgid "Away From Computer"
 msgstr "Away From Computer"
 
@@ -5903,14 +5765,6 @@
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Message may have not been sent because an unknown error occurred:"
 
-#, fuzzy, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "The user %s wants to add %s to his or her buddy list."
-
-#, fuzzy, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "The user %s wants to add %s to his or her buddy list."
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "Add to Address Book"
@@ -5943,6 +5797,55 @@
 msgstr "MSN Protocol Plugin"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s is not a valid group."
+
+msgid "Unknown error."
+msgstr "Unknown error."
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s on %s (%s)"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "Unable to add user on %s (%s)"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "Unable to block user on %s (%s)"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "Unable to permit user on %s (%s)"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s could not be added because your buddy list is full."
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s is not a valid passport account."
+
+#, fuzzy
+msgid "Service Temporarily Unavailable."
+msgstr "Service Temporarily Unavailable"
+
+msgid "Unable to rename group"
+msgstr "Unable to rename group"
+
+msgid "Unable to delete group"
+msgstr "Unable to delete group"
+
+#, fuzzy, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "The user %s wants to add %s to his or her buddy list."
+
+#, fuzzy, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "The user %s wants to add %s to his or her buddy list."
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -5977,6 +5880,8 @@
 msgstr "You were disconnected from the server."
 
 #. Can't write _()'d strings in array initializers. Workaround.
+#. khc: then use N_() in the array initializer and use _() when they are
+#. used
 #, fuzzy
 msgid "New mail messages"
 msgstr "New away message"
@@ -6014,24 +5919,20 @@
 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 ""
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
-msgstr ""
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
+msgstr ""
+
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "Incorrect nickname or password."
 
 msgid "MySpaceIM Error"
 msgstr ""
@@ -6041,18 +5942,6 @@
 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"
 
@@ -6147,6 +6036,12 @@
 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"
@@ -6373,10 +6268,6 @@
 msgstr "Master archive is misconfigured"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "Incorrect nickname or password."
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "Could not recognise the host of the username you entered"
 
@@ -6421,9 +6312,9 @@
 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)."
@@ -6525,9 +6416,6 @@
 msgid "Authenticating..."
 msgstr "Authenticating..."
 
-msgid "Unable to connect to server."
-msgstr "Unable to connect to server."
-
 msgid "Waiting for response..."
 msgstr "Waiting for response..."
 
@@ -6551,25 +6439,20 @@
 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."
 
-msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+#, fuzzy
+msgid ""
+"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."
 
@@ -6593,6 +6476,25 @@
 msgstr "Server port"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "Invalid response from server."
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "Error creating connection"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "Could not connect"
 
@@ -6601,17 +6503,7 @@
 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
@@ -6664,8 +6556,9 @@
 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"
@@ -6861,15 +6754,11 @@
 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
@@ -6885,51 +6774,62 @@
 
 #, 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 "
 "letters, numbers and spaces, or contain only numbers."
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+
+#, fuzzy
+msgid "Unable to get a valid AIM login hash."
+msgstr "Pidgin was unable to get a valid AIM login hash."
+
+#, fuzzy
+msgid "Unable to get a valid login hash."
+msgstr "Pidgin was unable to get a valid login hash."
+
+msgid "Received authorization"
+msgstr "Received authorisation"
+
 #. Unregistered username
 #. uid is not exist
-#, fuzzy
-msgid "Invalid username."
-msgstr "Invalid Username"
-
-msgid "Incorrect password."
-msgstr "Incorrect password."
+#. 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
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "The AOL Instant Messenger service is temporarily unavailable."
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "The client version you are using is too old. Please upgrade at %s"
+
 #. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+#, fuzzy
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait a minute and "
+"try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "The client version you are using is too old. Please upgrade at %s"
-
-msgid "Could Not Connect"
-msgstr "Could Not Connect"
-
-msgid "Received authorization"
-msgstr "Received authorisation"
-
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "The SecurID key entered is invalid."
 
 msgid "Enter SecurID"
@@ -6945,26 +6845,6 @@
 msgid "_OK"
 msgstr "OK"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-
-#, fuzzy
-msgid "Unable to get a valid AIM login hash."
-msgstr "Pidgin was unable to get a valid AIM login hash."
-
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-
-#, fuzzy
-msgid "Unable to get a valid login hash."
-msgstr "Pidgin was unable to get a valid login hash."
-
 msgid "Password sent"
 msgstr "Password sent"
 
@@ -7119,6 +6999,9 @@
 msgid "Member Since"
 msgstr "Member Since"
 
+msgid "Capabilities"
+msgstr "Capabilities"
+
 msgid "Profile"
 msgstr "Profile"
 
@@ -7307,7 +7190,7 @@
 
 #, 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 ""
@@ -7335,9 +7218,9 @@
 msgid "Orphans"
 msgstr "Orphans"
 
-#, c-format
-msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+#, fuzzy, c-format
+msgid ""
+"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 "
@@ -7347,7 +7230,7 @@
 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
@@ -7483,6 +7366,7 @@
 msgid "Set User Info (web)..."
 msgstr "Set User Info (URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "Change Password (URL)"
@@ -7518,6 +7402,10 @@
 msgid "Search for Buddy by Information"
 msgstr "Search for Buddy by Information"
 
+#, fuzzy
+msgid "Use clientLogin"
+msgstr "User is not logged in"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -8220,7 +8108,7 @@
 msgstr "Reading error"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "Cannot get server information"
 
 #, c-format
@@ -8247,10 +8135,6 @@
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "Cannot get server information"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "Request ambiguous"
 
@@ -8286,26 +8170,11 @@
 "%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..."
 
@@ -8314,8 +8183,8 @@
 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"
@@ -8366,7 +8235,7 @@
 msgstr "Command"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "Cannot get server information"
 
 #, fuzzy
@@ -8389,10 +8258,6 @@
 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>"
@@ -8454,19 +8319,6 @@
 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 ""
@@ -8494,6 +8346,10 @@
 msgstr "Video Chat"
 
 #, fuzzy
+msgid "File Transfer"
+msgstr "File Transfers"
+
+#, fuzzy
 msgid "Supports"
 msgstr "support"
 
@@ -9328,6 +9184,9 @@
 msgid "Network Statistics"
 msgstr "Network Statistics"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping failed"
 
@@ -9393,7 +9252,8 @@
 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"
@@ -9404,29 +9264,26 @@
 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
@@ -9735,7 +9592,7 @@
 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
@@ -9829,6 +9686,9 @@
 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"
@@ -9869,7 +9729,8 @@
 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
@@ -9877,27 +9738,20 @@
 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"
-
-#, fuzzy
-msgid "Unknown server response."
+msgid "Unable to create connection"
+msgstr "Unable to create new connection."
+
+#, fuzzy
+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"
@@ -9947,9 +9801,84 @@
 msgid "Auth Domain"
 msgstr "Automatic"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-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
+#, 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 ""
@@ -9976,6 +9905,30 @@
 msgid "Add buddy rejected"
 msgstr "Add buddy rejected"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+msgstr "Unable to make SSL connection to server."
+
+#. security lock from too many failed login attempts
+#, fuzzy
+msgid ""
+"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."
+
+#. indicates a lock of some description
+#, fuzzy
+msgid ""
+"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
+#, fuzzy
+msgid "Username or password missing"
+msgstr "Incorrect nickname or password."
+
 #, fuzzy, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10007,11 +9960,12 @@
 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
@@ -10019,23 +9973,16 @@
 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"
+#, fuzzy, c-format
+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"
@@ -10090,9 +10037,8 @@
 msgid "Start Doodling"
 msgstr ""
 
-#, fuzzy
-msgid "Activate which ID?"
-msgstr "Active which ID?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "Join whom in chat?"
@@ -10107,83 +10053,15 @@
 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."
 
@@ -10191,6 +10069,10 @@
 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"
 
@@ -10312,21 +10194,19 @@
 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)"
@@ -10459,31 +10339,21 @@
 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 ""
@@ -10699,12 +10569,6 @@
 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 ""
@@ -10909,8 +10773,8 @@
 msgstr ""
 
 #, fuzzy
-msgid "Room _List"
-msgstr "Room List"
+msgid "A_ccount"
+msgstr "Account:"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10919,8 +10783,9 @@
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 
-msgid "_Account:"
-msgstr "_Account:"
+#, fuzzy
+msgid "Room _List"
+msgstr "Room List"
 
 #, fuzzy
 msgid "_Block"
@@ -10962,7 +10827,11 @@
 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..."
@@ -11415,6 +11284,120 @@
 msgid "/Buddies/Sort Buddies"
 msgstr "/Buddies/Show Offline Buddies"
 
+#. Buddy List
+#, fuzzy
+msgid "Background Color"
+msgstr "Background colour"
+
+#, fuzzy
+msgid "The background color for the buddy list"
+msgstr "Do you want to add this buddy to your buddy list?"
+
+#, fuzzy
+msgid "Layout"
+msgstr "Logged out"
+
+msgid "The layout of icons, name, and status of the blist"
+msgstr ""
+
+#. Group
+#, fuzzy
+msgid "Expanded Background Color"
+msgstr "Background colour"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#, fuzzy
+msgid "Expanded Text"
+msgstr "_Expand"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Background Color"
+msgstr "Select Background Colour"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#, fuzzy
+msgid "Collapsed Text"
+msgstr "_Collapse"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#, fuzzy
+msgid "Contact/Chat Background Color"
+msgstr "Select Background Colour"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#, fuzzy
+msgid "Contact Text"
+msgstr "Shortcuts"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#, fuzzy
+msgid "On-line Text"
+msgstr "Online"
+
+#, fuzzy
+msgid "The text information for when a buddy is online"
+msgstr "Get information on the selected buddy"
+
+#, fuzzy
+msgid "Away Text"
+msgstr "Away"
+
+#, fuzzy
+msgid "The text information for when a buddy is away"
+msgstr "Get information on the selected buddy"
+
+#, fuzzy
+msgid "Off-line Text"
+msgstr "Offline"
+
+#, fuzzy
+msgid "The text information for when a buddy is off-line"
+msgstr "Get information on the selected buddy"
+
+#, fuzzy
+msgid "Idle Text"
+msgstr "Mood"
+
+#, fuzzy
+msgid "The text information for when a buddy is idle"
+msgstr "Get information on the selected buddy"
+
+msgid "Message Text"
+msgstr "Message Text"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#, fuzzy
+msgid "Message (Nick Said) Text"
+msgstr "Message Text"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nick"
+msgstr ""
+
+#, fuzzy
+msgid "The text information for a buddy's status"
+msgstr "Change user information for %s"
+
+msgid "Type the host name for this certificate."
+msgstr ""
+
 #. Widget creation function
 #, fuzzy
 msgid "SSL Servers"
@@ -11466,7 +11449,7 @@
 msgstr "New Away Message"
 
 #, fuzzy
-msgid "Last said"
+msgid "Last Said"
 msgstr "Last name:"
 
 msgid "Unable to save icon file to disk."
@@ -11961,6 +11944,10 @@
 msgstr "Hungarian"
 
 #, fuzzy
+msgid "Armenian"
+msgstr "Romanian"
+
+#, fuzzy
 msgid "Indonesian"
 msgstr "Macedonian"
 
@@ -12067,6 +12054,9 @@
 msgid "Swedish"
 msgstr "Swedish"
 
+msgid "Swahili"
+msgstr ""
+
 #, fuzzy
 msgid "Tamil"
 msgstr "Terminal"
@@ -12418,7 +12408,7 @@
 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
@@ -12458,15 +12448,22 @@
 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"
@@ -12511,11 +12508,9 @@
 msgid "Save Image"
 msgstr "Save Image"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "_Save Image..."
 
-#, c-format
 msgid "_Add Custom Smiley..."
 msgstr ""
 
@@ -12606,10 +12601,6 @@
 msgstr "Font Face"
 
 #, fuzzy
-msgid "Background Color"
-msgstr "Background colour"
-
-#, fuzzy
 msgid "Foreground Color"
 msgstr "Foreground font colour"
 
@@ -12844,6 +12835,10 @@
 "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"
 
@@ -12868,10 +12863,6 @@
 "\n"
 "%s"
 
-#, fuzzy
-msgid "No message"
-msgstr "(1 message)"
-
 msgid "The following plugins will be unloaded."
 msgstr ""
 
@@ -12934,6 +12925,9 @@
 msgid "Pounce on Whom"
 msgstr "Pounce Who"
 
+msgid "_Account:"
+msgstr "_Account:"
+
 msgid "_Buddy name:"
 msgstr "_Buddy name:"
 
@@ -13058,7 +13052,14 @@
 msgid "Unknown.... Please report this!"
 msgstr "Unknown pounce event. Please report this!"
 
-msgid "Smiley theme failed to unpack."
+msgid "Theme failed to unpack."
+msgstr ""
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "Failed to store image: %s\n"
+
+msgid "Theme failed to copy."
 msgstr ""
 
 msgid "Install Theme"
@@ -13100,7 +13101,7 @@
 msgstr "Send a _message"
 
 #, fuzzy
-msgid "Conversation Window Hiding"
+msgid "Conversation Window"
 msgstr "IM Conversation Windows"
 
 #, fuzzy
@@ -13110,6 +13111,10 @@
 msgid "When away"
 msgstr "When away"
 
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "IM Conversation Windows"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr ""
@@ -13174,10 +13179,6 @@
 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 ""
 
@@ -13216,8 +13217,8 @@
 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:"
@@ -13612,36 +13613,20 @@
 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.
-#.
+#, c-format
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgstr ""
+
 #, 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"
 
 #, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "Please enter a new name for the selected group."
-
-#, fuzzy
 msgid "Edit Smiley"
 msgstr "Insert smiley"
 
@@ -13669,6 +13654,10 @@
 msgid "Custom Smiley Manager"
 msgstr ""
 
+#, fuzzy
+msgid "Select Buddy Icon"
+msgstr "Select Buddy"
+
 msgid "Click to change your buddyicon for this account."
 msgstr ""
 
@@ -13758,8 +13747,8 @@
 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
@@ -13907,6 +13896,78 @@
 msgstr ""
 
 #, fuzzy
+msgid "Server name request"
+msgstr "Server address"
+
+#, fuzzy
+msgid "Enter an XMPP Server"
+msgstr "Enter a Conference Server"
+
+#, fuzzy
+msgid "Select an XMPP server to query"
+msgstr "Select a conference server to query"
+
+#, fuzzy
+msgid "Find Services"
+msgstr "Online Services"
+
+#, fuzzy
+msgid "Add to Buddy List"
+msgstr "Send Buddy List"
+
+#, fuzzy
+msgid "Gateway"
+msgstr "When away"
+
+#, fuzzy
+msgid "Directory"
+msgstr "_Search for:"
+
+#, fuzzy
+msgid "PubSub Collection"
+msgstr "Sound Selection"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Description:</b> Spooky"
+
+#. Create the window.
+#, fuzzy
+msgid "Service Discovery"
+msgstr "Set Dir Info"
+
+#, fuzzy
+msgid "_Browse"
+msgstr "_Browser:"
+
+#, fuzzy
+msgid "Server does not exist"
+msgstr "User does not exist"
+
+#, fuzzy
+msgid "Server does not support service discovery"
+msgstr "Server does not use any supported authentication method"
+
+#, fuzzy
+msgid "XMPP Service Discovery"
+msgstr "Set Dir Info"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+
+#, fuzzy
 msgid "Buddy is idle"
 msgstr "Buddy is idle:"
 
@@ -14316,7 +14377,7 @@
 #. *  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" ----------
@@ -14432,12 +14493,6 @@
 "- It reverses all incoming text\n"
 "- It sends a message to people on your list immediately when they sign on"
 
-msgid "Cursor Color"
-msgstr ""
-
-msgid "Secondary Cursor Color"
-msgstr ""
-
 #, fuzzy
 msgid "Hyperlink Color"
 msgstr "Hyperlink colour"
@@ -14450,6 +14505,10 @@
 msgid "Highlighted Message Name Color"
 msgstr "Send Message"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "Notification Removal"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
@@ -14484,37 +14543,25 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-#, fuzzy
-msgid "Interface colors"
-msgstr "Ignore c_olours"
-
-msgid "Widget Sizes"
-msgstr ""
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "New mail notifications"
+
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin File Control"
+
+#, fuzzy
+msgid "Colors"
+msgstr "Close"
 
 #, fuzzy
 msgid "Fonts"
 msgstr "Accounts"
 
+msgid "Miscellaneous"
+msgstr ""
+
 #, fuzzy
 msgid "Gtkrc File Tools"
 msgstr "Pidgin File Control"
@@ -14605,7 +14652,7 @@
 #. *< 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"
@@ -14658,6 +14705,113 @@
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Replaces text in outgoing messages according to user-defined rules."
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "Not logged in"
+
+#, fuzzy
+msgid "Just logged out"
+msgstr "%s logged out."
+
+msgid ""
+"Icon for Contact/\n"
+"Icon for Unknown person"
+msgstr ""
+
+#, fuzzy
+msgid "Icon for Chat"
+msgstr "Join a Chat"
+
+#, fuzzy
+msgid "Ignored"
+msgstr "Ignore"
+
+#, fuzzy
+msgid "Founder"
+msgstr "hour"
+
+#, fuzzy
+msgid "Operator"
+msgstr "Opera"
+
+msgid "Half Operator"
+msgstr ""
+
+#, fuzzy
+msgid "Authorization dialog"
+msgstr "Authorisation Given"
+
+#, fuzzy
+msgid "Error dialog"
+msgstr "Error"
+
+#, fuzzy
+msgid "Information dialog"
+msgstr "Information"
+
+msgid "Mail dialog"
+msgstr ""
+
+#, fuzzy
+msgid "Question dialog"
+msgstr "Request ambiguous"
+
+#, fuzzy
+msgid "Warning dialog"
+msgstr "Warning Level"
+
+msgid "What kind of dialog is this?"
+msgstr ""
+
+#, fuzzy
+msgid "Status Icons"
+msgstr "Status: %s"
+
+#, fuzzy
+msgid "Chatroom Emblems"
+msgstr "Chat Room List Url"
+
+#, fuzzy
+msgid "Dialog Icons"
+msgstr "Save Icon"
+
+#, fuzzy
+msgid "Pidgin Icon Theme Editor"
+msgstr "Pidgin File Control"
+
+#, fuzzy
+msgid "Contact"
+msgstr "Account Info"
+
+#, fuzzy
+msgid "Pidgin Buddylist Theme Editor"
+msgstr "Buddy List"
+
+#, fuzzy
+msgid "Edit Buddylist Theme"
+msgstr "Buddy List"
+
+msgid "Edit Icon Theme"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin File Control"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin File Control"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -14837,9 +14991,10 @@
 msgid "Options specific to Pidgin for Windows."
 msgstr "Options specific to Windows Pidgin."
 
-msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
+#, fuzzy
+msgid ""
+"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 ""
@@ -14882,6 +15037,293 @@
 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?"
+
+#, fuzzy
+#~ msgid "Interface colors"
+#~ msgstr "Ignore c_olours"
+
+#, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "(1 message)"
 
@@ -15375,10 +15817,6 @@
 #~ msgstr "Users on %s: %s"
 
 #, fuzzy
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "Do you want to add this buddy to your buddy list?"
-
-#, fuzzy
 #~ msgid "Group Operation Error"
 #~ msgstr "File operation error"
 
@@ -15387,10 +15825,6 @@
 #~ msgstr "%s not currently logged in."
 
 #, fuzzy
-#~ msgid "Error requesting login token"
-#~ msgstr "Error creating connection"
-
-#, fuzzy
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "Unable to login to AIM"
 
@@ -15509,17 +15943,9 @@
 #~ msgstr "Currently on"
 
 #, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Unable to connect to server."
-
-#, fuzzy
 #~ msgid "_Merge"
 #~ msgstr "_Message:"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Account:"
-
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "Hide Disconnect Errors"
 
@@ -15680,13 +16106,6 @@
 #~ "\n"
 #~ "<b>Status:</b> Offline"
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Description:</b> Spooky"
-
 #, fuzzy
 #~ msgid ""
 #~ "\n"
@@ -16347,9 +16766,6 @@
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "Send a message to the selected buddy"
 
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "Get information on the selected buddy"
-
 #~ msgid "_Chat"
 #~ msgstr "_Chat"
 
@@ -16558,9 +16974,6 @@
 #~ msgid "Summary"
 #~ msgstr "Summary"
 
-#~ msgid "Message Text"
-#~ msgstr "Message Text"
-
 #~ msgid "Away Messages"
 #~ msgstr "Away Messages"
 
@@ -16659,9 +17072,6 @@
 #~ msgid "Critical error in GG library\n"
 #~ msgstr "Critical error in GG library\n"
 
-#~ msgid "Unable to ping server"
-#~ msgstr "Unable to ping server"
-
 #~ msgid "Send as message"
 #~ msgstr "Send as message"
 
@@ -16872,9 +17282,6 @@
 #~ msgid "%s logged in."
 #~ msgstr "%s logged in."
 
-#~ msgid "%s logged out."
-#~ msgstr "%s logged out."
-
 #~ msgid ""
 #~ "%s has just been warned by %s.\n"
 #~ "Your new warning level is %d%%"