diff po/en_CA.po @ 30909:25e200cb3532

propagate from branch 'im.pidgin.pidgin' (head dca20e09164518b0f7a773edd7e9649f41d8873d) to branch 'im.pidgin.cpw.malu.xmpp.google_refactor' (head 7823c556f2d1bbca43f5ef9f0fea30cabc5d313f)
author Marcus Lundblad <ml@update.uu.se>
date Tue, 31 Aug 2010 18:28:10 +0000
parents 1cdae196aac8
children 52d9f591585e
line wrap: on
line diff
--- a/po/en_CA.po	Fri Apr 09 22:14:51 2010 +0000
+++ b/po/en_CA.po	Tue Aug 31 18:28:10 2010 +0000
@@ -8,10 +8,11 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-29 00:12-0700\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2005-03-17 19:45-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -51,12 +52,24 @@
 msgstr "Error"
 
 #, fuzzy
+msgid "Account was not modified"
+msgstr "Account has been disabled"
+
+#, fuzzy
 msgid "Account was not added"
 msgstr "Account has been disabled"
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "New mail notifications"
 
@@ -821,7 +834,7 @@
 msgid "Waiting for transfer to begin"
 msgstr "Waiting for transfer to begin"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Cancelled"
 
 msgid "Failed"
@@ -1332,6 +1345,10 @@
 msgid "Someone says your username in chat"
 msgstr "Someone says your name in chat"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Registration Required"
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1439,7 +1456,6 @@
 msgstr "Server Statistics"
 
 #. title
-#. optional information
 msgid "Title"
 msgstr "Title"
 
@@ -1647,7 +1663,7 @@
 msgid "Online"
 msgstr "Online"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Offline"
 
@@ -1749,6 +1765,14 @@
 msgid "Set User Info"
 msgstr "Set User Info"
 
+#, fuzzy
+msgid "This protocol does not support setting a public alias."
+msgstr "This protocol does not support chat rooms."
+
+#, fuzzy
+msgid "This protocol does not support fetching the public alias."
+msgstr "This protocol does not support chat rooms."
+
 msgid "Unknown"
 msgstr "Unknown"
 
@@ -1767,9 +1791,10 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "The SecurID key entered is invalid."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr ""
@@ -2007,7 +2032,6 @@
 msgid "Thread creation failure: %s"
 msgstr "Authentication Failure"
 
-#. Data is assumed to be the destination bn
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Unknown reason."
@@ -3302,6 +3326,9 @@
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "First Name"
 
@@ -3948,14 +3975,6 @@
 msgid "execute"
 msgstr "Not expected"
 
-#, 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 was found."
-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"
 
@@ -3988,6 +4007,18 @@
 msgstr ""
 
 #, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Server requires plaintext authentication over an unencrypted stream"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"This server requires plaintext authentication over an unencrypted "
+"connection.  Allow this and continue authentication?"
+
+#, fuzzy
 msgid "SASL authentication failed"
 msgstr "Authentication failed"
 
@@ -3996,6 +4027,42 @@
 msgstr "Read error"
 
 #, fuzzy
+msgid "Invalid Encoding"
+msgstr "Finalizing connection"
+
+#, fuzzy
+msgid "Unsupported Extension"
+msgstr "Unsupported Version"
+
+msgid ""
+"Unexpected response from the server.  This may indicate a possible MITM "
+"attack"
+msgstr ""
+
+msgid ""
+"The server does support channel binding, but did not appear to advertise "
+"it.  This indicates a likely MITM attack"
+msgstr ""
+
+#, fuzzy
+msgid "Server does not support channel binding"
+msgstr "Server does not use any supported authentication method"
+
+#, fuzzy
+msgid "Unsupported channel binding method"
+msgstr "Unsupported Encoding"
+
+msgid "User not found"
+msgstr "User not found"
+
+#, fuzzy
+msgid "Invalid Username Encoding"
+msgstr "Invalid Username"
+
+msgid "Resource Constraint"
+msgstr "Resource Constraint"
+
+#, fuzzy
 msgid "Unable to canonicalize username"
 msgstr "Unable to configure"
 
