Checkin updated versions of this files after running the stats script on them

1 files changed, 958 insertions, 450 deletions

diff --git a/po/en_AU.po b/po/en_AU.po
index 15fca0e1c4..8fca9ab8af 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-11-14 20:33-0500\n"
+"POT-Creation-Date: 2010-03-29 00:12-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"
@@ -1647,6 +1647,7 @@ msgstr ""
 msgid "Online"
 msgstr "Online"
 
+#. primative,						no,							id,			name
 msgid "Offline"
 msgstr "Offline"
 
@@ -2048,6 +2049,10 @@ msgstr "Cannot send a directory."
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 
+#, fuzzy
+msgid "File is not readable."
+msgstr "Chat in %s is not available."
+
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s wants to send you %s (%s)"
@@ -2298,24 +2303,20 @@ msgstr ""
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "An unknown signon error has occurred: %s."
 
-#, fuzzy
-msgid "Conference error"
-msgstr "Connection Closed"
-
 msgid "Error with your microphone"
 msgstr ""
 
 msgid "Error with your webcam"
 msgstr ""
 
+#, fuzzy
+msgid "Conference error"
+msgstr "Connection Closed"
+
 #, fuzzy, c-format
 msgid "Error creating session: %s"
 msgstr "Error creating connection"
 
-#, fuzzy
-msgid "Error creating conference."
-msgstr "Error creating connection"
-
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
@@ -3100,18 +3101,6 @@ 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, 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, c-format
-msgid "Unable to listen on socket: %s"
-msgstr "Unable to create socket"
-
 #, fuzzy
 msgid "Error communicating with local mDNSResponder."
 msgstr "Error communicating with server"
@@ -3289,10 +3278,20 @@ msgstr "Remove the chat from your buddy list"
 msgid "Add to chat..."
 msgstr "Add a C_hat"
 
+#. 0
 #. Global
 msgid "Available"
 msgstr "Available"
 
+#. 2
+msgid "Chatty"
+msgstr "Chatty"
+
+#. 3
+msgid "Do Not Disturb"
+msgstr "Do Not Disturb"
+
+#. 1
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
@@ -3958,6 +3957,14 @@ msgstr "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Server requires plaintext authentication over an unencrypted stream"
 
+#. This should never happen!
+#, 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"
+
 #, fuzzy, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -3969,27 +3976,39 @@ msgstr ""
 msgid "Plaintext Authentication"
 msgstr "Plaintext Authentication"
 
-#, 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"
 
+msgid "Server thinks authentication is complete, but client does not"
+msgstr ""
+
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "Authentication failed"
+
 #, fuzzy, c-format
 msgid "SASL error: %s"
 msgstr "Read error"
 
+#, fuzzy
+msgid "Unable to canonicalize username"
+msgstr "Unable to configure"
+
+#, fuzzy
+msgid "Unable to canonicalize password"
+msgstr "Pidgin could not open a listening port."
+
+#, fuzzy
+msgid "Malicious challenge from server"
+msgstr "Invalid challenge from server"
+
+#, fuzzy
+msgid "Unexpected response from server"
+msgstr "Invalid response from server."
+
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
 
@@ -4098,14 +4117,18 @@ msgstr "Port"
 msgid "Resource"
 msgstr "Resource"
 
-#, c-format
-msgid "%s ago"
-msgstr ""
+#, fuzzy
+msgid "Uptime"
+msgstr "Last Updated"
 
 #, fuzzy
 msgid "Logged Off"
 msgstr "Logged out"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
 msgid "Middle Name"
 msgstr "Middle Name"
 
@@ -4156,15 +4179,6 @@ msgstr "Login"
 msgid "Log Out"
 msgstr "Logged out"
 
-msgid "Chatty"
-msgstr "Chatty"
-
-msgid "Extended Away"
-msgstr "Extended Away"
-
-msgid "Do Not Disturb"
-msgstr "Do Not Disturb"
-
 msgid "JID"
 msgstr ""
 
@@ -4305,11 +4319,6 @@ msgstr "Role"
 msgid "Ping timed out"
 msgstr "Plain text"
 
-msgid ""
-"Unable to find alternative XMPP connection methods after failing to connect "
-"directly."
-msgstr ""
-
 msgid "Invalid XMPP ID"
 msgstr "Invalid XMPP ID"
 
@@ -4440,6 +4449,7 @@ msgstr "To"
 msgid "None (To pending)"
 msgstr "None (To pending)"
 
+#. 0
 msgid "None"
 msgstr "None"
 
@@ -4455,6 +4465,14 @@ msgstr "Mood"
 msgid "Allow Buzz"
 msgstr "Allow"
 
+#, fuzzy
+msgid "Mood Name"
+msgstr "Middle Name"
+
+#, fuzzy
+msgid "Mood Comment"
+msgstr "Buddy Comment"
+
 msgid "Tune Artist"
 msgstr ""
 
@@ -4701,10 +4719,6 @@ msgid ""
 "buzzes now."
 msgstr "Unable to play sound because the chosen file (%s) does not exist."
 
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
-
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 #, fuzzy
@@ -4715,6 +4729,10 @@ msgstr "Buzz!!"
 msgid "%s has buzzed you!"
 msgstr "The user has blocked you"
 
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
 #, fuzzy, c-format
 msgid "Unable to initiate media with %s: invalid JID"
 msgstr "Unable to send message to %s:"
@@ -4746,6 +4764,10 @@ msgstr "Select a file"
 msgid "Initiate Media"
 msgstr "Initiate _Chat"
 
+#, fuzzy
+msgid "Account does not support PEP, can't set mood"
+msgstr "This protocol does not support chat rooms."
+
 msgid "config:  Configure a chat room."
 msgstr "config:  Configure a chat room."
 
@@ -4799,6 +4821,13 @@ msgstr ""
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
+#, fuzzy
+msgid "mood: Set current user mood"
+msgstr "Select correct user"
+
+msgid "Extended Away"
+msgstr "Extended Away"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4876,12 +4905,22 @@ msgstr "XMPP Message Error"
 msgid "(Code %s)"
 msgstr " (Code %s)"
 
