pidgin: 0644248e: Updated Hebrew, Norwegian Nynorsk, and S...

darkrain42 at pidgin.im darkrain42 at pidgin.im
Mon Nov 23 13:17:16 EST 2009


-----------------------------------------------------------------
Revision: 0644248e7ae782562a19e64ff02bb1f4b7194132
Ancestor: 79af586d6ba84bac40c41d29bc481d2ce6106a30
Author: darkrain42 at pidgin.im
Date: 2009-11-23T18:10:38
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0644248e7ae782562a19e64ff02bb1f4b7194132

Modified files:
        po/ChangeLog po/he.po po/nn.po po/zh_CN.po

ChangeLog: 

Updated Hebrew, Norwegian Nynorsk, and Simplified Chinese translations.

Closes #10557, #10742, #10801.

-------------- next part --------------
============================================================
--- po/ChangeLog	f993cb719b4b09aa5cfa812796704c31818ac593
+++ po/ChangeLog	2991b2aee1c02e0855331bbfbc02c092b07e5eb3
@@ -1,6 +1,9 @@ version 2.6.4
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.6.4
+	* Chinese (Simplified) translation updated (liyuekui and Aron Xu)
+	* Hebrew translation updated (Shalom Craimer)
+	* Norwegian Nynorsk translation updated (Yngve Spjeld Landro)
 	* Vietnamese translation updated (Clytie Siddall)
 
 version 2.6.3
============================================================
--- po/he.po	b61e8bfcf5b2cf68dd501fea78e6067b401843c0
+++ po/he.po	b7105c7b566e059f8e7900c25a3d380717872397
@@ -8,8 +8,8 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:34-0500\n"
-"PO-Revision-Date: 2009-08-30 09:44+0200\n"
+"POT-Creation-Date: 2009-11-23 10:05-0800\n"
+"PO-Revision-Date: 2009-11-23 12:21+0200\n"
 "Last-Translator: Shalom Craimer <scraimer at g mail dot com>\n"
 "Language-Team: Hebrew <he at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -618,9 +618,8 @@ msgstr "???? ??????"
 msgid "Enable Sounds"
 msgstr "???? ??????"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "?? ???? ??????"
+msgstr "???? ?????/?."
 
 msgid "<AUTO-REPLY> "
 msgstr "<????-???????> "
@@ -631,9 +630,8 @@ msgstr[1] "????? ?? %d ?????
 msgstr[0] "????? ?? %d ?????:\n"
 msgstr[1] "????? ?? %d ???????:\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "???????? ????? ?????? ??????? ??:  version"
+msgstr "???????? ????? ?????? ??????? ??:  plungins version"
 
 msgid "No such command (in this context)."
 msgstr "??? ????? ??? (????? ???)."
@@ -1497,10 +1495,10 @@ msgid "TinyURL for above: %s"
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "URL ????? ???? ??\"?: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "?? ?????? ??? TinyURL ???? ????? ??????..."
 
 msgid "Only create TinyURL for URLs of this length or greater"
 msgstr "?? ???? TinyURL ???? ?????? ????? ??? ?????"
@@ -1627,7 +1625,7 @@ msgid ""
 msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
-msgstr ""
+msgstr "?? ???? ????? ?????? ????? ???? ????? ?????? ?????? ???? ????."
 
 msgid "The certificate is not valid yet."
 msgstr "?????? ????? ???? ????."
@@ -1855,9 +1853,9 @@ msgstr "????? ????? ?????
 msgid "Resolver process exited without answering our request"
 msgstr "????? ????? ?????? ???? ??? ????? ???????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "????? ?-resolving %s: %d"
+msgstr "????? ????? %s ?? punycode: %d"
 
 #, c-format
 msgid "Thread creation failure: %s"
@@ -2154,17 +2152,14 @@ msgstr "????? ????? ??? ?? msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "????? ????? ??? ???? ??????? ???? ?-Farsight2."
 
-#, fuzzy
 msgid "Conference error"
-msgstr "????? ??????."
+msgstr "????? ??????"
 
-#, fuzzy
 msgid "Error with your microphone"
-msgstr "????? ?? ????????? ???."
+msgstr "????? ?? ????????? ???"
 
-#, fuzzy
 msgid "Error with your webcam"
-msgstr "????? ?? ?????? ???."
+msgstr "????? ?? ?????? ???"
 
 #, c-format
 msgid "Error creating session: %s"
@@ -3889,6 +3884,10 @@ msgstr "?????"
 msgid "Log Out"
 msgstr "?????"
 
+#. primative,						no,							id,			name
+#. 0
+#. 1
+#. 2
 msgid "Chatty"
 msgstr "?????"
 
@@ -4154,6 +4153,7 @@ msgstr "??? (?? ?????)"
 msgid "None (To pending)"
 msgstr "??? (?? ?????)"
 
+#. 0
 msgid "None"
 msgstr "???"
 
@@ -4455,9 +4455,8 @@ msgstr "configure:  ??? ?????? 
 msgid "configure:  Configure a chat room."
 msgstr "configure:  ??? ?????? ??? ?'??."
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [???]:  ???? ?? ????."
+msgstr "part [?????]:  ???? ?? ????."
 
 msgid "register:  Register with a chat room."
 msgstr "register:  ???? ???? ?'??."
@@ -5105,13 +5104,13 @@ msgstr "????? ????? ?-SSL ?? msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "????? ????? ?-SSL ???? MSN. ?? ?????? ?????? SSL ?????."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
 msgstr ""
 "?? ???? ?????? ?? ???? %s ?????? ??? ?????? ???? ????. ???? ??????? ??????? "
-"????? ?????? ?????? ?????."
+"????? ?????? ?????? ??????."
 
 msgid "Unable to Add"
 msgstr "?? ???? ??????"
@@ -5332,9 +5331,8 @@ msgstr "????? ?? ????? (%d)"
 msgid "Unknown error (%d)"
 msgstr "????? ?? ????? (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "?? ???? ?????? ?????"
+msgstr "?? ???? ????? ?????"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "????? ????? ?? ????? ?????? ???? ????? ???."
@@ -5563,28 +5561,86 @@ msgstr "%s ????/? ???? ????
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s ????/? ???? ?????? ???? ???? ??? ?? ???."
 
+#. 1
+msgid "Angry"
+msgstr "????"
+
+#. 2
+msgid "Excited"
+msgstr "????"
+
+#. 3
+msgid "Grumpy"
+msgstr "?????"
+
+#. 4
+msgid "Happy"
+msgstr "???"
+
+#. 5
+msgid "In Love"
+msgstr "?????"
+
+#. 6
+msgid "Invincible"
+msgstr "???? ?????"
+
+#. 7
+msgid "Sad"
+msgstr "????"
+
+#. 8
+msgid "Hot"
+msgstr "??"
+
+#. 9
+msgid "Sick"
+msgstr "????"
+
+#. 10
+msgid "Sleepy"
+msgstr "??????"
+
 #. show current mood
-#, fuzzy
 msgid "Current Mood"
-msgstr "??? ???? ?????? ???"
+msgstr "??? ???? ??????"
 
 #. add all moods to list
-#, fuzzy
 msgid "New Mood"
-msgstr "???-??? ??????"
+msgstr "???-??? ???"
 
-#, fuzzy
 msgid "Change your Mood"
-msgstr "??? ?????"
+msgstr "??? ?? ??? ???? ???"
 
+msgid "How do you feel right now?"
+msgstr "??? ??/? ?????/? ??????"
+
 #, fuzzy
-msgid "How do you feel right now?"
-msgstr "??? ?? ??? ????"
+msgid "The PIN you entered is invalid."
+msgstr "????? SecurID ????? ???? ???."
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "????? SecurID ????? ???? ???."
+
+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 "?????? ????? ??????? ???? ??????."
+
+#, fuzzy
+msgid "The name you entered is invalid."
+msgstr "????? SecurID ????? ???? ???."
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
+
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "????? ??????"
+msgstr "????? ?????? ??????"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5592,352 +5648,297 @@ msgid "Your profile information is not y
 msgstr "??????"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
-msgstr ""
+msgstr "???? ??????? ??? ??? ?? ??????. ?? ????? ???? ????? ????."
 
 #. pin
-#, fuzzy
 msgid "PIN"
 msgstr "???? ?????"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "????? ???? ????"
 
 #. display name
-#, fuzzy
 msgid "Display Name"
-msgstr "?? ?????"
+msgstr "?? ?????"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "???? ?? ?????"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
 msgstr "???? ????? ????"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "?????? ?????"
+msgstr "?????? ??????? ???"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "??? ?? ??????? ????? ?? ?????? ?-MXit ???"
 
 msgid "View Splash"
-msgstr ""
+msgstr "??? ????-?????"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
+msgstr "??? ????-????? ???? ????"
 
-#, fuzzy
 msgid "About"
-msgstr "??????"
+msgstr "?????"
 
 #. display / change mood
-#, fuzzy
 msgid "Change Mood..."
-msgstr "??? ?????..."
+msgstr "????? ???-???..."
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "??? ?????..."
+msgstr "??? ??????..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "??? ????-?????..."
+msgstr "??? ????-?????..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "??????"
+msgstr "?????..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "?????? ????? ???."
+msgstr "????? ??????? ????? ???? ???!"
 
 msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr "?? ???? ?????? ???? ?-MXit HTTP. ?? ????? ?? ?????? ???? ???."
 
-#, fuzzy
 msgid "Logging In..."
-msgstr "?????"
+msgstr "?????..."
 
-#, fuzzy
 msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr "?? ???? ?????? ????. ?? ????? ?? ????? ???? ???? ?????? ??????."
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr "?? ???? ?????? ???? ?-MXit. ?? ????? ?? ?????? ???? ???."
 
+msgid "Connecting..."
+msgstr "?????..."
+
 #, fuzzy
-msgid "Connecting..."
-msgstr "?????"
+msgid "The nick name you entered is invalid."
+msgstr "????? SecurID ????? ???? ???."
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "????? SecurID ????? ???? ???."
+
 #. mxit login name
 msgid "MXit Login Name"
-msgstr ""
+msgstr "?? ????? MXit"
 
 #. nick name
-#, fuzzy
 msgid "Nick Name"
 msgstr "?????"
 
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "???? ????? XMPP ???"
+msgstr "???? ????? MXit ???"
 
-#, fuzzy
 msgid "Please fill in the following fields:"
-msgstr "?? ???? ?? ????? ?????"
+msgstr "?? ???? ?? ????? ?????:"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
-msgstr ""
+msgstr "????? ????? ???? ?-WAP ?? MXit. ?? ????? ???? ????? ????."
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
-msgstr ""
+msgstr "MXit ???? ????? ???? ?????. ?? ????? ????? ????? ????."
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "???? ??? ????? ????. ?? ????? ????? ????? ????."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "?? ????? ?? ??????. ?? ????? ????? ????? ????."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "????? ??? ??-?????. ?? ????? ????."
 
 msgid "Username is not registered. Please register first."
-msgstr ""
+msgstr "?? ?????? ???? ????. ???? ?????? ????."
 
 msgid "Username is already registered. Please choose another username."
-msgstr ""
+msgstr "?? ?????? ??? ????. ?? ????? ?? ????? ???."
 
-#, fuzzy
 msgid "Internal error. Please try again later."
-msgstr "???? ?? ????; ?? ????? ????? ????"
+msgstr "????? ??????. ?? ????? ????? ????."
 
 msgid "You did not enter the security code"
-msgstr ""
+msgstr "?? ???? ?? ??? ??????"
 
-#, fuzzy
 msgid "Security Code"
-msgstr "????? ??????"
+msgstr "??? ?????"
 
 #. ask for input
-#, fuzzy
 msgid "Enter Security Code"
-msgstr "??? ???"
+msgstr "??? ??? ?????"
 
-#, fuzzy
 msgid "Your Country"
-msgstr "?????"
+msgstr "??????"
 
-#, fuzzy
 msgid "Your Language"
-msgstr "??? ??????"
+msgstr "????"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "???? ?????"
+msgstr "????? MXit"
 
 msgid "MXit account validation"
-msgstr ""
+msgstr "????? ????? MXit"
 
-#, fuzzy
 msgid "Retrieving User Information..."
-msgstr "???? ?? ????"
+msgstr "???? ???? ?????..."
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "?????..."
+
 msgid "Status Message"
-msgstr "?????? ??????"
+msgstr "????? ???"
 
-#, fuzzy
 msgid "Hidden Number"
-msgstr "?? ?????"
+msgstr "???? ????"
 
-#, fuzzy
 msgid "Your Mobile Number..."
-msgstr "???/? ???? ????? ????..."
+msgstr "???? ????? ???..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "???"
+msgstr "??? WAP"
 
-#, fuzzy
 msgid "Connect via HTTP"
-msgstr "????? ????? TCP"
+msgstr "????? ????? HTTP"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "???? ????? ????-?????"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
-msgstr ""
+msgstr "?????? ?? MXit ???. ?? ?????? ?????."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "????? ????? XMPP"
+msgstr "????? ?????? ?????"
 
-#, fuzzy
 msgid "Unable to process your request at this time"
-msgstr "?? ???? ????? ?? ?? ???? ??????"
+msgstr "?? ???? ???? ?????? ???? ??"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
+msgstr "??? ???? ??????? ????? ?? ????? ????? ???? ?-XMit."
 
-#, fuzzy
 msgid "Successfully Logged In..."
-msgstr "???? ?????? ?? Qun"
+msgstr "?????? ????? ??????..."
 
-#, fuzzy
+#, fuzzy, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "????? ???? ????? ????? ????? ??? %s, ??? ???? ????? ???."
+
 msgid "Message Error"
-msgstr "????? ????? XMPP"
+msgstr "????? ?????"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
+msgstr "?? ???? ???? ????? ????? ????????? ?????"
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "????? ????? ??-????? ?? ??????."
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "????? SASL: %s"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "????? SASL: %s"
+
 msgid "Contact Error"
-msgstr "????? ???????"
+msgstr "????? ?????"
 
-#, fuzzy
 msgid "Message Sending Error"
-msgstr "????? ????? XMPP"
+msgstr "????? ?????? ?????"
 
-#, fuzzy
 msgid "Status Error"
-msgstr "????? ????"
+msgstr "????? ???"
 
-#, fuzzy
 msgid "Mood Error"
-msgstr "????? ?????"
+msgstr "????? ???-???"
 
-#, fuzzy
 msgid "Invitation Error"
-msgstr "????? ????-?????"
+msgstr "????? ?????"
 
-#, fuzzy
 msgid "Contact Removal Error"
-msgstr "????? ???????"
+msgstr "????? ???? ???-???"
 
-#, fuzzy
 msgid "Subscription Error"
-msgstr "????"
+msgstr "????? ????"
 
-#, fuzzy
 msgid "Contact Update Error"
-msgstr "????? ???????"
+msgstr "????? ?????? ???-???"
 
-#, fuzzy
 msgid "File Transfer Error"
-msgstr "????? ?????"
+msgstr "????? ????? ??????"
 
-#, fuzzy
 msgid "Cannot create MultiMx room"
-msgstr "?? ???? ????? ?????-?????"
+msgstr "?? ???? ????? ??? MultiMx"
 
-#, fuzzy
 msgid "MultiMx Invitation Error"
-msgstr "????? ????-?????"
+msgstr "????? ????? MultiMx"
 
-#, fuzzy
 msgid "Profile Error"