@@ -4066,6 +4133,7 @@
 msgid "Postal Code"
 msgstr "Postal Code"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Country"
 
@@ -4080,10 +4148,14 @@
 msgid "Organization Unit"
 msgstr "Organization Unit"
 
+msgid "Job Title"
+msgstr "Job Title"
+
 msgid "Role"
 msgstr "Role"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Birthday"
 
@@ -4318,12 +4390,23 @@
 msgstr "Role"
 
 #, 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 was found."
+msgstr "Server requires TLS/SSL for login.  No TLS/SSL support found."
+
+#, fuzzy
 msgid "Ping timed out"
 msgstr "Plain text"
 
 msgid "Invalid XMPP ID"
 msgstr "Invalid XMPP ID"
 
+msgid "Invalid XMPP ID. Username portion must be set."
+msgstr ""
+
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
@@ -4429,7 +4512,6 @@
 msgid "Not Authorized"
 msgstr "Not Authorized"
 
-#. (reference: "libpurple/request.h")
 msgid "Mood"
 msgstr "Mood"
 
@@ -4451,7 +4533,6 @@
 msgid "None (To pending)"
 msgstr "None (To pending)"
 
-#. 0
 msgid "None"
 msgstr "None"
 
@@ -4475,6 +4556,12 @@
 msgid "Mood Comment"
 msgstr "Buddy Comment"
 
+#. primitive
+#. ID
+#. name - use default
+#. saveable
+#. should be user_settable some day
+#. independent
 msgid "Tune Artist"
 msgstr ""
 
@@ -4649,9 +4736,6 @@
 msgid "Remote Connection Failed"
 msgstr "Remote Connection Failed"
 
-msgid "Resource Constraint"
-msgstr "Resource Constraint"
-
 msgid "Restricted XML"
 msgstr "Restricted XML"
 
@@ -5010,7 +5094,6 @@
 msgid "Amorous"
 msgstr ""
 
-#. 1
 msgid "Angry"
 msgstr "Angry"
 
@@ -5108,7 +5191,6 @@
 msgid "Envious"
 msgstr "Anxious"
 
-#. 2
 msgid "Excited"
 msgstr "Excited"
 
@@ -5126,7 +5208,6 @@
 msgid "Grieving"
 msgstr "Connecting..."
 
-#. 3
 #, fuzzy
 msgid "Grumpy"
 msgstr "Group:"
@@ -5135,14 +5216,12 @@
 msgid "Guilty"
 msgstr "City"
 
-#. 4
 msgid "Happy"
 msgstr "Happy"
 
 msgid "Hopeful"
 msgstr ""
 
-#. 8
 #, fuzzy
 msgid "Hot"
 msgstr "_Host:"
@@ -5183,7 +5262,6 @@
 msgid "Intoxicated"
 msgstr "Invite"
 
-#. 6
 msgid "Invincible"
 msgstr "Invincible"
 
@@ -5247,7 +5325,6 @@
 msgid "Restless"
 msgstr "Register"
 
-#. 7
 msgid "Sad"
 msgstr "Sad"
 
@@ -5268,12 +5345,10 @@
 msgid "Shy"
 msgstr ""
 
-#. 9
 #, fuzzy
 msgid "Sick"
 msgstr "Nick"
 
-#. 10
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Sleepy"
@@ -5698,19 +5773,6 @@
 msgid "Out to Lunch"
 msgstr "Out To Lunch"
 
-#. primitive
-#. ID
-#. name - use default
-#. saveable
-#. should be user_settable some day
-#. independent
-#, fuzzy
-msgid "Artist"
-msgstr "Address"
-
-msgid "Album"
-msgstr ""
-
 #, fuzzy
 msgid "Game Title"
 msgstr "Title"
@@ -5884,9 +5946,6 @@
 msgid "Work"
 msgstr ""
 
-msgid "Job Title"
-msgstr "Job Title"
-
 msgid "Company"
 msgstr "Company"
 