+#, fuzzy
+msgid "A custom smiley in the message is too large to send."
+msgstr "Unable to send message. The message is too large."
+
+msgid "XMPP stream header missing"
+msgstr ""
+
+msgid "XMPP Version Mismatch"
+msgstr ""
+
+msgid "XMPP stream missing ID"
+msgstr ""
+
 msgid "XML Parse error"
 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"
@@ -4920,6 +4959,9 @@ msgstr "You have been kicked by %s: (%s)"
 msgid "Kicked (%s)"
 msgstr "Kicked by %s (%s)"
 
+msgid "Unknown Error in presence"
+msgstr "Unknown Error in presence"
+
 #, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "An error occurred while opening the file."
@@ -4956,19 +4998,319 @@ msgstr ""
 "Please enter the screen name of the person whose info you would like to view."
 
 #, fuzzy
-msgid "Edit User Mood"
-msgstr "User Modes"
+msgid "Afraid"
+msgstr "Amharic"
+
+#, fuzzy
+msgid "Amazed"
+msgstr "Ashamed"
 
-msgid "Please select your mood from the list."
+msgid "Amorous"
 msgstr ""
 
+#. 1
+msgid "Angry"
+msgstr "Angry"
+
 #, fuzzy
-msgid "Set"
-msgstr "_Set"
+msgid "Annoyed"
+msgstr "Banned"
+
+msgid "Anxious"
+msgstr "Anxious"
 
 #, fuzzy
-msgid "Set Mood..."
-msgstr "Save File..."
+msgid "Aroused"
+msgstr "You send"
+
+msgid "Ashamed"
+msgstr "Ashamed"
+
+msgid "Bored"
+msgstr "Bored"
+
+#, fuzzy
+msgid "Brave"
+msgstr "Save"
+
+#, fuzzy
+msgid "Calm"
+msgstr "Realname"
+
+#, fuzzy
+msgid "Cautious"
+msgstr "Chats"
+
+#, fuzzy
+msgid "Cold"
+msgstr "Bold"
+
+#, fuzzy
+msgid "Confident"
+msgstr "Conflict"
+
+#, fuzzy
+msgid "Confused"
+msgstr "Connecting"
+
+#, fuzzy
+msgid "Contemplative"
+msgstr "Account Info"
+
+#, fuzzy
+msgid "Contented"
+msgstr "Connect"
+
+#, fuzzy
+msgid "Cranky"
+msgstr "Company"
+
+msgid "Crazy"
+msgstr ""
+
+#, fuzzy
+msgid "Creative"
+msgstr "Date"
+
+#, fuzzy
+msgid "Curious"
+msgstr "Turkish"
+
+#, fuzzy
+msgid "Dejected"
+msgstr "Reset"
+
+#, fuzzy
+msgid "Depressed"
+msgstr "Delete"
+
+#, fuzzy
+msgid "Disappointed"
+msgstr "Disconnected."
+
+msgid "Disgusted"
+msgstr ""
+
+#, fuzzy
+msgid "Dismayed"
+msgstr "Visible"
+
+#, fuzzy
+msgid "Distracted"
+msgstr "Detached"
+
+msgid "Embarrassed"
+msgstr ""
+
+#, fuzzy
+msgid "Envious"
+msgstr "Anxious"
+
+#. 2
+msgid "Excited"
+msgstr "Excited"
+
+msgid "Flirtatious"
+msgstr ""
+
+#, fuzzy
+msgid "Frustrated"
+msgstr "First name:"
+
+msgid "Grateful"
+msgstr ""
+
+#, fuzzy
+msgid "Grieving"
+msgstr "Connecting..."
+
+#. 3
+#, fuzzy
+msgid "Grumpy"
+msgstr "Group:"
+
+#, fuzzy
+msgid "Guilty"
+msgstr "City"
+
+#. 4
+msgid "Happy"
+msgstr "Happy"
+
+msgid "Hopeful"
+msgstr ""
+
+#. 8
+#, fuzzy
+msgid "Hot"
+msgstr "_Host:"
+
+msgid "Humbled"
+msgstr ""
+
+msgid "Humiliated"
+msgstr ""
+
+#, fuzzy
+msgid "Hungry"
+msgstr "Angry"
+
+msgid "Hurt"
+msgstr ""
+
+msgid "Impressed"
+msgstr ""
+
+#, fuzzy
+msgid "In awe"
+msgstr "In Love"
+
+#, fuzzy
+msgid "In love"
+msgstr "In Love"
+
+#, fuzzy
+msgid "Indignant"
+msgstr "Macedonian"
+
+#, fuzzy
+msgid "Interested"
+msgstr "_Insert"
+
+#, fuzzy
+msgid "Intoxicated"
+msgstr "Invite"
+
+#. 6
+msgid "Invincible"
+msgstr "Invincible"
+
+msgid "Jealous"
+msgstr "Jealous"
+
+#, fuzzy
+msgid "Lonely"
+msgstr "None"
+
+#, fuzzy
+msgid "Lost"
+msgstr "Sounds"
+
+msgid "Lucky"
+msgstr ""
+
+#, fuzzy
+msgid "Mean"
+msgstr "German"
+
+#, fuzzy
+msgid "Moody"
+msgstr "Mood"
+
+msgid "Nervous"
+msgstr ""
+
+#, fuzzy
+msgid "Neutral"
+msgstr "Details"
+
+#, fuzzy
+msgid "Offended"
+msgstr "Offline"
+
+msgid "Outraged"
+msgstr ""
+
+#, fuzzy
+msgid "Playful"
+msgstr "Play"
+
+#, fuzzy
+msgid "Proud"
+msgstr "Load"
+
+#, fuzzy
+msgid "Relaxed"
+msgstr "Realname"
+
+#, fuzzy
+msgid "Relieved"
+msgstr "Send Message"
+
+#, fuzzy
+msgid "Remorseful"
+msgstr "Remove"
+
+#, fuzzy
+msgid "Restless"
+msgstr "Register"
+
+#. 7
+msgid "Sad"
+msgstr "Sad"
+
+msgid "Sarcastic"
+msgstr ""
+
+msgid "Satisfied"
+msgstr ""
+
+#, fuzzy
+msgid "Serious"
+msgstr "Sounds"
+
+#, fuzzy
+msgid "Shocked"
+msgstr "Blocked"
+
+msgid "Shy"
+msgstr ""
+
+#. 9
+#, fuzzy
+msgid "Sick"
+msgstr "Nick"
+
+#. 10
+#. Sleepy / Tired
+msgid "Sleepy"
+msgstr "Sleepy"
+
+msgid "Spontaneous"
+msgstr ""
+
+#, fuzzy
+msgid "Stressed"
+msgstr "Speed:"
+
+#, fuzzy
+msgid "Strong"
+msgstr "_Sorting:"
+
+msgid "Surprised"
+msgstr ""
+
+msgid "Thankful"
+msgstr ""
+
+msgid "Thirsty"
+msgstr ""
+
+#, fuzzy
+msgid "Tired"
+msgstr "Firefox"
+
+#, fuzzy
+msgid "Undefined"
+msgstr "Underline"
+
+#, fuzzy
+msgid "Weak"
+msgstr "Back"
+
+#, fuzzy
+msgid "Worried"
+msgstr "Bored"
 
 #, fuzzy
 msgid "Set User Nickname"