-msgstr "????? ??????"
+msgstr "????? ???????"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "?????? ????? ??-????? ??? MXit."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "????? ????? ?????? ?? MXit. (??? ????? 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "????? ????? ?????? ?? MXit. (??? ????? 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "????? ????? ?????? ?? MXit. (??? ????? 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "????? ????? ?????? ?? MXit. (??? ????? 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "????? ????? ?????? ?? MXit. (??? ????? 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
+msgstr "????? ????? ?????? ?? MXit. (??? ????? 0x06)"
 
-msgid "Angry"
-msgstr "????"
-
-msgid "Excited"
-msgstr "????"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "?????"
-
-msgid "Happy"
-msgstr "???"
-
-msgid "In Love"
-msgstr "?????"
-
-msgid "Invincible"
-msgstr "???? ?????"
-
-msgid "Sad"
-msgstr "????"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_???:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "?????"
-
-msgid "Sleepy"
-msgstr "??????"
-
-#, fuzzy
 msgid "Pending"
-msgstr "?????"
+msgstr "?????"
 
-#, fuzzy
 msgid "Invited"
-msgstr "????"
+msgstr "?????"
 
-#, fuzzy
 msgid "Rejected"
-msgstr "???"
+msgstr "????"
 
-#, fuzzy
 msgid "Deleted"
-msgstr "???"
+msgstr "????"
 
 msgid "MXit Advertising"
-msgstr ""
+msgstr "?????? MXit"
 
-#, fuzzy
 msgid "More Information"
-msgstr "???? ?????"
+msgstr "???? ????"
 
 #, c-format
 msgid "No such user: %s"
@@ -6699,46 +6700,42 @@ msgid "Cannot receive IM due to parental
 msgstr "?? ???? ???? ?-AOL"
 
 msgid "Cannot receive IM due to parental controls"
-msgstr ""
+msgstr "?? ???? ???? ?????? ??? ?????? ?????"
 
 msgid "Cannot send SMS without accepting terms"
-msgstr ""
+msgstr "?? ???? ????? SMS ??? ???? ??????"
 
-#, fuzzy
 msgid "Cannot send SMS"
-msgstr "?? ???? ????? ?? ?????"
+msgstr "?? ????? ????? SMS"
 
 #. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
 msgid "Cannot send SMS to this country"
-msgstr "?? ???? ????? ??????"
+msgstr "?? ????? ????? SMS ???? ??"
 
 #. Undocumented
 msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgstr "?? ???? ????? SMS ?????? ?? ?????"
 
 msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+msgstr "????? ?????? ?? ?????? ????? ?????"
 
 msgid "Bot account cannot IM this user"
-msgstr ""
+msgstr "????? ?????? ?? ?????? ????? ????? ?????? ??"
 
 msgid "Bot account reached IM limit"
-msgstr ""
+msgstr "?????? ?????? ??? ?? ???? ???????"
 
 msgid "Bot account reached daily IM limit"
-msgstr ""
+msgstr "?????? ?????? ??? ?? ???? ??????? ??????"
 
 msgid "Bot account reached monthly IM limit"
-msgstr ""
+msgstr "?????? ?????? ??? ?? ???? ??????? ???????"
 
-#, fuzzy
 msgid "Unable to receive offline messages"
-msgstr "?? ???? ????? ?????"
+msgstr "?? ???? ???? ?????? ??-???????"
 
-#, fuzzy
 msgid "Offline message store full"
-msgstr "?????? ??-???????"
+msgstr "????? ????? ??????? ???-??????? ???? ???"
 
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
@@ -6905,14 +6902,13 @@ msgstr "????? ??????? ?? A
 msgstr "????? ??????? ?? AOL ?? ???? ????."
 
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has been connecting and disconnecting too frequently. Wait ten "
 "minutes and try again. If you continue to try, you will need to wait even "
 "longer."
 msgstr ""
-"?????? ??????? ??????? ????? ????. ???? 10 ???? ???? ????. ?? ????? ?????, "
-"????? ?????? ????? ????."
+"?? ?????? ??? ???? ??????? ???????? ??????? ????? ????. ?? ?????? ??? ???? "
+"?????? ????. ??????? ?????? ?????? ????? ??? ????? ???? ??? ????."
 
 #. client too old
 #, c-format
@@ -6920,14 +6916,13 @@ msgstr "????? ????? ?????
 msgstr "????? ????? ????? ?? ??/? ?????/? ???? ???. ??? ????/? ?-%s"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "Your IP address has 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 ""
-"?????? ??????? ??????? ????? ????. ?? ?????? ??? ?????? ????. ?? ?????/? "
-"?????, ?????/? ?????? ????? ????."
+"????? ?-IP ??? ???? ??????? ???????? ??????? ????? ????. ?? ?????? ??? ???? "
+"?????? ????. ??????? ?????? ?????? ????? ??? ????? ???? ??? ????."
 
 msgid "The SecurID key entered is invalid"
 msgstr "????? SecurID ????? ???? ???."
@@ -7060,21 +7055,21 @@ msgstr[1] "????? %hu ?????? ? msgstr[0] "????? %hu ????? ??? %s ????? ?? ?????."
 msgstr[1] "????? %hu ?????? ??? %s ????? ?? ?????."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message: %s (%s)"
-msgstr "?? ???? ????? ????? (%s)."
+msgstr "?? ???? ????? ????? %s (%s)"
 
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "?? ???? ????? ?????: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message to %s: %s (%s)"
-msgstr "?? ???? ????? ????? ? %s:"
+msgstr "?? ???? ????? ????? ?? %s: %s (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message to %s: %s"
-msgstr "?? ???? ????? ????? ? %s:"
+msgstr "?? ???? ????? ????? ?? %s: %s"
 
 #, c-format
 msgid "User information not available: %s"
@@ -7101,13 +7096,12 @@ msgstr "[?? ???? ????? ???
 "characters.]"
 msgstr "[?? ???? ????? ????? ?????? ?? ????? ???? ????? ????? ?? ??????.]"
 
-#, 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 ""
-"?????? ??????? ?????? ???? ?? ?????? ????? ???? ????? ??????? ????? ?????? "
-"?? ????? 10 ????? ?????? ????."
+"?????? ??????? ?????? ???? ?? ?????? ????? ???? ????? ??? ????? ???????. ?? "
+"????? 10 ????? ?????? ????.\n"
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
@@ -9889,13 +9883,13 @@ msgid "Can't send SMS. Unable to obtain 
 msgstr "??? ?? ???? ????? ???"
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
-msgstr ""
+msgstr "?? ???? ????? SMS. ?? ????? ????? ???? ?????? ?????."
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "?? ???? ????? SMS. ??? ????? ???? ?? ????."
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "???? ???? ?????? ????? ????? ?? ?-SMS."
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -10420,6 +10414,8 @@ msgstr ""
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"?'?? ????? ??????-???????.  ???? AIM, Google Talk, Jabber/XMPP, MSN, Yahoo "
+"????"
 
 msgid "Internet Messenger"
 msgstr "?????? ????????"
@@ -12355,7 +12351,7 @@ msgid "DIR"
 "\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "?????"
 
 msgid "use DIR for config files"
 msgstr "????? ??????? DIR ????? ??????"
@@ -12376,16 +12372,16 @@ msgid "NAME"
 msgstr "?? ????? ????????"
 
 msgid "NAME"
-msgstr ""
+msgstr "??"
 
-#, fuzzy
 msgid ""
 "enable specified account(s) (optional argument NAME\n"
 "                      specifies account(s) to use, separated by commas.\n"
 "                      Without this only the first account will be enabled)."
 msgstr ""
 "???? ??????? (????? ?? ?? ??????\n"
-"                      ????? ???? ??????? ?????? ???, ??????? ?? ??? ??????."
+"                      ????? ???? ??????? ?????? ???, ??????? ?? ??? ??????.\n"
+"                      ??? ???, ?? ?????? ?????? ???? ????)."
 
 msgid "X display to use"
 msgstr "????? X ?????? ??"
@@ -12645,21 +12641,19 @@ msgid "(Custom)"
 msgstr "?? ????. ??? ???? ?? ??!"
 
 msgid "(Custom)"
-msgstr ""
+msgstr "(????? ?????)"
 
-#, fuzzy
-msgid "(Default)"
-msgstr "????? ?????))"
+msgid "Penguin Pimps"
+msgstr "??????? ?????????"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
+msgstr "???? ??????? ??????? ?? ????'??"
 
-#, fuzzy
 msgid "The default Pidgin buddy list theme"
-msgstr "???? ???????? ?? ????? ?????? ?????'??"
+msgstr "???? ???????? ??????? ???? ????? ?????? ?????'??"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "???? ??????? ??????? ?? ????'??"
 
 msgid "Theme failed to unpack."
 msgstr "?????? ??? ????? ???? ?????."
@@ -12670,29 +12664,36 @@ msgstr "?????? ??? ????? ? msgid "Theme failed to copy."
 msgstr "?????? ??? ????? ???? ?????."
 
-msgid "Install Theme"
-msgstr "???? ?????"
+msgid "Theme Selections"
+msgstr "????? ????? ???????"
 
+#. Instructions
 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 ""
-"??? ???? ??????? ?????? ????. ????? ????? ???? ?????? ?\"? ?????? ?? ????? "
-"??????."
+"?? ????? ???? ??????? ???????? ?????.\n"
+".????? ????? ???? ?????? ?\"? ?????? ?? ????? ??????"
 
-msgid "Icon"
-msgstr "???"
+msgid "Buddy List Theme:"
+msgstr "?????? ????? ???? ????? ??????:"
 
+msgid "Status Icon Theme:"
+msgstr "???? ??? ????:"
+
+msgid "Sound Theme:"
+msgstr "???? ??????:"
+
+msgid "Smiley Theme:"
+msgstr "???? ??????:"
+
 msgid "Keyboard Shortcuts"
 msgstr "??????-?????"
 
 msgid "Cl_ose conversations with the Escape key"
 msgstr "_???? ?????? ???? ?? ????? ???????"
 
-#. Buddy List Themes
-msgid "Buddy List Theme"
-msgstr "?????? ????? ???? ????? ??????"
-
 #. System Tray
 msgid "System Tray Icon"
 msgstr "??? ??? ??????"
@@ -12779,9 +12780,6 @@ msgstr "????"
 msgid "Font"
 msgstr "????"
 
-msgid "Use document font from _theme"
-msgstr "????? ????? ????? ???????"
-
 msgid "Use font from _theme"
 msgstr "????? ????? ???????"
 
@@ -12804,15 +12802,13 @@ msgstr "?? ???? ?????? ?? 
 msgid "Cannot start browser configuration program."
 msgstr "?? ???? ?????? ?? ????? ?????? ??????."
 
-#, fuzzy
 msgid "Disabled"
-msgstr "_???"
+msgstr "????"
 
 #, c-format
 msgid "Use _automatically detected IP address: %s"
 msgstr "????? ?_????? ?-IP ??????? ????????: %s"
 
-#, fuzzy
 msgid "ST_UN server:"
 msgstr "??? STUN:"
 
@@ -12828,79 +12824,28 @@ msgstr "_???? ????? ????? 
 msgid "_Enable automatic router port forwarding"
 msgstr "_???? ????? ????? ???????? ????"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "?_??? ????? ?? ???? ??????? ?????? ???"
+msgstr "?_??? ????? ?? ???? ??????? ?????? ???:"
 
-#, fuzzy
 msgid "_Start:"
-msgstr "_???:"
+msgstr "_????:"
 
-#, fuzzy
 msgid "_End:"
-msgstr "?_???"
+msgstr "_????:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
 msgstr "??? ????? (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "??? STUN:"
+msgstr "??? TURN:"
 
-#, fuzzy
 msgid "Use_rname:"
 msgstr "?? ?????:"
 
-#, fuzzy
 msgid "Pass_word:"
 msgstr "?????:"
 
-msgid "Proxy Server &amp; Browser"
-msgstr "??? ????? ??????"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>????? ?????? ??? ?????? ?? ?????.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>????? ?????? ?????? ?? ?????.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"?????? ???-????? ?????? ???????\n"
-"??????? ?? GNOME"
-
-msgid "Configure _Proxy"
-msgstr "????? ??? ?????"
-
-msgid "Configure _Browser"
-msgstr "????? ?????"
-
-msgid "Proxy Server"
-msgstr "?????? ??????"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "????? ?????? DNS ????? ?? ????-????? SOCKS"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "??? ?_??????"
-
-msgid "No proxy"
-msgstr "??? ?????"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_?????:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "?? ?????:"
-
 msgid "Seamonkey"
 msgstr "??-?????"
 
@@ -12940,6 +12885,15 @@ msgstr "????? ??????"
 msgid "Browser Selection"
 msgstr "????? ??????"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "?????? ????? ??????? ??????? ?? GNOME"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>????? ?????? ?????? ?? ?????.</b>"
+
+msgid "Configure _Browser"
+msgstr "????? ?????"
+
 msgid "_Browser:"
 msgstr "_?????:"
 
@@ -12963,6 +12917,35 @@ msgstr ""
 "_?????:\n"
 "(%s ???? URL)"
 
+msgid "Proxy Server"
+msgstr "?????? ??????"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "?????? ???-????? ??????? ??????? ?? GNOME"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>????? ?????? ??? ?????? ?? ?????.</b>"
+
+msgid "Configure _Proxy"
+msgstr "????? ??? ?????"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "????? ?????? DNS ????? ?? ????-????? SOCKS4"
+
+msgid "Proxy t_ype:"
+msgstr "??? ?_??????:"
+
+msgid "No proxy"
+msgstr "??? ?????"
+
+msgid "P_ort:"
+msgstr "_?????:"
+
+msgid "User_name:"
+msgstr "?? ?????:"
+
 msgid "Log _format:"
 msgstr "???? ?_?????:"
 
@@ -13046,25 +13029,18 @@ msgstr "??-?? ?????? ???? 
 msgid "Based on keyboard or mouse use"
 msgstr "??-?? ?????? ???? ?? ?????"
 
+msgid "_Minutes before becoming idle:"
+msgstr "_???? ???? ????? ?????:"
+
+msgid "Change to this status when _idle:"
+msgstr "??? ??? ?? ??? ???? ??????:"
+
 msgid "_Auto-reply:"
 msgstr "???? ?????_??:"
 
 msgid "When both away and idle"
 msgstr "???? ????? ??? ??? ??????"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "????? ???????"
-
-msgid "_Minutes before becoming idle:"
-msgstr "_???? ???? ????? ?????:"
-
-msgid "Change status when _idle"
-msgstr "??? ????? ??? ???? ??????"
-
-msgid "Change _status to:"
-msgstr "??? ????? ?:"
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "????? ??? ??????"
@@ -13078,15 +13054,15 @@ msgstr "???? ??????"
 msgid "Interface"
 msgstr "???? ??????"
 
-msgid "Smiley Themes"
-msgstr "????? ???????"
-
 msgid "Browser"
 msgstr "?????"
 
 msgid "Status / Idle"
 msgstr "??? / ???? ??????"
 
+msgid "Themes"
+msgstr "???????"
+
 msgid "Allow all users to contact me"
 msgstr "???? ??? ????? ????? ???? ???"
 
@@ -13421,9 +13397,6 @@ msgstr "?????? ????'??"
 msgid "Pidgin smileys"
 msgstr "?????? ????'??"
 
-msgid "Penguin Pimps"
-msgstr "??????? ?????????"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "?????? ?? ??????? ????-?????? ???????."
 
@@ -14047,6 +14020,9 @@ msgstr "???? ?????"
 msgid "Conversation Entry"
 msgstr "???? ?????"
 
+msgid "Conversation History"
+msgstr "????????? ?????"
+
 msgid "Request Dialog"
 msgstr "???? ????"
 
@@ -14503,7 +14479,6 @@ msgstr "???? ?? %s ??? ????
 msgid "_Start %s on Windows startup"
 msgstr "???? ?? %s ??? ????? ??????"
 
-#, fuzzy
 msgid "Allow multiple instances"
 msgstr "???? ?????? ???? ????? ????"
 
@@ -14568,6 +14543,28 @@ msgstr "???? ?? ?????? ??? msgstr "???? ?? ?????? ?????? ????? ?????? ??????? ?? XMPP."
 
 #, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "????? ?????))"
+
+#~ msgid "Install Theme"
+#~ msgstr "???? ?????"
+
+#~ msgid "Icon"
+#~ msgstr "???"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "????? ????? ????? ???????"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "??? ????? ??????"
+
+#~ msgid "Auto-away"
+#~ msgstr "????? ???????"
+
+#~ msgid "Change _status to:"
+#~ msgstr "??? ????? ?:"
+
+#, fuzzy
 #~ msgid "The root certificate this one claims to be issued by is unknown."
 #~ msgstr "?????-????? ??????? ?????? ?? ?????? ???? ????? ?????'??."
 
============================================================
--- po/nn.po	8abd8b6e324e461eed06d7a46de9bc3d2829deea
+++ po/nn.po	1b1f11a0f37535313e1d3d1b32fa578dddf21dad
@@ -2,14 +2,15 @@ msgstr ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:35-0500\n"
-"PO-Revision-Date: 2009-08-09 02:41+0100\n"
-"Last-Translator: Yngve Spjeld Landro <nynorsk at landro.net>\n"
+"POT-Creation-Date: 2009-11-23 10:04-0800\n"
+"PO-Revision-Date: 2009-11-22 11:56+0100\n"
+"Last-Translator: Yngve Spjeld Landro <nynorsk(a)strilen.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Poedit-Bookmarks: -1,1060,1063,3712,-1,-1,-1,-1,-1,-1\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -134,7 +135,7 @@ msgid "Add buddy to your list?"
 msgstr "%s%s%s%s har gjort %s til sin venn%s%s"
 
 msgid "Add buddy to your list?"
-msgstr "Legg til venn i lista?"
+msgstr "Leggja til venn i lista?"
 
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
@@ -167,7 +168,7 @@ msgstr ""
 "Last Seen: %s ago"
 msgstr ""
 "\n"
-"Sist sett: %s ago"
+"Sist sett: %s sidan"
 
 msgid "Default"
 msgstr "Standard"
@@ -260,8 +261,9 @@ msgstr "Hent info"
 msgid "Get Info"
 msgstr "Hent info"
 
+# var: varsling
 msgid "Add Buddy Pounce"
-msgstr "Legg til vennevarsling"
+msgstr "Legg til venneovervaking"
 
 msgid "Send File"
 msgstr "Send fil"
@@ -501,8 +503,9 @@ msgstr "Stadfest sertifikatslettinga"
 msgid "Confirm certificate delete"
 msgstr "Stadfest sertifikatslettinga"
 
+# var: Sertifikatstyrar
 msgid "Certificate Manager"
-msgstr "Sertifikatstyrar"
+msgstr "Sertifikatbehandling"
 
 #. Creating the user splits
 msgid "Hostname"
@@ -587,12 +590,13 @@ msgstr ""
 
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
-"Logginga er starta. Framtidige meldingar i denne samtala vil bli logga."
+"Logginga er starta. Framtidige meldingar i denne samtalen vil bli logga."
 
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
-"Logginga er stoppa. Framtidige meldingar i denne samtala vil ikkje bli logga."
+"Logginga er stoppa. Framtidige meldingar i denne samtalen vil ikkje bli "
+"logga."
 
 msgid "Send To"
 msgstr "Send til"
@@ -606,8 +610,9 @@ msgstr "Vis tidsstempel"
 msgid "Show Timestamps"
 msgstr "Vis tidsstempel"
 
+# var: varsling...
 msgid "Add Buddy Pounce..."
-msgstr "Legg til vennevarsling..."
+msgstr "Legg til venneovervaking..."
 
 msgid "Invite..."
 msgstr "Inviter..."
@@ -618,9 +623,8 @@ msgstr "Sl? p? lydar"
 msgid "Enable Sounds"
 msgstr "Sl? p? lydar"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "Tenaren lukka tilkoplinga"
+msgstr "Du er ikkje tilkopla."
 
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-SVAR> "
@@ -631,9 +635,8 @@ msgstr[1] "Liste av %d brukarar:\n"
 msgstr[0] "Liste av %d brukar:\n"
 msgstr[1] "Liste av %d brukarar:\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "St?tta feils?kingsval er:  utg?ve"
+msgstr "St?tta feils?kingsval er:  programtilleggsutg?ver"
 
 msgid "No such command (in this context)."
 msgstr "Kommandoen finst ikkje (i denne samanhengen)."
@@ -673,7 +676,8 @@ msgstr ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
-"debug &lt;val&gt;: send ulike feils?kingsopplysningar til samtala du er i."
+"debug &lt;val&gt;: send ulike feils?kingsopplysningar til den gjeldande "
+"samtalen."
 
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: t?mmer skjermen."
@@ -808,11 +812,11 @@ msgid "Conversation in %s on %s"
 
 #, c-format
 msgid "Conversation in %s on %s"
-msgstr "Samtala i %s p? %s"
+msgstr "Samtalen i %s p? %s"
 
 #, c-format
 msgid "Conversation with %s on %s"
-msgstr "Samtala med %s p? %s"
+msgstr "Samtalen med %s p? %s"
 
 msgid "%B %Y"
 msgstr "%B %Y"
@@ -834,7 +838,7 @@ msgstr ""
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
-"Samtaler vil berre bli logga om innstillinga \"Logg alle samtaler\" er sl?tt "
+"Samtalen vil berre bli logga om innstillinga \"Logg alle samtalar\" er sl?tt "
 "p?."
 
 msgid "No logs were found"
@@ -849,14 +853,14 @@ msgid "Conversations in %s"
 
 #, c-format
 msgid "Conversations in %s"
-msgstr "Samtaler i %s"
+msgstr "Samtalar i %s"
 
 #, c-format
 msgid "Conversations with %s"
-msgstr "Samtaler med %s"
+msgstr "Samtalar med %s"
 
 msgid "All Conversations"
-msgstr "Alle samtaler"
+msgstr "Alle samtalar"
 
 msgid "System Log"
 msgstr "Systemlogg"
@@ -889,7 +893,7 @@ msgid "You have rejected the call."
 msgstr "%s pr?ver ? starta ein media?kttype som ikkje er st?tta."
 
 msgid "You have rejected the call."
-msgstr "Du har avvist samtala."
+msgstr "Du har avvist samtalen."
 
 msgid "call: Make an audio call."
 msgstr "call: lag ei lydoppringing."
@@ -993,7 +997,7 @@ msgid "Configure Plugin"
 msgstr "Installer programtillegg..."
 
 msgid "Configure Plugin"
-msgstr "Endra programtillegg"
+msgstr "Endra programtillegget"
 
 #. copy the preferences to tmp values...
 #. * I liked "take affect immediately" Oh well :-(
@@ -1003,17 +1007,21 @@ msgstr "Innstillingar "
 msgid "Preferences"
 msgstr "Innstillingar "
 
+# var: Skriv inn vennen du vil bli varsla om.
 msgid "Please enter a buddy to pounce."
-msgstr "Skriv inn vennen du vil bli varsla om."
+msgstr "Skriv inn vennen du vil overvaka."
 
+# var: Nytt vennevarsel
 msgid "New Buddy Pounce"
-msgstr "Nytt vennevarsel"
+msgstr "Ny venneovervaking"
 
+# var: Endra vennevarsel
 msgid "Edit Buddy Pounce"
-msgstr "Endra vennevarsel"
+msgstr "Endra venneovervakinga"
 
+# var: Varsling for
 msgid "Pounce Who"
-msgstr "Varsling for"
+msgstr "Overvaka kven"
 
 #. Account:
 msgid "Account:"
@@ -1022,9 +1030,10 @@ msgstr "Vennenamn:"
 msgid "Buddy name:"
 msgstr "Vennenamn:"
 
+# merknad: her kan ein nok ikkje nytta ordet "overvaka" som er nytta i andre samanhengar
 #. Create the "Pounce When Buddy..." frame.
 msgid "Pounce When Buddy..."
-msgstr "Varsla n?r venn..."
+msgstr "Varsla n?r vennen..."
 
 msgid "Signs on"
 msgstr "Loggar p?"
@@ -1075,25 +1084,29 @@ msgstr "Spel ein lyd"
 msgid "Play a sound"
 msgstr "Spel ein lyd"
 
+# var: Vennevarsling berre n?r eg ikkje er tilgjengeleg
 msgid "Pounce only when my status is not Available"
-msgstr "Vennevarsling berre n?r eg ikkje er tilgjengeleg"
+msgstr "Venneovervaking berre n?r statusen min er Ikkje tilgjengeleg"
 
 # Regelmessig?
 msgid "Recurring"
 msgstr "Gjentakande"
 
+# var: Klarer ikkje ? oppretta vennevarsel
 msgid "Cannot create pounce"
-msgstr "Klarer ikkje ? oppretta vennevarsel"
+msgstr "Klarer ikkje ? oppretta venneovervakinga"
 
 msgid "You do not have any accounts."
 msgstr "Du har ingen kontoar."
 
+# var: Du m? f?rst oppretta ein konto f?r du kan laga eit vennevarsel.
 msgid "You must create an account first before you can create a pounce."
-msgstr "Du m? f?rst oppretta ein konto f?r du kan laga eit vennevarsel."
+msgstr "Du m? f?rst oppretta ein konto f?r du kan laga ei venneovervaking."
 
+# Er du sikker p? at du ?nskjer ? sletta varselet i %s  for %s?
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "Er du sikker p? at du ?nskjer ? sletta varselet i %s  for %s??"
+msgstr "Vil du verkeleg sletta overvakinga i %s av %s?"
 
 msgid "Buddy Pounces"
 msgstr "Vennevarsel"
@@ -1139,7 +1152,7 @@ msgid "Unknown pounce event. Please repo
 msgstr "%s har sendt deg ei melding. (%s)"
 
 msgid "Unknown pounce event. Please report this!"
-msgstr "Ukjend varselhending. Rapporter feilen."
+msgstr "Ukjend overvakingshending. Rapporter feilen."
 
 msgid "Based on keyboard use"
 msgstr "Basert p? tastaturbruk"
@@ -1184,7 +1197,7 @@ msgid "Conversations"
 msgstr "Endra tilstand til"
 
 msgid "Conversations"
-msgstr "Samtaler"
+msgstr "Samtalar"
 
 msgid "Logging"
 msgstr "Loggf?ring"
@@ -1227,7 +1240,7 @@ msgid "Message received begins conversat
 msgstr "Melding motteken"
 
 msgid "Message received begins conversation"
-msgstr "Motteken melding startar samtala"
+msgstr "Motteken melding startar samtalen"
 
 msgid "Message sent"
 msgstr "Melding sendt"
@@ -1296,7 +1309,7 @@ msgid "Sounds when conversation has focu
 msgstr "Lydinnstillingar"
 
 msgid "Sounds when conversation has focus"
-msgstr "Lydar n?r samtala har fokus"
+msgstr "Lydar n?r samtalen har fokus"
 
 msgid "Always"
 msgstr "Alltid"
@@ -1384,14 +1397,14 @@ msgid "Edit Status"
 msgstr "Melding:"
 
 msgid "Edit Status"
-msgstr "Endra tilstand"
+msgstr "Endra tilstanden"
 
 msgid "Use different status for following accounts"
 msgstr "Bruk forskjellig status for dei f?lgjande kontoane"
 
 #. Save & Use
 msgid "Save & Use"
-msgstr "Lagra & bruk"
+msgstr "Lagra og bruk"
 
 msgid "Certificates"
 msgstr "Sertifikat"
@@ -1491,21 +1504,21 @@ msgstr ""
 msgstr ""
 "Ein kan sl? p? loggf?ring fr? Verkt?y -> Innstillingar -> Loggf?ring.\n"
 "\n"
-"? ta i bruk loggf?ring for lynmeldingar og/eller prating sl?r p? historikk "
-"for liknande samtaletype (-ar)."
+"Loggf?ring av lynmeldingar og/eller prating sl?r p? historikken for liknande "
+"samtaletype (-ar)."
 
 msgid "GntHistory"
 msgstr "GntHistory"
 
 msgid "Shows recently logged conversations in new conversations."
-msgstr "Viser nyleg logga samtaler i nye samtaler."
+msgstr "Viser nyleg logga samtalar i nye samtalar."
 
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
 msgstr ""
-"N?r ei ny samtale blir opna, vil dette tillegget setja inn den siste samtala "
-"i den noverande."
+"N?r ein ny samtale blir opna, vil dette tillegget setja inn den siste "
+"samtalen i den noverande."
 
 #, c-format
 msgid ""
@@ -1515,16 +1528,16 @@ msgstr ""
 "\n"
 "Hentar TinyURL..."
 
+# Sjekk!
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "TinyURL til adressa ovanfor: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "Vent mens TinyURL hentar ein kortare URL ..."
 
-#, fuzzy
 msgid "Only create TinyURL for URLs of this length or greater"
-msgstr "Lag berre TinyURL for adresser med denne eller st?rre lengd"
+msgstr "Lag berre TinyURL-ar for adresser med denne eller st?rre lengd"
 
 msgid "TinyURL (or other) address prefix"
 msgstr "TinyURL-adresseprefiks (eller annan) "
@@ -1535,7 +1548,6 @@ msgstr "TinyURL-programtillegg"
 msgid "TinyURL plugin"
 msgstr "TinyURL-programtillegg"
 
-#, fuzzy
 msgid "When receiving a message with URL(s), use TinyURL for easier copying"
 msgstr ""
 "Ved mottak av meldingar med adresser (URL), bruk TinyURL som gjev lettare "
@@ -1576,7 +1588,7 @@ msgid "lastlog: Searches for a substring
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
 msgid "lastlog: Searches for a substring in the backlog."
-msgstr "lastlog: leiter etter understrengar i loggen."
+msgstr "lastlog: leiter etter ein understreng i loggen."
 
 msgid "GntLastlog"
 msgstr "GntLastlog"
@@ -1588,7 +1600,7 @@ msgid "Password is required to sign on."
 msgstr "kontoar"
 
 msgid "Password is required to sign on."
-msgstr "Passord er p?kravd for ? logga p?."
+msgstr "Ein m? nytta passord for ? logga p?."
 
 #, c-format
 msgid "Enter password for %s (%s)"
@@ -1645,29 +1657,26 @@ msgstr "venneliste"
 msgid "buddy list"
 msgstr "venneliste"
 
-#, fuzzy
 msgid "The certificate is self-signed and cannot be automatically checked."
-msgstr ""
-"Sertifikatet som \"%s\" presenterte, er sj?lvsignert. Det kan ikkje "
-"kontrollerast automatisk."
+msgstr "Sertifikatet er sj?lvsignert og kan ikkje kontrollerast automatisk."
 
+# !?
 msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 msgstr ""
+"Ein kan ikkje stola p? sertifikatet sidan det ikkje finst tiltrudde "
+"sertifikat som kan stadfesta det."
 
-#, fuzzy
 msgid "The certificate is not valid yet."
-msgstr "Den presenterte sertifikatkjeda til %s er ikkje gyldig."
+msgstr "Sertifikatet er ikkje gyldig enno."
 
-#, fuzzy
 msgid "The certificate has expired and should not be considered valid."
-msgstr "Den presenterte sertifikatkjeda til %s er ikkje gyldig."
+msgstr "Sertifikatet har g?tt ut og kan ikkje reknast for ? vera gyldig."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
-#, fuzzy
 msgid "The certificate presented is not issued to this domain."
-msgstr "Den presenterte sertifikatkjeda til %s er ikkje gyldig."
+msgstr "Det presenterte sertifikatet er ikkje skrive ut til dette domenet."
 
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
@@ -1676,16 +1685,14 @@ msgstr ""
 "Du har ingen database over rotsertifikat. Dermed kan ikkje dette "
 "sertifikatet validerast."
 
-#, fuzzy
 msgid "The certificate chain presented is invalid."
-msgstr "Den presenterte sertifikatkjeda til %s er ikkje gyldig."
+msgstr "Den presenterte sertifikatkjeda er ugyldig."
 
-#, fuzzy
 msgid "The certificate has been revoked."
-msgstr "Oppringinga er blitt avbroten."
+msgstr "Sertifikatet er blitt trekt attende."
 
 msgid "An unknown certificate error occurred."
-msgstr ""
+msgstr "Det oppstod ein ukjent sertifikatfeil."
 
 msgid "(DOES NOT MATCH)"
 msgstr "(SAMSVARER IKKJE)"
@@ -1729,25 +1736,24 @@ msgstr "Vis _sertifikat..."
 msgid "_View Certificate..."
 msgstr "Vis _sertifikat..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "The certificate for %s could not be validated."
-msgstr "Den presenterte sertifikatkjeda til %s er ikkje gyldig."
+msgstr "Klarte ikkje ? validera sertifikatet til %s."
 
 #. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "SSL sertifikatfeil"
 
-#, fuzzy
 msgid "Unable to validate certificate"
-msgstr "Klarte ikkje ? autentisera: %s"
+msgstr "Klarte ikkje ? stadfesta sertifikatet"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The certificate claims to be from \"%s\" instead. This could mean that you "
 "are not connecting to the service you believe you are."
 msgstr ""
-"Sertifikatet som \"%s\" presenterte seier at det er fr? \"%s\" i staden for. "
-"Dette kan bety at du ikkje koplar deg til den tenesta du trur du gjer."
+"Sertifikatet seier at det er fr? \"%s\" i staden for. Dette kan bety at du "
+"ikkje koplar deg til den tenesta du trur du gjer."
 
 #. Make messages
 #, c-format
@@ -1763,7 +1769,7 @@ msgstr ""
 "\n"
 "Fingeravtrykk (SHA1): %s\n"
 "\n"
-"Teken i bruk: %s\n"
+"Teke i bruk: %s\n"
 "Utg?r: %s\n"
 
 #. TODO: Find what the handle ought to be
@@ -1893,9 +1899,10 @@ msgstr "Oppslagsprosessen blei avslutta 
 msgid "Resolver process exited without answering our request"
 msgstr "Oppslagsprosessen blei avslutta utan vi fekk svar"
 
-#, fuzzy, c-format
+# la:
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "Oppslagsfeil mot %s: %d"
+msgstr "Konverteringa av %s til punycode feila: %d"
 
 #, c-format
 msgid "Thread creation failure: %s"
@@ -1930,7 +1937,7 @@ msgid "Directory is not writable."
 "%s.\n"
 
 msgid "Directory is not writable."
-msgstr "Ein kan ikkje skriva til atalogen."
+msgstr "Ein kan ikkje skriva til katalogen."
 
 msgid "Cannot send a file of 0 bytes."
 msgstr "Ein kan ikkje senda ei fil p? 0 bytar."
@@ -1991,18 +1998,18 @@ msgstr "Filoverf?ringa er ferdig"
 msgid "File transfer complete"
 msgstr "Filoverf?ringa er ferdig"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You cancelled the transfer of %s"
 msgstr "Du avbraut overf?ringa av %s"
 
 msgid "File transfer cancelled"
 msgstr "Filoverf?ringa blei avbroten"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s cancelled the transfer of %s"
 msgstr "%s avbraut overf?ringa av %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s cancelled the file transfer"
 msgstr "%s avbraut filoverf?ringa"
 
@@ -2165,7 +2172,7 @@ msgid "Logging of this conversation fail
 msgstr "Gammalt flatformat"
 
 msgid "Logging of this conversation failed."
-msgstr "Klarte ikkje ? loggf?ra denne samtala."
+msgstr "Klarte ikkje ? loggf?ra denne samtalen."
 
 msgid "XML"
 msgstr "XML"
@@ -2201,28 +2208,30 @@ msgstr ""
 "No codecs found. Install some GStreamer codecs found in GStreamer plugins "
 "packages."
 msgstr ""
+"Fnn ingen kodekar. Installer nokre GStreamer-kodekar fr? GStreamer-"
+"programtilleggspakkane."
 
 msgid ""
 "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
 msgstr ""
+"Ingen kodekar igjen. Kodek-innstillingane dine i fs-codecs.conf er for "
+"strenge."
 
-#, fuzzy
 msgid "A non-recoverable Farsight2 error has occurred."
-msgstr "F?lgande feil har oppst?tt:"
+msgstr "Det oppstod ein uoppretteleg Farsight2-feil."
 
-#, fuzzy
 msgid "Conference error"
-msgstr "Konferansen er lukka"
+msgstr "Konferansefeil"
 
 msgid "Error with your microphone"
-msgstr ""
+msgstr "Mikrofonfeil"
 
 msgid "Error with your webcam"
-msgstr ""
+msgstr "Nettkamerafeil"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error creating session: %s"
-msgstr "Tilkoplingsfeil"
+msgstr "Klarte ikkje ? laga ?kta: %s"
 
 msgid "Error creating conference."
 msgstr "Klarte ikkje ? laga konferansen"
@@ -2240,7 +2249,7 @@ msgid "ABI version mismatch %d.%d.x (nee
 
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
-msgstr "Samsvarsfeil %d i ABI-utg?va.%d.x (treng %d.%d.x)"
+msgstr "Samsvarsfeil i ABI-utg?ve %d.%d.x (treng %d.%d.x)"
 
 msgid ""
 "Plugin does not implement all required functions (list_icon, login and close)"
@@ -2317,8 +2326,9 @@ msgstr ""
 "Fillagringsbane\n"
 "(f?r opp heile filbana)"
 
+# var: Automatisk avvising fr? brukarar utanfor vennelista
 msgid "Automatically reject from users not in buddy list"
-msgstr "Automatisk avvising fr? brukarar utanfor vennelista"
+msgstr "Automatisk avvising av brukarar utanfor vennelista"
 
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
@@ -2326,7 +2336,7 @@ msgstr ""
 msgstr ""
 "La eit varslingsvindauge spretta opp n?r ei auto-godkjend filoverf?ring er "
 "ferdig\n"
-"(berre n?r det ikkje foreg?r ei samtale med sendaren)"
+"(berre n?r det ikkje foreg?r ein samtale med sendaren)"
 
 msgid "Create a new directory for each user"
 msgstr "Lag ein ny katalog for kvar brukar"
@@ -2484,17 +2494,17 @@ msgid "Hide Joins/Parts"
 "Test IPC-st?tta i tillegget (som tenar). Dette registrerer IPC-kommandoane."
 
 msgid "Hide Joins/Parts"
-msgstr ""
+msgstr "Skjul blir med / g?r ut"
 
 #. Translators: Followed by an input request a number of people
 msgid "For rooms with more than this many people"
-msgstr ""
+msgstr "For rom med fleire personar enn"
 
 msgid "If user has not spoken in this many minutes"
-msgstr ""
+msgstr "Minutt brukaren har vore taus"
 
 msgid "Apply hiding rules to buddies"
-msgstr "Bruk skjul reglar p? vennene"
+msgstr "Bruk skjulereglar p? vennene"
 
 #. *< type
 #. *< ui_requirement
@@ -2516,8 +2526,8 @@ msgstr ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
 msgstr ""
-"Dette tillegget skjuler bli med-/g? ut-meldingar i store rom, med unntak for "
-"brukarar som tek aktv del i ei samtale."
+"Dette tillegget skjuler bli med- / g? ut-meldingar i store rom, med unntak "
+"for brukarar som tek aktiv del i ein samtale."
 
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
@@ -2645,10 +2655,10 @@ msgid "Add new line in IMs"
 msgstr "Lastar .Net-programtillegg saman med Mono."
 
 msgid "Add new line in IMs"
-msgstr "Leg til ne linje i lynmeldnga"
+msgstr "Legg til ny linje i lynmeldinga"
 
 msgid "Add new line in Chats"
-msgstr "Legg til ny linje i samtaler"
+msgstr "Legg til ny linje i samtalar"
 
 #. *< magic
 #. *< major version
@@ -2679,15 +2689,16 @@ msgid "Save messages sent to an offline 
 msgstr "Emulering av fr?kopla meldingar"
 
 msgid "Save messages sent to an offline user as pounce."
-msgstr "Lagra meldingar som er sende til ein fr?kopla brukar som varsel."
+msgstr "Lagra meldingar som er sende til ein fr?kopla brukar som eit varsel."
 
 # `? '?
+# var: Resten av meldingane vil bli lagra som varsel. Du kan endra/sletta varselet fr? `vennevarsel'-vindauget.
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Resten av meldingane vil bli lagra som varsel. Du kan endra/sletta varselet "
-"fr? `vennevarsel'-vindauget."
+"fr? `venneovervaking'-vindauget."
 
 #, c-format
 msgid ""
@@ -2701,7 +2712,7 @@ msgid "You can edit/delete the pounce fr
 msgstr "Fr?kopla melding"
 
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
-msgstr "Du kan endra/sletta varselet fr? vennevarsel-vindauget"
+msgstr "Du kan endra/sletta varselet fr? `venneovervaking'-vindauget"
 
 msgid "Yes"
 msgstr "Ja"
@@ -2784,7 +2795,7 @@ msgid "Raise psychic conversations"
 msgstr "Viser varslingsmelding i pratevindauget"
 
 msgid "Raise psychic conversations"
-msgstr "Hev synske samtaler"
+msgstr "Hev synske samtalar"
 
 #. *< type
 #. *< ui_requirement
@@ -2868,7 +2879,7 @@ msgid "Provides a wrapper around SSL sup
 #. *  summary
 #. *  description
 msgid "Provides a wrapper around SSL support libraries."
-msgstr "Tilbyr felles grensesnitt mot SSL st?ttebiblioteka."
+msgstr "Tilbyr felles grensesnitt mot SSL-st?ttebiblioteka."
 
 #, c-format
 msgid "%s is no longer away."
@@ -2897,7 +2908,7 @@ msgid "Buddy Goes _Idle"
 msgstr "Venn g?r _vekk"
 
 msgid "Buddy Goes _Idle"
-msgstr "Venn blir _uverksam"
+msgstr "Venn _blir uverksam"
 
 msgid "Buddy _Signs On/Off"
 msgstr "Venn _loggar p?/av"
@@ -2990,10 +3001,10 @@ msgid "%s has closed the conversation."
 
 #, c-format
 msgid "%s has closed the conversation."
-msgstr "%s har lukka samtala."
+msgstr "%s har lukka samtalen."
 
 msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "Klarte ikkje ? senda meldinga. Samtala kunne ikkje startast."
+msgstr "Klarte ikkje ? senda meldinga. Samtalen kunne ikkje startast."
 
 #, c-format
 msgid "Unable to create socket: %s"
@@ -3047,8 +3058,9 @@ msgstr "Vennelista er henta inn."
 msgid "Buddylist loaded successfully!"
 msgstr "Vennelista er henta inn."
 
+# var: Lagra venneliste...
 msgid "Save buddylist..."
-msgstr "Lagra venneliste..."
+msgstr "Lagra vennelista..."
 
 msgid "Load buddylist from file..."
 msgstr "Hent vennelista fr? fil..."
@@ -3326,7 +3338,7 @@ msgid "_Channel:"
 msgstr "Vis \"Dagens melding\""
 
 msgid "_Channel:"
-msgstr "_Kanal:"
+msgstr "K_anal:"
 
 msgid "_Password:"
 msgstr "_Passord:"
@@ -3493,7 +3505,7 @@ msgid "Joining %s requires an invitation
 
 #, c-format
 msgid "Joining %s requires an invitation."
-msgstr "Du m? vera invitert for ? bli med  i %s."
+msgstr "Du m? vera invitert for ? bli med i %s."
 
 msgid "Invitation only"
 msgstr "Berre for inviterte"
@@ -3557,7 +3569,7 @@ msgid "Cannot join %s: Registration is r
 
 #, c-format
 msgid "Cannot join %s: Registration is required."
-msgstr "Kan ikkje bli med i %s: Registrering er p?kravd."
+msgstr "Kan ikkje bli med i %s: m? vera registrert."
 
 msgid "Cannot join channel"
 msgstr "Klarer ikkje ? opna kanal"
@@ -3896,8 +3908,8 @@ msgstr ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr ""
-"Alle punkta under er valfrie. Ikkje fyll ut noko informasjon du ikkje er "
-"komfortabel med ? gje fr? deg."
+"Alle punkta under er valfrie. Skriv berre opplysningar som du ?nskjer ? dela "
+"med andre."
 
 msgid "Client"
 msgstr "Klient"
@@ -3936,11 +3948,12 @@ msgstr "Logo"
 msgid "Logo"
 msgstr "Logo"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s will no longer be able to see your status updates.  Do you want to "
 "continue?"
-msgstr "Er du sikker p? at du ?nskjer ? fjerna %s fr? vennelista di?"
+msgstr ""
+"%s vil ikkje lenger kunna sj? statusoppdateringane dine. Vil du halda fram?"
 
 msgid "Cancel Presence Notification"
 msgstr "Avbryt naervaersvarsling"
@@ -3968,6 +3981,10 @@ msgstr "Logg av"
 msgid "Log Out"
 msgstr "Logg av"
 
+#. primative,						no,							id,			name
+#. 0
+#. 1
+#. 2
 msgid "Chatty"
 msgstr "Snakkesaleg"
 
@@ -4031,7 +4048,7 @@ msgid "Search Directory"
 msgstr "Vel ein brukarkatalog ? s?kja i"
 
 msgid "Search Directory"
-msgstr "S?k katalog"
+msgstr "S?k i katalog"
 
 msgid "_Room:"
 msgstr "_Rom:"
@@ -4040,7 +4057,7 @@ msgid "_Handle:"
 msgstr "_Tenar:"
 
 msgid "_Handle:"
-msgstr "_Handtak:"
+msgstr "R_eferanse:"
 
 #, c-format
 msgid "%s is not a valid room name"
@@ -4058,10 +4075,10 @@ msgid "%s is not a valid room handle"
 
 #, c-format
 msgid "%s is not a valid room handle"
-msgstr "%s er ikkje eit gyldig romhandtak"
+msgstr "%s er ikkje ein gyldig romreferanse"
 
 msgid "Invalid Room Handle"
-msgstr "Ugyldig romhandtak"
+msgstr "Ugyldig romreferanse"
 
 msgid "Configuration error"
 msgstr "Feil i innstillingane"
@@ -4218,14 +4235,15 @@ msgstr "Sinnsstemning"
 msgid "Mood"
 msgstr "Sinnsstemning"
 
+# var: Lyttar
 msgid "Now Listening"
-msgstr "Lyttar"
+msgstr "Lyttar til"
 
 msgid "Both"
 msgstr "Begge"
 
 msgid "From (To pending)"
-msgstr "Fr? (til er ventande)"
+msgstr "Fr? (ventande)"
 
 msgid "From"
 msgstr "Fr?"
@@ -4234,8 +4252,9 @@ msgid "None (To pending)"
 msgstr "Til"
 
 msgid "None (To pending)"
-msgstr "Ingen (til er ventande)"
+msgstr "Ingen (ventande)"
 
+#. 0
 msgid "None"
 msgstr "Ingen"
 
@@ -4348,10 +4367,10 @@ msgid "Server Overloaded"
 msgstr "Tidsavbrot p? fjerntenaren"
 
 msgid "Server Overloaded"
-msgstr "Tenaren er overlasta"
+msgstr "Tenaren er overbelasta"
 
 msgid "Service Unavailable"
-msgstr "Tenesten er utilgjengeleg"
+msgstr "Tenesta er utilgjengeleg"
 
 msgid "Subscription Required"
 msgstr "Abonnement p?kravd"
@@ -4539,9 +4558,8 @@ msgstr "configure:  Endra prateromsinnst
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Endra prateromsinnstillingane."
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [rom]:  Forlata praterommet."
+msgstr "part [melding]:  forlat rommet."
 
 msgid "register:  Register with a chat room."
 msgstr "register:  Registrera seg i eit praterom."
@@ -4560,13 +4578,12 @@ msgstr ""
 "[kallenamn2]...: hent brukarar med ei tilknyting til rommet eller lag slik "
 "tilknyting."
 
-#, fuzzy
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with a role or set users' role with the room."
 msgstr ""
-"role &lt;moderator|deltakar|bes?kjar|none&gt;: hent brukarar med ei rolle i "
-"rommet eller lag slik rolle."
+"role &lt;moderator|deltakar|bes?kjande|ingen&gt;: hent brukarane med ei "
+"rolle i rommet eller lag rolla deira."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;brukar&gt; [melding]:  Invit?r ein brukar til rommet."
@@ -4625,15 +4642,16 @@ msgid "File transfer proxies"
 msgstr "Tilkoplingstenar"
 
 msgid "File transfer proxies"
-msgstr "Mellomlager filoverf?ringar"
+msgstr "Mellomtenar filoverf?ringar"
 
 msgid "BOSH URL"
 msgstr "BOSH-adresse"
 
+# ? custom = tilpassa
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
-msgstr "Vis tilpass smilefjes"
+msgstr "Vis eigne smilefjes"
 
 #, c-format
 msgid "%s has left the conversation."
@@ -4655,8 +4673,9 @@ msgstr "Meldinga til %s kom ikkje fram: 
 msgid "Message delivery to %s failed: %s"
 msgstr "Meldinga til %s kom ikkje fram: %s"
 
+# var: Jabber meldingsfeil
 msgid "XMPP Message Error"
-msgstr "Jabber meldingsfeil"
+msgstr "XMPP-meldingsfeil"
 
 #, c-format
 msgid "(Code %s)"
@@ -4737,7 +4756,7 @@ msgid "Edit User Mood"
 msgstr "Vel kva for ressurs av %s du ?nskjer ? senda fila til"
 
 msgid "Edit User Mood"
-msgstr "Endra brukarsinnsstemning"
+msgstr "Endra brukarsinnsstemninga"
 
 msgid "Please select your mood from the list."
 msgstr "Vel sinnsstemninga di fr? lista."
@@ -4945,7 +4964,7 @@ msgid "Server is going down (abandon shi
 
 #, c-format
 msgid "Server is going down (abandon ship)"
-msgstr "Tenaren er p? veg ned (forlat skipet)"
+msgstr "Tenaren er p? veg ned (r?m skipet)"
 
 #, c-format
 msgid "Error creating connection"
@@ -4983,9 +5002,8 @@ msgstr "Uventa"
 msgid "Not expected"
 msgstr "Uventa"
 
-#, fuzzy
 msgid "Friendly name is changing too rapidly"
-msgstr "Endrar visingsnamnet for ofte"
+msgstr "Visingsnamnet blir endra for kjapt."
 
 #, c-format
 msgid "Server too busy"
@@ -5204,12 +5222,12 @@ msgstr "MSN krev bruk av SSL. Last ned e
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN krev bruk av SSL. Last ned eit st?tta SSL-bibliotek. "
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
 msgstr ""
-"Klarte ikkje ? leggja til vennen %s fordi brukarnamnet er ugyldig. "
+"Klarer ikkje ? leggja til vennen %s fordi brukarnamnet er ugyldig. "
 "Brukarnamn m? vera ei gyldig e-postadresse."
 
 msgid "Unable to Add"
@@ -5296,17 +5314,19 @@ msgstr "Heimeadresse"
 msgid "Home Address"
 msgstr "Heimeadresse"
 
+# var: Personleg mobil
 msgid "Personal Mobile"
-msgstr "Personleg mobil"
+msgstr "Privat mobil"
 
 msgid "Home Fax"
 msgstr "Heimefaks"
 
 msgid "Personal Email"
-msgstr "E-postadresse privat"
+msgstr "Privat e-postadresse"
 
+# var: Personleg pratenett
 msgid "Personal IM"
-msgstr "Personleg pratenett"
+msgstr "Privat prateadresse"
 
 msgid "Anniversary"
 msgstr "Jubileum"
@@ -5433,9 +5453,8 @@ msgstr "ukjend feil (%d)"
 msgid "Unknown error (%d)"
 msgstr "ukjend feil (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "Klarte ikkje ? leggja til brukar"
+msgstr "Klarer ikkje ? fjerna brukaren"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobilmeldinga blei ikkje sendt sidan ho var for lang."
@@ -5457,12 +5476,12 @@ msgstr[0] ""
 "sign in."
 msgstr[0] ""
 "MSN-tenaren vil stengjast ned grunna vedlikehald om %d minutt. Du blir d? "
-"automatisk logga av. Du b?r lukka alle p?g?ande samtaler.\n"
+"automatisk logga av. Du b?r lukka alle opne samtalar.\n"
 "\n"
 "Du vil kunna logga p? att straks vedlikehaldsarbeidet er ferdig."
 msgstr[1] ""
 "MSN-tenaren vil stengjast ned grunna vedlikehald om %d minutt. Du blir d? "
-"automatisk logga av. Du b?r lukka alle p?g?ande samtaler.\n"
+"automatisk logga av. Du b?r lukka alle opne samtalar.\n"
 "\n"
 "Du vil kunna logga p? att straks vedlikehaldsarbeidet er ferdig."
 
@@ -5547,10 +5566,11 @@ msgstr ""
 "%s sp?r om ? f? sj? nettkameraet ditt. Denne funksjonen er enno ikkje st?tta."
 
 # d?rleg formulering?
-#, fuzzy, c-format
+#, c-format
 msgid "%s invited you to view his/her webcam, but this is not yet supported."
 msgstr ""
-"%s sp?r om ? f? sj? nettkameraet ditt. Denne funksjonen er enno ikkje st?tta."
+"%s har invitert deg til ? f? sj? nettkameraet hans/hennar, men funksjonen er "
+"enno ikkje st?tta."
 
 msgid "Away From Computer"
 msgstr "Vekke fr? datamaskina"
@@ -5589,7 +5609,7 @@ msgstr ""
 
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
-"Det kan vera at meldinga ikkje blei sendt sidan ein ukjend feil oppstod:"
+"Det kan vera at meldinga ikkje blei sendt sidan det oppstod ein ukjend feil:"
 
 msgid "Delete Buddy from Address Book?"
 msgstr "Sletta venn fr? adresseboka?"
@@ -5671,28 +5691,87 @@ msgstr "%s har fjerna deg fr? vennelist
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s har fjerna deg fr? vennelista si."
 
+#. 1
+msgid "Angry"
+msgstr "Sint"
+
+#. 2
+msgid "Excited"
+msgstr "Oppgl?dd"
+
+# Grinete?
+#. 3
+msgid "Grumpy"
+msgstr "Sur"
+
+#. 4
+msgid "Happy"
+msgstr "Glad"
+
+#. 5
+msgid "In Love"
+msgstr "Forelska"
+
+#. 6
+msgid "Invincible"
+msgstr "Uovervinneleg"
+
+#. 7
+msgid "Sad"
+msgstr "Trist"
+
+#. 8
+msgid "Hot"
+msgstr "Heit"
+
+#. 9
+msgid "Sick"
+msgstr "Sjuk"
+
+#. 10
+msgid "Sleepy"
+msgstr "S?vnig"
+
 #. show current mood
-#, fuzzy
 msgid "Current Mood"
-msgstr "Sinnsstemninga di no"
+msgstr "Sinnsstemninga no"
 
 #. add all moods to list
-#, fuzzy
 msgid "New Mood"
-msgstr "Sinnsstemning"
+msgstr "Ny sinnsstemning"
 
-#, fuzzy
 msgid "Change your Mood"
-msgstr "Endra passord"
+msgstr "Endra sinnsstemninga di"
 
+msgid "How do you feel right now?"
+msgstr "Korleis kjenner du deg nett no?"
+
 #, fuzzy
-msgid "How do you feel right now?"
-msgstr "Eg er ikkje her nett no"
+msgid "The PIN you entered is invalid."
+msgstr "Den innskrivne SecurID-n?kkelen er ugyldig"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "Den innskrivne SecurID-n?kkelen er ugyldig"
+
+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 "Dei nye passorda samsvarer ikkje."
+
+#, fuzzy
+msgid "The name you entered is invalid."
+msgstr "Den innskrivne SecurID-n?kkelen er ugyldig"
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
+
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "Skrivefeil"
+msgstr "Profiloppdateringsfeil"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5700,354 +5779,308 @@ msgid "Your profile information is not y
 msgstr "Profil"
 
 msgid "Your profile information is not yet retrieved. Please try again later."
-msgstr ""
+msgstr "Profilopplysningane dine er ikkje henta enno. Pr?v igjen seinare."
 
 #. pin
-#, fuzzy
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "Stadfest PIN"
 
 #. display name
-#, fuzzy
 msgid "Display Name"
-msgstr "Etternamn"
+msgstr "Visingsnamn"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "Skjul nummeret mitt"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
-msgstr "Mobiltelefon"
+msgstr "Mobilnummer"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "Yahoo!-profil"
+msgstr "Oppdater profilen din"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "Her kan du oppdatera MXit-profilen din"
 
 msgid "View Splash"
-msgstr ""
+msgstr "Syn oppstartsbilete"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
+msgstr "Ikkje noko oppstartsvindage er tilgjengeleg no"
 
-#, fuzzy
 msgid "About"
-msgstr "Om meg"
+msgstr "Om"
 
 #. display / change mood
-#, fuzzy
 msgid "Change Mood..."
-msgstr "Endra passord..."
+msgstr "Endra sinnsstemninga..."
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "Endra passord..."
+msgstr "Endra profilen..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "Sj? p? loggen..."
+msgstr "Syn opningsbiletet..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "Om meg"
+msgstr "Om..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "Meldinga er for stor."
+msgstr "Meldinga du pr?ver ? senda er for stor."
 
 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 ""
+"Klarer ikkje ? kopla til MXit sin HTTP-tenar. Kontroller tenarinnstillingane "
+"dine."
 
-#, fuzzy
 msgid "Logging In..."
-msgstr "Loggar p?"
+msgstr "Loggar p?..."
 
-#, 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 ""
-"Klarer ikkje ? kopla til tenaren. Skriv inn adressa til tenaren du vil kopla "
-"deg til."
+"Klarer ikkje ? kopla til MXit-tenaren. Kontroller tenarinnstillingane dine."
 
+msgid "Connecting..."
+msgstr "Koplar til..."
+
 #, fuzzy
-msgid "Connecting..."
-msgstr "Koplar til"
+msgid "The nick name you entered is invalid."
+msgstr "Den innskrivne SecurID-n?kkelen er ugyldig"
 
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "Den innskrivne SecurID-n?kkelen er ugyldig"
+
 #. mxit login name
 msgid "MXit Login Name"
-msgstr ""
+msgstr "P?loggingsnamn MXit"
 
 #. nick name
-#, fuzzy
 msgid "Nick Name"
 msgstr "Kallenamn"
 
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "Registrer ein ny XMPP-konto"
+msgstr "Registrer ein ny MXit-konto"
 
-#, fuzzy
 msgid "Please fill in the following fields:"
-msgstr "Fyll ut f?lgjande felt"
+msgstr "Fyll ut desse felta:"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
-msgstr ""
+msgstr "Klarte ikkje ? n? MXit sin WAP-nettstad. Pr?v igjen seinare."
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
-msgstr ""
+msgstr "MXit klarer ikkje ? behandla f?respurnaden din no. Pr?v igjen seinare."
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "Du skreiv feil tryggleikskode. Pr?v igjen seinare."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "?kta di har g?tt ut. Pr?v igjen seinare."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
+msgstr "Du valde eit ugyldig land. Pr?v igjen seinare."
 
 msgid "Username is not registered. Please register first."
-msgstr ""
+msgstr "Brukarnamnet er ikkje registrert. Registrer deg f?rst."
 
 msgid "Username is already registered. Please choose another username."
-msgstr ""
+msgstr "Brukarnamnet er allereie registrert. Vel eit anna brukarnamn."
 
-#, fuzzy
 msgid "Internal error. Please try again later."
-msgstr "Tenaren er ikkje tilgjengeleg - pr?v igjen seinare"
+msgstr "Intern feil. Pr?v igjen seinare."
 
 msgid "You did not enter the security code"
-msgstr ""
+msgstr "Du skreiv ikkje inn tryggleikskoden"
 
-#, fuzzy
 msgid "Security Code"
-msgstr "Tryggleik er sl?tt p?"
+msgstr "Tryggleikskode"
 
 #. ask for input
-#, fuzzy
 msgid "Enter Security Code"
-msgstr "Skriv inn koden"
+msgstr "Skriv inn tryggleikskoden"
 
-#, fuzzy
 msgid "Your Country"
-msgstr "Land"
+msgstr "Landet ditt"
 
-#, fuzzy
 msgid "Your Language"
-msgstr "F?retrekt spr?k"
+msgstr "Spr?ket ditt"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "Krev godkjenning"
+msgstr "MXit-godkjenning"
 
 msgid "MXit account validation"
-msgstr ""
+msgstr "MXit-kontovalidering"
 
-#, fuzzy
 msgid "Retrieving User Information..."
-msgstr "Tenarinformasjon"
+msgstr "Hentar brukaropplysningar..."
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Loggar p?..."
+
 msgid "Status Message"
-msgstr "Sende meldingar"
+msgstr "Statusmelding"
 
-#, fuzzy
 msgid "Hidden Number"
-msgstr "Mellomnamn"
+msgstr "Skjult nummer"
 
-#, fuzzy
 msgid "Your Mobile Number..."
-msgstr "Skriv inn mobiltelefonnummer..."
+msgstr "Mobiltelefonnummeret ditt..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "Tenar"
+msgstr "WAP-tenar"
 
-#, fuzzy
 msgid "Connect via HTTP"
-msgstr "Kopla til med TCP"
+msgstr "Kopla til over HTTP"
 
+# ? treng gjennomsyn
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "Bruk oppstartsvindauge"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
-msgstr ""
+msgstr "Det er ikkje samband med MXit. Kopla til att."
 
+# var: Jabber meldingsfeil
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "Jabber meldingsfeil"
+msgstr "Sendingsfeil melding"
 
-#, fuzzy
 msgid "Unable to process your request at this time"
-msgstr "Klarer ikkje ? finna tenarnamnet"
+msgstr "Klarer ikkje ? behandla f?respurnaden no"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
+msgstr "Tidsavbrot medan ein venta p? svar fr? MXit-tenaren."
 
-#, fuzzy
 msgid "Successfully Logged In..."
-msgstr "Blei med i Qun"
+msgstr "Du er p?logga..."
 
-#, fuzzy
+#, fuzzy, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr ""
+"%s har sendt deg ein lydpratinvitasjon. Denne funksjonen er enno ikkje "
+"st?tta."
+
+# var: Jabber meldingsfeil
 msgid "Message Error"
-msgstr "Jabber meldingsfeil"
+msgstr "Meldingsfeil"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
+msgstr "Kan ikkje nytta den spesifiserte protokollen til ? vidaresenda"
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "Det oppstod ein ukjent sertifikatfeil."
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "SASL-feil: %s"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "SASL-feil: %s"
+
+# Kontaktfeil? - Sannsynlegvis ikkje
 msgid "Contact Error"
 msgstr "Sambandsfeil"
 
-#, fuzzy
+# var: Jabber meldingsfeil
 msgid "Message Sending Error"
-msgstr "Jabber meldingsfeil"
+msgstr "Sendefeil melding"
 
-#, fuzzy
 msgid "Status Error"
-msgstr "Feil i datastraumen"
+msgstr "Statusfeil"
 
-#, fuzzy
 msgid "Mood Error"
-msgstr "Ikon-feil"
+msgstr "Sinnsstemnings-feil"
 
-#, fuzzy
 msgid "Invitation Error"
-msgstr "Avregistreringsfeil"
+msgstr "Invitasjonsfeil"
 
-#, fuzzy
 msgid "Contact Removal Error"
-msgstr "Sambandsfeil"
+msgstr "Kontaktfjerningsfeil"
 
-#, fuzzy
 msgid "Subscription Error"
-msgstr "Abonnement"
+msgstr "Abonnementsfeil"
 
-#, fuzzy
 msgid "Contact Update Error"
-msgstr "Sambandsfeil"
+msgstr "Kontaktoppdateringsfeil"
 
-#, fuzzy
 msgid "File Transfer Error"
-msgstr "Filoverf?ring"
+msgstr "Filoverf?ringsfeil"
 
-#, fuzzy
+# var: Klarer ikkje ? oppretta vennevarsel
 msgid "Cannot create MultiMx room"
-msgstr "Klarer ikkje ? oppretta vennevarsel"
+msgstr "Klarer ikkje ? laga MultiMx-rom"
 
-#, fuzzy
 msgid "MultiMx Invitation Error"
-msgstr "Avregistreringsfeil"
+msgstr "MultiMx-invitasjonsfeil"
 
-#, fuzzy
 msgid "Profile Error"
-msgstr "Skrivefeil"
+msgstr "Profilfeil"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "Fekk ein ugyldig pakke fr? MXit."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "Det oppstod ein feil i sambandet mot MXit. (lesefase 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "Det oppstod ein feil i sambandet mot MXit. (lesefase 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "Det oppstod ein feil i sambandet mot MXit. (lesefase 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "Det oppstod ein feil i sambandet mot MXit. (lesefase 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "Det oppstod ein feil i sambandet mot MXit. (lesefase 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
+msgstr "Det oppstod ein feil i sambandet mot MXit. (lesefase 0x06)"
 
-msgid "Angry"
-msgstr "Sint"
-
-msgid "Excited"
-msgstr "Oppgl?dd"
-
-#, fuzzy
-msgid "Grumpy"
-msgstr "Gruppe"
-
-msgid "Happy"
-msgstr "Glad"
-
-msgid "In Love"
-msgstr "Forelska"
-
-msgid "Invincible"
-msgstr "Uovervinneleg"
-
-msgid "Sad"
-msgstr "Trist"
-
-#, fuzzy
-msgid "Hot"
-msgstr "_Vert:"
-
-#, fuzzy
-msgid "Sick"
-msgstr "Kallenamn"
-
-msgid "Sleepy"
-msgstr "S?vnig"
-
-#, fuzzy
 msgid "Pending"
-msgstr "Sender"
+msgstr "Ventar"
 
-#, fuzzy
 msgid "Invited"
-msgstr "Inviter"
+msgstr "Invitert"
 
-#, fuzzy
 msgid "Rejected"
-msgstr "Avvis"
+msgstr "Avvist"
 
-#, fuzzy
 msgid "Deleted"
-msgstr "Slett"
+msgstr "Sletta"
 
 msgid "MXit Advertising"
-msgstr ""
+msgstr "MXit-annonsering"
 
-#, fuzzy
 msgid "More Information"
-msgstr "Arbeidsinformasjon"
+msgstr "Fleire opplsyningar"
 
 #, c-format
 msgid "No such user: %s"
@@ -6303,15 +6336,15 @@ msgid "Smooch"
 
 #. Smooch means "to kiss someone, often enthusiastically"
 msgid "Smooch"
-msgstr "V?tkyss"
+msgstr "Kosekyss"
 
 #, c-format
 msgid "%s has smooched you!"
-msgstr "%s har v?tkyssa deg!"
+msgstr "%s har kosekyssa deg!"
 
 #, c-format
 msgid "Smooching %s..."
-msgstr "V?tkysser %s..."
+msgstr "Kosekysser %s..."
 
 #. A hug is a display of affection; wrapping your arms around someone
 msgid "Hug"
@@ -6395,7 +6428,6 @@ msgstr "Rekkjer %s tunga..."
 msgid "Raspberrying %s..."
 msgstr "Rekkjer %s tunga..."
 
-#
 msgid "Required parameters not passed in"
 msgstr "P?kravde parameter ikkje oppgjevne"
 
@@ -6459,7 +6491,7 @@ msgid "You cannot add the same person tw
 msgstr "Kontoen din er sperra grunna for mange feilp?loggingsfors?k"
 
 msgid "You cannot add the same person twice to a conversation"
-msgstr "Du kan ikkje leggja til same person to gonger i ei samtale"
+msgstr "Du kan ikkje leggja til same person to gonger i ein samtale"
 
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Du har n?dd grensa for tilletne kontaktar"
@@ -6650,9 +6682,9 @@ msgstr "Tenarport"
 msgstr "Tenarport"
 
 #. Note to translators: %s in this string is a URL
-#, fuzzy, c-format
+#, c-format
 msgid "Received unexpected response from %s"
-msgstr "Fekk uventa svar fr? "
+msgstr "Fekk uventa svar fr? %s"
 
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -6663,9 +6695,9 @@ msgstr ""
 
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting %s: %s"
-msgstr "Klarte ikkje ? sp?rja"
+msgstr "Klarte ikkje ? henta %s: %s"
 
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL till?t ikkje at brukarnamnet ditt kan autentiserast her"
@@ -6815,46 +6847,43 @@ msgid "Cannot receive IM due to parental
 msgstr "Ikkje n?r p?logga AOL"
 
 msgid "Cannot receive IM due to parental controls"
-msgstr ""
+msgstr "F?r ikkje ta i mot lynmeldingar grunna foreldrekontrollreglar"
 
 msgid "Cannot send SMS without accepting terms"
-msgstr ""
+msgstr "Kan ikkje senda teksmeldingar utan godkjenning av vilk?ra"
 
-#, fuzzy
+# tekstmeldinga? SMS-en?
 msgid "Cannot send SMS"
-msgstr "Klarer ikkje ? senda fila"
+msgstr "Klarer ikkje ? senda meldinga"
 
 #. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
 msgid "Cannot send SMS to this country"
-msgstr "Ein kan ikkje senda ein katalog."
+msgstr "Kan ikkje senda meldingar til dette landet"
 
 #. Undocumented
 msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgstr "Kan ikkje senda meldingar til ukjente land"
 
 msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+msgstr "Bot-kontoar kan ikkje setja i gang lynmeldingar"
 
 msgid "Bot account cannot IM this user"
-msgstr ""
+msgstr "Bot-kontoen kan ikkje senda lynmelding til denne brukaren"
 
 msgid "Bot account reached IM limit"
-msgstr ""
+msgstr "Bot-kontoen har n?dd lynmeldingsgrensa"
 
 msgid "Bot account reached daily IM limit"
-msgstr ""
+msgstr "Bot-kontoen har n?dd dagsgrensa for lynmeldingar"
 
 msgid "Bot account reached monthly IM limit"
-msgstr ""
+msgstr "Bot-kontoen har n?dd m?nadsgrensa for lynmeldingar"
 
-#, fuzzy
 msgid "Unable to receive offline messages"
-msgstr "Klarte ikkje ? senda meldinga."
+msgstr "Klarer ikkje ? ta i mot fr?kopla meldingar"
 
-#, fuzzy
 msgid "Offline message store full"
-msgstr "Fr?kopla melding"
+msgstr "Fr?kopla meldingslager er fullt"
 
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
@@ -6991,7 +7020,7 @@ msgstr ""
 msgstr ""
 "F?r ikkje til ? logga p? som %s fordi brukarnamnet er ugyldig. Brukarnamn m? "
 "vera ei gyldig e-postadresse, eller begynna med ein bokstav og berre "
-"innehalda bokstavar. tal og mellomrom, eller berre innehalda tal."
+"innehalda bokstavar, tal og mellomrom, eller berre innehalda tal."
 
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
@@ -7022,14 +7051,13 @@ msgstr "AOL si lynmeldingsteneste er mel
 msgstr "AOL si lynmeldingsteneste er mellombels utilgjengeleg."
 
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has been connecting and disconnecting too frequently. Wait ten "
 "minutes and try again. If you continue to try, you will need to wait even "
 "longer."
 msgstr ""
-"Du har kopla til og blitt fr?kopla for ofte. Vent i ti minutt og pr?v igjen. "
-"Held du fram med ? pr?va, vil du m?tta venta end? lenger."
+"Brukarnamnet ditt har kopla til og blitt fr?kopla for ofte. Vent i ti minutt "
+"og pr?v igjen. Held du fram med ? pr?va, vil du m?tta venta end? lenger."
 
 #. client too old
 #, c-format
@@ -7037,14 +7065,13 @@ msgstr "Klientutg?va du bruker er for g
 msgstr "Klientutg?va du bruker er for gammal. Oppgrader p? %s"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "Your IP address has been connecting and disconnecting too frequently. Wait a "
 "minute and try again. If you continue to try, you will need to wait even "
 "longer."
 msgstr ""
-"Du har kopla til og blitt fr?kopla for ofte. Vent ei stund og pr?v igjen. "
-"Held du fram med ? pr?va, vil du m?tta venta end? lenger."
+"IP-adressa di har kopla til og blitt fr?kopla for ofte. Vent ei stund og "
+"pr?v igjen. Held du fram med ? pr?va, vil du m?tta venta end? lenger."
 
 msgid "The SecurID key entered is invalid"
 msgstr "Den innskrivne SecurID-n?kkelen er ugyldig"
@@ -7185,21 +7212,21 @@ msgstr[1] "Du fekk ikkje %hu meldingar f
 msgstr[0] "Du fekk ikkje %hu melding fr? %s av uviss ?rsak."
 msgstr[1] "Du fekk ikkje %hu meldingar fr? %s av uviss ?rsak."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message: %s (%s)"
-msgstr "Klarer ikkje ? senda melding (%s)."
+msgstr "Klarer ikkje ? senda meldinga: %s (%s)"
 
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Klarer ikkje ? senda melding: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message to %s: %s (%s)"
-msgstr "Klarte ikkje ? senda til %s:"
+msgstr "Klarer ikkje ? senda meldinga til %s: %s (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message to %s: %s"
-msgstr "Klarte ikkje ? senda til %s:"
+msgstr "Klarer ikkje ? senda meldinga til %s: %s"
 
 #, c-format
 msgid "User information not available: %s"
@@ -7228,13 +7255,13 @@ msgstr ""
 "Klarer ikkje visa ei melding fr? denne brukaren: ho inneheldt ulovlege "
 "teikn.]"
 
-#, fuzzy
+# mengdegrensa?
 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 ""
 "Klarte ikkje ? utf?ra den siste handlinga sidan du er over mengdegrensa. "
-"Vent i 10 minutt og pr?v igjen."
+"Vent i 10 sekund og pr?v igjen.\n"
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
@@ -7403,7 +7430,7 @@ msgstr ""
 msgstr ""
 "Klarte ikkje ? leggja til vennen %s fordi brukarnamnet er ugyldig. "
 "Brukarnamn m? vera ei gyldig e-postadresse, eller begynna med ein bokstav og "
-"berre innehalda bokstavar. tal og mellomrom, eller berre innehalda tal."
+"berre innehalda bokstavar, tal og mellomrom, eller berre innehalda tal."
 
 msgid "Unable to Retrieve Buddy List"
 msgstr "Klarer ikkje ? henta vennelista"
@@ -7496,11 +7523,10 @@ msgid "C_onnect"
 "Vil du fortsetja?"
 
 msgid "C_onnect"
-msgstr "_Koplar til"
+msgstr "_Kopla til"
 
-#, fuzzy
 msgid "You closed the connection."
-msgstr "Tenaren lukka tilkoplinga"
+msgstr "Du lukka tilkoplinga."
 
 msgid "Get AIM Info"
 msgstr "Hent _AIM-informasjon"
@@ -7512,9 +7538,8 @@ msgstr "Hent statusmelding"
 msgid "Get Status Msg"
 msgstr "Hent statusmelding"
 
-#, fuzzy
 msgid "End Direct IM Session"
-msgstr "Oppretta direkte lynmeldingssamband"
+msgstr "Avslutt direktelynmeldings?kta"
 
 msgid "Direct IM"
 msgstr "Direktelynmelding"
@@ -8133,7 +8158,7 @@ msgid "and more, please let me know... t
 msgstr "<p><b>Grundige testarar</b>:<br>\n"
 
 msgid "and more, please let me know... thank you!))"
-msgstr "?n og meir, gjer vel ? la meg f? vita det... takk! :-)"
+msgstr "og meir, gjer vel og la meg f? vita det... takk! ))"
 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>Og alle gutane p? bakrommet...</i><br>\n"
@@ -8349,9 +8374,9 @@ msgstr "Filsending"
 msgid "File Send"
 msgstr "Filsending"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d cancelled the transfer of %s"
-msgstr "%d avbraut overf?ringa av %s"
+msgstr "%d stoppa overf?ringa av %s"
 
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
@@ -8498,7 +8523,7 @@ msgstr ""
 "Please enter one below to continue logging in."
 msgstr ""
 "Meanwhile-kontoen %s har ingen vert eller IP-adresse knytt til seg. F?r opp "
-"ein av desse verdiane for ? logga p?."
+"ein av desse verdiane for ? logga deg p?."
 
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile tilkoplingsinnstillingar"
@@ -9181,7 +9206,7 @@ msgid "Server Information"
 msgstr "Fekk ingen offentleg n?kkel"
 
 msgid "Server Information"
-msgstr "Tenarinformasjon"
+msgstr "Tenaropplysningar"
 
 msgid "Cannot get server information"
 msgstr "Klarer ikkje ? henta tenarinformasjonen"
@@ -9315,7 +9340,7 @@ msgid "Connecting to SILC Server"
 
 #. Progress
 msgid "Connecting to SILC Server"
-msgstr "Koplar til SILC-tenar"
+msgstr "Koplar til SILC-tenaren"
 
 msgid "Out of memory"
 msgstr "Ikkje nok minne"
@@ -9532,7 +9557,7 @@ msgstr ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
-"invite &lt;kanal&gt; [-|+]&lt;kanalnamn&gt;:  inviter kallenamn eller legg "
+"invite &lt;kanal&gt; [-|+]&lt;kallenamn&gt;:  inviter kallenamn eller legg "
 "til/fjern fr? kanalinvitasjonslista"
 
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
@@ -9578,7 +9603,7 @@ msgid "SILC Protocol Plugin"
 #. *< version
 #. *  summary
 msgid "SILC Protocol Plugin"
-msgstr "SILC protokolltillegg"
+msgstr "SILC-protokolltillegg"
 
 #. *  description
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
@@ -9815,7 +9840,7 @@ msgid "Proxy"
 msgstr "Bruk mellomlager"
 
 msgid "Proxy"
-msgstr "Mellomlager"
+msgstr "Mellomtenar"
 
 msgid "Auth User"
 msgstr "Autentiser brukar"
@@ -9867,7 +9892,7 @@ msgid "Use account proxy for SSL connect
 msgstr "_Ignorer konferanse- og prateromsinvitasjonar"
 
 msgid "Use account proxy for SSL connections"
-msgstr ""
+msgstr "Bruk kontomellomtenar for SSL-sambanda"
 
 msgid "Chat room list URL"
 msgstr "Prateromslisteadresse"
@@ -9975,26 +10000,26 @@ msgstr "Ignorera vennen?"
 msgid "Ignore buddy?"
 msgstr "Ignorera vennen?"
 
-#, fuzzy
 msgid "Invalid username or password"
 msgstr "Feil brukarnamn eller passord"
 
-#, fuzzy
 msgid ""
 "Your account has been locked due to too many failed login attempts.  Please "
 "try logging into the Yahoo! website."
 msgstr ""
-"Kontoen er l?st grunna for mange fors?k p? ? logga p?. Du kan kanskje l?ysa "
-"problemet ved ? logga deg p? Yahoo! sin nettstad."
+"Kontoen er l?st grunna for mange fors?k p? ? logga p?. Logg deg p? Yahoo! "
+"sin nettstad."
 
 #, c-format
 msgid "Unknown error 52.  Reconnecting should fix this."
-msgstr ""
+msgstr "Ukjend feilnummer 52. Oppattilkopling burde ordna problemet."
 
 msgid ""
 "Error 1013: The username you have entered is invalid.  The most common cause "
 "of this error is entering your email address instead of your Yahoo! ID."
 msgstr ""
+"Feil 1013: ugyldig brukarnamn. Som oftast skuldast denne feilen at du har "
+"skrive e-postadressa di i staden for Yahoo!-id-en din."
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
@@ -10087,12 +10112,13 @@ msgstr ""
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
 msgstr ""
+"Klarer ikkje ? senda tekstmeldingar. F?r ikkje kontakt med mobiloperat?ren."
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "Klarer ikkje ? senda tekstmeldingar. Ukjend mobiloperat?r."
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "Hentar mobiloperat?r for ? kunna senda tekstmeldingar. "
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -10338,7 +10364,7 @@ msgid "Zephyr Protocol Plugin"
 #. *  summary
 #. *  description
 msgid "Zephyr Protocol Plugin"
-msgstr "Zephyr protokolltillegg"
+msgstr "Zephyr-protokolltillegg"
 
 msgid "Use tzc"
 msgstr "Bruk tzc"
@@ -10495,7 +10521,7 @@ msgid "+++ %s became unidle"
 
 #, c-format
 msgid "+++ %s became unidle"
-msgstr "%s vart verksam igjen"
+msgstr "+++ %s blei verksam igjen"
 
 #.
 #. * This string determines how some dates are displayed.  The default
@@ -10629,6 +10655,8 @@ msgstr ""
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"Prat ved hjelp av lynmeldingar.  St?ttar AIM, Google Talk, Jabber/XMPP, MSN, "
+"Yahoo og fleire"
 
 msgid "Internet Messenger"
 msgstr "Lynmeldingsklient"
@@ -10650,7 +10678,7 @@ msgid "_Username:"
 msgstr "Proto_koll:"
 
 msgid "_Username:"
-msgstr "Brukar_namn:"
+msgstr "_Brukarnamn:"
 
 msgid "Remember pass_word"
 msgstr "_Hugs passordet"
@@ -10670,7 +10698,7 @@ msgid "Ad_vanced"
 msgstr "Bruk dette venne-_ikonet for denne kontoen:"
 
 msgid "Ad_vanced"
-msgstr "A_vansert"
+msgstr "_Avansert"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Bruk GNOME mellomlagerinnstillingar"
@@ -10712,7 +10740,7 @@ msgid "_Port:"
 msgstr "_Vert:"
 
 msgid "_Port:"
-msgstr "_Port:"
+msgstr "Po_rt:"
 
 msgid "Pa_ssword:"
 msgstr "P_assord:"
@@ -10730,10 +10758,10 @@ msgid "Create _this new account on the s
 msgstr "_Grunnleggjande"
 
 msgid "Create _this new account on the server"
-msgstr "Opprett denne _nye kontoen p? tenaren"
+msgstr "Opprett _denne nye kontoen p? tenaren"
 
 msgid "P_roxy"
-msgstr "_Mellomlager"
+msgstr "_Mellomtenar"
 
 msgid "Enabled"
 msgstr "I bruk"
@@ -10775,7 +10803,6 @@ msgstr "Utforming"
 msgstr "Utforming"
 
 # blist = vennelista?
-#, fuzzy
 msgid "The layout of icons, name, and status of the buddy list"
 msgstr "Utforminga av ikona, namna og statusen til vennelista"
 
@@ -10831,9 +10858,8 @@ msgstr "Tekstopplysningar n?r ein konta
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is online
-#, fuzzy
 msgid "Online Text"
-msgstr "Tilkopla-tekst"
+msgstr "N?r tilkopla"
 
 msgid "The text information for when a buddy is online"
 msgstr "Tekstopplysningar n?r ein venn er tilkopla"
@@ -10848,13 +10874,11 @@ msgstr "Tekstopplysningar n?r ein venn 
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is offline
-#, fuzzy
 msgid "Offline Text"
-msgstr "Fr?kopla-tekst"
+msgstr "N?r fr?kopla"
 
-#, fuzzy
 msgid "The text information for when a buddy is offline"
-msgstr "Tekstopplysningar n?r ein venn er fr?kopla"
+msgstr "Tekstopplysningar n?r ein venn er vekke"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is idle
@@ -10877,7 +10901,6 @@ msgstr "Meldingstekst (kallenamnet sa)"
 msgid "Message (Nick Said) Text"
 msgstr "Meldingstekst (kallenamnet sa)"
 
-#, fuzzy
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nickname"
@@ -10946,8 +10969,9 @@ msgstr "_Send fil..."
 msgid "_Send File..."
 msgstr "_Send fil..."
 
+# var: Legg til _vennevarsling...
 msgid "Add Buddy _Pounce..."
-msgstr "Legg til _vennevarsling..."
+msgstr "Legg til _venneovervaking..."
 
 msgid "View _Log"
 msgstr "Vis l_ogg"
@@ -10977,7 +11001,7 @@ msgid "_Delete Group"
 msgstr "Legg til prate_rom..."
 
 msgid "_Delete Group"
-msgstr "_Slett gruppe"
+msgstr "_Slett gruppa"
 
 msgid "_Rename"
 msgstr "_Gje nytt namn"
@@ -11074,8 +11098,9 @@ msgstr "/V_erkt?y"
 msgid "/_Tools"
 msgstr "/V_erkt?y"
 
+# var: /Verkt?y/Venne_varsling
 msgid "/Tools/Buddy _Pounces"
-msgstr "/Verkt?y/Venne_varsling"
+msgstr "/Verkt?y/Venne_overvaking"
 
 msgid "/Tools/_Certificates"
 msgstr "/Verkt?y/_Sertifikat"
@@ -11084,7 +11109,7 @@ msgid "/Tools/Plu_gins"
 msgstr "/Verkt?y/_Tilpassa smilefjes"
 
 msgid "/Tools/Plu_gins"
-msgstr "/Verkt?y/Program_tillegg"
+msgstr "/Verkt?y/Progra_mtillegg"
 
 msgid "/Tools/Pr_eferences"
 msgstr "/Verkt?y/_Innstillingar"
@@ -11289,10 +11314,10 @@ msgid "Buddy's _username:"
 msgstr "Legg til venn.\n"
 
 msgid "Buddy's _username:"
-msgstr "Brukarnamnet til vennen:"
+msgstr "_Brukarnamnet til vennen:"
 
 msgid "(Optional) A_lias:"
-msgstr "Ka_llenamn (valfritt) :"
+msgstr "Kalle_namn (valfritt) :"
 
 msgid "Add buddy to _group:"
 msgstr "Legg vennen til i _gruppa:"
@@ -11313,14 +11338,13 @@ msgid "A_lias:"
 "leggja til i vennelista.\n"
 
 msgid "A_lias:"
-msgstr "Al_ias:"
+msgstr "Kall_enamn:"
 
 msgid "_Group:"
 msgstr "_Gruppe:"
 
-#, fuzzy
 msgid "Auto_join when account connects."
-msgstr "Bli automatisk _med n?r kontoen koplar seg til att."
+msgstr "Bli automatisk _med n?r kontoen koplar seg til."
 
 msgid "_Remain in chat after window is closed."
 msgstr "_Hald fram i praten etter at vindauget er lukka."
@@ -11329,7 +11353,7 @@ msgid "Enable Account"
 msgstr "Skriv inn namnet p? gruppa du ?nskjer ? leggja til."
 
 msgid "Enable Account"
-msgstr "Ta konto i bruk"
+msgstr "Ta kontoen i bruk"
 
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Kontoar/Ta i bruk konto"
@@ -11346,6 +11370,7 @@ msgstr "_Sl? av"
 msgid "_Disable"
 msgstr "_Sl? av"
 
+# skal det vera hurtigtast her?
 msgid "/Tools"
 msgstr "/V_erkt?y"
 
@@ -11384,7 +11409,7 @@ msgid "Save Conversation"
 msgstr "<h1>Samtale med %s</h1>\n"
 
 msgid "Save Conversation"
-msgstr "Lagra samtale"
+msgstr "Lagra samtalen"
 
 msgid "Find"
 msgstr "Finn"
@@ -11435,9 +11460,8 @@ msgstr "/Samtale/_Ny lynmelding..."
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Samtale/_Ny lynmelding..."
 
-#, fuzzy
 msgid "/Conversation/Join a _Chat..."
-msgstr "/Samtale/_Inviter..."
+msgstr "/Samtale/Bli med  i eit _praterom..."
 
 msgid "/Conversation/_Find..."
 msgstr "/Samtale/_Finn..."
@@ -11449,7 +11473,7 @@ msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Samtale/Lagra _som..."
 
 msgid "/Conversation/Clea_r Scrollback"
-msgstr "/Samtale/T_?m skjermen"
+msgstr "/Samtale/T_?m historikken"
 
 msgid "/Conversation/M_edia"
 msgstr "/Samtale/M_edia"
@@ -11466,11 +11490,12 @@ msgstr "/Samtale/S_end fil..."
 msgid "/Conversation/Se_nd File..."
 msgstr "/Samtale/S_end fil..."
 
+# var: /Samtale/Legg til _vennevarsling...
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Samtale/Legg til _vennevarsling..."
+msgstr "/Samtale/Legg til _venneovervaking..."
 
 msgid "/Conversation/_Get Info"
-msgstr "/Samtale/Hent info_rmasjon"
+msgstr "/Samtale/Hent opplysninga_r"
 
 msgid "/Conversation/In_vite..."
 msgstr "/Samtale/_Inviter..."
@@ -11497,7 +11522,7 @@ msgid "/Conversation/Insert Imag_e..."
 msgstr "/Samtale/Set inn _lenkje..."
 
 msgid "/Conversation/Insert Imag_e..."
-msgstr "/Samtale/Set inn _bilete..."
+msgstr "/Samtale/Set inn b_ilete..."
 
 msgid "/Conversation/_Close"
 msgstr "/Samtale/L_ukk"
@@ -11547,8 +11572,9 @@ msgstr "/Samtale/Send fil..."
 msgid "/Conversation/Send File..."
 msgstr "/Samtale/Send fil..."
 
+# var: /Samtale/Legg til vennevarsling...
 msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/Samtale/Legg til vennevarsling..."
+msgstr "/Samtale/Legg til venneovervaking..."
 
 msgid "/Conversation/Get Info"
 msgstr "/Samtale/Hent info"
@@ -11654,7 +11680,7 @@ msgid "Close conversation"
 msgstr "Lukk denne fana"
 
 msgid "Close conversation"
-msgstr "Lukk samtala"
+msgstr "Lukk samtalen"
 
 msgid "Last created window"
 msgstr "Siste opna vindauge"
@@ -11822,7 +11848,7 @@ msgid "Basque"
 msgstr "Estisk"
 
 msgid "Basque"
-msgstr ""
+msgstr "Baskisk"
 
 msgid "Persian"
 msgstr "Persisk"
@@ -11900,7 +11926,7 @@ msgid "Bokm?l Norwegian"
 msgstr "Mongolsk"
 
 msgid "Bokm?l Norwegian"
-msgstr "Norsk bokm?l"
+msgstr "Norsk (bokm?l)"
 
 msgid "Nepali"
 msgstr "Nepali"
@@ -12032,6 +12058,12 @@ msgstr ""
 "primary language is <b>English</b>.  You are welcome to post in another "
 "language, but the responses may be less helpful.<br/><br/>"
 msgstr ""
+"<font size=\"4\">Hjelp fr? andre Pidgin-brukarar:</font> <a href=\"mailto:"
+"support at pidgin.im\">support at pidgin.im</a><br/>Dette er ei <b>open</b> "
+"postliste. (<a href=\"http://pidgin.im/pipermail/support/\">arkiv</a>)<br/"
+">Vi kan ikkje hjelpa med tredjepart-protokollar eller -programtillegg.<br/"
+">Lista sitt primaerspr?k er  <b>engelsk</b>. Du kan skriva p? eit anna spr?k, "
+"men d? vil du kanskje ikkje f? den hjelpa du treng.<br/><br/>"
 
 #, c-format
 msgid ""
@@ -12263,13 +12295,14 @@ msgid "File transfer _details"
 
 #. "Download Details" arrow
 msgid "File transfer _details"
-msgstr "Filoverf?ringsdetaljar"
+msgstr "_Filoverf?ringsdetaljar"
 
 msgid "Paste as Plain _Text"
 msgstr "_Lim inn som rein tekst"
 
+# var: _Ta vekk formatering
 msgid "_Reset formatting"
-msgstr "_Ta vekk formatering"
+msgstr "Nulls_till formateringa"
 
 msgid "Disable _smileys in selected text"
 msgstr "Sl? av _smilefjes i vald tekst"
@@ -12420,7 +12453,7 @@ msgid "_Insert"
 msgstr "Legg til lenkje"
 
 msgid "_Insert"
-msgstr "Set _inn"
+msgstr "Se_t inn"
 
 #, c-format
 msgid "Failed to store image: %s\n"
@@ -12438,8 +12471,9 @@ msgstr ""
 "til denne snarvegen:\n"
 "%s"
 
+# var: Smil!
 msgid "Smile!"
-msgstr "Smil!"
+msgstr "Smilefjes"
 
 msgid "_Manage custom smileys"
 msgstr "_Smilefjesbehandling"
@@ -12531,8 +12565,9 @@ msgstr "_Horisontal strek"
 msgid "_Horizontal rule"
 msgstr "_Horisontal strek"
 
+# treng ikkje utropsteikn p? norsk, skulle eg tru :-)
 msgid "_Smile!"
-msgstr "S_mil!"
+msgstr "Smile_fjes"
 
 msgid "Log Deletion Failed"
 msgstr "Klarte ikkje ? sletta loggen"
@@ -12590,43 +12625,48 @@ msgstr ""
 "Usage: %s [OPTION]...\n"
 "\n"
 msgstr ""
+"Bruk: %s [VAL]...\n"
+"\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "KAT"
 
 msgid "use DIR for config files"
-msgstr ""
+msgstr "bruk DIR for innstillingsfiler"
 
 msgid "print debugging messages to stdout"
-msgstr ""
+msgstr "skriv feils?kingsmeldingane til standard utfil"
 
 msgid "force online, regardless of network status"
-msgstr ""
+msgstr "kopla til uavhengig av nettverksstatus"
 
 msgid "display this help and exit"
-msgstr ""
+msgstr "syn denne hjelpa og avslutt"
 
-#, fuzzy
 msgid "allow multiple instances"
-msgstr "Tillat fleire samstundes p?loggingar"
+msgstr "tillat fleire samstundes ?kter"
 
 msgid "don't automatically login"
-msgstr ""
+msgstr "logg ikkje p? automatisk"
 
 msgid "NAME"
-msgstr ""
+msgstr "NAMN"
 
 msgid ""
 "enable specified account(s) (optional argument NAME\n"
 "                      specifies account(s) to use, separated by commas.\n"
 "                      Without this only the first account will be enabled)."
 msgstr ""
+"sl? p? spesifisert(e) konto(ar) (valfritt argument NAMN\n"
+"                      spesifiserer konto(ar) ? bruka, skilde med komma.\n"
+"                      Utan dette vil berre den f?rste kontoen bli teken i "
+"bruk)."
 
 msgid "X display to use"
-msgstr ""
+msgstr "X-skjerm som skal brukast"
 
 msgid "display the current version and exit"
-msgstr ""
+msgstr "syn den noverande utg?va og avslutt"
 
 #, c-format
 msgid ""
@@ -12675,7 +12715,7 @@ msgid "Incoming Call"
 msgstr "%s ?nskjer ? starta ei bilet?kt med deg."
 
 msgid "Incoming Call"
-msgstr ""
+msgstr "Innkomande samtale"
 
 msgid "_Pause"
 msgstr "_Pause"
@@ -12723,8 +12763,10 @@ msgstr "Avvis"
 msgid "Dismiss"
 msgstr "Avvis"
 
+# var: <span weight=\"bold\" size=\"larger\">Du har f?tt vennevarsel!</span>
+# verkar ikkje fungera :-(
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Du har f?tt vennevarsel!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Du har sl?tt til!</span>"
 
 msgid "The following plugins will be unloaded."
 msgstr "Dei f?lgjande programtillegga vil bli lasta ut."
@@ -12775,7 +12817,7 @@ msgid "Modify Buddy Pounce"
 msgstr "Vel ei fil"
 
 msgid "Modify Buddy Pounce"
-msgstr "Endra vennevarsel"
+msgstr "Endra vennevarselet"
 
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
@@ -12785,7 +12827,7 @@ msgid "_Buddy name:"
 msgstr "_Konto:"
 
 msgid "_Buddy name:"
-msgstr "_Vennenamn:"
+msgstr "Venne_namn:"
 
 msgid "Si_gns on"
 msgstr "Lo_ggar p?"
@@ -12794,55 +12836,55 @@ msgid "Goes a_way"
 msgstr "L_oggar av"
 
 msgid "Goes a_way"
-msgstr "G?r _vekk"
+msgstr "G_?r vekk"
 
 msgid "Ret_urns from away"
-msgstr "_Kjem attende etter ? ha vore vekke"
+msgstr "Kj_em attende etter ? ha vore vekke"
 
 msgid "Becomes _idle"
 msgstr "Blir _uverksam"
 
 msgid "Is no longer i_dle"
-msgstr "Er ikkje uverksam lenger"
+msgstr "Er _ikkje uverksam lenger"
 
 msgid "Starts _typing"
-msgstr "Begynner ? skriva"
+msgstr "Begynner ? _skriva"
 
 msgid "P_auses while typing"
 msgstr "Tek ein _pause under skrivinga"
 
 msgid "Stops t_yping"
-msgstr "Stansar skrivinga"
+msgstr "St_ansar skrivinga"
 
 msgid "Sends a _message"
 msgstr "Sender ei _melding"
 
 msgid "Ope_n an IM window"
-msgstr "Opna eit lynmeldingsvindauge"
+msgstr "Opna eit lyn_meldingsvindauge"
 
 msgid "_Pop up a notification"
-msgstr "Sprett opp eit _varsel"
+msgstr "_Sprett opp eit varsel"
 
 msgid "Send a _message"
-msgstr "Send ei _melding"
+msgstr "Send e_i melding"
 
 msgid "E_xecute a command"
-msgstr "K?yr ein _kommando"
+msgstr "Kj?_r ein kommando"
 
 msgid "P_lay a sound"
-msgstr "Spel ein _lyd"
+msgstr "Spel ein ly_d"
 
 msgid "Brows_e..."
 msgstr "_Bla gjennom..."
 
 msgid "Br_owse..."
-msgstr "_Bla gjennom..."
+msgstr "Bl_a gjennom..."
 
 msgid "Pre_view"
-msgstr "F?rehands_vis"
+msgstr "F_?rehandsvis"
 
 msgid "P_ounce only when my status is not Available"
-msgstr "Vennevarsling berre n?r eg ikkje er tilgjengeleg"
+msgstr "Venne_overvaking berre n?r statusen min er Ikkje tilgjengeleg"
 
 msgid "_Recurring"
 msgstr "_Gjentakande"
@@ -12884,21 +12926,19 @@ msgid "(Custom)"
 msgstr "Ukjend... . Rapporter feilen."
 
 msgid "(Custom)"
-msgstr ""
+msgstr "(tilpassa)"
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(standard)"
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
+msgstr "Pidgin sitt standard lydtema"
 
-#, fuzzy
 msgid "The default Pidgin buddy list theme"
-msgstr "Pidgin vennelistedraktbehandlar"
+msgstr "Pidgin si standard vennelistedrakt"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "Pidgin si standard ikondrakt"
 
 msgid "Theme failed to unpack."
 msgstr "Klarte ikkje ? pakka ut drakta. "
@@ -12909,30 +12949,37 @@ msgstr "Klarte ikkje ? kopiera drakta."
 msgid "Theme failed to copy."
 msgstr "Klarte ikkje ? kopiera drakta."
 
-msgid "Install Theme"
-msgstr "Installer drakta"
+msgid "Theme Selections"
+msgstr "Draktval"
 
+#. Instructions
 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 ""
-"Vel smilefjesdrakt fr? lista nedanfor. Du kan installera nye drakter ved ? "
-"dra og sleppa dei ned i draktlista."
+"Vel drakta du ?nskjer ? bruka fr? lista nedanfor.\n"
+"Du kan installera nye drakter ved ? dra og sleppa dei ned i draktlista."
 
-msgid "Icon"
-msgstr "Ikon"
+msgid "Buddy List Theme:"
+msgstr "Vennelistedrakt:"
 
+msgid "Status Icon Theme:"
+msgstr "Statusikondrakt:"
+
+msgid "Sound Theme:"
+msgstr "Lyddrakt:"
+
+msgid "Smiley Theme:"
+msgstr "Smilefjesdrakt:"
+
 msgid "Keyboard Shortcuts"
 msgstr "Tastatursnarvegar"
 
 # Trur det skal vera liten bokstav i escape :-)
 msgid "Cl_ose conversations with the Escape key"
-msgstr "L_ukk samtaler med escape-tasten"
+msgstr "Lukk samtalar med _escape-tasten"
 
-#. Buddy List Themes
-msgid "Buddy List Theme"
-msgstr "Vennelistedrakt"
-
 #. System Tray
 msgid "System Tray Icon"
 msgstr "Systempanelikon"
@@ -12947,7 +12994,7 @@ msgid "_Hide new IM conversations:"
 msgstr "Samtalevindauge"
 
 msgid "_Hide new IM conversations:"
-msgstr "_Skjul nye lynmeldingssamtaler:"
+msgstr "_Skjul nye lynmeldingssamtalar:"
 
 msgid "When away"
 msgstr "N?r vekke"
@@ -12963,7 +13010,7 @@ msgid "Show close b_utton on tabs"
 msgstr "Vis lynmeldingar og prat i _faner"
 
 msgid "Show close b_utton on tabs"
-msgstr "Vis l_ukkeknappar p? faner"
+msgstr "Vis _lukkeknappar p? faner"
 
 msgid "_Placement:"
 msgstr "_Plassering:"
@@ -12987,16 +13034,16 @@ msgid "N_ew conversations:"
 msgstr "Vertikalt til h?gre"
 
 msgid "N_ew conversations:"
-msgstr "_Nye samtaler:"
+msgstr "Nye samtala_r:"
 
 msgid "Show _formatting on incoming messages"
-msgstr "Vis _formatering i innkomne meldingar"
+msgstr "Vis formatering i _innkomne meldingar"
 
 msgid "Close IMs immediately when the tab is closed"
 msgstr "Lukk lynmeldingane med ein gong fana blir lukka"
 
 msgid "Show _detailed information"
-msgstr "Vis _detaljar"
+msgstr "Vis d_etaljar"
 
 msgid "Enable buddy ic_on animation"
 msgstr "Bruk _animerte venneikon"
@@ -13019,14 +13066,11 @@ msgstr "Skrifttype"
 msgid "Font"
 msgstr "Skrifttype"
 
-msgid "Use document font from _theme"
-msgstr "Bruk dokumentskrifttype fr? _drakta"
-
 msgid "Use font from _theme"
 msgstr "Bruk skrifttype fr? _drakta"
 
 msgid "Conversation _font:"
-msgstr "Samtaleskrift:"
+msgstr "Samtaleskri_ft:"
 
 msgid "Default Formatting"
 msgstr "Standardformatering"
@@ -13044,17 +13088,15 @@ msgstr "Klarer ikkje ? starta nettlesar
 msgid "Cannot start browser configuration program."
 msgstr "Klarer ikkje ? starta nettlesaren sitt innstillingsprogram."
 
-#, fuzzy
 msgid "Disabled"
-msgstr "_Sl? av"
+msgstr "Sl?tt av"
 
 #, c-format
 msgid "Use _automatically detected IP address: %s"
 msgstr "Bruk _automatisk funnen IP-adresse: %s"
 
-#, fuzzy
 msgid "ST_UN server:"
-msgstr "_Tenar:"
+msgstr "STU_N-tenar:"
 
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">D?me: stunserver.org</span>"
@@ -13068,79 +13110,28 @@ msgstr "Sl? p? automatisk port_vidares
 msgid "_Enable automatic router port forwarding"
 msgstr "Sl? p? automatisk port_vidaresending"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "F?r opp _portrekkje det skal lyttast til"
+msgstr "F?r opp _portrekkje det skal lyttast til:"
 
-#, fuzzy
 msgid "_Start:"
-msgstr "_Status:"
+msgstr "_Start:"
 
-#, fuzzy
 msgid "_End:"
-msgstr "_Utvid"
+msgstr "_Slutt:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr "s"
+msgstr "Vidaresendingstenar (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "_Tenar:"
+msgstr "_TURN-tenar:"
 
-#, fuzzy
 msgid "Use_rname:"
-msgstr "Brukarnamn:"
+msgstr "_Brukarnamn:"
 
-#, fuzzy
 msgid "Pass_word:"
-msgstr "Passord:"
+msgstr "_Passord:"
 
-msgid "Proxy Server &amp; Browser"
-msgstr "Mellomtenar &amp; nettlesar"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>Fann ikkje innstillingsprogrammet til mellomlageret.</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>Fann ikkje innstillingsprogrammet til nettlesaren.</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-"Mellomlager- og nettlesarinnstillingar endrar\n"
-"ein i GNOME-innstillingane"
-
-msgid "Configure _Proxy"
-msgstr "Innstillingar _mellomtenar"
-
-msgid "Configure _Browser"
-msgstr "Innstillingar _nettlesar"
-
-msgid "Proxy Server"
-msgstr "Mellomtenar"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "Bruk fjern-DNS med SOCKS4-mellomtenarar"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "_Mellomtenartype:"
-
-msgid "No proxy"
-msgstr "Inga mellomlagring"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "_Port:"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "Brukarnamn:"
-
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
@@ -13180,6 +13171,15 @@ msgstr "Nettlesarval"
 msgid "Browser Selection"
 msgstr "Nettlesarval"
 
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "Nettlesarinnstillingar endrar ein i GNOME-innstillingane"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Fann ikkje innstillingsprogrammet til nettlesaren.</b>"
+
+msgid "Configure _Browser"
+msgstr "_Nettlesarinnstillingar"
+
 msgid "_Browser:"
 msgstr "_Nettlesar:"
 
@@ -13203,6 +13203,35 @@ msgstr ""
 "_Sj?lvvald:\n"
 "(%s for adresse)"
 
+msgid "Proxy Server"
+msgstr "Mellomtenar"
+
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "Mellomtenarinnstillingar endrar ein i GNOME-innstillingane"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Fann ikkje innstillingsprogrammet til mellomlageret.</b>"
+
+msgid "Configure _Proxy"
+msgstr "_Mellomtenarinnstillingar"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "Bruk fjern-_DNS med SOCKS4-mellomtenarar"
+
+msgid "Proxy t_ype:"
+msgstr "_Mellomtenartype:"
+
+msgid "No proxy"
+msgstr "Inga mellomlagring"
+
+msgid "P_ort:"
+msgstr "Po_rt:"
+
+msgid "User_name:"
+msgstr "_Brukarnamn:"
+
 msgid "Log _format:"
 msgstr "Logg_format:"
 
@@ -13210,7 +13239,7 @@ msgid "Log all c_hats"
 msgstr "L_oggf?r alle lynmeldingar"
 
 msgid "Log all c_hats"
-msgstr "Loggf?r alle sa_mtaler"
+msgstr "Loggf?r alle sa_mtalar"
 
 msgid "Log all _status changes to system log"
 msgstr "Loggf?r alle _statusendringar i systemloggen"
@@ -13281,30 +13310,23 @@ msgid "_Report idle time:"
 msgstr "_Nullstill"
 
 msgid "_Report idle time:"
-msgstr "Vis kor lenge _uverksam:"
+msgstr "Vis kor _lenge uverksam:"
 
 msgid "Based on keyboard or mouse use"
 msgstr "Basert p? tastatur- eller musebruk"
 
+msgid "_Minutes before becoming idle:"
+msgstr "_Minutt f?r ein blir uverksam:"
+
+msgid "Change to this status when _idle:"
+msgstr "Endra til denne _tilstanden n?r uverksam:"
+
 msgid "_Auto-reply:"
 msgstr "_Automatisk svar:"
 
 msgid "When both away and idle"
 msgstr "B?de n?r vekke og uverksam"
 
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "Automatisk vekke"
-
-msgid "_Minutes before becoming idle:"
-msgstr "_Minutt f?r ein blir uverksam:"
-
-msgid "Change status when _idle"
-msgstr "_Endra tilstand n?r uverksam"
-
-msgid "Change _status to:"
-msgstr "Endra _tilstand til:"
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "Tilstand ved oppstart"
@@ -13318,15 +13340,15 @@ msgstr "Grensesnitt"
 msgid "Interface"
 msgstr "Grensesnitt"
 
-msgid "Smiley Themes"
-msgstr "Smilefjesdrakt"
-
 msgid "Browser"
 msgstr "Nettlesar"
 
 msgid "Status / Idle"
 msgstr "Tilstand/uverksam"
 
+msgid "Themes"
+msgstr "Drakter:"
+
 msgid "Allow all users to contact me"
 msgstr "Tillat alle ? kontakta meg"
 
@@ -13348,8 +13370,9 @@ msgstr "Endringar i personvernet blir te
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Endringar i personvernet blir tekne i bruk med ein gong."
 
+# var: Personvern for:
 msgid "Set privacy for:"
-msgstr "Personvern for:"
+msgstr "Gjeld kontoen:"
 
 #. Remove All button
 msgid "Remove Al_l"
@@ -13480,8 +13503,9 @@ msgstr "Snarvegstekst"
 msgid "Shortcut Text"
 msgstr "Snarvegstekst"
 
+# var: Tilpassa smilefjesbehandling
 msgid "Custom Smiley Manager"
-msgstr "Tilpassa smilefjesbehandling"
+msgstr "Smilefjesbehandling"
 
 msgid "Select Buddy Icon"
 msgstr "Vel venneikon"
@@ -13652,10 +13676,10 @@ msgid "_Modify..."
 msgstr "_Inviter"
 
 msgid "_Modify..."
-msgstr "_Endra..."
+msgstr "E_ndra..."
 
 msgid "_Add..."
-msgstr "_Legg til..."
+msgstr "L_egg til..."
 
 msgid "_Open Mail"
 msgstr "_Opna e-post"
@@ -13669,9 +13693,6 @@ msgstr "Pidgin-smilefjes"
 msgid "Pidgin smileys"
 msgstr "Pidgin-smilefjes"
 
-msgid "Penguin Pimps"
-msgstr "Penguin Pimps"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "? velja dette tek vekk bruk av grafiske smilefjes."
 
@@ -13856,7 +13877,7 @@ msgid "_Browse"
 msgstr "Tenesteoppdaging"
 
 msgid "_Browse"
-msgstr "_Bla:"
+msgstr "_Bla"
 
 msgid "Server does not exist"
 msgstr "Tenaren finst ikkje"
@@ -13878,7 +13899,7 @@ msgid "By conversation count"
 "eller andre XMPP-tenester."
 
 msgid "By conversation count"
-msgstr "Etter tal p? samtaler"
+msgstr "Etter tal p? samtalar"
 
 msgid "Conversation Placement"
 msgstr "Samtaleplassering"
@@ -13888,11 +13909,11 @@ msgstr ""
 "Note: The preference for \"New conversations\" must be set to \"By "
 "conversation count\"."
 msgstr ""
-"Merk: innstillinga for \"Nye samtaler\" vera stilt inn p? \"Etter tal p? "
-"samtaler\"."
+"Merk: innstillinga for \"Nye samtalar\" m? vera stilt inn p? \"Etter tal p? "
+"samtalar\"."
 
 msgid "Number of conversations per window"
-msgstr "Tal p? samtaler per vindauge"
+msgstr "Tal p? samtalar per vindauge"
 
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "Skil lynmeldingsvindauge og praterom n?r plassert i nummerorden"
@@ -13917,7 +13938,7 @@ msgstr ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
 msgstr ""
-"Avgrens talet p? samtaler i kvart vindauge og, om du vil, skil "
+"Avgrens talet p? samtalar i kvart vindauge og, om du vil, skil "
 "lynmeldingsvindauge og praterom"
 
 #. Configuration frame
@@ -13959,7 +13980,7 @@ msgstr ""
 msgstr ""
 "Gjev st?tte til muser?rsler i samtalevindauge. Dra midtknappen p? musa for ? "
 "utf?ra enkelte handlingar:\n"
-" o dra ned og til h?gre: l?t deg lukka ei samtale.\n"
+" o dra ned og til h?gre: l?t deg lukka ein samtale.\n"
 " o dra opp og til venstre: byter til f?rre samtale.\n"
 " o dra opp og til h?gre: byter til neste samtale."
 
@@ -14098,7 +14119,7 @@ msgid "Iconifies the buddy list and your
 #. *  summary
 #. *  description
 msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "Minimerer vennelista og alle opne samtaler n?r du g?r vekk."
+msgstr "Minimerer vennelista og alle opne samtalar n?r du g?r vekk."
 
 msgid "Mail Checker"
 msgstr "E-postsjekkar"
@@ -14113,7 +14134,7 @@ msgid "Draw a line to indicate new messa
 msgstr "Markeringslinje"
 
 msgid "Draw a line to indicate new messages in a conversation."
-msgstr "Trekk ei linje for ? visa nye meldingar i ei samtale."
+msgstr "Trekk ei linje for ? visa nye meldingar i ein samtale."
 
 msgid "Jump to markerline"
 msgstr "G? til markeringslinja"
@@ -14125,7 +14146,7 @@ msgid "C_hat windows"
 msgstr "_Lynmeldingsvindauge"
 
 msgid "C_hat windows"
-msgstr "_Samtalevindauge"
+msgstr "Samtale_vindauge"
 
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
@@ -14182,8 +14203,9 @@ msgstr "Nytt varsel for"
 msgid "Notify For"
 msgstr "Nytt varsel for"
 
+# \t_Berre n?r nokon seier brukarnamnet ditt
 msgid "\t_Only when someone says your username"
-msgstr "\t_Berre n?r nokon seier brukarnamnet ditt"
+msgstr "Berre n?r nokon seier brukarnamnet _ditt"
 
 msgid "_Focused windows"
 msgstr "_Fokuserte vindauge"
@@ -14197,7 +14219,7 @@ msgid "Insert c_ount of new messages int
 
 #. Count method button
 msgid "Insert c_ount of new messages into window title"
-msgstr "Viser _talet p? nye meldingar i vindaugstittelen"
+msgstr "Viser talet p? _nye meldingar i vindaugstittelen"
 
 #. Count xprop method button
 msgid "Insert count of new message into _X property"
@@ -14212,11 +14234,11 @@ msgid "R_aise conversation window"
 
 #. Raise window method button
 msgid "R_aise conversation window"
-msgstr "Hev samtalevindauge"
+msgstr "_Hev samtalevindauget"
 
 #. Present conversation method button
 msgid "_Present conversation window"
-msgstr "_Framhev samtalevindauget"
+msgstr "F_ramhev samtalevindauget"
 
 #. ---------- "Notification Removals" ----------
 msgid "Notification Removal"
@@ -14224,7 +14246,7 @@ msgid "Remove when conversation window _
 
 #. Remove on focus button
 msgid "Remove when conversation window _gains focus"
-msgstr "Fjern n?r vindauget f?r _fokus"
+msgstr "Fjern n?r vindauget f?r f_okus"
 
 #. Remove on click button
 msgid "Remove when conversation window _receives click"
@@ -14303,6 +14325,9 @@ msgstr "Samtale"
 msgid "Conversation Entry"
 msgstr "Samtale"
 
+msgid "Conversation History"
+msgstr "Samtalehistorikk"
+
 # Vindauge eller meldingsvindauge?
 msgid "Request Dialog"
 msgstr "F?respurnadsvindauge"
@@ -14456,7 +14481,7 @@ msgid "You _type:"
 msgstr "Legg til ei ny teksterstatning"
 
 msgid "You _type:"
-msgstr "Du _skriv:"
+msgstr "_Du skriv:"
 
 msgid "You _send:"
 msgstr "Du s_ender:"
@@ -14590,8 +14615,9 @@ msgstr "Ei rullande, vassrett utg?ve av
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Ei rullande, vassrett utg?ve av vennelista."
 
+# var: Vis tidsstempel kvar(t)
 msgid "Display Timestamps Every"
-msgstr "Vis tidsstempel kvar(t)"
+msgstr "Vis tidsstempel kvart"
 
 #. *< type
 #. *< ui_requirement
@@ -14623,7 +14649,7 @@ msgid "Co_nversations:"
 msgstr "Vis datoar i..."
 
 msgid "Co_nversations:"
-msgstr "_Samtaler:"
+msgstr "_Samtalar:"
 
 # var: For forseinka meldingar
 msgid "For delayed messages"
@@ -14657,37 +14683,31 @@ msgstr ""
 "timestamp formats."
 msgstr ""
 "Dette programtillegget till?t at brukaren tilpassar tidsstempelformata for "
-"samtaler og loggmeldingar."
+"samtalar og loggmeldingar."
 
-#, fuzzy
 msgid "Audio"
-msgstr "Auto"
+msgstr "Lyd"
 
-#, fuzzy
 msgid "Video"
 msgstr "Video"
 
 msgid "Output"
-msgstr ""
+msgstr "Utdata"
 
-#, fuzzy
 msgid "_Plugin"
-msgstr "Tilleggsprogram"
+msgstr "_Programtillegg"
 
-#, fuzzy
 msgid "_Device"
-msgstr "Eining"
+msgstr "_Eining"
 
 msgid "Input"
-msgstr ""
+msgstr "Inndata"
 
-#, fuzzy
 msgid "P_lugin"
-msgstr "Tilleggsprogram"
+msgstr "_Programtillegg"
 
-#, fuzzy
 msgid "D_evice"
-msgstr "Eining"
+msgstr "_Eining"
 
 #. *< magic
 #. *< major version
@@ -14698,18 +14718,17 @@ msgstr "Eining"
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Voice/Video Settings"
-msgstr "Endra innstillingar"
+msgstr "Lyd-/videoinnstillingar"
 
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
-msgstr ""
+msgstr "Mikrofon- og nettkamera-innstillingar."
 
 #. *< summary
 msgid "Configure microphone and webcam settings for voice/video calls."
-msgstr ""
+msgstr "Mikrofon- og nettkamera-innstillingar for tale-/video-samtalar."
 
 msgid "Opacity:"
 msgstr "Ugjennomskin:"
@@ -14722,7 +14741,7 @@ msgid "_Show slider bar in IM window"
 msgstr "_Gjennomsiktige lynmeldingsvindauge"
 
 msgid "_Show slider bar in IM window"
-msgstr "Vis _glidefelt i lynmeldingsvindauga"
+msgstr "Vis glidefelt i _lynmeldingsvindauga"
 
 msgid "Remove IM window transparency on focus"
 msgstr "Ta vekk transparens i lynmeldingsvindauge ved fokus"
@@ -14775,9 +14794,8 @@ msgstr "_Start %s saman med Windows"
 msgid "_Start %s on Windows startup"
 msgstr "_Start %s saman med Windows"
 
-#, fuzzy
 msgid "Allow multiple instances"
-msgstr "Tillat fleire samstundes p?loggingar"
+msgstr "Tillat fleire samstundes instansar"
 
 msgid "_Dockable Buddy List"
 msgstr "Vennelista kan _festast"
@@ -14840,11 +14858,27 @@ msgstr ""
 msgstr ""
 "Dette programtillegget er nyttig ved feils?king av XMPP-tenarar og -klientar."
 
-# ?
-#, fuzzy
-#~ msgid "The root certificate this one claims to be issued by is unknown."
-#~ msgstr "Pidgin kjenner ikkje til utferdaren av rotsertifikatet."
+#~ msgid "(Default)"
+#~ msgstr "(standard)"
 
+#~ msgid "Install Theme"
+#~ msgstr "Installer drakta"
+
+#~ msgid "Icon"
+#~ msgstr "Ikon"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "Bruk dokumentskrifttype fr? _drakta"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "Mellomtenar &amp; nettlesar"
+
+#~ msgid "Auto-away"
+#~ msgstr "Automatisk vekke"
+
+#~ msgid "Change _status to:"
+#~ msgstr "Endra _tilstand til:"
+
 #~ msgid "Send instant messages over multiple protocols"
 #~ msgstr "Send lynmeldingar over fleire protokollar"
 
@@ -14857,11 +14891,15 @@ msgstr ""
 #~ msgid "_User:"
 #~ msgstr "Br_ukar:"
 
+# ?
+#~ msgid "The root certificate this one claims to be issued by is unknown."
+#~ msgstr "Pidgin kjenner ikkje til utferdaren av rotsertifikatet."
+
 #~ msgid "GTK+ Runtime Version"
 #~ msgstr "GTK+ kj?remilj?utg?ve"
 
-#~ msgid "Calling ... "
-#~ msgstr "Ringjer..."
+#~ msgid "Without this only the first account will be enabled)."
+#~ msgstr "Utan dette vil berre den f?rste kontoen bli sl?tt p?)."
 
 #~ msgid "Invalid certificate chain"
 #~ msgstr "Ugyldig sertifikatkjede"
@@ -14877,6 +14915,13 @@ msgstr ""
 #~ msgid "Invalid certificate authority signature"
 #~ msgstr "Ugyldig sertifikatautoritetssignatur"
 
+#, fuzzy
+#~ msgid "Failed to validate expiration time for %s"
+#~ msgstr "Klarte ikkje ? velja cmodes for %s"
+
+#~ msgid "Calling ... "
+#~ msgstr "Ringjer..."
+
 #~ msgid "Join/Part Hiding Configuration"
 #~ msgstr "Innstilling for ? skjula bli med-/forlat-tilstandar"
 
============================================================
--- po/zh_CN.po	a835dd4481d1dafd05d583754199740526401d0a
+++ po/zh_CN.po	78b7752b21bca8e5347c95ae8448e6f964ea82f8
@@ -2,17 +2,17 @@
 # Copyright (C) 2009 pidgin team.
 # This file is distributed under the same license as the pidgin package.
 # Funda Wang <fundawang at linux.net.cn>, 2003, 2004.
-# liyuekui <liyuekui at gmail.com>, 2009.
-# Aron Xu <aronmalache at 163.com>, 2009.
+# Aron Xu <happyaron.xu at gmail.com>, 2009.
 # fujianwzh <fujianwzh at gmail.com>, 2009.
+# liyuekui <liyuekui at gmail.com>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: pidgin HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-14 20:36-0500\n"
-"PO-Revision-Date: 2009-08-23 22:12+0800\n"
-"Last-Translator: Aron Xu <aronmalache at 163.com>\n"
+"POT-Creation-Date: 2009-11-23 09:57-0800\n"
+"PO-Revision-Date: 2009-11-05 18:56+0800\n"
+"Last-Translator: Aron Xu <happyaron.xu at gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh at googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,11 +42,11 @@ msgstr ""
 "%s\n"
 "??: %s [??]...\n"
 "\n"
-"  -c, --config=??   ????????????\n"
-"  -d, --debug         ????????????\n"
-"  -h, --help          ???????\n"
-"  -n, --nologin       ?????\n"
-"  -v, --version       ?????????\n"
+"  -c, --config=??\t????????????\n"
+"  -d, --debug\t\t????????????\n"
+"  -h, --help\t\t???????\n"
+"  -n, --nologin\t?????\n"
+"  -v, --version\t?????????\n"
 
 #, c-format
 msgid ""
@@ -54,7 +54,7 @@ msgstr ""
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
 msgstr ""
-"%s ??????? %s ??? %s ???????????????????????"
+"%s ??????? %s ??? %s ???????????????????????"
 "???? http://developer.pidgin.im"
 
 #. the user did not fill in the captcha
@@ -62,10 +62,10 @@ msgid "Account was not added"
 msgstr "??"
 
 msgid "Account was not added"
-msgstr "?????"
+msgstr "?????"
 
 msgid "Username of an account must be non-empty."
-msgstr "???????????"
+msgstr "???????????"
 
 msgid "New mail notifications"
 msgstr "?????"
@@ -80,10 +80,10 @@ msgid "Modify Account"
 msgstr "(???????"make install"??)"
 
 msgid "Modify Account"
-msgstr "????"
+msgstr "????"
 
 msgid "New Account"
-msgstr "????"
+msgstr "????"
 
 msgid "Protocol:"
 msgstr "??:"
@@ -99,7 +99,7 @@ msgid "Create this account on the server
 
 #. Register checkbox
 msgid "Create this account on the server"
-msgstr "??????????"
+msgstr "??????????"
 
 #. Cancel button
 #. Cancel
@@ -116,17 +116,17 @@ msgid "Delete Account"
 msgstr "??????? %s ??"
 
 msgid "Delete Account"
-msgstr "????"
+msgstr "????"
 
 #. Delete button
 msgid "Delete"
 msgstr "??"
 
 msgid "Accounts"
-msgstr "??"
+msgstr "??"
 
 msgid "You can enable/disable accounts from the following list."
-msgstr "?????/???????????"
+msgstr "?????/???????????"
 
 #. Add button
 msgid "Add"
@@ -166,7 +166,7 @@ msgid "Account: %s (%s)"
 
 #, c-format
 msgid "Account: %s (%s)"
-msgstr "??:%s (%s)"
+msgstr "??:%s (%s)"
 
 #, c-format
 msgid ""
@@ -186,10 +186,10 @@ msgid "You must select an account."
 msgstr "???????"
 
 msgid "You must select an account."
-msgstr "????????"
+msgstr "????????"
 
 msgid "The selected account is not online."
-msgstr "????????"
+msgstr "????????"
 
 msgid "Error adding buddy"
 msgstr "??????"
@@ -204,7 +204,7 @@ msgid "Account"
 msgstr "????"
 
 msgid "Account"
-msgstr "??"
+msgstr "??"
 
 msgid "Add Buddy"
 msgstr "????"
@@ -355,7 +355,7 @@ msgid ""
 msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
-msgstr "????????/????????????"
+msgstr "????????/????????????"
 
 #. Not multiline
 #. Not masked?
@@ -421,7 +421,7 @@ msgid "Alphabetically"
 msgstr "???"
 
 msgid "Alphabetically"
-msgstr "????"
+msgstr "?????"
 
 msgid "By Log Size"
 msgstr "???????"
@@ -535,10 +535,10 @@ msgstr ""
 msgstr ""
 "%s\n"
 "\n"
-"Finch ??????????,?????????????????"
+"Finch ??????????,?????????????????"
 
 msgid "Re-enable Account"
-msgstr "??????"
+msgstr "??????"
 
 msgid "No such command."
 msgstr "?????"
@@ -616,9 +616,8 @@ msgstr "????"
 msgid "Enable Sounds"
 msgstr "????"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "????"
+msgstr "????"
 
 msgid "<AUTO-REPLY> "
 msgstr "<????> "
@@ -628,12 +627,11 @@ msgstr[0] "%d ??????:\n"
 msgid_plural "List of %d users:\n"
 msgstr[0] "%d ??????:\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "????????:version"
+msgstr "????????:plugins version"
 
 msgid "No such command (in this context)."
-msgstr "??????????"
+msgstr "???????????"
 
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
@@ -681,7 +679,7 @@ msgid "accounts: Show the accounts windo
 msgstr "buddylist:???????"
 
 msgid "accounts: Show the accounts window."
-msgstr "accounts:???????"
+msgstr "accounts:???????"
 
 msgid "debugwin: Show the debug window."
 msgstr "debug??:???????"
@@ -999,7 +997,7 @@ msgid "Account:"
 
 #. Account:
 msgid "Account:"
-msgstr "??:"
+msgstr "??:"
 
 msgid "Buddy name:"
 msgstr "????:"
@@ -1061,16 +1059,16 @@ msgid "Recurring"
 msgstr "?????????????"
 
 msgid "Recurring"
-msgstr "??"
+msgstr "??"
 
 msgid "Cannot create pounce"
 msgstr "???????"
 
 msgid "You do not have any accounts."
-msgstr "??????"
+msgstr "??????"
 
 msgid "You must create an account first before you can create a pounce."
-msgstr "???????????????????"
+msgstr "???????????????????"
 
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
@@ -1368,7 +1366,7 @@ msgid "Use different status for followin
 msgstr "????"
 
 msgid "Use different status for following accounts"
-msgstr "????????????"
+msgstr "????????????"
 
 #. Save & Use
 msgid "Save & Use"
@@ -1496,7 +1494,6 @@ msgstr ""
 msgid "Please wait while TinyURL fetches a shorter URL ..."
 msgstr ""
 
-#, fuzzy
 msgid "Only create TinyURL for URLs of this length or greater"
 msgstr "??????????? URL ?? TinyURL"
 
@@ -1509,7 +1506,6 @@ msgstr "TinyURL ??"
 msgid "TinyURL plugin"
 msgstr "TinyURL ??"
 
-#, fuzzy
 msgid "When receiving a message with URL(s), use TinyURL for easier copying"
 msgstr "?????? URL ????????? TinyURL ?????"
 
@@ -1557,7 +1553,7 @@ msgid "accounts"
 msgstr "Lastlog ???"
 
 msgid "accounts"
-msgstr "??"
+msgstr "??"
 
 msgid "Password is required to sign on."
 msgstr "?????????"
@@ -1625,9 +1621,8 @@ msgstr ""
 "currently trusted."
 msgstr ""
 
-#, fuzzy
 msgid "The certificate is not valid yet."
-msgstr "?????????????"
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr ""
@@ -1645,13 +1640,11 @@ msgstr "?????????"
 msgid "The certificate chain presented is invalid."
 msgstr "?????????"
 
-#, fuzzy
 msgid "The certificate has been revoked."
-msgstr "??????"
+msgstr "????????"
 
-#, fuzzy
 msgid "An unknown certificate error occurred."
-msgstr "?????????: %s?"
+msgstr "??????????"
 
 msgid "(DOES NOT MATCH)"
 msgstr "(???)"
@@ -1684,7 +1677,7 @@ msgid "Accept certificate for %s?"
 #. Make messages
 #, c-format
 msgid "Accept certificate for %s?"
-msgstr "?? %s ???????"
+msgstr "?? %s ?????"
 
 #. TODO: Find what the handle ought to be
 msgid "SSL Certificate Verification"
@@ -1701,9 +1694,8 @@ msgstr "SSL ????"
 msgid "SSL Certificate Error"
 msgstr "SSL ????"
 
-#, fuzzy
 msgid "Unable to validate certificate"
-msgstr "????????: %s"
+msgstr ""
 
 #, c-format
 msgid ""
@@ -1721,6 +1713,12 @@ msgstr ""
 "Activation date: %s\n"
 "Expiration date: %s\n"
 msgstr ""
+"????:%s\n"
+"\n"
+"??(SHA1):%s\n"
+"\n"
+"????:%s\n"
+"????:%s\n"
 
 #. TODO: Find what the handle ought to be
 msgid "Certificate Information"
@@ -1747,7 +1745,7 @@ msgid "Unable to send message: The messa
 msgstr "????"
 
 msgid "Unable to send message: The message is too large."
-msgstr "??????: ?????"
+msgstr "??????:?????"
 
 #, c-format
 msgid "Unable to send message to %s."
@@ -1800,11 +1798,11 @@ msgid "Failed to get connection: %s"
 
 #, c-format
 msgid "Failed to get connection: %s"
-msgstr "??????: %s"
+msgstr "??????:%s"
 
 #, c-format
 msgid "Failed to get name: %s"
-msgstr "??????: %s"
+msgstr "??????:%s"
 
 #, c-format
 msgid "Failed to get serv name: %s"
@@ -1832,7 +1830,7 @@ msgid "Error resolving %s: %d"
 
 #, c-format
 msgid "Error resolving %s: %d"
-msgstr "?? %s ???: %d"
+msgstr "?? %s ???:%d"
 
 #, c-format
 msgid ""
@@ -1848,11 +1846,11 @@ msgid "Error converting %s to punycode: 
 
 #, fuzzy, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "?? %s ???: %d"
+msgstr "?? %s ???:%d"
 
 #, c-format
 msgid "Thread creation failure: %s"
-msgstr "??????: %s"
+msgstr "??????:%s"
 
 #. Data is assumed to be the destination bn
 msgid "Unknown reason"
@@ -1935,7 +1933,7 @@ msgid "Transfer of file <A HREF=\"file:/
 
 #, c-format
 msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
-msgstr "?? %s ????"
+msgstr "?? <A HREF=\"file://%s\">%s</A> ????"
 
 #, c-format
 msgid "Transfer of file %s complete"
@@ -1944,18 +1942,18 @@ msgstr "??????"
 msgid "File transfer complete"
 msgstr "??????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You cancelled the transfer of %s"
 msgstr "???? %s ???"
 
 msgid "File transfer cancelled"
 msgstr "???????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s cancelled the transfer of %s"
 msgstr "%s ??? %s ???"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s cancelled the file transfer"
 msgstr "%s ???????"
 
@@ -2126,7 +2124,7 @@ msgid "<font color=\"red\"><b>Could not 
 
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
-msgstr "<font color=\"red\"><b>??????: %s</b></font>"
+msgstr "<font color=\"red\"><b>??????:%s</b></font>"
 
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
@@ -2141,13 +2139,11 @@ msgstr ""
 "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
 msgstr ""
 
-#, fuzzy
 msgid "A non-recoverable Farsight2 error has occurred."
-msgstr "?????????: %s?"
+msgstr ""
 
-#, fuzzy
 msgid "Conference error"
-msgstr "?????"
+msgstr "????"
 
 msgid "Error with your microphone"
 msgstr ""
@@ -2155,9 +2151,9 @@ msgstr ""
 msgid "Error with your webcam"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error creating session: %s"
-msgstr "??????"
+msgstr "??????:%s"
 
 msgid "Error creating conference."
 msgstr "??????"
@@ -2344,25 +2340,25 @@ msgid "Set Account Idle Time"
 msgstr "???"
 
 msgid "Set Account Idle Time"
-msgstr "????????"
+msgstr "????????"
 
 msgid "_Set"
 msgstr "??(_S)"
 
 msgid "None of your accounts are idle."
-msgstr "??????????????"
+msgstr "??????????????"
 
 msgid "Unset Account Idle Time"
-msgstr "???????????"
+msgstr "???????????"
 
 msgid "_Unset"
 msgstr "????(_U)"
 
 msgid "Set Idle Time for All Accounts"
-msgstr "???????????"
+msgstr "???????????"
 
 msgid "Unset Idle Time for All Idled Accounts"
-msgstr "???????????"
+msgstr "???????????"
 
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "???????????????"
@@ -2863,10 +2859,10 @@ msgid "AIM Account"
 msgstr "????"
 
 msgid "AIM Account"
-msgstr "AIM ??"
+msgstr "AIM ??"
 
 msgid "XMPP Account"
-msgstr "XMPP ??"
+msgstr "XMPP ??"
 
 #. *< type
 #. *< ui_requirement
@@ -2906,16 +2902,14 @@ msgid "Unable to bind socket to port: %s
 
 #, c-format
 msgid "Unable to bind socket to port: %s"
-msgstr "???????????"
+msgstr "???????????:%s"
 
 #, c-format
 msgid "Unable to listen on socket: %s"
-msgstr ""
-"???????:\n"
-"%s"
+msgstr "???????:%s"
 
 msgid "Error communicating with local mDNSResponder."
-msgstr "??? mDNSResponder ??????"
+msgstr "??? mDNSResponder ???????"
 
 msgid "Invalid proxy settings"
 msgstr "???????"
@@ -2966,10 +2960,10 @@ msgid "Unable to register new account.  
 msgstr "??????"
 
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "??????????????"
+msgstr "??????????????"
 
 msgid "New Gadu-Gadu Account Registered"
-msgstr "????? Gadu-Gadu ??"
+msgstr "????? Gadu-Gadu ??"
 
 msgid "Registration completed successfully!"
 msgstr "????!"
@@ -2984,10 +2978,10 @@ msgid "Captcha"
 msgstr ""
 
 msgid "Captcha"
-msgstr "????"
+msgstr "?????"
 
 msgid "Register New Gadu-Gadu Account"
-msgstr "???? Gadu-Gadu ??"
+msgstr "???? Gadu-Gadu ??"
 
 msgid "Please, fill in the following fields"
 msgstr "???????"
@@ -3031,7 +3025,7 @@ msgid "Change password for the Gadu-Gadu
 msgstr "?????????????\n"
 
 msgid "Change password for the Gadu-Gadu account"
-msgstr "?? Gadu-Gadu ?????"
+msgstr "?? Gadu-Gadu ?????"
 
 msgid "Password was changed successfully!"
 msgstr "??????!"
@@ -3128,7 +3122,7 @@ msgid "Unable to resolve hostname '%s': 
 
 #, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "???????"
+msgstr "???????"%s":%s"
 
 #. 1. connect to server
 #. connect to the server
@@ -3225,9 +3219,7 @@ msgid "Lost connection with server: %s"
 #. TODO: do we really want to disconnect on a failure to write?
 #, c-format
 msgid "Lost connection with server: %s"
-msgstr ""
-"????????:\n"
-"%s"
+msgstr "????????:%s"
 
 msgid "View MOTD"
 msgstr "?? MOTD"
@@ -3310,7 +3302,7 @@ msgid "Ban on %s"
 
 #, c-format
 msgid "Ban on %s"
-msgstr "??: %s"
+msgstr "??: %s"
 
 msgid "End of ban list"
 msgstr "??????"
@@ -3374,7 +3366,7 @@ msgid "Users on %s: %s"
 
 #, c-format
 msgid "Users on %s: %s"
-msgstr "%s ?????: %s"
+msgstr "%s ?????:%s"
 
 msgid "Time Response"
 msgstr "????"
@@ -3407,7 +3399,7 @@ msgid "You have been kicked by %s: (%s)"
 
 #, c-format
 msgid "You have been kicked by %s: (%s)"
-msgstr "??? %s ?? (%s)"
+msgstr "??? %s ???:(%s)"
 
 #. Remove user from channel
 #, c-format
@@ -3429,7 +3421,7 @@ msgid ""
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
-msgstr "???????????????????????????"
+msgstr "???????????????????????????"
 
 #. We only want to do the following dance if the connection
 #. has not been successfully completed.  If it has, just
@@ -3452,7 +3444,7 @@ msgid "Error: invalid PONG from server"
 msgstr "????????%s%s"
 
 msgid "Error: invalid PONG from server"
-msgstr "??: ???? PONG ??"
+msgstr "??:???? PONG ??"
 
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
@@ -3478,7 +3470,7 @@ msgid ""
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
-msgstr "away [??]: ??????,???????????"
+msgstr "away [??]:??????,???????????"
 
 msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
 msgstr "ctcp <nick> <msg>:??????? CTCP ???"
@@ -3503,26 +3495,27 @@ msgid ""
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
-msgstr "invite &lt;??&gt; [???]: ????????????,???????"
+msgstr ""
+"invite &lt;??&gt; [???]: ????????????,???????"
 
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"j &lt;???1&gt;[,???][,......] [??1[,??2][,......]]: ?????????,?"
+"j &lt;???1&gt;[,???][,......] [??1[,??2][,......]]: ?????????,?"
 "?????????????"
 
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"join &lt;???1&gt;[,???][,......] [??1[,??2][,......]]: ?????????,"
-"??????????????"
+"join &lt;???1&gt;[,???][,......] [??1[,??2][,......]]: ????????"
+"?,??????????????"
 
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
-msgstr "kick &lt;??&gt; [??]: ??????????????????"
+msgstr "kick &lt;??&gt; [??]:??????????????????"
 
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
@@ -3531,10 +3524,10 @@ msgid "me &lt;action to perform&gt;:  Pe
 "list:????????????<i>??,?????????????????</i>"
 
 msgid "me &lt;action to perform&gt;:  Perform an action."
-msgstr "me &lt;??????&gt;: ?????"
+msgstr "me &lt;??????&gt;:?????"
 
 msgid "memoserv: Send a command to memoserv"
-msgstr "memoserv: ? memoserv ????"
+msgstr "memoserv:? memoserv ????"
 
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
@@ -3545,19 +3538,19 @@ msgid ""
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
-msgstr "msg &lt;??&gt; &lt;??&gt;: ?????????(?????)?"
+msgstr "msg &lt;??&gt; &lt;??&gt;:?????????(?????)?"
 
 msgid "names [channel]:  List the users currently in a channel."
-msgstr "name [??]: ???????????"
+msgstr "name [??]:???????????"
 
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
-msgstr "nick &lt;???&gt;: ???????"
+msgstr "nick &lt;???&gt;:???????"
 
 msgid "nickserv: Send a command to nickserv"
-msgstr "nickserv: ? nickserv ????"
+msgstr "nickserv:? nickserv ????"
 
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
-msgstr "notice &lt;??&gt;: ???????????"
+msgstr "notice &lt;??&gt;: ???????????"
 
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
@@ -3568,48 +3561,48 @@ msgid ""
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
-msgstr "operwall &lt;??&gt;: ????????????,??????"
+msgstr "operwall &lt;??&gt;:????????????,??????"
 
 msgid "operserv: Send a command to operserv"
-msgstr "operserv: ? operserv ????"
+msgstr "operserv:? operserv ????"
 
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
-msgstr "part [???] [??]: ???????????,?????????"
+msgstr "part [???] [??]: ???????????,?????????"
 
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
-msgstr "ping [??]: ???????????(????????????)?"
+msgstr "ping [??]:???????????(????????????)?"
 
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
-msgstr "query &lt;??&gt; &lt;??&gt;: ?????????(?????)?"
+msgstr "query &lt;??&gt; &lt;??&gt;: ?????????(?????)?"
 
 msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr "quit [??]: ?????????,?????????"
+msgstr "quit [??]:?????????,?????????"
 
 msgid "quote [...]:  Send a raw command to the server."
-msgstr "quote [......]: ???????????"
+msgstr "quot [......]:???????????"
 
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
-msgstr "remove &lt;??&gt; [??]: ???????????????????"
+msgstr "remove &lt;??&gt; [??]: ???????????????????"
 
 msgid "time: Displays the current local time at the IRC server."
-msgstr "time: ?? IRC ????????????"
+msgstr "time:?? IRC ????????????"
 
 msgid "topic [new topic]:  View or change the channel topic."
-msgstr "topic [???]: ??????????"
+msgstr "topic [???]:??????????"
 
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;: ??????????"
+msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:??????????"
 
 msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr "version [??]: ????? CTCP VERSION ??"
+msgstr "version [??]:????? CTCP VERSION ??"
 
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
@@ -3619,17 +3612,17 @@ msgid ""
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
-msgstr "wallops &lt;??&gt;: ????????????,??????"
+msgstr "wallops &lt;??&gt;:????????????,??????"
 
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [???] &lt;??&gt;:???????"
 
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr "whois [???] &lt;??&gt;:???????"
+msgstr "whowas &lt;??&gt;:???????????"
 
 #, c-format
 msgid "Reply time from %s: %lu seconds"
-msgstr "%s ?????: %lu ?"
+msgstr "%s ?????:%lu ?"
 
 msgid "PONG"
 msgstr "PONG"
@@ -3644,7 +3637,7 @@ msgid "Ad-Hoc Command Failed"
 msgstr "????"
 
 msgid "Ad-Hoc Command Failed"
-msgstr "?????"
+msgstr "Ad-Hoc ????"
 
 msgid "execute"
 msgstr "??"
@@ -3684,7 +3677,7 @@ msgid "SASL error: %s"
 
 #, c-format
 msgid "SASL error: %s"
-msgstr "SASL ??"
+msgstr "SASL ??:%s"
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -3700,7 +3693,7 @@ msgid "Unable to establish a connection 
 
 #, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr "??????????"
+msgstr "??????????:%s"
 
 msgid "Unable to establish SSL connection"
 msgstr "???? SSL ??"
@@ -3806,11 +3799,11 @@ msgstr "Logo"
 msgid "Logo"
 msgstr "Logo"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s will no longer be able to see your status updates.  Do you want to "
 "continue?"
-msgstr "????????????? %s??????????"
+msgstr "%s ?????????????????????"
 
 msgid "Cancel Presence Notification"
 msgstr "???????"
@@ -3838,14 +3831,18 @@ msgstr "??"
 msgid "Log Out"
 msgstr "??"
 
+#. primative,						no,							id,			name
+#. 0
+#. 1
+#. 2
 msgid "Chatty"
-msgstr "?????"
+msgstr "?????"
 
 msgid "Extended Away"
 msgstr "??"
 
 msgid "Do Not Disturb"
-msgstr "????"
+msgstr "?? - ????"
 
 msgid "JID"
 msgstr "JID"
@@ -4035,13 +4032,13 @@ msgid ""
 
 msgid ""
 "Please fill out the information below to change your account registration."
-msgstr "?????????????????"
+msgstr "?????????????????"
 
 msgid "Please fill out the information below to register your new account."
-msgstr "?????????????????"
+msgstr "?????????????????"
 
 msgid "Register New XMPP Account"
-msgstr "???? XMPP ??"
+msgstr "???? XMPP ??"
 
 msgid "Register"
 msgstr "??"
@@ -4052,16 +4049,16 @@ msgid "Register New Account at %s"
 
 #, c-format
 msgid "Register New Account at %s"
-msgstr "? %s ?????"
+msgstr "? %s ?????"
 
 msgid "Change Registration"
-msgstr "????"
+msgstr "????"
 
 msgid "Error unregistering account"
-msgstr "????????"
+msgstr "????????"
 
 msgid "Account successfully unregistered"
-msgstr "????????"
+msgstr "????????"
 
 msgid "Initializing Stream"
 msgstr "????"
@@ -4103,6 +4100,7 @@ msgstr "?(???)"
 msgid "None (To pending)"
 msgstr "?(???)"
 
+#. 0
 msgid "None"
 msgstr "?"
 
@@ -4111,37 +4109,37 @@ msgid "Mood Text"
 msgstr "??"
 
 msgid "Mood Text"
-msgstr "??"
+msgstr "????"
 
 msgid "Allow Buzz"
-msgstr "??"
+msgstr "??????"
 
 msgid "Tune Artist"
-msgstr "??"
+msgstr "?????"
 
 msgid "Tune Title"
-msgstr "??"
+msgstr "????"
 
 msgid "Tune Album"
-msgstr ""
+msgstr "????"
 
 msgid "Tune Genre"
-msgstr ""
+msgstr "????"
 
 msgid "Tune Comment"
-msgstr "????"
+msgstr "????"
 
 msgid "Tune Track"
-msgstr ""
+msgstr "????"
 
 msgid "Tune Time"
-msgstr ""
+msgstr "????"
 
 msgid "Tune Year"
-msgstr ""
+msgstr "????"
 
 msgid "Tune URL"
-msgstr ""
+msgstr "?? URL"
 
 msgid "Password Changed"
 msgstr "?????"
@@ -4203,7 +4201,7 @@ msgid "Recipient Unavailable"
 msgstr "????"
 
 msgid "Recipient Unavailable"
-msgstr "??????"
+msgstr "??????"
 
 msgid "Registration Required"
 msgstr "????"
@@ -4346,17 +4344,17 @@ msgid "Unable to buzz, because there is 
 
 #, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
-msgstr "??? %s ????,?????????"
+msgstr ""
 
 #, c-format
 msgid "Unable to buzz, because %s might be offline."
-msgstr "??? %s ????,?????????"
+msgstr ""
 
 #, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
 "buzzes now."
-msgstr "??? %s ????,?????????"
+msgstr ""
 
 #, c-format
 msgid "Buzzing %s..."
@@ -4365,15 +4363,15 @@ msgid "Buzz"
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
-msgstr "????"
+msgstr ""
 
 #, c-format
 msgid "%s has buzzed you!"
-msgstr "%s ?????????!"
+msgstr ""
 
 #, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "??? %s ???????:??? JID?"
+msgstr "??? %s ???????:??? JID"
 
 #, c-format
 msgid "Unable to initiate media with %s: user is not online"
@@ -4390,7 +4388,7 @@ msgid ""
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
-msgstr "??????????????/?????????"
+msgstr ""
 
 msgid "Select a Resource"
 msgstr "????"
@@ -4404,50 +4402,48 @@ msgstr "??:??????"
 msgid "configure:  Configure a chat room."
 msgstr "??:??????"
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [???]: ??????"
+msgstr "part [???]:??????"
 
 msgid "register:  Register with a chat room."
 msgstr "??:??????"
 
 msgid "topic [new topic]:  View or change the topic."
-msgstr "topic [???]: ????????"
+msgstr "topic [???]: ????????"
 
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
-msgstr "ban &lt;??&gt; [??]: ????????????"
+msgstr "ban &lt;??&gt; [??]: ????????????"
 
 msgid ""
 "affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
 "the users with an affiliation or set users' affiliation with the room."
 msgstr ""
 
-#, fuzzy
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with a role or set users' role with the room."
 msgstr ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: ???????"
-"??????"
+"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;[??1] [??"
+"2]: ?????????????"
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr "invite &lt;??&gt; [??]: ??????????"
+msgstr "invite &lt;??&gt; [??]: ??????????"
 
 msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
-msgstr "join: &lt;???&gt; [??]: ??????????????"
+msgstr "join: &lt;???&gt; [??]: ??????????????"
 
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
-msgstr "kick &lt;??&gt; [??]: ????????????"
+msgstr "kick &lt;??&gt; [??]: ????????????"
 
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr "msg &lt;??&gt; &lt;??&gt;: ?????????????"
+msgstr "msg &lt;??&gt; &lt;??&gt;: ?????????????"
 
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
-msgstr ""
+msgstr "ping &lt;jid&gt;:\tPing ??/??/???"
 
 msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: ??????????,????????"
+msgstr "buzz: ??????????,????????"
 
 #. *< type
 #. *< ui_requirement
@@ -4505,15 +4501,15 @@ msgid "%s has set the topic to: %s"
 
 #, c-format
 msgid "%s has set the topic to: %s"
-msgstr "%s ?????: %s"
+msgstr "%s ?????:%s"
 
 #, c-format
 msgid "The topic is: %s"
-msgstr "???: %s"
+msgstr "???:%s"
 
 #, c-format
 msgid "Message delivery to %s failed: %s"
-msgstr "??? %s ?????: %s"
+msgstr "??? %s ?????:%s"
 
 msgid "XMPP Message Error"
 msgstr "XMPP ????"
@@ -4553,13 +4549,13 @@ msgstr "???????"
 msgid "No reason"
 msgstr "???????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "??? %s ?? (%s)"
+msgstr "????? (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Kicked (%s)"
-msgstr "? %s ?? (%s) "
+msgstr "??? %s ??"
 
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "???????????\n"
@@ -4591,7 +4587,7 @@ msgid "Please select the resource of %s 
 
 #, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
-msgstr "??????????????/?????????"
+msgstr ""
 
 msgid "Edit User Mood"
 msgstr "??????"
@@ -4835,13 +4831,12 @@ msgstr "???"
 msgid "Not expected"
 msgstr "???"
 
-#, fuzzy
 msgid "Friendly name is changing too rapidly"
-msgstr "??????????"
+msgstr "?????????"
 
 #, c-format
 msgid "Server too busy"
-msgstr "?????"
+msgstr "????"
 
 #, c-format
 msgid "Authentication failed"
@@ -4861,10 +4856,10 @@ msgid "Passport account not yet verified
 
 #, c-format
 msgid "Passport account not yet verified"
-msgstr "????????"
+msgstr "????????"
 
 msgid "Passport account suspended"
-msgstr "?????????"
+msgstr "?????????"
 
 #, c-format
 msgid "Bad ticket"
@@ -4876,7 +4871,7 @@ msgid "MSN Error: %s\n"
 
 #, c-format
 msgid "MSN Error: %s\n"
-msgstr "MSN ??: %s\n"
+msgstr "MSN ??:%s\n"
 
 msgid "Other Contacts"
 msgstr "?????"
@@ -4905,15 +4900,15 @@ msgid "Nudge"
 msgstr "%s ???????????,??????"
 
 msgid "Nudge"
-msgstr "????"
+msgstr "????"
 
 #, c-format
 msgid "%s has nudged you!"
-msgstr "%s ????????,??????!"
+msgstr "%s ????????????!"
 
 #, c-format
 msgid "Nudging %s..."
-msgstr "?????? %s ,?????????..."
+msgstr "? %s ????????..."
 
 msgid "Email Address..."
 msgstr "??????..."
@@ -4954,10 +4949,10 @@ msgid "Blocked Text for %s"
 
 #, c-format
 msgid "Blocked Text for %s"
-msgstr "%s ?????"
+msgstr "%s ?????"
 
 msgid "No text is blocked for this account."
-msgstr "??????????(_I):"
+msgstr "????????????"
 
 #, c-format
 msgid ""
@@ -4965,7 +4960,7 @@ msgid "This account does not have email 
 msgstr ""
 
 msgid "This account does not have email enabled."
-msgstr "????????????"
+msgstr "????????????"
 
 msgid "Send a mobile message."
 msgstr "???????"
@@ -4980,7 +4975,7 @@ msgid "Has you"
 msgstr "????"
 
 msgid "Has you"
-msgstr ""
+msgstr "????"
 
 msgid "Home Phone Number"
 msgstr "??????"
@@ -5051,13 +5046,11 @@ msgstr "MSN ?? SSL ?????? msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN ?? SSL ???????????? SSL ??"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
-msgstr ""
-"?????? %s,????????????????????????,?????"
-"??,?????????????,????????"
+msgstr "?????? %s,??????????????????????"
 
 msgid "Unable to Add"
 msgstr "????"
@@ -5251,7 +5244,7 @@ msgid "nudge: nudge a user to get their 
 msgstr "???????:"
 
 msgid "nudge: nudge a user to get their attention"
-msgstr "nudge:?????????,????????"
+msgstr "nudge:?????????,????????"
 
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr "Windows Live ID ??:????"
@@ -5261,14 +5254,14 @@ msgid "%s just sent you a Nudge!"
 
 #, c-format
 msgid "%s just sent you a Nudge!"
-msgstr "%s ???????????!"
+msgstr "%s ?????????????!"
 
 msgid "The following users are missing from your addressbook"
 msgstr "????????????"
 
 #, c-format
 msgid "Unknown error (%d): %s"
-msgstr "???? (%d): %s"
+msgstr "???? (%d): %s"
 
 msgid "Unable to add user"
 msgstr "??????"
@@ -5278,9 +5271,8 @@ msgstr "???? (%d)"
 msgid "Unknown error (%d)"
 msgstr "???? (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "??????"
+msgstr "??????"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "?????,???????"
@@ -5300,7 +5292,11 @@ msgid_plural ""
 "\n"
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
-msgstr[0] "?????,???????"
+msgstr[0] ""
+"MSN ?????? %d ????????????????????????????"
+"???????\n"
+"\n"
+"?????,?????????"
 
 msgid ""
 "Message was not sent because the system is unavailable. This normally "
@@ -5347,7 +5343,7 @@ msgid "Unable to authenticate: %s"
 
 #, c-format
 msgid "Unable to authenticate: %s"
-msgstr "????????: %s"
+msgstr "????????:%s"
 
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
@@ -5375,7 +5371,7 @@ msgstr "%s ?????????? msgid "%s requests to view your webcam, but this request is not yet supported."
 msgstr "%s ???????????,??????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s invited you to view his/her webcam, but this is not yet supported."
 msgstr "%s ???????????,??????"
 
@@ -5429,7 +5425,7 @@ msgid "This Hotmail account may not be a
 msgstr "??????????"
 
 msgid "This Hotmail account may not be active."
-msgstr "? Hotmail ????????"
+msgstr "? Hotmail ????????"
 
 msgid "Profile URL"
 msgstr "???? URL"
@@ -5476,7 +5472,7 @@ msgid "%s is not a valid passport accoun
 
 #, c-format
 msgid "%s is not a valid passport account."
-msgstr "%s ???????????"
+msgstr "%s ???????????"
 
 msgid "Service Temporarily Unavailable."
 msgstr "????????"
@@ -5495,6 +5491,49 @@ msgstr "%s ?????????? msgid "%s has removed you from his or her buddy list."
 msgstr "%s ?????????????"
 
+#. 1
+msgid "Angry"
+msgstr "??"
+
+#. 2
+msgid "Excited"
+msgstr "??"
+
+#. 3
+#, fuzzy
+msgid "Grumpy"
+msgstr "?"
+
+#. 4
+msgid "Happy"
+msgstr "??"
+
+#. 5
+msgid "In Love"
+msgstr "??"
+
+#. 6
+msgid "Invincible"
+msgstr "??"
+
+#. 7
+msgid "Sad"
+msgstr "??"
+
+#. 8
+#, fuzzy
+msgid "Hot"
+msgstr "??(_H):"
+
+#. 9
+#, fuzzy
+msgid "Sick"
+msgstr "??"
+
+#. 10
+msgid "Sleepy"
+msgstr "??"
+
 #. show current mood
 #, fuzzy
 msgid "Current Mood"
@@ -5513,6 +5552,29 @@ msgstr "?????"
 msgid "How do you feel right now?"
 msgstr "?????"
 
+#, fuzzy
+msgid "The PIN you entered is invalid."
+msgstr "??? SecurID ?????"
+
+#, fuzzy
+msgid "The PIN you entered has an invalid length [4-10]."
+msgstr "??? SecurID ?????"
+
+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 "???????"
+
+#, fuzzy
+msgid "The name you entered is invalid."
+msgstr "??? SecurID ?????"
+
+msgid ""
+"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgstr ""
+
 #. show error to user
 #, fuzzy
 msgid "Profile Update Error"
@@ -5591,8 +5653,7 @@ msgid ""
 msgstr "?????"
 
 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 ""
 
 #, fuzzy
@@ -5601,14 +5662,21 @@ msgid ""
 
 #, 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 "?????????????????????????"
 
 #, fuzzy
 msgid "Connecting..."
 msgstr "????"
 
+#, fuzzy
+msgid "The nick name you entered is invalid."
+msgstr "??? SecurID ?????"
+
+#, fuzzy
+msgid "The PIN you entered has an invalid length [7-10]."
+msgstr "??? SecurID ?????"
+
 #. mxit login name
 msgid "MXit Login Name"
 msgstr ""
@@ -5621,7 +5689,7 @@ msgid "Register New MXit Account"
 #. show the form to the user to complete
 #, fuzzy
 msgid "Register New MXit Account"
-msgstr "???? XMPP ??"
+msgstr "???? XMPP ??"
 
 #, fuzzy
 msgid "Please fill in the following fields:"
@@ -5666,7 +5734,7 @@ msgid "Enter Security Code"
 #. ask for input
 #, fuzzy
 msgid "Enter Security Code"
-msgstr "????"
+msgstr "?????"
 
 #, fuzzy
 msgid "Your Country"
@@ -5688,6 +5756,9 @@ msgstr "?????"
 msgid "Retrieving User Information..."
 msgstr "?????"
 
+msgid "Loading menu..."
+msgstr ""
+
 #, fuzzy
 msgid "Status Message"
 msgstr "????"
@@ -5733,6 +5804,11 @@ msgstr "?????"
 msgid "Successfully Logged In..."
 msgstr "?????"
 
+#, fuzzy, c-format
+msgid ""
+"%s sent you an encrypted message, but it is not supported on this client."
+msgstr "%s ???????????,??????"
+
 #, fuzzy
 msgid "Message Error"
 msgstr "XMPP ????"
@@ -5741,6 +5817,18 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
+msgid "An internal MXit server error occurred."
+msgstr "??????????"
+
+#, fuzzy, c-format
+msgid "Login error: %s (%i)"
+msgstr "SASL ??:%s"
+
+#, fuzzy, c-format
+msgid "Logout error: %s (%i)"
+msgstr "SASL ??:%s"
+
+#, fuzzy
 msgid "Contact Error"
 msgstr "????"
 
@@ -5815,40 +5903,7 @@ msgstr ""
 msgid "A connection error occurred to MXit. (read stage 0x06)"
 msgstr ""
 
-msgid "Angry"
-msgstr "??"
-
-msgid "Excited"
-msgstr "??"
-
 #, fuzzy
-msgid "Grumpy"
-msgstr "?"
-
-msgid "Happy"
-msgstr "??"
-
-msgid "In Love"
-msgstr "??"
-
-msgid "Invincible"
-msgstr "??"
-
-msgid "Sad"
-msgstr "??"
-
-#, fuzzy
-msgid "Hot"
-msgstr "??(_H):"
-
-#, fuzzy
-msgid "Sick"
-msgstr "??"
-
-msgid "Sleepy"
-msgstr "??"
-
-#, fuzzy
 msgid "Pending"
 msgstr "????"
 
@@ -5873,7 +5928,7 @@ msgid "No such user: %s"
 
 #, c-format
 msgid "No such user: %s"
-msgstr ""
+msgstr "????:%s"
 
 msgid "User lookup"
 msgstr "????"
@@ -5930,14 +5985,14 @@ msgid_plural ""
 msgid_plural ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
-msgstr[0] "??????"
+msgstr[0] ""
 
 msgid "Add contacts from server"
 msgstr "?????????"
 
 #, c-format
 msgid "Protocol error, code %d: %s"
-msgstr "????,?? %d: %s"
+msgstr "????,?? %d: %s"
 
 #, c-format
 msgid ""
@@ -5945,6 +6000,8 @@ msgstr ""
 "of %d.  Please shorten your password at http://profileedit.myspace.com/index."
 "cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
+"%s ????? %zu ???,??????? %d??? http://profileedit.myspace."
+"com/index.cfm?fuseaction=accountSettings.changePassword ??????????"
 
 msgid "Incorrect username or password"
 msgstr "????????"
@@ -6019,13 +6076,13 @@ msgid "Base font size (points)"
 msgstr "?????(?????)"
 
 msgid "Base font size (points)"
-msgstr "????"
+msgstr "????(?)"
 
 msgid "User"
 msgstr "??"
 
 msgid "Headline"
-msgstr "??(_H):"
+msgstr "??"
 
 msgid "Song"
 msgstr "??"
@@ -6076,9 +6133,9 @@ msgstr ""
 msgid "Zap"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has zapped you!"
-msgstr "%s ????[%s]?????"
+msgstr ""
 
 #, c-format
 msgid "Zapping %s..."
@@ -6088,9 +6145,9 @@ msgstr ""
 msgid "Whack"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has whacked you!"
-msgstr "%s ????[%s]?????"
+msgstr ""
 
 #, c-format
 msgid "Whacking %s..."
@@ -6100,11 +6157,11 @@ msgid "Torch"
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
 msgid "Torch"
-msgstr "??"
+msgstr ""
 
 #, c-format
 msgid "%s has torched you!"
-msgstr "????????"
+msgstr ""
 
 #, c-format
 msgid "Torching %s..."
@@ -6112,35 +6169,35 @@ msgid "Smooch"
 
 #. Smooch means "to kiss someone, often enthusiastically"
 msgid "Smooch"
-msgstr ""
+msgstr "??"
 
 #, c-format
 msgid "%s has smooched you!"
-msgstr "%s ????"
+msgstr "%s ???????!"
 
 #, c-format
 msgid "Smooching %s..."
-msgstr ""
+msgstr "?? %s..."
 
 #. A hug is a display of affection; wrapping your arms around someone
 msgid "Hug"
-msgstr ""
+msgstr "??"
 
 #, c-format
 msgid "%s has hugged you!"
-msgstr "%s ????"
+msgstr "%s ????!"
 
 #, c-format
 msgid "Hugging %s..."
-msgstr ""
+msgstr "?? %s..."
 
 #. Slap means "to hit someone with an open/flat hand"
 msgid "Slap"
-msgstr "??"
+msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has slapped you!"
-msgstr "%s ????[%s]?????"
+msgstr ""
 
 #, c-format
 msgid "Slapping %s..."
@@ -6148,15 +6205,15 @@ msgid "Goose"
 
 #. Goose means "to pinch someone on their butt"
 msgid "Goose"
-msgstr "??"
+msgstr ""
 
 #, c-format
 msgid "%s has goosed you!"
-msgstr "%s ???"
+msgstr ""
 
 #, c-format
 msgid "Goosing %s..."
-msgstr "?? %s"
+msgstr ""
 
 #. A high-five is when two people's hands slap each other
 #. * in the air above their heads.  It is done to celebrate
@@ -6166,7 +6223,7 @@ msgid "%s has high-fived you!"
 
 #, c-format
 msgid "%s has high-fived you!"
-msgstr "%s ????"
+msgstr ""
 
 #, c-format
 msgid "High-fiving %s..."
@@ -6180,7 +6237,7 @@ msgid "%s has punk'd you!"
 
 #, c-format
 msgid "%s has punk'd you!"
-msgstr "%s ????"
+msgstr ""
 
 #, c-format
 msgid "Punking %s..."
@@ -6198,7 +6255,7 @@ msgid "%s has raspberried you!"
 
 #, c-format
 msgid "%s has raspberried you!"
-msgstr "%s ????"
+msgstr ""
 
 #, c-format
 msgid "Raspberrying %s..."
@@ -6238,7 +6295,7 @@ msgid "Account has been disabled"
 msgstr "?????"
 
 msgid "Account has been disabled"
-msgstr "???????"
+msgstr "???????"
 
 msgid "The server could not access the directory"
 msgstr "?????????"
@@ -6264,7 +6321,7 @@ msgid ""
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
-msgstr "?????????,????????????"
+msgstr "?????????,????????????"
 
 msgid "You cannot add the same person twice to a conversation"
 msgstr "???????????????"
@@ -6294,11 +6351,11 @@ msgid "Unknown error: 0x%X"
 
 #, c-format
 msgid "Unknown error: 0x%X"
-msgstr "????: 0x%X"
+msgstr "????:0x%X"
 
 #, c-format
 msgid "Unable to login: %s"
-msgstr "?? ping ?? %s"
+msgstr "????: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6452,9 +6509,9 @@ msgstr "?????"
 msgstr "?????"
 
 #. Note to translators: %s in this string is a URL
-#, fuzzy, c-format
+#, c-format
 msgid "Received unexpected response from %s"
-msgstr "?????????? HTTP ???"
+msgstr "?????????? HTTP ?? %s?"
 
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -6465,9 +6522,9 @@ msgstr ""
 
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting %s: %s"
-msgstr "?????"
+msgstr "?? %s ???:%s"
 
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL ?????????????????"
@@ -6620,18 +6677,16 @@ msgstr ""
 msgid "Cannot send SMS without accepting terms"
 msgstr ""
 
-#, fuzzy
 msgid "Cannot send SMS"
-msgstr "??????"
+msgstr "???????"
 
 #. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
 msgid "Cannot send SMS to this country"
-msgstr "???????"
+msgstr "???????????"
 
 #. Undocumented
 msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgstr "????????????"
 
 msgid "Bot accounts cannot initiate IMs"
 msgstr ""
@@ -6648,9 +6703,8 @@ msgstr ""
 msgid "Bot account reached monthly IM limit"
 msgstr ""
 
-#, fuzzy
 msgid "Unable to receive offline messages"
-msgstr "???????"
+msgstr "????????"
 
 #, fuzzy
 msgid "Offline message store full"
@@ -6667,7 +6721,9 @@ msgid ""
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
 "different encodings selected, or %s has a buggy client.)"
-msgstr "(??????????????????????????????)"
+msgstr ""
+"(????????????? %s ????????,?? %s ????????"
+"??)"
 
 #. Label
 msgid "Buddy Icon"
@@ -6734,7 +6790,7 @@ msgid "Screen Sharing"
 msgstr "??"
 
 msgid "Screen Sharing"
-msgstr "???"
+msgstr "????"
 
 msgid "Free For Chat"
 msgstr "????"
@@ -6768,10 +6824,10 @@ msgid "Unable to connect to BOS server: 
 
 #, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "?????????"
+msgstr "????? BOS ???:%s"
 
 msgid "Username sent"
-msgstr "???"
+msgstr "??????"
 
 msgid "Connection established, cookie sent"
 msgstr "?????,??? cookie"
@@ -6810,7 +6866,7 @@ msgid "Your account is currently suspend
 
 #. Suspended account
 msgid "Your account is currently suspended"
-msgstr "????????"
+msgstr "????????"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
@@ -6934,53 +6990,53 @@ msgid_plural "You missed %hu messages fr
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
-msgstr[0] "??(_D)"
+msgstr[0] ""
 
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
-msgstr[0] "??(_D)"
+msgstr[0] ""
 
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
-msgstr[0] "??(_D)"
+msgstr[0] ""
 
 #, c-format
 msgid ""
 "You missed %hu message from %s because his/her warning level is too high."
 msgid_plural ""
 "You missed %hu messages from %s because his/her warning level is too high."
-msgstr[0] "??(_D)"
+msgstr[0] ""
 
 #, c-format
 msgid "You missed %hu message from %s because your warning level is too high."
 msgid_plural ""
 "You missed %hu messages from %s because your warning level is too high."
-msgstr[0] "??(_D)"
+msgstr[0] ""
 
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
-msgstr[0] "??(_D)"
+msgstr[0] ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message: %s (%s)"
-msgstr "??????(%s)?"
+msgstr "??????:%s (%s)?"
 
 #, c-format
 msgid "Unable to send message: %s"
-msgstr "??????: %s"
+msgstr "??????:%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message to %s: %s (%s)"
-msgstr "??? %s ????:"
+msgstr "??? %s ????:%s (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message to %s: %s"
-msgstr "??? %s ????:"
+msgstr "??? %s ????:%s"
 
 #, c-format
 msgid "User information not available: %s"
@@ -7007,13 +7063,11 @@ msgstr "[???????????"characters.]"
 msgstr "[????????????,??????????????"
 
-#, 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 ""
-"?????????????,???????????????? 10 ?,????"
-"???"
+"???????????,????????????????? 10 ??????\n"
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
@@ -7051,7 +7105,7 @@ msgid_plural "The following usernames ar
 #, c-format
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
-msgstr[0] "????"
+msgstr[0] "??????? %s ??"
 
 #, c-format
 msgid "No results found for email address %s"
@@ -7062,7 +7116,7 @@ msgid "Account Confirmation Requested"
 msgstr "????????? %s ????"
 
 msgid "Account Confirmation Requested"
-msgstr "???????"
+msgstr "???????"
 
 #, c-format
 msgid ""
@@ -7103,14 +7157,14 @@ msgid "Error Changing Account Info"
 msgstr "?? 0x%04x:?????"
 
 msgid "Error Changing Account Info"
-msgstr "????????"
+msgstr "????????"
 
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s ???????? %s"
 
 msgid "Account Info"
-msgstr "????"
+msgstr "????"
 
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
@@ -7135,8 +7189,6 @@ msgstr[0] ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
-"?????????????????????????????;????????"
-"?????"
 
 msgid "Profile too long."
 msgstr "???????"
@@ -7148,7 +7200,7 @@ msgid_plural ""
 msgid_plural ""
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
-msgstr[0] "???????"
+msgstr[0] "?????????? %d ??,???????"
 
 msgid "Away message too long."
 msgstr "???????"
@@ -7187,7 +7239,7 @@ msgid "Unable to add the buddy %s for an
 
 #, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
-msgstr "??????,?????"
+msgstr "???? %s,?????"
 
 #, c-format
 msgid ""
@@ -7248,9 +7300,8 @@ msgstr "??(_O)"
 msgid "C_onnect"
 msgstr "??(_O)"
 
-#, fuzzy
 msgid "You closed the connection."
-msgstr "?????????"
+msgstr "???????"
 
 msgid "Get AIM Info"
 msgstr "?? AIM ??"
@@ -7262,9 +7313,8 @@ msgstr "??????"
 msgid "Get Status Msg"
 msgstr "??????"
 
-#, fuzzy
 msgid "End Direct IM Session"
-msgstr "???????????"
+msgstr "??????????"
 
 msgid "Direct IM"
 msgstr "????"
@@ -7331,7 +7381,7 @@ msgid "Confirm Account"
 
 #. AIM actions
 msgid "Confirm Account"
-msgstr "????"
+msgstr "????"
 
 msgid "Display Currently Registered Email Address"
 msgstr "?????????????"
@@ -7356,8 +7406,9 @@ msgstr ""
 "file transfers and direct IM (slower,\n"
 "but does not reveal your IP address)"
 msgstr ""
-"???? ICQ ?????\n"
-"(??,??????? IP ??)"
+"????????????? AIM/ICQ \n"
+"?????(??,??????? IP \n"
+"??)"
 
 msgid "Allow multiple simultaneous logins"
 msgstr ""
@@ -7467,7 +7518,7 @@ msgid "Private"
 msgstr "?????"
 
 msgid "Private"
-msgstr "??"
+msgstr "??"
 
 msgid "QQ Number"
 msgstr "QQ ??"
@@ -7476,7 +7527,7 @@ msgid "Province/State"
 msgstr "??/??"
 
 msgid "Province/State"
-msgstr "?/?"
+msgstr "?/?"
 
 msgid "Zipcode"
 msgstr "????"
@@ -7485,7 +7536,7 @@ msgid "Authorize adding"
 msgstr "????"
 
 msgid "Authorize adding"
-msgstr "???????"
+msgstr "??????"
 
 msgid "Cellphone Number"
 msgstr "????"
@@ -7503,7 +7554,7 @@ msgid "College"
 msgstr "??????"
 
 msgid "College"
-msgstr "??"
+msgstr "??"
 
 msgid "Horoscope"
 msgstr "??"
@@ -7521,7 +7572,7 @@ msgid "Modify Contact"
 msgstr "?"
 
 msgid "Modify Contact"
-msgstr "?????"
+msgstr "??????"
 
 msgid "Modify Address"
 msgstr "????"
@@ -7539,7 +7590,7 @@ msgid "Mobile"
 msgstr "?????????"
 
 msgid "Mobile"
-msgstr "??"
+msgstr "??"
 
 msgid "Note"
 msgstr "??"
@@ -7619,10 +7670,10 @@ msgid "Failed removing me from %d's budd
 
 #, c-format
 msgid "Failed removing me from %d's buddy list"
-msgstr "%d ?????????????"
+msgstr "? %d ??????????"
 
 msgid "No reason given"
-msgstr "???????"
+msgstr "??????"
 
 #. only need to get value
 #, c-format
@@ -7671,7 +7722,7 @@ msgid "Notice"
 msgstr "???"
 
 msgid "Notice"
-msgstr "??"
+msgstr "??"
 
 msgid "Detail"
 msgstr "????"
@@ -7780,22 +7831,22 @@ msgid " FromMobile"
 msgstr " TCP"
 
 msgid " FromMobile"
-msgstr "??"
+msgstr " ????"
 
 msgid " BindMobile"
-msgstr "??"
+msgstr " ????"
 
 msgid " Video"
 msgstr "??"
 
 msgid " Zone"
-msgstr "?"
+msgstr " ??"
 
 msgid "Flag"
 msgstr ""
 
 msgid "Ver"
-msgstr ""
+msgstr "??"
 
 msgid "Invalid name"
 msgstr "????"
@@ -7805,86 +7856,86 @@ msgid "<b>Login time</b>: %d-%d-%d, %d:%
 
 #, c-format
 msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>????</b>: %d-%d-%d, %d:%d:%d<br>\n"
+msgstr "<b>????</b>:%d-%d-%d,%d:%d:%d<br>\n"
 
 #, c-format
 msgid "<b>Total Online Buddies</b>: %d<br>\n"
-msgstr "<b>??????</b>: %d<br>\n"
+msgstr "<b>??????</b>: %d<br>\n"
 
 #, c-format
 msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>????</b>:: %d-%d-%d, %d:%d:%d<br>\n"
+msgstr "<b>????</b>:%d-%d-%d,%d:%d:%d<br>\n"
 
 #, c-format
 msgid "<b>Server</b>: %s<br>\n"
-msgstr "<b>???</b>: %s<br>\n"
+msgstr "<b>???</b>:%s<br>\n"
 
 #, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
-msgstr "<b>????</b>: %s<br>\n"
+msgstr "<b>?????</b>:%s<br>\n"
 
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
-msgstr "<b>????</b>: %s<br>\n"
+msgstr "<b>????</b>:%s<br>\n"
 
 #, c-format
 msgid "<b>My Internet IP</b>: %s:%d<br>\n"
-msgstr "<b>?? Internet IP</b>: %s:%d<br>\n"
+msgstr "<b>????? IP</b>:%s:%d<br>\n"
 
 #, c-format
 msgid "<b>Sent</b>: %lu<br>\n"
-msgstr "<b>??????</b>: %lu<br>\n"
+msgstr "<b>???</b>:%lu<br>\n"
 
 #, c-format
 msgid "<b>Resend</b>: %lu<br>\n"
-msgstr "<b>????</b>: %lu<br>\n"
+msgstr "<b>??</b>:%lu<br>\n"
 
 #, c-format
 msgid "<b>Lost</b>: %lu<br>\n"
-msgstr "<b>????</b>: %lu<br>\n"
+msgstr "<b>??</b>:%lu<br>\n"
 
 #, c-format
 msgid "<b>Received</b>: %lu<br>\n"
-msgstr "<b>????</b>: %lu<br>\n"
+msgstr "<b>??</b>:%lu<br>\n"
 
 #, c-format
 msgid "<b>Received Duplicate</b>: %lu<br>\n"
-msgstr "<b>???? IP</b>: %lu<br>\n"
+msgstr "<b>????</b>:%lu<br>\n"
 
 #, c-format
 msgid "<b>Time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>????</b>: %d-%d-%d, %d:%d:%d<br>\n"
+msgstr "<b>????</b>: %d-%d-%d, %d:%d:%d<br>\n"
 
 #, c-format
 msgid "<b>IP</b>: %s<br>\n"
-msgstr "<b>IP</b>: %s<br>\n"
+msgstr "<b>IP</b>:%s<br>\n"
 
 msgid "Login Information"
 msgstr "????"
 
 msgid "<p><b>Original Author</b>:<br>\n"
-msgstr "<p><b>????</b>:<br>\n"
+msgstr "<p><b>???</b>:<br>\n"
 
 msgid "<p><b>Code Contributors</b>:<br>\n"
 msgstr "<p><b>?????</b>:<br>\n"
 
 msgid "<p><b>Lovely Patch Writers</b>:<br>\n"
-msgstr "<b>????</b>: %s<br>\n"
+msgstr "<p><b>????????</b>:<br>\n"
 
 msgid "<p><b>Acknowledgement</b>:<br>\n"
-msgstr "<b>??????</b>: %d<br>\n"
+msgstr "<p><b>??</b>:<br>\n"
 
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
-msgstr "<b>????</b>: %s<br>\n"
+msgstr "<p><b>??????</b>:<br>\n"
 
 msgid "and more, please let me know... thank you!))"
-msgstr ""
+msgstr "???????,????......??!))"
 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
-msgstr ""
+msgstr "<p><i>??,????????......</i><br>\n"
 
 msgid "<i>Feel free to join us!</i> :)"
-msgstr ""
+msgstr "<i>????????!</i> :)"
 
 #, c-format
 msgid "About OpenQ %s"
@@ -7897,7 +7948,7 @@ msgid "Account Information"
 msgstr "????"
 
 msgid "Account Information"
-msgstr "????"
+msgstr "????"
 
 msgid "Update all QQ Quns"
 msgstr "???? QQ ?"
@@ -7949,10 +8000,10 @@ msgid "Keep alive interval (seconds)"
 msgstr "???????????"
 
 msgid "Keep alive interval (seconds)"
-msgstr "??????"
+msgstr "??????(?)"
 
 msgid "Update interval (seconds)"
-msgstr "??????"
+msgstr "????(?)"
 
 msgid "Unable to decrypt server reply"
 msgstr "?????????"
@@ -7963,7 +8014,7 @@ msgid "Invalid token len, %d"
 
 #, c-format
 msgid "Invalid token len, %d"
-msgstr "?????"
+msgstr ""
 
 #. extend redirect used in QQ2006
 msgid "Redirect_EX is not currently supported"
@@ -7977,32 +8028,32 @@ msgid "Unknown reply code when logging i
 
 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
-msgstr ""
+msgstr "??????????? (0x%02X)"
 
 msgid "Requesting captcha"
-msgstr "???? %s ???..."
+msgstr "???????"
 
 msgid "Checking captcha"
-msgstr "???? %s ???..."
+msgstr "???????"
 
 msgid "Failed captcha verification"
-msgstr "Yahoo! ????"
+msgstr "???????"
 
 msgid "Captcha Image"
-msgstr "????"
+msgstr "?????"
 
 msgid "Enter code"
-msgstr "????"
+msgstr "?????"
 
 msgid "QQ Captcha Verification"
-msgstr ""
+msgstr "QQ ?????"
 
 msgid "Enter the text from the image"
-msgstr "?????????"
+msgstr "????????"
 
 #, c-format
 msgid "Unknown reply when checking password (0x%02X)"
-msgstr ""
+msgstr "???????????(0x%02X)"
 
 #, c-format
 msgid ""
@@ -8014,7 +8065,7 @@ msgid "Getting server"
 msgstr "?????"
 
 msgid "Getting server"
-msgstr "??????..."
+msgstr "?????"
 
 msgid "Requesting token"
 msgstr "?????"
@@ -8037,11 +8088,15 @@ msgid ""
 "%s\n"
 "%s\n"
 "%s"
-msgstr "ICQ ?????"
+msgstr ""
+"?????\n"
+"%s\n"
+"%s\n"
+"%s"
 
 #, c-format
 msgid "%s:%s"
-msgstr "%s:%s"
+msgstr "%s:%s"
 
 #, c-format
 msgid "From %s:"
@@ -8051,7 +8106,9 @@ msgid ""
 msgid ""
 "Server notice From %s: \n"
 "%s"
-msgstr "?????:%s"
+msgstr ""
+"?? %s ??????:\n"
+"%s"
 
 msgid "Unknown SERVER CMD"
 msgstr "???????"
@@ -8081,7 +8138,7 @@ msgstr "????"
 msgid "File Send"
 msgstr "????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d cancelled the transfer of %s"
 msgstr "%d ??? %s ???"
 
@@ -8146,7 +8203,7 @@ msgid "Unable to send message: "
 msgstr "?????"
 
 msgid "Unable to send message: "
-msgstr "??????: "
+msgstr "??????:"
 
 #, c-format
 msgid "Unable to send message to %s:"
@@ -8238,6 +8295,7 @@ msgstr "?? (0x%04x)<br>"
 msgid "Unknown (0x%04x)<br>"
 msgstr "?? (0x%04x)<br>"
 
+#, fuzzy
 msgid "Last Known Client"
 msgstr "????"
 
@@ -8255,13 +8313,12 @@ msgstr ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
 "select the correct user from the list below to add them to your buddy list."
 msgstr ""
-"?????????????????????????????????????"
 
 msgid "Select User"
 msgstr "????"
 
 msgid "Unable to add user: user not found"
-msgstr "??????: ?????"
+msgstr "??????:?????"
 
 #, c-format
 msgid ""
@@ -8297,11 +8354,11 @@ msgid "Import Sametime List for Account 
 
 #, c-format
 msgid "Import Sametime List for Account %s"
-msgstr "??? %s ?? Sametime ??"
+msgstr "??? %s ?? Sametime ??"
 
 #, c-format
 msgid "Export Sametime List for Account %s"
-msgstr "??? %s ?? Sametime ??"
+msgstr "??? %s ?? Sametime ??"
 
 msgid "Unable to add group: group exists"
 msgstr "?????:?????"
@@ -8597,40 +8654,40 @@ msgid "<b>Channel Name:</b> %s"
 
 #, c-format
 msgid "<b>Channel Name:</b> %s"
-msgstr "<b>????:</b> %s"
+msgstr "<b>????:</b> %s"
 
 #, c-format
 msgid "<br><b>User Count:</b> %d"
-msgstr "<br><b>???:</b> %d"
+msgstr "<br><b>???:</b> %d"
 
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
-msgstr "<br><b>?????:</b> %s"
+msgstr "<br><b>?????:</b> %s"
 
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
-msgstr "<br><b>????:</b> %s"
+msgstr "<br><b>????:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
-msgstr "<br><b>?? HMAC:</b> %s"
+msgstr "<br><b>?? HMAC:</b> %s"
 
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
-msgstr "<br><b>????:</b><br>%s"
+msgstr "<br><b>????:</b><br>%s"
 
 #, c-format
 msgid "<br><b>Channel Modes:</b> "
-msgstr "<br><b>????:</b> "
+msgstr "<br><b>????:</b> "
 
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
-msgstr "<br><b>???????:</b><br%s"
+msgstr "<br><b>???????:</b><br%s"
 
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
-msgstr "<br><b>???????:</b><br>%s"
+msgstr "<br><b>???????:</b><br>%s"
 
 msgid "Add Channel Public Key"
 msgstr "??????"
@@ -9065,7 +9122,7 @@ msgid "Your VCard File"
 msgstr "????????????????"
 
 msgid "Your VCard File"
-msgstr "?? vCard ??"
+msgstr "?? VCard ??"
 
 msgid "Timezone (UTC)"
 msgstr "??(UTC)"
@@ -9160,48 +9217,48 @@ msgid "topic [&lt;new topic&gt;]:  View 
 msgstr "leave [??]: ????"
 
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
-msgstr "topic [&lt;???&gt;]: ???????"
+msgstr "topic [&lt;???&gt;]:???????"
 
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr "join: &lt;???&gt; [&lt;???&gt;]: ??????????"
+msgstr "join: &lt;???&gt; [&lt;???&gt;]: ??????????"
 
 msgid "list:  List channels on this network"
-msgstr "list: ?????????"
+msgstr "list:?????????"
 
 msgid "whois &lt;nick&gt;:  View nick's information"
-msgstr "whois &lt;??&gt;: ??????"
+msgstr "whois &lt;??&gt;:??????"
 
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
-msgstr "msg &lt;??&gt; &lt;??&gt;: ?????????"
+msgstr "msg &lt;??&gt; &lt;??&gt;:?????????"
 
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
-msgstr "query &lt;??&gt; [&lt;??&gt;]: ????????????"
+msgstr "query &lt;??&gt; [&lt;??&gt;]:????????????"
 
 msgid "motd:  View the server's Message Of The Day"
-msgstr "motd: ??????????"
+msgstr "motd:??????????"
 
 msgid "detach:  Detach this session"
-msgstr "detach: ?????"
+msgstr "detach:?????"
 
 msgid "quit [message]:  Disconnect from the server, with an optional message"
-msgstr "quit [??]: ?????????,????????"
+msgstr "quit [??]:?????????,????????"
 
 msgid "call &lt;command&gt;:  Call any silc client command"
-msgstr "call &lt;??&gt;: ???? silc ?????"
+msgstr "call &lt;??&gt;:???? silc ?????"
 
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-msgstr "kill &lt;??&gt; [-pubkey|&lt;??&gt;]: ????"
+msgstr "kill &lt;??&gt; [-pubkey|&lt;??&gt;]:????"
 
 msgid "nick &lt;newnick&gt;:  Change your nickname"
-msgstr "nick &lt;???&gt;: ??????"
+msgstr "nick &lt;???&gt;:??????"
 
 msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr "whowas &lt;??&gt;: ??????"
+msgstr "whowas &lt;??&gt;:??????"
 
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
-msgstr "cmode &lt;??&gt; [+|-&lt;??&gt] [??]: ?????????"
+msgstr "cmode &lt;??&gt; [+|-&lt;??&gt] [??]:?????????"
 
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
@@ -9210,7 +9267,7 @@ msgid "umode &lt;usermodes&gt;:  Set you
 "cumode &lt;??&gt; +|-&lt;??&gt; &lt;??&gt;: ???????????"
 
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
-msgstr "umode &lt;????&gt;: ??????????"
+msgstr "umode &lt;????&gt;:??????????"
 
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;??&gt; [-pubkey]:??????????"
@@ -9219,34 +9276,34 @@ msgstr ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
-"invite &lt;??&gt; [-|+]&lt;??&gt;: ???????????????/??"
+"invite &lt;??&gt; [-|+]&lt;??&gt;:???????????????/??"
 
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
-msgstr "kick &lt;??&gt; &lt;??&gt; [??]: ???????"
+msgstr "kick &lt;??&gt; &lt;??&gt; [??]:???????"
 
 msgid "info [server]:  View server administrative details"
-msgstr "info [???]: ?????????"
+msgstr "info [???]:?????????"
 
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
-msgstr "ban [&lt;??&gt; +|-&lt;??&gt;]: ????????"
+msgstr "ban [&lt;??&gt; +|-&lt;??&gt;]:????????"
 
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;??|???&gt;:???????????"
 
 msgid "stats:  View server and network statistics"
-msgstr "stat: ??????????"
+msgstr "stat:??????????"
 
 msgid "ping:  Send PING to the connected server"
-msgstr "ping: ????????? PING"
+msgstr "ping:????????? PING"
 
 msgid "users &lt;channel&gt;:  List users in channel"
-msgstr "users &lt;??&gt;: ??????????"
+msgstr "users &lt;??&gt;:??????????"
 
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
 msgstr ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;??&gt;: ?????????"
+"names [-count|-ops|-halfops|-voices|-normal] &lt;??&gt;:?????????"
 "?"
 
 #. *< type
@@ -9309,35 +9366,35 @@ msgid "Real Name: \t%s\n"
 #. sum: 3 tabs or 24 characters)
 #, c-format
 msgid "Real Name: \t%s\n"
-msgstr "??:\t%s\n"
+msgstr "??:\t%s\n"
 
 #, c-format
 msgid "User Name: \t%s\n"
-msgstr "???:\t%s\n"
+msgstr "???:\t%s\n"
 
 #, c-format
 msgid "Email: \t\t%s\n"
-msgstr "????:\t\t%s\n"
+msgstr "????:\t\t%s\n"
 
 #, c-format
 msgid "Host Name: \t%s\n"
-msgstr "???:\t%s\n"
+msgstr "???:\t%s\n"
 
 #, c-format
 msgid "Organization: \t%s\n"
-msgstr "??:\t%s\n"
+msgstr "??:\t%s\n"
 
 #, c-format
 msgid "Country: \t%s\n"
-msgstr "??:\t%s\n"
+msgstr "??:\t%s\n"
 
 #, c-format
 msgid "Algorithm: \t%s\n"
-msgstr "??:\t%s\n"
+msgstr "??:\t%s\n"
 
 #, c-format
 msgid "Key Length: \t%d bits\n"
-msgstr "????:\t%d ?\n"
+msgstr "????:\t%d ?\n"
 
 #, c-format
 msgid "Version: \t%s\n"
@@ -9349,7 +9406,7 @@ msgstr ""
 "%s\n"
 "\n"
 msgstr ""
-"????:\n"
+"????:\n"
 "%s\n"
 "\n"
 
@@ -9358,7 +9415,7 @@ msgstr ""
 "Public Key Babbleprint:\n"
 "%s"
 msgstr ""
-"????:\n"
+"????:\n"
 "%s"
 
 msgid "Public Key Information"
@@ -9400,43 +9457,43 @@ msgid "Failure: Version mismatch, upgrad
 
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
-msgstr "??: ?????,????????"
+msgstr "??:?????,????????"
 
 #, c-format
 msgid "Failure: Remote does not trust/support your public key"
-msgstr "??: ?????????????"
+msgstr "??:?????????????"
 
 #, c-format
 msgid "Failure: Remote does not support proposed KE group"
-msgstr "??: ???????? KE ?"
+msgstr "??:???????? KE ?"
 
 #, c-format
 msgid "Failure: Remote does not support proposed cipher"
-msgstr "??: ????????????"
+msgstr "??:????????????"
 
 #, c-format
 msgid "Failure: Remote does not support proposed PKCS"
-msgstr "??: ???????? PKCS"
+msgstr "??:???????? PKCS"
 
 #, c-format
 msgid "Failure: Remote does not support proposed hash function"
-msgstr "??: ????????????"
+msgstr "??:????????????"
 
 #, c-format
 msgid "Failure: Remote does not support proposed HMAC"
-msgstr "??: ????? HMAC"
+msgstr "??:????? HMAC"
 
 #, c-format
 msgid "Failure: Incorrect signature"
-msgstr "??: ?????"
+msgstr "??:?????"
 
 #, c-format
 msgid "Failure: Invalid cookie"
-msgstr "??: ??? cookie"
+msgstr "??:??? cookie"
 
 #, c-format
 msgid "Failure: Authentication failed"
-msgstr "??: ??????"
+msgstr "??:??????"
 
 msgid "Unable to initialize SILC Client connection"
 msgstr "????? SILC ????"
@@ -9461,7 +9518,7 @@ msgid "SIP connect server not specified"
 msgstr "SIP ?????????? @ ??"
 
 msgid "SIP connect server not specified"
-msgstr "?????"
+msgstr "???? SIP ?????"
 
 #. *< type
 #. *< ui_requirement
@@ -9497,10 +9554,10 @@ msgid "join &lt;room&gt;:  Join a chat r
 msgstr "???"
 
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;???&gt;: ?? Yahoo ???????"
+msgstr "join: &lt;???&gt;: ?? Yahoo ???????"
 
 msgid "list: List rooms on the Yahoo network"
-msgstr "list: ?? Yahoo ???????"
+msgstr "list: ?? Yahoo ???????"
 
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
@@ -9612,7 +9669,7 @@ msgid "Username or password missing"
 
 #. username or password missing
 msgid "Username or password missing"
-msgstr "???????"
+msgstr "????????"
 
 #, c-format
 msgid ""
@@ -9636,15 +9693,13 @@ msgstr "?????"
 msgid "Ignore buddy?"
 msgstr "?????"
 
-#, fuzzy
 msgid "Invalid username or password"
 msgstr "????????"
 
-#, fuzzy
 msgid ""
 "Your account has been locked due to too many failed login attempts.  Please "
 "try logging into the Yahoo! website."
-msgstr "????? %d???? Yahoo! ???????"
+msgstr "???????????,????????,???? Yahoo! ?????"
 
 #, c-format
 msgid "Unknown error 52.  Reconnecting should fix this."
@@ -9661,7 +9716,7 @@ msgid "Unable to add buddy %s to group %
 
 #, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
-msgstr "????? %s ????? %s ?????????? %s?"
+msgstr "????? %s ????? %s ?????????? %s?"
 
 msgid "Unable to add buddy to server list"
 msgstr "?????????????"
@@ -9681,7 +9736,7 @@ msgid "Unable to establish a connection 
 
 #, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr "??????????"
+msgstr "??? %s ????:%s"
 
 msgid "Not at Home"
 msgstr "???"
@@ -9766,7 +9821,7 @@ msgid "%s is trying to send you a group 
 
 #, c-format
 msgid "%s is trying to send you a group of %d files.\n"
-msgstr "%s ?????? %d\n"
+msgstr "%s ?????? %d ????\n"
 
 msgid "Write Error"
 msgstr "???"
@@ -9889,7 +9944,7 @@ msgid ""
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
-msgstr "(????????\t??????????"??"??)"
+msgstr "(????????\t??????????"??"??)"
 
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
@@ -9919,32 +9974,32 @@ msgid "zlocate &lt;nick&gt;: Locate user
 msgstr "???? %s,%s,%s ???"
 
 msgid "zlocate &lt;nick&gt;: Locate user"
-msgstr "zlocate &lt;??&gt;: ????"
+msgstr "zlocate &lt;??&gt;:????"
 
 msgid "zl &lt;nick&gt;: Locate user"
-msgstr "zl &lt;??&gt;: ????"
+msgstr "zl &lt;??&gt;:????"
 
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "instance &lt;??&gt;: ???????????"
+msgstr "instance &lt;??&gt;:???????????"
 
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "inst &lt;??&gt;: ???????????"
+msgstr "inst &lt;??&gt;:???????????"
 
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "topic &lt;??&gt;: ???????????"
+msgstr "topic &lt;??&gt;:???????????"
 
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-msgstr "sub &lt;?&gt; &lt;??&gt; &lt;???&gt;: ?????"
+msgstr "sub &lt;?&gt; &lt;??&gt; &lt;???&gt;:?????"
 
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr "zi &lt;??&gt;: ? &lt;??,<i>??</i>,*&gt; ????"
+msgstr "zi &lt;??&gt;:? &lt;??,<i>??</i>,*&gt; ????"
 
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
-"zci &lt;?&gt; &lt;??&gt;: ? &lt;<i>?</i>,<i>??</i>,*&gt; ????"
+"zci &lt;?&gt; &lt;??&gt;:? &lt;<i>?</i>,<i>??</i>,*&gt; ????"
 
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
@@ -9961,7 +10016,7 @@ msgid "zc &lt;class&gt;: Send a message 
 "???"
 
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-msgstr "zc &lt;?&gt;: ? &lt;<i>?</i>,??,*&gt; ????"
+msgstr "zc &lt;?&gt;:? &lt;<i>?</i>,??,*&gt; ????"
 
 msgid "Resubscribe"
 msgstr "??"
@@ -10016,7 +10071,7 @@ msgid "Access denied: HTTP proxy server 
 
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
-msgstr "?????: HTTP ????????? %d ???"
+msgstr "?????:HTTP ????????? %d ???"
 
 #, c-format
 msgid "Error resolving %s"
@@ -10158,32 +10213,32 @@ msgid_plural "%d seconds"
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] "???"
+msgstr[0] "%d ?"
 
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] "???"
+msgstr[0] "%d ?"
 
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
-msgstr[0] "???"
+msgstr[0] "%s,%d ??"
 
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] "???"
+msgstr[0] "%d ??"
 
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
-msgstr[0] "???"
+msgstr[0] "%s,%d ??"
 
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] "???"
+msgstr[0] "%d ??"
 
 #, c-format
 msgid "Could not open %s: Redirected too many times"