@@ -5986,6 +6045,10 @@
 msgid "Show custom smileys"
 msgstr ""
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "Unable to create new connection."
+
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -6187,27 +6250,6 @@
 msgid "The username specified is invalid."
 msgstr "The SecurID key entered is invalid."
 
-#. 5
-msgid "In Love"
-msgstr "In Love"
-
-#. show current mood
-#, fuzzy
-msgid "Current Mood"
-msgstr "Your Current Mood"
-
-#. add all moods to list
-#, fuzzy
-msgid "New Mood"
-msgstr "User Modes"
-
-#, fuzzy
-msgid "Change your Mood"
-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."
@@ -6244,7 +6286,11 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 #, fuzzy
 msgid "PIN"
 msgstr "UIN"
@@ -6253,6 +6299,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Display"
@@ -6284,11 +6331,6 @@
 msgid "About"
 msgstr "About Pidgin"
 
-#. display / change mood
-#, fuzzy
-msgid "Change Mood..."
-msgstr "Change Password..."
-
 #. display / change profile
 #, fuzzy
 msgid "Change Profile..."
@@ -6332,7 +6374,7 @@
 msgstr "Connecting"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "The SecurID key entered is invalid."
 
 #, fuzzy
@@ -6340,13 +6382,8 @@
 msgstr "The SecurID key entered is invalid."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name
-#, fuzzy
-msgid "Nick Name"
-msgstr "Nickname"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6384,10 +6421,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6401,7 +6438,7 @@
 msgid "Security Code"
 msgstr "Security Enabled"
 
-#. ask for input
+#. ask for input (required)
 #, fuzzy
 msgid "Enter Security Code"
 msgstr "Change Password"
@@ -6435,12 +6472,17 @@
 msgstr "Send Message"
 
 #, fuzzy
+msgid "Rejection Message"
+msgstr "Send Message"
+
+#. hidden number
+#, fuzzy
 msgid "Hidden Number"
 msgstr "Middle Name"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Set Mobile Phone Number"
+msgid "Your MXit ID..."
+msgstr "Yahoo! ID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6455,6 +6497,28 @@
 msgid "Enable splash-screen popup"
 msgstr ""
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "You have been kicked by %s: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Bad ticket"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Room:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "You have been kicked by %s: (%s)"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Online"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 #, fuzzy
 msgid "We have lost the connection to MXit. Please reconnect."
@@ -6575,6 +6639,9 @@
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
+msgid "In Love"
+msgstr "In Love"
+
 #, fuzzy
 msgid "Pending"
 msgstr "Send"
@@ -6996,9 +7063,6 @@
 msgid "Incorrect password"
 msgstr "Incorrect password."
 
-msgid "User not found"
-msgstr "User not found"
-
 msgid "Account has been disabled"
 msgstr "Account has been disabled"
 
@@ -7257,6 +7321,10 @@
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Error requesting %s"
+msgstr "Error creating connection"
+
 #, fuzzy
 msgid "Could not join chat room"
 msgstr "Could not connect"
@@ -7265,6 +7333,67 @@
 msgid "Invalid chat room name"
 msgstr "Invalid Room Name"
 
+msgid "Invalid error"
+msgstr "Invalid error"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr ""
+
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
+
+#, fuzzy
+msgid "Cannot send SMS"
+msgstr "Cannot send file"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+#, fuzzy
+msgid "Cannot send SMS to this country"
+msgstr "Cannot send a directory."
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr ""
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr ""
+
+msgid "Bot account cannot IM this user"
+msgstr ""
+
+msgid "Bot account reached IM limit"
+msgstr ""
+
+msgid "Bot account reached daily IM limit"
+msgstr ""
+
+msgid "Bot account reached monthly IM limit"
+msgstr ""
+
+#, fuzzy
+msgid "Unable to receive offline messages"
+msgstr "Unable to send message."
+
+#, fuzzy
+msgid "Offline message store full"
+msgstr "Offline "
+
+#, fuzzy, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Unable to send message (%s)."
+
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Unable to send message: %s"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Unable to send message to %s:"
+
+#, fuzzy, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Unable to send message to %s:"
+
 msgid "Thinking"
 msgstr ""
 