@@ -4984,6 +5326,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+msgid "Set"
+msgstr "_Set"
+
+#, fuzzy
 msgid "Set Nickname..."
 msgstr "Nickname"
 
@@ -5030,183 +5376,148 @@ msgstr ""
 "%s is on the local list but not on the server list. Do you want this buddy "
 "to be added?"
 
-#, c-format
 msgid "Unable to parse message"
 msgstr "Unable to parse message"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntax Error (probably a Pidgin bug)"
 
-#, c-format
 msgid "Invalid email address"
 msgstr "Invalid email address"
 
-#, c-format
 msgid "User does not exist"
 msgstr "User does not exist"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Fully qualified domain name missing"
 msgstr "Fully Qualified Domain Name missing"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Already logged in"
 msgstr "Already Logged In"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid username"
 msgstr "Invalid Username"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Invalid friendly name"
 msgstr "Invalid Friendly Name"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "List full"
 msgstr "List Full"
 
-#, c-format
 msgid "Already there"
 msgstr "Already there"
 
-#, c-format
 msgid "Not on list"
 msgstr "Not on list"
 
-#, c-format
 msgid "User is offline"
 msgstr "User is offline"
 
-#, c-format
 msgid "Already in the mode"
 msgstr "Already in the mode"
 
-#, c-format
 msgid "Already in opposite list"
 msgstr "Already in opposite list"
 
-#, c-format
 msgid "Too many groups"
 msgstr "Too many groups"
 
-#, c-format
 msgid "Invalid group"
 msgstr "Invalid group"
 
-#, c-format
 msgid "User not in group"
 msgstr "User not in group"
 
-#, c-format
 msgid "Group name too long"
 msgstr "Group name too long"
 
-#, c-format
 msgid "Cannot remove group zero"
 msgstr "Cannot remove group zero"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Tried to add a contact to a group that doesn't exist"
 
-#, c-format
 msgid "Switchboard failed"
 msgstr "Switchboard failed"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Notify transfer failed"
 msgstr "Notify Transfer failed"
 
-#, c-format
 msgid "Required fields missing"
 msgstr "Required fields missing"
 
-#, c-format
 msgid "Too many hits to a FND"
 msgstr "Too many hits to a FND"
 
-#, c-format
 msgid "Not logged in"
 msgstr "Not logged in"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Service temporarily unavailable"
 msgstr "Service Temporarily Unavailable"
 
-#, c-format
 msgid "Database server error"
 msgstr "Database server error"
 
-#, c-format
 msgid "Command disabled"
 msgstr "Command disabled"
 
-#, c-format
 msgid "File operation error"
 msgstr "File operation error"
 
-#, c-format
 msgid "Memory allocation error"
 msgstr "Memory allocation error"
 
-#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Wrong CHL value sent to server"
 
-#, c-format
 msgid "Server busy"
 msgstr "Server busy"
 
-#, c-format
 msgid "Server unavailable"
 msgstr "Server unavailable"
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "Peer notification server down"
 msgstr "Peer Notification server down"
 
-#, c-format
 msgid "Database connect error"
 msgstr "Database connect error"
 
-#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Server is going down (abandon ship)"
 
-#, c-format
 msgid "Error creating connection"
 msgstr "Error creating connection"
 
-#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parameters are either unknown or not allowed"
 
-#, c-format
 msgid "Unable to write"
 msgstr "Unable to write"
 
-#, c-format
 msgid "Session overload"
 msgstr "Session overload"
 
-#, c-format
 msgid "User is too active"
 msgstr "User is too active"
 
-#, c-format
 msgid "Too many sessions"
 msgstr "Too many sessions"
 
-#, c-format
 msgid "Passport not verified"
 msgstr "Passport not verified"
 
-#, c-format
 msgid "Bad friend file"
 msgstr "Bad friend file"
 
-#, c-format
 msgid "Not expected"
 msgstr "Not expected"
 
@@ -5214,27 +5525,21 @@ msgstr "Not expected"
 msgid "Friendly name is changing too rapidly"
 msgstr "Friendly name changes too rapidly"
 
-#, c-format
 msgid "Server too busy"
 msgstr "Server too busy"
 
-#, c-format
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
-#, c-format
 msgid "Not allowed when offline"
 msgstr "Not allowed when offline"
 
-#, c-format
 msgid "Not accepting new users"
 msgstr "Not accepting new users"
 
-#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Kids Passport without parental consent"
 
-#, c-format
 msgid "Passport account not yet verified"
 msgstr "Passport account not yet verified"
 
@@ -5242,7 +5547,6 @@ msgstr "Passport account not yet verified"
 msgid "Passport account suspended"
 msgstr "Passport account not yet verified"
 