@@ -10195,7 +10250,7 @@ msgid "Error reading from %s: response t
 
 #, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
-msgstr "??????????"
+msgstr "? %s ????:????(??? %d ??)"
 
 #, c-format
 msgid ""
@@ -10213,11 +10268,11 @@ msgid "Unable to connect to %s: %s"
 
 #, c-format
 msgid "Unable to connect to %s: %s"
-msgstr "????? %s: %s"
+msgstr "????? %s:%s"
 
 #, c-format
 msgid " - %s"
-msgstr ""
+msgstr " - %s"
 
 #, c-format
 msgid " (%s)"
@@ -10299,7 +10354,7 @@ msgid "Use this buddy _icon for this acc
 
 #. Buddy icon
 msgid "Use this buddy _icon for this account:"
-msgstr "????????(_I):"
+msgstr "????????(_I):"
 
 msgid "Ad_vanced"
 msgstr "??(_A)"
@@ -10350,19 +10405,19 @@ msgid "Unable to save new account"
 msgstr "??(_S):"
 
 msgid "Unable to save new account"
-msgstr "???????"
+msgstr "???????"
 
 msgid "An account already exists with the specified criteria."
-msgstr "????????????"
+msgstr "????????????"
 
 msgid "Add Account"
-msgstr "????"
+msgstr "????"
 
 msgid "_Basic"
 msgstr "??(_B)"
 
 msgid "Create _this new account on the server"