@@ -7438,120 +7567,6 @@
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
-msgid "Invalid error"
-msgstr "Invalid error"
-
-msgid "Invalid SNAC"
-msgstr "Invalid SNAC"
-
-msgid "Rate to host"
-msgstr "Rate to host"
-
-msgid "Rate to client"
-msgstr "Rate to client"
-
-msgid "Service unavailable"
-msgstr "Service unavailable"
-
-msgid "Service not defined"
-msgstr "Service not defined"
-
-msgid "Obsolete SNAC"
-msgstr "Obsolete SNAC"
-
-msgid "Not supported by host"
-msgstr "Not supported by host"
-
-msgid "Not supported by client"
-msgstr "Not supported by client"
-
-msgid "Refused by client"
-msgstr "Refused by client"
-
-msgid "Reply too big"
-msgstr "Reply too big"
-
-msgid "Responses lost"
-msgstr "Responses lost"
-
-msgid "Request denied"
-msgstr "Request denied"
-
-msgid "Busted SNAC payload"
-msgstr "Busted SNAC payload"
-
-msgid "Insufficient rights"
-msgstr "Insufficient rights"
-
-msgid "In local permit/deny"
-msgstr "In local permit/deny"
-
-msgid "Warning level too high (sender)"
-msgstr ""
-
-msgid "Warning level too high (receiver)"
-msgstr ""
-
-msgid "User temporarily unavailable"
-msgstr "User temporarily unavailable"
-
-msgid "No match"
-msgstr "No match"
-
-msgid "List overflow"
-msgstr "List overflow"
-
-msgid "Request ambiguous"
-msgstr "Request ambiguous"
-
-msgid "Queue full"
-msgstr "Queue full"
-
-msgid "Not while on AOL"
-msgstr "Not while on AOL"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr ""
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot send SMS"
-msgstr "Cannot send file"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
-msgid "Cannot send SMS to this country"
-msgstr "Cannot send a directory."
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr ""
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr ""
-
-msgid "Bot account cannot IM this user"
-msgstr ""
-
-msgid "Bot account reached IM limit"
-msgstr ""
-
-msgid "Bot account reached daily IM limit"
-msgstr ""
-
-msgid "Bot account reached monthly IM limit"
-msgstr ""
-
-#, fuzzy
-msgid "Unable to receive offline messages"
-msgstr "Unable to send message."
-
-#, fuzzy
-msgid "Offline message store full"
-msgstr "Offline "
-
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -7907,29 +7922,10 @@
 msgstr[0] "You missed %hu message from %s for an unknown reason."
 msgstr[1] "You missed %hu messages from %s for an unknown reason."
 
-#, fuzzy, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Unable to send message (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Unable to send message: %s"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Unable to send message to %s:"
-
-#, fuzzy, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Unable to send message to %s:"
-
 #, c-format
 msgid "User information not available: %s"
 msgstr "User information not available: %s"
 
-msgid "Unknown reason."
-msgstr "Unknown reason."
-
 msgid "Online Since"
 msgstr "Online Since"
 
@@ -8372,6 +8368,75 @@
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 
+msgid "Invalid SNAC"
+msgstr "Invalid SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "Service unavailable"
+
+msgid "Service not defined"
+msgstr "Service not defined"
+
+msgid "Obsolete SNAC"
+msgstr "Obsolete SNAC"
+
+msgid "Not supported by host"
+msgstr "Not supported by host"
+
+msgid "Not supported by client"
+msgstr "Not supported by client"
+
+msgid "Refused by client"
+msgstr "Refused by client"
+
+msgid "Reply too big"
+msgstr "Reply too big"
+
+msgid "Responses lost"
+msgstr "Responses lost"
+
+msgid "Request denied"
+msgstr "Request denied"
+
+msgid "Busted SNAC payload"
+msgstr "Busted SNAC payload"
+
+msgid "Insufficient rights"
+msgstr "Insufficient rights"
+
+msgid "In local permit/deny"
+msgstr "In local permit/deny"
+
+msgid "Warning level too high (sender)"
+msgstr ""
+
+msgid "Warning level too high (receiver)"
+msgstr ""
+
+msgid "User temporarily unavailable"
+msgstr "User temporarily unavailable"
+
+msgid "No match"
+msgstr "No match"
+
+msgid "List overflow"
+msgstr "List overflow"
+
+msgid "Request ambiguous"
+msgstr "Request ambiguous"
+
+msgid "Queue full"
+msgstr "Queue full"
+
+msgid "Not while on AOL"
+msgstr "Not while on AOL"
+
 msgid "Aquarius"
 msgstr ""
 