-#, c-format
 msgid "Bad ticket"
 msgstr "Bad ticket"
 
@@ -5300,6 +5604,10 @@ msgstr "Email Address"
 msgid "Your new MSN friendly name is too long."
 msgstr "Your new MSN friendly name is too long."
 
+#, fuzzy, c-format
+msgid "Set friendly name for %s."
+msgstr "Set your friendly name."
+
 msgid "Set your friendly name."
 msgstr "Set your friendly name."
 
@@ -5687,10 +5995,6 @@ msgstr "Normal authentication failed!"
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Normal authentication failed!"
 
-#, fuzzy, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s wants to send you a file"
-
 msgid "The following users are missing from your addressbook"
 msgstr ""
 
@@ -5892,77 +6196,9 @@ msgstr "Do you want to add this buddy to your buddy list?"
 msgid "The username specified is invalid."
 msgstr "The SecurID key entered is invalid."
 
-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Friendly name changes too rapidly"
-
-msgid "This Hotmail account may not be active."
-msgstr ""
-
-msgid "Profile URL"
-msgstr "Profile URL"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "MSN Protocol Plugin"
-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."
+#. 5
+msgid "In Love"
+msgstr "In Love"
 
 #. show current mood
 #, fuzzy
@@ -5981,6 +6217,29 @@ msgstr "Change Password"
 msgid "How do you feel right now?"
 msgstr ""
 
+#, fuzzy
+msgid "The PIN you entered is invalid."
+msgstr "The SecurID key entered is invalid."
+
+#, fuzzy
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "The SecurID key entered is invalid."
+
+msgid "The PIN is invalid. It should only consist of digits [0-9]."
+msgstr ""
+
+#, fuzzy
+msgid "The two PINs you entered do not match."
+msgstr "New passwords do not match."
+
+#, fuzzy
+msgid "The name you entered is invalid."
+msgstr "The SecurID key entered is invalid."
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
+
 #. show error to user
 #, fuzzy
 msgid "Profile Update Error"
@@ -6059,10 +6318,12 @@ msgstr "About Pidgin"
 msgid "The file you are trying to send is too large!"
 msgstr "The message is too large."
 
+#, fuzzy
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
+"Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
+"Unable to connect to server. Please enter the address of the server you wish "
+"to connect to."
 
 #, fuzzy
 msgid "Logging In..."
@@ -6070,8 +6331,7 @@ msgstr "Logging"
 
 #, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
+"Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -6080,6 +6340,14 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Connecting"
 
+#, fuzzy
+msgid "The nick name you entered is invalid."
+msgstr "The SecurID key entered is invalid."
+
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "The SecurID key entered is invalid."
+
 #. mxit login name
 msgid "MXit Login Name"
 msgstr ""
@@ -6168,6 +6436,10 @@ msgid "Retrieving User Information..."
 msgstr "Server Information"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Logging"
+
+#, fuzzy
 msgid "Status Message"
 msgstr "Send Message"
 
@@ -6213,6 +6485,11 @@ msgstr ""
 msgid "Successfully Logged In..."
 msgstr "Telephone Number"
 
+#, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+
 #, fuzzy
 msgid "Message Error"
 msgstr "XMPP Message Error"
@@ -6221,6 +6498,18 @@ msgid "Cannot perform redirect using the specified protocol"
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "An unknown signon error has occurred: %s."
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "Read error"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "Read error"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "Connection Error"
 
@@ -6295,39 +6584,6 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "Angry"
-
-msgid "Excited"
-msgstr "Excited"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Group:"
-
-msgid "Happy"
-msgstr "Happy"
-
-msgid "In Love"
-msgstr "In Love"
-
-msgid "Invincible"
-msgstr "Invincible"
-
-msgid "Sad"
-msgstr "Sad"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Host:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Nick"
-
-msgid "Sleepy"
-msgstr "Sleepy"
-
 #, fuzzy
 msgid "Pending"
 msgstr "Send"
@@ -6981,7 +7237,10 @@ msgstr "Server address"
 msgid "Server port"
 msgstr "Server port"
 
-#. Note to translators: %s in this string is a URL
+#, fuzzy, c-format
+msgid "Received unexpected response from %s: %s"
+msgstr "Invalid response from server."
+
 #, fuzzy, c-format
 msgid "Received unexpected response from %s"
 msgstr "Invalid response from server."
@@ -6999,6 +7258,11 @@ msgstr ""
 msgid "Error requesting %s: %s"
 msgstr "Error creating connection"
 
+msgid ""
+"Server requested that you fill out a CAPTCHA in order to sign in, but this "
+"client does not currently support CAPTCHAs."
+msgstr ""
+
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
@@ -7010,6 +7274,107 @@ msgstr "Could not connect"
 msgid "Invalid chat room name"
 msgstr "Invalid Room Name"
 
+msgid "Thinking"
+msgstr ""
+
+#, fuzzy
+msgid "Shopping"
+msgstr "Buddy stops t_yping"
+
+#, fuzzy
+msgid "Questioning"
+msgstr "Request ambiguous"
+
+#, fuzzy
+msgid "Eating"
+msgstr "Paging"
+
+msgid "Watching a movie"
+msgstr ""
+
+#, fuzzy
+msgid "Typing"
+msgstr "Ping"
+
+#, fuzzy
+msgid "At the office"
+msgstr "Not In Office"
+
+msgid "Taking a bath"
+msgstr ""
+
+msgid "Watching TV"
+msgstr ""
+
+msgid "Having fun"
+msgstr ""
+
+#, fuzzy
+msgid "Sleeping"
+msgstr "Sleepy"
+
+msgid "Using a PDA"
+msgstr ""
+
+#, fuzzy
+msgid "Meeting friends"
+msgstr "_IM windows"
+
+#, fuzzy
+msgid "On the phone"
+msgstr "On The Phone"
+
+msgid "Surfing"
+msgstr ""
+
+#. "I am mobile." / "John is mobile."
+#, fuzzy
+msgid "Mobile"
+msgstr "Mobile Phone"
+
+#, fuzzy
+msgid "Searching the web"
+msgstr "Warn the user"
+
+#, fuzzy
+msgid "At a party"
+msgstr "Auth port"
+
+msgid "Having Coffee"
+msgstr ""
+
+#. Playing video games
+#, fuzzy
+msgid "Gaming"
+msgstr "User Limit"
+
+msgid "Browsing the web"
+msgstr ""
+
+#, fuzzy
+msgid "Smoking"
+msgstr "_Sorting:"
+
+#, fuzzy
+msgid "Writing"
+msgstr "Warn"
+
+#. Drinking [Alcohol]
+#, fuzzy
+msgid "Drinking"
+msgstr "Warn"
+
+msgid "Listening to music"
+msgstr ""
+
+#, fuzzy
+msgid "Studying"
+msgstr "Send"
+
+#, fuzzy
+msgid "In the restroom"
+msgstr "_Insert"
+
 #, fuzzy
 msgid "Received invalid data on connection with server"
 msgstr "Unable to make SSL connection to server."