-msgstr "???????????(_T)"
+msgstr "???????????(_T)"
 
 msgid "P_roxy"
 msgstr "??"
@@ -10385,14 +10440,14 @@ msgstr ""
 "You can come back to this window to add, edit, or remove accounts from "
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
-"<span size='larger' weight='bold'>???? %s!</span>\n"
+"<span size='larger' weight='bold'>???? %s!</span>\n"
 "\n"
-"?????????????? %s ????,??????<b>??</b>??,???"
-"??????????????? %s ???????????,?????<b>??</"
+"?????????????? %s ????,??????<b>??</b>??,???"
+"??????????????? %s ???????????,?????<b>??</"
 "b>???????\n"
 "\n"
-"??????????????????????,?????????????<b>?"
-"?->??/??</b>"
+"??????????????????????,?????????????<b>?"
+"?->????</b>"
 
 #. Buddy List
 msgid "Background Color"
@@ -10459,12 +10514,11 @@ msgstr ""
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is online
-#, fuzzy
 msgid "Online Text"
 msgstr "????"
 
 msgid "The text information for when a buddy is online"
-msgstr ""
+msgstr "???????????????"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is away
@@ -10476,7 +10530,6 @@ msgstr ""
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is offline
-#, fuzzy
 msgid "Offline Text"
 msgstr "????"
 