@@ -8713,6 +8778,11 @@
 msgid "Admin"
 msgstr ""
 
+#. XXX: Should this be "Topic"?
+#, fuzzy
+msgid "Room Title"
+msgstr "Room List"
+
 #, fuzzy
 msgid "Notice"
 msgstr "Note"
@@ -10721,10 +10791,6 @@
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo Protocol Plugin"
 
-#, fuzzy
-msgid "Pager server"
-msgstr "Proxy Server"
-
 msgid "Pager port"
 msgstr "Pager port"
 
@@ -10742,20 +10808,13 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 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"
@@ -10822,6 +10881,13 @@
 "this."
 msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
 
+#. indicates a lock due to logging in too frequently
+#, fuzzy
+msgid ""
+"Account locked: You have been logging in too frequently.  Wait a few minutes "
+"before trying to connect again.  Logging into the Yahoo! website may help."
+msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
+
 #. username or password missing
 #, fuzzy
 msgid "Username or password missing"
@@ -10899,6 +10965,17 @@
 msgstr "Unable to make SSL connection to server."
 
 #, fuzzy
+msgid "Unable to connect: The server returned an empty response."
+msgstr ""
+"Unable to connect to server. Please enter the address of the server you wish "
+"to connect to."
+
+msgid ""
+"Unable to connect: The server's response did not contain the necessary "
+"information"
+msgstr ""
+
+#, fuzzy
 msgid "Not at Home"
 msgstr "Not At Home"
 
@@ -11300,6 +11377,10 @@
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
+#. *
+#. * A wrapper for purple_request_action_with_icon() that uses Accept and Cancel
+#. * buttons.
+#.
 #, fuzzy
 msgid "_Accept"
 msgstr "Accept"
@@ -11553,13 +11634,6 @@
 msgid "Pidgin Internet Messenger"
 msgstr "Instant Messagers"
 
-#, fuzzy
-msgid "Orientation"
-msgstr "Organization"
-
-msgid "The orientation of the tray."
-msgstr ""
-
 #. Build the login options frame.
 msgid "Login Options"
 msgstr "Login Options"
@@ -12853,6 +12927,10 @@
 msgid "Arabic"
 msgstr "Amharic"
 
+#, fuzzy
+msgid "Assamese"
+msgstr "Ashamed"
+
 msgid "Belarusian Latin"
 msgstr ""
 
@@ -12862,6 +12940,9 @@
 msgid "Bengali"
 msgstr ""
 
+msgid "Bengali-India"
+msgstr ""
+
 #, fuzzy
 msgid "Bosnian"
 msgstr "Romanian"
@@ -12989,6 +13070,10 @@
 msgstr "Macedonian"
 
 #, fuzzy
+msgid "Malayalam"
+msgstr "Male"
+
+#, fuzzy
 msgid "Mongolian"
 msgstr "Macedonian"
 
@@ -13112,8 +13197,8 @@
 "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>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 
 #, c-format
@@ -13696,14 +13781,14 @@
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
-msgstr ""
-
-#, fuzzy, c-format
-msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "Are you sure you want to remove the away message \"%s\"?"
 
 #, fuzzy
@@ -13798,10 +13883,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -14712,10 +14797,6 @@
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Registration Required"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Select Buddy"
 
@@ -15944,7 +16025,17 @@
 msgstr ""
 
 #, c-format