@@ -7227,6 +7592,9 @@ msgstr "Get File"
 msgid "Games"
 msgstr "Games"
 
+msgid "ICQ Xtraz"
+msgstr ""
+
 msgid "Add-Ins"
 msgstr "Add-Ins"
 
@@ -7294,6 +7662,26 @@ msgstr "Web Aware"
 msgid "Invisible"
 msgstr "Invisible"
 
+#, fuzzy
+msgid "Evil"
+msgstr "Email"
+
+#, fuzzy
+msgid "Depression"
+msgstr "Progress"
+
+#, fuzzy
+msgid "At home"
+msgstr "About Pidgin"
+
+#, fuzzy
+msgid "At work"
+msgstr "Network"
+
+#, fuzzy
+msgid "At lunch"
+msgstr "Out To Lunch"
+
 msgid "IP Address"
 msgstr "IP Address"
 
@@ -7569,14 +7957,6 @@ msgstr ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 
-#, fuzzy
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again.\n"
-msgstr ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again."
-
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "You have been disconnected from chat room %s."
@@ -7825,6 +8205,10 @@ msgstr "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgid "iTunes Music Store Link"
 msgstr ""
 
+#, fuzzy
+msgid "Lunch"
+msgstr "Finch"
+
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Buddy Comment for %s"
@@ -7860,7 +8244,8 @@ msgstr "Get Info"
 msgid "Edit Buddy Comment"
 msgstr "Edit Buddy Comment"
 
-msgid "Get Status Msg"
+#, fuzzy
+msgid "Get X-Status Msg"
 msgstr "Get Status Msg"
 
 #, fuzzy
@@ -8187,10 +8572,6 @@ msgstr "Last Updated"
 msgid "Could not change buddy information."
 msgstr "Please enter a buddy to pounce."
 
-#, fuzzy
-msgid "Mobile"
-msgstr "Mobile Phone"
-
 msgid "Note"
 msgstr "Note"
 
@@ -9319,18 +9700,6 @@ msgstr "Hyper Active"
 msgid "Robot"
 msgstr "Robot"
 
-msgid "Jealous"
-msgstr "Jealous"
-
-msgid "Ashamed"
-msgstr "Ashamed"
-
-msgid "Bored"
-msgstr "Bored"
-
-msgid "Anxious"
-msgstr "Anxious"
-
 msgid "User Modes"
 msgstr "User Modes"
 
@@ -9838,10 +10207,6 @@ msgstr "Your Current Mood"
 msgid "Normal"
 msgstr "Normal"
 
-#, fuzzy
-msgid "In love"
-msgstr "In Love"
-
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -10905,6 +11270,10 @@ msgid "Exposure"
 msgstr "Exposure"
 
 #, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr "Unable to create socket"
+
+#, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "Unable to send message: %s"
 
@@ -11016,8 +11385,9 @@ msgstr "Do Not Disturb"
 msgid "Extended away"
 msgstr "Extended Away"
 
-msgid "Listening to music"
-msgstr ""
+#, fuzzy
+msgid "Feeling"
+msgstr "Remaining"
 
 #, fuzzy, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -11603,6 +11973,18 @@ msgstr ""
 msgid "Unknown node type"
 msgstr "Unknown Error Code %d"
 
+#, fuzzy
+msgid "Please select your mood from the list"
+msgstr "Please enter a new name for the selected group."
+
+#, fuzzy
+msgid "Message (optional)"
+msgstr "Message Notification"
+
+#, fuzzy
+msgid "Edit User Mood"
+msgstr "User Modes"
+
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Buddies"
@@ -11694,6 +12076,10 @@ msgstr "/Tools/Pr_eferences"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Tools/Pr_ivacy"
 
+#, fuzzy
+msgid "/Tools/Set _Mood"
+msgstr "/Tools/View System _Log"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Tools/_File Transfers"
 
@@ -11715,9 +12101,21 @@ msgstr "/_Help"
 msgid "/Help/Online _Help"
 msgstr "/Help/Online _Help"
 
+#, fuzzy
+msgid "/Help/_Build Information"
+msgstr "Buddy Information"
+
 msgid "/Help/_Debug Window"
 msgstr "/Help/_Debug Window"
 
+#, fuzzy
+msgid "/Help/De_veloper Information"
+msgstr "Server Information"
+
+#, fuzzy
+msgid "/Help/_Translator Information"
+msgstr "Personal Information"
+
 msgid "/Help/_About"
 msgstr "/Help/_About"
 
@@ -11973,6 +12371,10 @@ msgstr ""
 msgid "_Edit Account"
 msgstr "_Account"
 
+#, fuzzy
+msgid "Set _Mood..."
+msgstr "Save File..."
+
 msgid "No actions available"
 msgstr "No actions available"
 
@@ -12025,12 +12427,6 @@ msgstr "<h1>Conversation with %s</h1>\n"
 msgid "Save Conversation"
 msgstr "Save Conversation"
 
-msgid "Find"
-msgstr "Find"
-
-msgid "_Search for:"
-msgstr "_Search for:"
-
 msgid "Un-Ignore"
 msgstr "Un-Ignore"
 