@@ -10531,7 +10584,7 @@ msgid "A_ccount"
 msgstr "?????????"
 
 msgid "A_ccount"
-msgstr "??(_C):"
+msgstr "??(_C):"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10687,10 +10740,10 @@ msgid "/_Accounts"
 
 #. Accounts menu
 msgid "/_Accounts"
-msgstr "/??(_A)"
+msgstr "/??(_A)"
 
 msgid "/Accounts/Manage Accounts"
-msgstr "/??/????"
+msgstr "/??/????"
 
 #. Tools
 msgid "/_Tools"
@@ -10741,7 +10794,7 @@ msgid "<b>Account:</b> %s"
 
 #, c-format
 msgid "<b>Account:</b> %s"
-msgstr "<b>??:</b>%s"
+msgstr "<b>??:</b>%s"
 
 #, c-format
 msgid ""
@@ -10769,13 +10822,13 @@ msgid "Last Seen"
 msgstr "???"
 
 msgid "Last Seen"
-msgstr "????"
+msgstr "????"
 
 msgid "Spooky"
 msgstr "??"
 
 msgid "Awesome"
-msgstr ""
+msgstr "??"
 
 msgid "Rockin'"
 msgstr ""
@@ -10822,7 +10875,7 @@ msgid_plural "%d unread messages from %s
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
-msgstr[0] "/??/?????\n"
+msgstr[0] "?? %2$s ? %1$d ?????\n"
 
 msgid "Manually"
 msgstr "??"