-msgid "_Force 24-hour time format"
+msgid "_Force timestamp format:"
+msgstr ""
+
+#, fuzzy
+msgid "Use system default"
+msgstr "Accept Defaults"
+
+msgid "12 hour time format"
+msgstr ""
+
+msgid "24 hour time format"
 msgstr ""
 
 #, fuzzy
@@ -16165,6 +16256,195 @@
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr ""
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
+msgid ""
+"$(^Name) is released under the GNU General Public License (GPL). The license "
+"is provided here for information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr ""
+
+msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Core Pidgin files and dlls"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a Start Menu entry for Pidgin"
+msgstr ""
+
+#. Installer Subsection Detailed Description
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Debug Symbols (for reporting crashes)"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Desktop"
+msgstr "Accept Defaults"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+msgid ""
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
+msgid ""
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
+msgstr ""
+
+#. $R3 will display the URL that the Dictionary failed to download from
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ Runtime Version"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Localizations"
+msgstr "Location"
+
+#. "Next >" appears on a button on the License Page of the Installer
+#, fuzzy
+msgid "Next >"
+msgstr "Text"
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Instant Messagers"
+
+msgid ""
+"Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
+"already present).$\\rAre you sure you want to skip installing the GTK+ "
+"Runtime?"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Shortcuts"
+
+#. Installer Subsection Detailed Description
+msgid "Shortcuts for starting Pidgin"
+msgstr ""
+
+#. Installer Subsection Text
+msgid "Spellchecking Support"
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "Start Menu"
+msgstr "Startup"
+
+#. Installer Subsection Detailed Description
+msgid ""
+"Support for Spellchecking.  (Internet connection required for installation)"
+msgstr ""
+
+#, fuzzy
+msgid "The installer is already running."
+msgstr "That file already exists"
+
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+
+#. Installer Subsection Text
+#, fuzzy
+msgid "URI Handlers"
+msgstr "_Handle:"
+
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+
+#. Text displayed on Installer Finish Page
+msgid "Visit the Pidgin Web Page"
+msgstr ""
+
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "The SecurID key entered is invalid."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "The SecurID key entered is invalid."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Nickname"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Set Mobile Phone Number"
+
+#~ msgid "Rate to host"
+#~ msgstr "Rate to host"
+
+#~ msgid "Rate to client"
+#~ msgstr "Rate to client"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Unknown reason."
+
+#, fuzzy
+#~ msgid "Artist"
+#~ msgstr "Address"
+
+#, fuzzy
+#~ msgid "Current Mood"
+#~ msgstr "Your Current Mood"
+
+#, fuzzy
+#~ msgid "New Mood"
+#~ msgstr "User Modes"
+
+#, fuzzy
+#~ msgid "Change your Mood"
+#~ msgstr "Change Password"
+
+#, fuzzy
+#~ msgid "Change Mood..."
+#~ msgstr "Change Password..."
+
+#, fuzzy
+#~ msgid "Pager server"
+#~ msgstr "Proxy Server"
+
+#, fuzzy
+#~ msgid "Yahoo Chat port"
+#~ msgstr "Yahoo Japan"
+
+#, fuzzy
+#~ msgid "Orientation"
+#~ msgstr "Organization"
+
 #, fuzzy
 #~ msgid "Error creating conference."
 #~ msgstr "Error creating connection"
@@ -16297,9 +16577,6 @@
 #~ msgid "_User:"
 #~ msgstr "_User:"
 
-#~ msgid "GTK+ Runtime Version"
-#~ msgstr "GTK+ Runtime Version"
-
 #, fuzzy
 #~ msgid "Calling ... "
 #~ msgstr "Calculating..."
@@ -16773,7 +17050,7 @@
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Could not open %s for writing!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "File transfer failed; other side probably cancelled."
 
 #~ msgid "Could not connect for transfer."
@@ -18132,9 +18409,6 @@
 #~ msgid "Show _buttons as:"
 #~ msgstr "Show _buttons as:"
 
-#~ msgid "Text"
-#~ msgstr "Text"
-
 #~ msgid "Pictures and text"
 #~ msgstr "Pictures and text"