@@ -12114,6 +12510,10 @@ msgstr "/Conversation/View _Log"
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversation/Se_nd File..."
 
+#, fuzzy
+msgid "/Conversation/Get _Attention"
+msgstr "/Conversation/Get Info"
+
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Add Buddy _Pounce..."
 
@@ -12206,6 +12606,10 @@ msgstr "/Conversation/_Close"
 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Send File..."
 
+#, fuzzy
+msgid "/Conversation/Get Attention"
+msgstr "/Conversation/Get Info"
+
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Add Buddy Pounce..."
 
@@ -12272,6 +12676,13 @@ msgstr "Send"
 msgid "0 people in room"
 msgstr "0 people in room"
 
+msgid "Close Find bar"
+msgstr ""
+
+#, fuzzy
+msgid "Find:"
+msgstr "Find"
+
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -12279,10 +12690,6 @@ msgstr[0] "%d person in room"
 msgstr[1] "%d people in room"
 
 #, fuzzy
-msgid "Typing"
-msgstr "Ping"
-
-#, fuzzy
 msgid "Stopped Typing"
 msgstr "Ping"
 
@@ -12340,6 +12747,12 @@ msgstr "By group"
 msgid "By account"
 msgstr "By account"
 
+msgid "Find"
+msgstr "Find"
+
+msgid "_Search for:"
+msgstr "_Search for:"
+
 msgid "Save Debug Log"
 msgstr "Save Debug Log"
 
@@ -12583,9 +12996,6 @@ msgstr "Turkish"
 msgid "Lao"
 msgstr ""
 
-msgid "Lithuanian"
-msgstr "Lithuanian"
-
 msgid "Macedonian"
 msgstr "Macedonian"
 
@@ -12594,6 +13004,14 @@ msgid "Mongolian"
 msgstr "Macedonian"
 
 #, fuzzy
+msgid "Marathi"
+msgstr "Address"
+
+#, fuzzy
+msgid "Malay"
+msgstr "Male"
+
+#, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "Norwegian"
 
@@ -12611,6 +13029,10 @@ msgstr "Norwegian"
 msgid "Occitan"
 msgstr ""
 
+#, fuzzy
+msgid "Oriya"
+msgstr "Opera"
+
 msgid "Punjabi"
 msgstr ""
 
@@ -12667,6 +13089,10 @@ msgstr ""
 msgid "Turkish"
 msgstr "Turkish"
 
+#, fuzzy
+msgid "Ukranian"
+msgstr "Ukrainian"
+
 msgid "Urdu"
 msgstr ""
 
@@ -12688,47 +13114,50 @@ msgstr "Traditional Chinese"
 msgid "Amharic"
 msgstr "Amharic"
 
-#, fuzzy, c-format
-msgid "About %s"
-msgstr "About Pidgin"
+msgid "Lithuanian"
+msgstr "Lithuanian"
 
 #, c-format
 msgid ""
-"%s is a graphical modular messaging client based on libpurple which is "
-"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
-"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
-"redistribute the program under the terms of the GPL (version 2 or later).  A "
-"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
-"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
-"complete list of contributors.  We provide no warranty for this program."
-"<BR><BR>"
+"%s is a messaging client based on libpurple which is capable of connecting "
+"to multiple messaging services at once.  %s is written in C using GTK+.  %s "
+"is released, and may be modified and redistributed,  under the terms of the "
+"GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
+"copyrighted by its contributors, a list of whom is also distributed with %"
+"s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 
 #, 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/>"
+"<FONT SIZE=\"4\"><B>Helpful Resources</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Frequently Asked Questions</A><BR>\tIRC "
+"Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
+"im<BR><BR>"
 msgstr ""
 
 #, c-format
 msgid ""
-"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
-"primary language is <b>English</b>.  You are welcome to post in another "
-"language, but the responses may be less helpful.<br/><br/>"
+"<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
+"e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
+">This is a <b>public</b> mailing list! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archive</a>)<br/>We can't help with third-party protocols or "
+"plugins!<br/>This list's primary language is <b>English</b>.  You are "
+"welcome to post in another language, but the responses may be less helpful."
+"<br/>"
 msgstr ""
 
 #, fuzzy, c-format
-msgid ""
-"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin on irc.freenode.net<BR><BR>"
+msgid "About %s"
+msgstr "About Pidgin"
 
+#, fuzzy
+msgid "Build Information"
+msgstr "Buddy Information"
+
+#. End of not to be translated section
 #, fuzzy, c-format
-msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin on irc.freenode.net<BR><BR>"
+msgid "%s Build Information"
+msgstr "Buddy Information"
 
 #, fuzzy
 msgid "Current Developers"
@@ -12744,15 +13173,19 @@ msgstr "Retired Developers"
 msgid "Retired Crazy Patch Writers"
 msgstr "Crazy Patch Writers"
 
+#, fuzzy, c-format
+msgid "%s Developer Information"
+msgstr "Server Information"
+
 msgid "Current Translators"
 msgstr "Current Translators"
 
 msgid "Past Translators"
 msgstr "Past Translators"
 
-#, fuzzy
-msgid "Debugging Information"
-msgstr "User Information"
+#, fuzzy, c-format
+msgid "%s Translator Information"
+msgstr "Work Information"
 
 #, fuzzy
 msgid "_Name"
@@ -13075,12 +13508,6 @@ msgid ""
 "Defaulting to PNG."
 msgstr ""
 
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-
 #, fuzzy, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13091,13 +13518,6 @@ msgstr ""
 "\n"
 "%s"
 
-#, fuzzy, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr "Error saving image: %s"
-
 msgid "Save Image"
 msgstr "Save Image"
 
@@ -13210,6 +13630,10 @@ msgid "Insert Smiley"
 msgstr "Insert smiley"
 
 #, fuzzy
+msgid "Send Attention"
+msgstr "_Send As"
+
+#, fuzzy
 msgid "<b>_Bold</b>"
 msgstr "<b>_Password:</b>"
 