@@ -10857,7 +10910,7 @@ msgid_plural ""
 msgid "%d account was disabled because you signed on from another location:"
 msgid_plural ""
 "%d accounts were disabled because you signed on from another location:"
-msgstr[0] "????!"
+msgstr[0] "%d ??????,???????????:"
 
 msgid "<b>Username:</b>"
 msgstr "<b>???:</b>"
@@ -10869,7 +10922,7 @@ msgid "/Accounts"
 msgstr "??(_L)"
 
 msgid "/Accounts"
-msgstr "/??(A)"
+msgstr "/??"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
 #, c-format
@@ -10880,10 +10933,10 @@ msgstr ""
 "b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, "
 "you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
-"<span size='larger' weight='bold'>???? %s!</span>\n"
+"<span weight='bold' size='larger'>???? %s!</span>\n"
 "\n"
-"???????????<b>??->??</b>??<b>??</b>??,????????"
-"?????????????,?????????????????"
+"???????????<b>??->??</b>??<b>??</b>??,????????"
+"?????????????,?????????????????"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
@@ -10910,10 +10963,10 @@ msgid "(Optional) A_lias:"
 msgstr "????(_U):"
 
 msgid "(Optional) A_lias:"
-msgstr "??(??):"
+msgstr "(??)??(_L):"
 
 msgid "Add buddy to _group:"