@@ -13265,6 +13689,9 @@ msgstr ""
 msgid "_Smile!"
 msgstr "Smile!"
 
+msgid "_Attention!"
+msgstr ""
+
 #, fuzzy
 msgid "Log Deletion Failed"
 msgstr "Connection Failed"
@@ -13651,9 +14078,8 @@ msgstr "Unknown pounce event. Please report this!"
 msgid "(Custom)"
 msgstr ""
 
-#, fuzzy
-msgid "(Default)"
-msgstr "Gnome Default"
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
 msgstr ""
@@ -13675,18 +14101,34 @@ msgstr "Failed to store image: %s\n"
 msgid "Theme failed to copy."
 msgstr ""
 
-msgid "Install Theme"
-msgstr ""
+#, fuzzy
+msgid "Theme Selections"
+msgstr "Browser Selection"
 
+#. Instructions
+#, fuzzy
 msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
+"Select a theme that you would like to use from the lists below.\n"
+"New themes can be installed by dragging and dropping them onto the theme "
+"list."
 msgstr ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
 
-msgid "Icon"
-msgstr "Icon"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "Buddy List"
+
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "Status: %s"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "Smiley Themes"
 
 #, fuzzy
 msgid "Keyboard Shortcuts"
@@ -13696,11 +14138,6 @@ msgstr "Shortcuts"
 msgid "Cl_ose conversations with the Escape key"
 msgstr "Conversations with %s"
 
-#. Buddy List Themes
-#, fuzzy
-msgid "Buddy List Theme"
-msgstr "Buddy List"
-
 #. System Tray
 msgid "System Tray Icon"
 msgstr "System Tray Icon"
@@ -13799,9 +14236,6 @@ msgstr ""
 msgid "Font"
 msgstr "Font Face"
 
-msgid "Use document font from _theme"
-msgstr ""
-
 msgid "Use font from _theme"
 msgstr ""
 
@@ -13879,51 +14313,6 @@ msgstr "_Username:"
 msgid "Pass_word:"
 msgstr "Password:"
 
-#, fuzzy
-msgid "Proxy Server &amp; Browser"
-msgstr "Proxy Server"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr ""
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr ""
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-
-#, fuzzy
-msgid "Configure _Proxy"
-msgstr "Configure Room"
-
-#, fuzzy
-msgid "Configure _Browser"
-msgstr "Configure Room"
-
-msgid "Proxy Server"
-msgstr "Proxy Server"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr ""
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "Proxy _type:"
-
-msgid "No proxy"
-msgstr "No proxy"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Port:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "_Username:"
-
 msgid "Seamonkey"
 msgstr ""
 
@@ -13965,6 +14354,16 @@ msgstr "Manual"
 msgid "Browser Selection"
 msgstr "Browser Selection"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Browser"
+msgstr "Configure Room"
+
 msgid "_Browser:"
 msgstr "_Browser:"
 
@@ -13988,6 +14387,39 @@ msgstr ""
 "_Manual:\n"
 "(%s for URL)"
 
+msgid "Proxy Server"
+msgstr "Proxy Server"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Configure _Proxy"
+msgstr "Configure Room"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr ""
+
+#, fuzzy
+msgid "Proxy t_ype:"
+msgstr "Proxy _type:"
+
+msgid "No proxy"
+msgstr "No proxy"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "_Port:"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "_Username:"
+
 #, fuzzy
 msgid "Log _format:"
 msgstr "Log _Format:"
@@ -14079,28 +14511,20 @@ msgstr "Show idle _times"
 msgid "Based on keyboard or mouse use"
 msgstr ""
 
-msgid "_Auto-reply:"
-msgstr "_Auto-reply:"
-
-#, fuzzy
-msgid "When both away and idle"
-msgstr "When away and idle"
-
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Auto-away"
-
 #, fuzzy
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutes before setting away:"
 
 #, fuzzy
-msgid "Change status when _idle"
+msgid "Change to this status when _idle:"
 msgstr "Set away _when idle"
 
+msgid "_Auto-reply:"
+msgstr "_Auto-reply:"
+
 #, fuzzy
-msgid "Change _status to:"
-msgstr "Change Address To:"
+msgid "When both away and idle"
+msgstr "When away and idle"
 
 #. Signon status stuff
 msgid "Status at Startup"
@@ -14115,9 +14539,6 @@ msgstr ""
 msgid "Interface"
 msgstr "Interface"
 
-msgid "Smiley Themes"
-msgstr "Smiley Themes"
-
 msgid "Browser"
 msgstr "Browser"
 
@@ -14125,6 +14546,10 @@ msgstr "Browser"
 msgid "Status / Idle"
 msgstr "Away / Idle"
 
+#, fuzzy
+msgid "Themes"
+msgstr "Smiley Themes"
+
 msgid "Allow all users to contact me"
 msgstr "Allow all users to contact me"
 
@@ -14298,6 +14723,10 @@ msgid "Custom Smiley Manager"
 msgstr ""
 
 #, fuzzy
+msgid "Attention received"
+msgstr "Registration Required"
+
+#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Select Buddy"
 
@@ -14380,10 +14809,13 @@ msgid ""
 "this user"
 msgstr ""
 
-#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
-#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
-#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
-#. * Probably not.  I'll just give an error and return.
+#. I don't know if we really want to do anything here.  Most of
+#. * the desktop item types are crap like "MIME Type" (I have no
+#. * clue how that would be a desktop item) and "Comment"...
+#. * nothing we can really send.  The only logical one is
+#. * "Application," but do we really want to send a binary and
+#. * nothing else? Probably not.  I'll just give an error and
+#. * return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
 #, fuzzy
 msgid "Cannot send launcher"
@@ -14416,15 +14848,6 @@ msgstr "Unknown Error"
 msgid "Could not set icon"
 msgstr "Could not send"
 
-#, fuzzy, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Failed to store image: %s\n"
-
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-
 #, fuzzy
 msgid "_Open Link"
 msgstr "_Open link in:"
@@ -14456,6 +14879,10 @@ msgid "_Save File"
 msgstr "Save File..."
 
 #, fuzzy