-msgstr "???????:"
+msgstr "???????(_G):"
 
 msgid "This protocol does not support chat rooms."
 msgstr "??????????"
@@ -10934,27 +10987,26 @@ msgstr "?(_G):"
 msgid "_Group:"
 msgstr "?(_G):"
 
-#, fuzzy
 msgid "Auto_join when account connects."
-msgstr "??????????"
+msgstr "?????????(_J)?"
 
 msgid "_Remain in chat after window is closed."
-msgstr "??????????"
+msgstr "?????????????(_R)?"
 
 msgid "Please enter the name of the group to be added."
 msgstr "???????????"
 
 msgid "Enable Account"
-msgstr "????"
+msgstr "????"
 
 msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr "<PurpleMain>/??/????"
+msgstr "<PurpleMain>/??/????"
 
 msgid "<PurpleMain>/Accounts/"
-msgstr "<PurpleMain>/??/"
+msgstr "<PurpleMain>/??/"
 
 msgid "_Edit Account"
-msgstr "????(_E)"
+msgstr "????(_E)"
 
 msgid "No actions available"
 msgstr "???????"
@@ -11048,41 +11100,40 @@ msgid "/Conversation/New Instant _Messag
 msgstr "/??(_C)"
 
 msgid "/Conversation/New Instant _Message..."