+msgid "Do you really want to clear?"
+msgstr "Are you sure you want to delete %s?"
+
+#, fuzzy
 msgid "Select color"
 msgstr "Select Text Colour"
 
@@ -14501,9 +14928,6 @@ msgstr "Paging"
 msgid "Pidgin smileys"
 msgstr ""
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr ""
 
@@ -15184,6 +15608,10 @@ msgid "Conversation Entry"
 msgstr "Conversations"
 
 #, fuzzy
+msgid "Conversation History"
+msgstr "Conversations"
+
+#, fuzzy
 msgid "Request Dialog"
 msgstr "Request ambiguous"
 
@@ -15738,16 +16166,6 @@ msgstr "Account:"
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr ""
 
-msgid "Insert an <iq/> stanza."
-msgstr ""
-
-msgid "Insert a <presence/> stanza."
-msgstr ""
-
-#, fuzzy
-msgid "Insert a <message/> stanza."
-msgstr "Insert image"
-
 #. *< name
 #. *< version
 #. *  summary
@@ -15755,10 +16173,131 @@ msgid "Send and receive raw XMPP stanzas."
 msgstr ""
 
 #. *  description
-msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
 #, fuzzy
+#~ msgid "Error creating conference."
+#~ msgstr "Error creating connection"
+
+#, fuzzy
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "Couldn't create socket"
+
+#, fuzzy
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "Unable to create socket"
+
+#, fuzzy
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s wants to send you a file"
+
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "Friendly name changes too rapidly"
+
+#~ msgid "Profile URL"
+#~ msgstr "Profile URL"
+
+#~ msgid "MSN Protocol Plugin"
+#~ msgstr "MSN Protocol Plugin"
+
+#~ msgid "%s is not a valid group."
+#~ msgstr "%s is not a valid group."
+
+#~ msgid "Unknown error."
+#~ msgstr "Unknown error."
+
+#~ msgid "%s on %s (%s)"
+#~ msgstr "%s on %s (%s)"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "Unable to add user on %s (%s)"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "Unable to block user on %s (%s)"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "Unable to permit user on %s (%s)"
+
+#~ msgid "%s could not be added because your buddy list is full."
+#~ msgstr "%s could not be added because your buddy list is full."
+
+#~ 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
+#~ 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
+#~ 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 ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again.\n"
+#~ msgstr ""
+#~ "The last action you attempted could not be performed because you are over "
+#~ "the rate limit. Please wait 10 seconds and try again."
+
+#, fuzzy
+#~ msgid ""
+#~ "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+#~ msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin on irc.freenode.net<BR><BR>"
+
+#, fuzzy
+#~ msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
+#~ msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin on irc.freenode.net<BR><BR>"
+
+#, fuzzy
+#~ msgid "Debugging Information"
+#~ msgstr "User Information"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error saving image\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr "Error saving image: %s"
+
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "Gnome Default"
+
+#~ msgid "Icon"
+#~ msgstr "Icon"
+
+#, fuzzy
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Proxy Server"
+
+#~ msgid "Auto-away"
+#~ msgstr "Auto-away"
+
+#, fuzzy
+#~ msgid "Change _status to:"
+#~ msgstr "Change Address To:"
+
+#, fuzzy
+#~ msgid "Failed to open file '%s': %s"
+#~ msgstr "Failed to store image: %s\n"
+
+#, fuzzy
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "Insert image"
+
+#, fuzzy
 #~ msgid "_Start port:"
 #~ msgstr "_Start Port:"
 
@@ -15937,10 +16476,6 @@ msgstr ""
 #~ msgstr "User Modes"
 
 #, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "User Limit"
-
-#, fuzzy
 #~ msgid "User Viewing"
 #~ msgstr "User Limit"
 
@@ -16079,10 +16614,6 @@ msgstr ""
 #~ 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?"
 
@@ -16168,9 +16699,6 @@ msgstr ""
 #~ msgstr ""
 #~ "A message has been dropped, you are exceeding the server speed limit."
 
-#~ msgid "Chat in %s is not available."
-#~ msgstr "Chat in %s is not available."
-
 #~ msgid "You are sending messages too fast to %s."
 #~ msgstr "You are sending messages too fast to %s."
 
@@ -16321,10 +16849,6 @@ msgstr ""
 #~ msgstr "User Information"
 
 #, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Speed:"
-
-#, fuzzy
 #~ msgid "Invalid QQ Face"
 #~ msgstr "Invalid Room Name"
 
@@ -16687,10 +17211,6 @@ msgstr ""
 #~ msgstr "Display timeout notices"
 
 #, fuzzy
-#~ msgid "Conversation History"
-#~ msgstr "Conversations"
-
-#, fuzzy
 #~ msgid "Log Viewer"
 #~ msgstr "Login server"
 
@@ -17035,9 +17555,6 @@ msgstr ""
 #~ msgid "<b>%s:</b> %s"
 #~ msgstr "<b>%s:</b> %s"
 
-#~ msgid "Realname"
-#~ msgstr "Realname"
-
 #~ msgid ""
 #~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 #~ "account properties"
@@ -17194,9 +17711,6 @@ msgstr ""
 #~ msgid "Auth host"
 #~ msgstr "Auth host"
 
-#~ msgid "Auth port"
-#~ msgstr "Auth port"
-
 #~ msgid "Active"
 #~ msgstr "Active"
 
@@ -17558,9 +18072,6 @@ msgstr ""
 #~ msgid "/Conversation/Warn..."
 #~ msgstr "/Conversation/Warn..."
 
-#~ msgid "Warn the user"
-#~ msgstr "Warn the user"
-
 #~ msgid "Send a file to the user"
 #~ msgstr "Send a file to the user"
 
@@ -17583,9 +18094,6 @@ msgstr ""
 #~ msgid "Burmese"
 #~ msgstr "Burmese"
 
-#~ msgid "Ukrainian"
-#~ msgstr "Ukrainian"
-
 #~ msgid "Chinese"
 #~ msgstr "Chinese"