-msgstr "/??/?????(_M)..."
+msgstr "/??(C)/?????(_M)..."
 
-#, fuzzy
 msgid "/Conversation/Join a _Chat..."
-msgstr "/??/??(_V)..."
+msgstr "/??(C)/??(_C)..."
 
 msgid "/Conversation/_Find..."
-msgstr "/??/??(_F)..."
+msgstr "/??(C)/??(_F)..."
 
 msgid "/Conversation/View _Log"
-msgstr "/??/??????(_L)"
+msgstr "/??(C)/??????(_L)"
 
 msgid "/Conversation/_Save As..."
-msgstr "/??/???(_S)..."
+msgstr "/??(C)/???(_S)..."
 
 msgid "/Conversation/Clea_r Scrollback"
-msgstr "/??/????(_R)"
+msgstr "/??(C)/????(_R)"
 
 msgid "/Conversation/M_edia"
-msgstr "/??/??(_E)"
+msgstr "/??(C)/??(_E)"
 
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/??/??/????(_A)"
+msgstr "/??(C)/??(E)/????(_A)"
 
 msgid "/Conversation/Media/_Video Call"
-msgstr "/??/??/????(_V)"
+msgstr "/??(C)/??(E)/????(_V)"
 
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/??/??/??\\/????(_C)"
+msgstr "/??(C)/??(E)/??\\/????(_C)"
 
 msgid "/Conversation/Se_nd File..."
-msgstr "/??/????(_N)..."
+msgstr "/??(C)/????(_N)..."
 
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/??/???????(_P)..."
+msgstr "/??(C)/???????(_P)..."
 
 msgid "/Conversation/_Get Info"
 msgstr "/??/????(_G)"
@@ -11207,13 +11258,13 @@ msgstr "??????..."
 msgid "User is typing..."
 msgstr "??????..."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "%s has stopped typing"
 msgstr ""
 "\n"
-"%s ?????(%s)"
+"%s ?????"
 
 #. Build the Send To menu
 msgid "S_end To"
@@ -11229,7 +11280,7 @@ msgid_plural "%d people in room"
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
-msgstr[0] "???????"
+msgstr[0] "????? %d ?"
 
 msgid "Typing"
 msgstr "????"
@@ -11247,7 +11298,7 @@ msgid "clear: Clears all conversation sc
 msgstr "???"
 
 msgid "clear: Clears all conversation scrollbacks."
-msgstr "clear: ?????????"
+msgstr "clear:?????????"
 
 msgid "Confirm close"
 msgstr "????"
@@ -11283,7 +11334,7 @@ msgid "By account"
 msgstr "??"
 
 msgid "By account"
-msgstr "???"
+msgstr "???"
 
 msgid "Save Debug Log"
 msgstr "????????"
@@ -11591,7 +11642,7 @@ msgid "Simplified Chinese"
 msgstr "T.M.Thanh ?Gnome ?????"
 
 msgid "Simplified Chinese"
-msgstr "??(??)"
+msgstr "??(????)"
 
 msgid "Hong Kong Chinese"
 msgstr "??(??)"
@@ -11630,8 +11681,8 @@ msgstr ""
 "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
 "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 msgstr ""
-"<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\">????:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/"
+"FAQ\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 
 #, c-format
 msgid ""
@@ -11678,7 +11729,7 @@ msgid "_Account"
 msgstr "??(_N)"
 
 msgid "_Account"
-msgstr "??(_A)"
+msgstr "??(_A)"
 
 msgid "Get User Info"
 msgstr "??????"
@@ -11717,7 +11768,7 @@ msgid_plural ""
 msgid_plural ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
-msgstr[0] "??????????"
+msgstr[0] ""
 
 msgid "Remove Contact"
 msgstr "?????"
@@ -11788,7 +11839,7 @@ msgid "_Accounts"
 msgstr "???(_M)..."
 
 msgid "_Accounts"
-msgstr "??(_A)"
+msgstr "??(_A)"
 
 msgid "Plu_gins"
 msgstr "??(_G)"
@@ -12193,8 +12244,9 @@ msgstr ""
 msgid "display this help and exit"
 msgstr ""
 
+#, fuzzy
 msgid "allow multiple instances"
-msgstr ""
+msgstr "?????????"
 
 msgid "don't automatically login"
 msgstr ""
@@ -12257,12 +12309,12 @@ msgid_plural "%s has %d new messages."
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
-msgstr[0] "??(_P)"
+msgstr[0] "%s ? %d ?????"
 
 #, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
-msgstr[0] "??(_P)"
+msgstr[0] "<b>%d ?????</b>"
 
 #, c-format
 msgid "The browser command \"%s\" is invalid."
@@ -12289,13 +12341,13 @@ msgid "New Pounces"
 msgstr "<span weight=\"bold\" size=\"larger\">??????!</span>"
 
 msgid "New Pounces"
-msgstr "???????"
+msgstr "???????"
 
 msgid "Dismiss"
-msgstr "??"
+msgstr "??"
 
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">??????!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">??????!</span>"
 
 msgid "The following plugins will be unloaded."
 msgstr "??????????"
@@ -12319,7 +12371,7 @@ msgstr ""
 "<span foreground=\"red\" weight=\"bold\">Error: %s\n"
 "Check the plugin website for an update.</span>"
 msgstr ""
-"<span foreground=\"#ff0000\" weight=\"bold\">??:%s\n"
+"<span foreground=\"red\" weight=\"bold\">??:%s\n"
 "????????????</span>"
 
 msgid "Author"
@@ -12351,7 +12403,7 @@ msgid "_Account:"
 msgstr "????"
 
 msgid "_Account:"
-msgstr "??(_A):"
+msgstr "??(_A):"
 
 msgid "_Buddy name:"
 msgstr "????(_B):"
@@ -12414,7 +12466,7 @@ msgid "_Recurring"
 msgstr "?????????????(_O)"
 
 msgid "_Recurring"
-msgstr "??(_R)"
+msgstr "??(_R)"
 
 msgid "Pounce Target"
 msgstr "????"
@@ -12450,24 +12502,22 @@ msgid "Unknown.... Please report this!"
 msgstr "????"
 
 msgid "Unknown.... Please report this!"
-msgstr "?????????????!"
+msgstr "??......??????!"
 
 msgid "(Custom)"
-msgstr ""
+msgstr "(???)"
 
-#, fuzzy
-msgid "(Default)"
-msgstr "(??)"
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
-msgstr ""
+msgstr "Pidgin ??????"
 
-#, fuzzy
 msgid "The default Pidgin buddy list theme"
-msgstr "????"
+msgstr "Pidgin ????????"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "Pidgin ????????"
 
 msgid "Theme failed to unpack."
 msgstr "???????"
@@ -12478,33 +12528,45 @@ msgstr "???????"
 msgid "Theme failed to copy."
 msgstr "???????"
 
-msgid "Install Theme"
-msgstr "????"
+#, fuzzy
+msgid "Theme Selections"
+msgstr "?????"
 
+#. 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 "??????????????????????????????????"
 
-msgid "Icon"
-msgstr "??"
+#, fuzzy
+msgid "Buddy List Theme:"
+msgstr "??????"
 
+#, fuzzy
+msgid "Status Icon Theme:"
+msgstr "????"
+
+msgid "Sound Theme:"
+msgstr ""
+
+#, fuzzy
+msgid "Smiley Theme:"
+msgstr "????"
+
 msgid "Keyboard Shortcuts"
 msgstr "?????"
 
 msgid "Cl_ose conversations with the Escape key"
 msgstr "?? ESC ?????(_O)"
 
-#. Buddy List Themes
-msgid "Buddy List Theme"
-msgstr "??????"
-
 #. System Tray
 msgid "System Tray Icon"
 msgstr "??????"
 
 msgid "_Show system tray icon:"
-msgstr "????????(_S):"
+msgstr "????????(_S):"
 
 msgid "On unread messages"
 msgstr "??????"
@@ -12513,7 +12575,7 @@ msgid "_Hide new IM conversations:"
 msgstr "????????"
 
 msgid "_Hide new IM conversations:"
-msgstr "???? IM ??(_H):"
+msgstr "???? IM ??(_H):"
 
 msgid "When away"
 msgstr "???"
@@ -12585,9 +12647,6 @@ msgstr "??"
 msgid "Font"
 msgstr "??"
 
-msgid "Use document font from _theme"
-msgstr "??????????(_T)"
-
 msgid "Use font from _theme"
 msgstr "????????(_T)"
 
@@ -12608,20 +12667,18 @@ msgstr "??????????? msgid "Cannot start browser configuration program."
 msgstr "????????????"
 
-#, fuzzy
 msgid "Disabled"
-msgstr "??(_D)"
+msgstr "??"
 
 #, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "???? IP ??(_A):%s"
+msgstr "???????? IP ??(_A):%s"
 
-#, fuzzy
 msgid "ST_UN server:"
-msgstr "STUN ???(_U):"
+msgstr "ST_UN ???:"
 
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
-msgstr "<span style=\"italic\">?:stunserver.org</span>"
+msgstr "<span style=\"italic\">??:stunserver.org</span>"
 
 msgid "Public _IP:"
 msgstr "?? _IP:"
@@ -12632,77 +12689,28 @@ msgstr "??????????? msgid "_Enable automatic router port forwarding"
 msgstr "???????????(_E)"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "????????????(_M)"
+msgstr "????????????(_M):"
 
-#, fuzzy
 msgid "_Start:"
-msgstr "??(_S):"
+msgstr "??(_S):"
 
-#, fuzzy
 msgid "_End:"
-msgstr "??(_E)"
+msgstr "??(_E):"
 
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr "?????(?)"
+msgstr "?????(TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "STUN ???(_U):"
+msgstr "_TURN ???:"
 
-#, fuzzy
 msgid "Use_rname:"
-msgstr "???:"
+msgstr "???(_R):"
 
-#, fuzzy
 msgid "Pass_word:"
-msgstr "??:"
+msgstr "??(_W):"
 
-msgid "Proxy Server &amp; Browser"
-msgstr "????? &amp; ???"
-
-msgid "<b>Proxy configuration program was not found.</b>"
-msgstr "<b>??????????</b>"
-
-msgid "<b>Browser configuration program was not found.</b>"
-msgstr "<b>???????????</b>"
-
-msgid ""
-"Proxy & Browser preferences are configured\n"
-"in GNOME Preferences"
-msgstr ""
-
-msgid "Configure _Proxy"
-msgstr "???????(_P)"
-
-msgid "Configure _Browser"
-msgstr "?????(_B)"
-
-msgid "Proxy Server"
-msgstr "?????"
-
-#. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
-#, fuzzy
-msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "?? SOCKS4 ?????? DNS"
-
-#, fuzzy
-msgid "Proxy t_ype:"
-msgstr "????(_T):"
-
-msgid "No proxy"
-msgstr "???"
-
-#, fuzzy
-msgid "P_ort:"
-msgstr "??(_P):"
-
-#, fuzzy
-msgid "User_name:"
-msgstr "???:"
-
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
@@ -12742,6 +12750,16 @@ msgstr "?????"
 msgid "Browser Selection"
 msgstr "?????"
 
+#, fuzzy
+msgid "Browser preferences are configured in GNOME preferences"
+msgstr "??????????? GNOME ???????"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>???????????</b>"
+
+msgid "Configure _Browser"
+msgstr "?????(_B)"
+
 msgid "_Browser:"
 msgstr "???(_B):"
 
@@ -12765,6 +12783,39 @@ msgstr ""
 "??(_M):\n"
 "(%s ?? URL)"
 
+msgid "Proxy Server"
+msgstr "?????"
+
+#, fuzzy
+msgid "Proxy preferences are configured in GNOME preferences"
+msgstr "??????????? GNOME ???????"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>??????????</b>"
+
+msgid "Configure _Proxy"
+msgstr "???????(_P)"
+
+#. This is a global option that affects SOCKS4 usage even with
+#. * account-specific proxy settings
+msgid "Use remote _DNS with SOCKS4 proxies"
+msgstr "?? SOCKS4 ?????? _DNS"
+
+#, fuzzy
+msgid "Proxy t_ype:"
+msgstr "????(_T):"
+
+msgid "No proxy"
+msgstr "???"
+
+#, fuzzy
+msgid "P_ort:"
+msgstr "??(_P):"
+
+#, fuzzy
+msgid "User_name:"
+msgstr "???:"
+
 msgid "Log _format:"
 msgstr "??????(_F):"
 
@@ -12828,10 +12879,10 @@ msgid "_Enable sounds:"
 msgstr "?????????(_F)"
 
 msgid "_Enable sounds:"
-msgstr "????(_E):"
+msgstr "????(_E):"
 
 msgid "V_olume:"
-msgstr "??(_O):"
+msgstr "??(_O):"
 
 msgid "Play"
 msgstr "??"
@@ -12848,25 +12899,19 @@ msgstr "?????????"
 msgid "Based on keyboard or mouse use"
 msgstr "?????????"
 
-msgid "_Auto-reply:"
-msgstr "????(_A):"
-
-msgid "When both away and idle"
-msgstr "??????"
-
-#. Auto-away stuff
-msgid "Auto-away"
-msgstr "????"
-
 msgid "_Minutes before becoming idle:"
 msgstr "?????????(_M):"
 
-msgid "Change status when _idle"
+#, fuzzy
+msgid "Change to this status when _idle:"
 msgstr "???????(_I)"
 
-msgid "Change _status to:"
-msgstr "??????(_S):"
+msgid "_Auto-reply:"
+msgstr "????(_A):"
 
+msgid "When both away and idle"
+msgstr "??????"
+
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "??????"
@@ -12880,15 +12925,16 @@ msgstr "??"
 msgid "Interface"
 msgstr "??"
 
-msgid "Smiley Themes"
-msgstr "????"
-
 msgid "Browser"
 msgstr "???"
 
 msgid "Status / Idle"
-msgstr "??/??"
+msgstr "?????"
 
+#, fuzzy
+msgid "Themes"
+msgstr "????"
+
 msgid "Allow all users to contact me"
 msgstr "?????????"
 
@@ -12911,7 +12957,7 @@ msgid "Set privacy for:"
 msgstr "???????????????"
 
 msgid "Set privacy for:"
-msgstr "???????:"
+msgstr "???????:"
 
 #. Remove All button
 msgid "Remove Al_l"
@@ -13001,7 +13047,7 @@ msgid "Use a _different status for some 
 
 #. Different status message expander
 msgid "Use a _different status for some accounts"
-msgstr "????????????(_D)"
+msgstr "????????????(_D)"
 
 #. Save & Use button
 msgid "Sa_ve & Use"
@@ -13029,11 +13075,11 @@ msgid "_Image:"
 msgstr "????"
 
 msgid "_Image:"
-msgstr "??(_I):"
+msgstr "??(_I):"
 
 #. Shortcut text
 msgid "S_hortcut text:"
-msgstr "??????:"
+msgstr "??????(_H):"
 
 msgid "Smiley"
 msgstr "??"
@@ -13048,10 +13094,10 @@ msgid "Click to change your buddyicon fo
 msgstr "??????"
 
 msgid "Click to change your buddyicon for this account."
-msgstr "?????????????"
+msgstr "?????????????"
 
 msgid "Click to change your buddyicon for all accounts."
-msgstr "?????????????"
+msgstr "?????????????"
 
 msgid "Waiting for network connection"
 msgstr "????????"
@@ -13070,7 +13116,7 @@ msgid "The following error has occurred 
 
 #, c-format
 msgid "The following error has occurred loading %s: %s"
-msgstr "?? %s ????????: %s?"
+msgstr "?? %s ????????: %s?"
 
 msgid "Failed to load image"
 msgstr "??????"
@@ -13222,9 +13268,6 @@ msgstr "Pidgin ??"
 msgid "Pidgin smileys"
 msgstr "Pidgin ??"
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "??????????????"
 
@@ -13235,7 +13278,7 @@ msgid "Smaller versions of the default s
 msgstr "?"
 
 msgid "Smaller versions of the default smilies"
-msgstr ""
+msgstr "??????????"
 
 msgid "Response Probability:"
 msgstr "?????:"
@@ -13245,7 +13288,7 @@ msgid "Maximum response timeout:"
 
 #. msg_difference spinner
 msgid "Maximum response timeout:"
-msgstr "??????:"
+msgstr "??????:"
 
 msgid "minutes"
 msgstr "??"
@@ -13304,7 +13347,7 @@ msgid "Point values to use for account..
 msgstr "???????????"
 
 msgid "Point values to use for account..."
-msgstr "?????..."
+msgstr "?????..."
 
 #. *< type
 #. *< ui_requirement
@@ -13397,14 +13440,14 @@ msgstr ""
 "<b>Description:</b> "
 msgstr ""
 "\n"
-"??"
+"<b>??:</b>"
 
 #. Create the window.
 msgid "Service Discovery"
 msgstr "??????"
 
 msgid "_Browse"
-msgstr "???(_B):"
+msgstr "??(_B)"
 
 msgid "Server does not exist"
 msgstr "?????"
@@ -13433,7 +13476,7 @@ msgid ""
 msgid ""
 "Note: The preference for \"New conversations\" must be set to \"By "
 "conversation count\"."
-msgstr "???:"????"?\"????????"?????"?"
+msgstr "???:"????"?????????"?????"?"
 
 msgid "Number of conversations per window"
 msgstr "????????"
@@ -13500,7 +13543,7 @@ msgstr ""
 " o Drag up and then to the right to switch to the next conversation."
 msgstr ""
 "???????????????\n"
-"?????????????:\n"
+"?????????????:\n"
 "\n"
 "????????????\n"
 "???????????????\n"
@@ -13559,7 +13602,7 @@ msgid "Select all accounts that buddies 
 
 #. Label
 msgid "Select all accounts that buddies should be auto-added to."
-msgstr "????????????????"
+msgstr "????????????????"
 
 #. *< type
 #. *< ui_requirement
@@ -13581,10 +13624,10 @@ msgid "Please enter the buddy's username
 msgstr "?????????????"
 
 msgid "Please enter the buddy's username and account type below."
-msgstr "??????????????????"
+msgstr "??????????????????"
 
 msgid "Account type:"
-msgstr "????:"
+msgstr "????:"
 
 #. Optional Information section
 msgid "Optional information:"
@@ -13621,7 +13664,7 @@ msgstr ""
 "<b>Buddy Note</b>: %s"
 msgstr ""
 "\n"
-"<b>????</b>: %s"
+"<b>????</b>:%s"
 
 msgid "History"
 msgstr "??"
@@ -13841,6 +13884,10 @@ msgstr "???"
 msgid "Conversation Entry"
 msgstr "???"
 
+#, fuzzy
+msgid "Conversation History"
+msgstr "???"
+
 msgid "Request Dialog"
 msgstr "?????"
 
@@ -14095,13 +14142,13 @@ msgid "Pidgin Theme Editor"
 #. *< id
 #. *  description
 msgid "Pidgin Theme Editor"
-msgstr "Pidgin GTK+ ????"
+msgstr "Pidgin GTK+ ?????"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Pidgin Theme Editor."
-msgstr "Pidgin GTK+ ????"
+msgstr "Pidgin GTK+ ?????"
 
 #. *< type
 #. *< ui_requirement
@@ -14184,9 +14231,8 @@ msgstr "??????????? "timestamp formats."
 msgstr "??????????????????????????"
 
-#, fuzzy
 msgid "Audio"
-msgstr "??"
+msgstr "??"
 
 #, fuzzy
 msgid "Video"
@@ -14195,24 +14241,20 @@ msgstr ""
 msgid "Output"
 msgstr ""
 
-#, fuzzy
 msgid "_Plugin"
-msgstr "??"
+msgstr "??(_P)"
 
-#, fuzzy
 msgid "_Device"
-msgstr "??"
+msgstr "??(_D)"
 
 msgid "Input"
 msgstr ""
 
-#, fuzzy
 msgid "P_lugin"
-msgstr "??"
+msgstr "??(_L)"
 
-#, fuzzy
 msgid "D_evice"
-msgstr "??"
+msgstr "??(_E)"
 
 #. *< magic
 #. *< major version
@@ -14223,9 +14265,8 @@ msgstr "??"
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Voice/Video Settings"
-msgstr "????"
+msgstr "??/?? ??"
 
 #. *< name
 #. *< version
@@ -14299,8 +14340,9 @@ msgstr "Windows ????? %s(_S)"
 msgid "_Start %s on Windows startup"
 msgstr "Windows ????? %s(_S)"
 
+#, fuzzy
 msgid "Allow multiple instances"
-msgstr ""
+msgstr "?????????"
 
 msgid "_Dockable Buddy List"
 msgstr "????????(_D)"
@@ -14336,7 +14378,7 @@ msgid "Account: "
 msgstr "XMPP ???"
 
 msgid "Account: "
-msgstr "??:"
+msgstr "??:"
 
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>???? XMPP</font>"
@@ -14363,6 +14405,27 @@ msgstr "??????? XMPP ?? #~ msgid "Send instant messages over multiple protocols"
 #~ msgstr "????????????"
 
+#~ msgid "(Default)"
+#~ msgstr "(??)"
+
+#~ msgid "Install Theme"
+#~ msgstr "????"
+
+#~ msgid "Icon"
+#~ msgstr "??"
+
+#~ msgid "Use document font from _theme"
+#~ msgstr "??????????(_T)"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "??????"
+
+#~ msgid "Auto-away"
+#~ msgstr "????"
+
+#~ msgid "Change _status to:"
+#~ msgstr "??????(_S):"
+
 #~ msgid "_Start port:"
 #~ msgstr "????(_S):"
 
@@ -14388,7 +14451,7 @@ msgstr "??????? XMPP ?? #~ msgstr "???????(????)"
 
 #~ msgid "Your account is locked, please log in to the Yahoo! website."
-#~ msgstr "???????,???? Yahoo! ???"
+#~ msgstr "???????,???? Yahoo! ???"
 
 #~ msgid ""
 #~ "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support at pidgin."
@@ -14424,7 +14487,7 @@ msgstr "??????? XMPP ?? #~ "  -h, --help\t\t???????\n"
 #~ "  -m, --multiple\t???????\n"
 #~ "  -n, --nologin\t?????\n"
-#~ "  -l, --login[=??]\t????(??"??"????????,?????)\n"
+#~ "  -l, --login[=??]\t????(??"??"????????,?????)\n"
 #~ "  --display=DISPLAY\t???? X ??\n"
 #~ "  -v, --version\t?????????\n"
 
@@ -14454,7 +14517,7 @@ msgstr "??????? XMPP ?? #~ "  -h, --help\t\t???????\n"
 #~ "  -m, --multiple\t???????\n"
 #~ "  -n, --nologin\t?????\n"
-#~ "  -l, --login[=??]\t????(??"??"????????,?????)\n"
+#~ "  -l, --login[=??]\t????(??"??"????????,?????)\n"
 #~ "  --display=DISPLAY\t???? X ??\n"
 #~ "  -v, --version\t?????????\n"
 
@@ -15324,7 +15387,7 @@ msgstr "??????? XMPP ?? #~ msgstr ""
 #~ "%s\n"
 #~ "\n"
-#~ "%s ???????????,?????????????????"
+#~ "%s ???????????,?????????????????"
 
 #~ msgid "User has typed something and stopped"
 #~ msgstr "???????,????"


More information about the Commits mailing list