# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1258999838 0
# Node ID 20fdc77547e7b26a4e5e7787dc88dedf398f899f
# Parent  31ea94bea68625bf1d14402536e09846a352be0f
Updated Hebrew, Norwegian Nynorsk, and Simplified Chinese translations.

Closes #10557, #10742, #10801.

diff -r 31ea94bea686 -r 20fdc77547e7 po/ChangeLog
--- a/po/ChangeLog	Mon Nov 23 17:02:26 2009 +0000
+++ b/po/ChangeLog	Mon Nov 23 18:10:38 2009 +0000
@@ -1,6 +1,9 @@
 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
diff -r 31ea94bea686 -r 20fdc77547e7 po/he.po
--- a/po/he.po	Mon Nov 23 17:02:26 2009 +0000
+++ b/po/he.po	Mon Nov 23 18:10:38 2009 +0000
@@ -8,8 +8,8 @@
 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@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -618,9 +618,8 @@
 msgid "Enable Sounds"
 msgstr "אפשר צלילים"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "לא ניתן להתחבר"
+msgstr "אינך מחובר/ת."
 
 msgid "<AUTO-REPLY> "
 msgstr "<מענה-אוטומטי> "
@@ -631,9 +630,8 @@
 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 @@
 
 #, 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 ""
 "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 @@
 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 @@
 msgid "A non-recoverable Farsight2 error has occurred."
 msgstr "אירעה שגיאה שלא ניתן להתאושש ממנה ב-Farsight2."
 
-#, fuzzy
 msgid "Conference error"
-msgstr "שגיאה בועידה."
-
-#, fuzzy
+msgstr "שגיאה בועידה"
+
 msgid "Error with your microphone"
-msgstr "שגיאה עם המיקרופון שלך."
-
-#, fuzzy
+msgstr "שגיאה עם המיקרופון שלך"
+
 msgid "Error with your webcam"
-msgstr "שגיאה עם המצלמה שלך."
+msgstr "שגיאה עם המצלמה שלך"
 
 #, c-format
 msgid "Error creating session: %s"
@@ -3889,6 +3884,10 @@
 msgid "Log Out"
 msgstr "התנתק"
 
+#. primative,						no,							id,			name
+#. 0
+#. 1
+#. 2
 msgid "Chatty"
 msgstr "פטפטן"
 
@@ -4154,6 +4153,7 @@
 msgid "None (To pending)"
 msgstr "אין (אל מושהה)"
 
+#. 0
 msgid "None"
 msgstr "ללא"
 
@@ -4455,9 +4455,8 @@
 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 @@
 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 @@
 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 @@
 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 "מצב-רוח חדש"
+
+msgid "Change your Mood"
+msgstr "שנה את מצב הרוח שלך"
+
+msgid "How do you feel right now?"
+msgstr "איך את/ה מרגיש/ה עכשיו?"
 
 #, fuzzy
-msgid "Change your Mood"
-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 "How do you feel right now?"
-msgstr "אני לא כאן כרגע"
+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 @@
 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 ""
-
-#, fuzzy
+msgstr "אין חלון-הקדמה זמין כרגע"
+
 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 "ההודעה ארוכה מדי."
-
-msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
+msgstr "הקובץ שברצונך לשלוח גדול מדי!"
+
+msgid ""
+"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgstr "לא ניתן להתחבר לשרת ה-MXit HTTP. יש לוודא את הגדרות השרת שלך."
+
+msgid "Logging In..."
+msgstr "מתאמת..."
+
+msgid ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr "לא ניתן להתחבר לשרת ה-MXit. יש לוודא את הגדרות השרת שלך."
+
+msgid "Connecting..."
+msgstr "מתחבר..."
 
 #, fuzzy
-msgid "Logging In..."
-msgstr "מתחבר"
+msgid "The nick name you entered is invalid."
+msgstr "המפתח SecurID שהוזן אינו תקף."
 
 #, fuzzy
-msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr "לא ניתן להתחבר לשרת. יש להזין את כתובת השרת אליו ברצונך להתחבר."
-
-#, fuzzy
-msgid "Connecting..."
-msgstr "מתחבר"
+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 חדש"
-
-#, fuzzy
+msgstr "רשום חשבון MXit חדש"
+
 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 ""
-
-#, fuzzy
+msgstr "שם המשתמש כבר רשום. יש לבחור שם משתמש אחר."
+
 msgid "Internal error. Please try again later."
-msgstr "השרת לא זמין; יש לנסות מאוחר יותר"
+msgstr "שגיאה פנימית. יש לנסות מאוחר יותר."
 
 msgid "You did not enter the security code"
-msgstr ""
-
-#, fuzzy
+msgstr "לא הזנת את קוד האבטחה"
+
 msgid "Security Code"
-msgstr "אבטחה מופעלת"
+msgstr "קוד אבטחה"
 
 #. ask for input
-#, fuzzy
 msgid "Enter Security Code"
-msgstr "הזן קוד"
-
-#, fuzzy
+msgstr "הזן קוד אבטחה"
+
 msgid "Your Country"
-msgstr "מדינה"
-
-#, fuzzy
+msgstr "מדינתך"
+
 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 ""
-
-#, fuzzy
+msgstr "אימות חשבון MXit"
+
 msgid "Retrieving User Information..."
-msgstr "מידע על השרת"
+msgstr "שולף מידע משתמש..."
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "מתאמת..."
+
 msgid "Status Message"
-msgstr "הודעות שנשלחו"
-
-#, fuzzy
+msgstr "הודעת מצב"
+
 msgid "Hidden Number"
-msgstr "שם אמצעי"
-
-#, fuzzy
+msgstr "מספר סמוי"
+
 msgid "Your Mobile Number..."
-msgstr "קבע/י מספר טלפון נייד..."
+msgstr "מספר הנייד שלך..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "שרת"
-
-#, fuzzy
+msgstr "שרת WAP"
+
 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"
-
-#, fuzzy
+msgstr "שגיאה בשליחת הודעה"
+
 msgid "Unable to process your request at this time"
-msgstr "לא ניתן לתרגם את שם השרת לכתובת"
+msgstr "לא ניתן לטפל בבקשתך ברגע זה"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
-
-#, fuzzy
+msgstr "עבר הזמן שציפינו לחכות עד שנקבל תשובה משרת ה-XMit."
+
 msgid "Successfully Logged In..."
-msgstr "צורף בהצלחה אל Qun"
-
-#, fuzzy
+msgstr "החיבור הושלם בהצלחה..."
+
+#, 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 ""
-
-#, fuzzy
-msgid "Contact Error"
-msgstr "שגיעת התחברות"
-
-#, fuzzy
-msgid "Message Sending Error"
-msgstr "הודעת שגיאת XMPP"
+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 "שגיאת חיבור"
+
+msgid "Message Sending Error"
+msgstr "שגיאה בשליחת הודעה"
+
 msgid "Status Error"
-msgstr "שגיאה בזרם"
-
-#, fuzzy
+msgstr "שגיאת מצב"
+
 msgid "Mood Error"
-msgstr "שגיאת תמונה"
-
-#, fuzzy
+msgstr "שגיאת מצב-רוח"
+
 msgid "Invitation Error"
-msgstr "שגיאת הסרת-רישום"
-
-#, fuzzy
+msgstr "שגיאת הזמנה"
+
 msgid "Contact Removal Error"
-msgstr "שגיעת התחברות"
-
-#, fuzzy
+msgstr "שגיאת הסרת איש-קשר"
+
 msgid "Subscription Error"
-msgstr "מנוי"
-
-#, fuzzy
+msgstr "שגיאת מנוי"
+
 msgid "Contact Update Error"
-msgstr "שגיעת התחברות"
-
-#, fuzzy
+msgstr "שגיאה בעדכון איש-קשר"
+
 msgid "File Transfer Error"
-msgstr "משלוח קבצים"
-
-#, fuzzy
+msgstr "שגיאת משלוח קובצים"
+
 msgid "Cannot create MultiMx room"
-msgstr "לא יכול ליצור תגובת-פעולה"
-
-#, fuzzy
+msgstr "לא יכול ליצור חדר MultiMx"
+
 msgid "MultiMx Invitation Error"
-msgstr "שגיאת הסרת-רישום"
-
-#, fuzzy
+msgstr "שגיאת הזמנת MultiMx"
+
 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 ""
-
-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
+msgstr "אירעה שגיאה בחיבור אל MXit. (שלב קריאה 0x06)"
+
 msgid "Pending"
-msgstr "שליחה"
-
-#, fuzzy
+msgstr "ממתין"
+
 msgid "Invited"
-msgstr "הזמן"
-
-#, fuzzy
+msgstr "הוזמן"
+
 msgid "Rejected"
-msgstr "דחה"
-
-#, fuzzy
+msgstr "נדחה"
+
 msgid "Deleted"
-msgstr "מחק"
+msgstr "מחוק"
 
 msgid "MXit Advertising"
-msgstr ""
-
-#, fuzzy
+msgstr "פירסום MXit"
+
 msgid "More Information"
-msgstr "פרטי עבודה"
+msgstr "מידע נוסף"
 
 #, c-format
 msgid "No such user: %s"
@@ -6699,46 +6700,42 @@
 msgstr "לא בזמן שהות ב-AOL"
 
 msgid "Cannot receive IM due to parental controls"
-msgstr ""
+msgstr "לא ניתן לקבל הודעות עקב הגבלות הורים"
 
 msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
+msgstr "לא ניתן לשלוח SMS ללא קבלת התנאים"
+
 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 ""
-
-#, fuzzy
+msgstr "החשבון רובוטי עבר את מכסת ההודעות החודשית"
+
 msgid "Unable to receive offline messages"
-msgstr "לא ניתן לשלוח הודעה"
-
-#, fuzzy
+msgstr "לא ניתן לקבל הודעות לא-מקוונות"
+
 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 "שירות ההודעות של 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 "גירסת תוכנת הלקוח בה את/ה משתמש/ת ישנה מדי. אנא שדרג/י ב-%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[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:"
-
-#, fuzzy, c-format
+msgstr "לא ניתן לשלוח הודעה אל %s: %s (%s)"
+
+#, 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 @@
 "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 @@
 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 @@
 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 @@
 "\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "ספריה"
 
 msgid "use DIR for config files"
 msgstr "השתמש בספרייה DIR לקבצי הגדרות"
@@ -12376,16 +12372,16 @@
 msgstr "אל תתחבר אוטומטית"
 
 msgid "NAME"
-msgstr ""
-
-#, fuzzy
+msgstr "שם"
+
 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 @@
 msgstr "לא מוכר. אנא דווח על כך!"
 
 msgid "(Custom)"
-msgstr ""
-
-#, fuzzy
-msgid "(Default)"
-msgstr "ברירת המחדל))"
+msgstr "(מותאם אישית)"
+
+msgid "Penguin Pimps"
+msgstr "פרפראות פנגווינים"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
-
-#, fuzzy
+msgstr "ערכת הצלילים המובנית של פידג'ין"
+
 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,18 +12664,29 @@
 msgid "Theme failed to copy."
 msgstr "כישלון בעת העתקת ערכת מוטיב."
 
-msgid "Install Theme"
-msgstr "התקן עיצוב"
-
-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."
-msgstr ""
-"בחר ערכת החיוכים מרשימה למטה. ערכות חדשות ניתן להתקין ע\"י גרירתם על רשימת "
-"הערכות."
-
-msgid "Icon"
-msgstr "סמל"
+msgid "Theme Selections"
+msgstr "בחירת ערכות מוטיבים"
+
+#. Instructions
+msgid ""
+"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 "Buddy List Theme:"
+msgstr "מוטיבי תצוגה עבור רשימת החברים:"
+
+msgid "Status Icon Theme:"
+msgstr "סמלי מצב ערכת:"
+
+msgid "Sound Theme:"
+msgstr "ערכת צלילים:"
+
+msgid "Smiley Theme:"
+msgstr "ערכת חיוכים:"
 
 msgid "Keyboard Shortcuts"
 msgstr "קיצורי-מקלדת"
@@ -12689,10 +12694,6 @@
 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 @@
 msgid "Font"
 msgstr "גופן"
 
-msgid "Use document font from _theme"
-msgstr "התשמש בגופן המסמך מהמוטיב"
-
 msgid "Use font from _theme"
 msgstr "השתמש בגופן מהמוטיב"
 
@@ -12804,15 +12802,13 @@
 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 @@
 msgid "_Enable automatic router port forwarding"
 msgstr "_אפשר ניתוב שקעים אוטומטית בנתב"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "ה_גדר ידנית את אוסף היציאות להקשיב להם"
-
-#, fuzzy
+msgstr "ה_גדר ידנית את אוסף היציאות להקשיב להם:"
+
 msgid "_Start:"
-msgstr "_מצב:"
-
-#, fuzzy
+msgstr "_התחל:"
+
 msgid "_End:"
-msgstr "ה_רחב"
+msgstr "_סיים:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
 msgstr "שרת העברה (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "שרת STUN:"
-
-#, fuzzy
+msgstr "שרת TURN:"
+
 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 @@
 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 @@
 "_ידנית:\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 @@
 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 @@
 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 @@
 msgid "Pidgin smileys"
 msgstr "חייכני פידג'ין"
 
-msgid "Penguin Pimps"
-msgstr "פרפראות פנגווינים"
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "בבחירת זה מבוטלים סמלי-הרגשות הגרפיים."
 
@@ -14047,6 +14020,9 @@
 msgid "Conversation Entry"
 msgstr "הזנת שיחות"
 
+msgid "Conversation History"
+msgstr "היסטוריית שיחות"
+
 msgid "Request Dialog"
 msgstr "חלון בקשה"
 
@@ -14503,7 +14479,6 @@
 msgid "_Start %s on Windows startup"
 msgstr "הפעל את %s בעת הפעלת חלונות"
 
-#, fuzzy
 msgid "Allow multiple instances"
 msgstr "אפשר להפעיל יותר מעותק יחיד"
 
@@ -14568,6 +14543,28 @@
 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 "תעודת-השורש שלכאורה הנפיקה את התעודה אינה מוכרת לפידג'ין."
 
diff -r 31ea94bea686 -r 20fdc77547e7 po/nn.po
--- a/po/nn.po	Mon Nov 23 17:02:26 2009 +0000
+++ b/po/nn.po	Mon Nov 23 18:10:38 2009 +0000
@@ -2,14 +2,15 @@
 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@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 @@
 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 @@
 "Last Seen: %s ago"
 msgstr ""
 "\n"
-"Sist sett: %s ago"
+"Sist sett: %s sidan"
 
 msgid "Default"
 msgstr "Standard"
@@ -260,8 +261,9 @@
 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 @@
 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 @@
 
 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 @@
 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 @@
 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[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 @@
 "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 @@
 
 #, 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 @@
 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 @@
 
 #, 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 msgstr "Endra tilstand til"
 
 msgid "Conversations"
-msgstr "Samtaler"
+msgstr "Samtalar"
 
 msgid "Logging"
 msgstr "Loggføring"
@@ -1227,7 +1240,7 @@
 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 @@
 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 @@
 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 ""
 "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 @@
 "\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 ""
-
-#, fuzzy
+msgstr "Vent mens TinyURL hentar ein kortare URL …"
+
 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 @@
 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 @@
 
 #. 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 @@
 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 @@
 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 ""
-
-#, fuzzy
+"Ein kan ikkje stola på sertifikatet sidan det ikkje finst tiltrudde "
+"sertifikat som kan stadfesta det."
+
 msgid "The certificate is not valid yet."
-msgstr "Den presenterte sertifikatkjeda til %s er ikkje gyldig."
-
-#, fuzzy
+msgstr "Sertifikatet er ikkje gyldig enno."
+
 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 @@
 "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."
-
-#, fuzzy
+msgstr "Den presenterte sertifikatkjeda er ugyldig."
+
 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 @@
 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"
-
-#, fuzzy, c-format
+msgstr "Klarte ikkje å stadfesta sertifikatet"
+
+#, 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 @@
 "\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 @@
 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 @@
 "%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 @@
 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 @@
 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 @@
 "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 ""
-
-#, fuzzy
+"Ingen kodekar igjen. Kodek-innstillingane dine i fs-codecs.conf er for "
+"strenge."
+
 msgid "A non-recoverable Farsight2 error has occurred."
-msgstr "Følgande feil har oppstått:"
-
-#, fuzzy
+msgstr "Det oppstod ein uoppretteleg Farsight2-feil."
+
 msgid "Conference error"
-msgstr "Konferansen er lukka"
+msgstr "Konferansefeil"
 
 msgid "Error with your microphone"
-msgstr ""
+msgstr "Mikrofonfeil"
 
 msgid "Error with your webcam"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Nettkamerafeil"
+
+#, 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 @@
 
 #, 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 @@
 "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 ""
 "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 @@
 "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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 msgstr "Viser varslingsmelding i pratevindauget"
 
 msgid "Raise psychic conversations"
-msgstr "Hev synske samtaler"
+msgstr "Hev synske samtalar"
 
 #. *< type
 #. *< ui_requirement
@@ -2868,7 +2879,7 @@
 #. *  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 @@
 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 @@
 
 #, 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 @@
 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 @@
 msgstr "Vis \"Dagens melding\""
 
 msgid "_Channel:"
-msgstr "_Kanal:"
+msgstr "K_anal:"
 
 msgid "_Password:"
 msgstr "_Passord:"
@@ -3493,7 +3505,7 @@
 
 #, 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 @@
 
 #, 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 @@
 "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 @@
 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 nærværsvarsling"
@@ -3968,6 +3981,10 @@
 msgid "Log Out"
 msgstr "Logg av"
 
+#. primative,						no,							id,			name
+#. 0
+#. 1
+#. 2
 msgid "Chatty"
 msgstr "Snakkesaleg"
 
@@ -4031,7 +4048,7 @@
 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 @@
 msgstr "_Tenar:"
 
 msgid "_Handle:"
-msgstr "_Handtak:"
+msgstr "R_eferanse:"
 
 #, c-format
 msgid "%s is not a valid room name"
@@ -4058,10 +4075,10 @@
 
 #, 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 @@
 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 @@
 msgstr "Til"
 
 msgid "None (To pending)"
-msgstr "Ingen (til er ventande)"
-
+msgstr "Ingen (ventande)"
+
+#. 0
 msgid "None"
 msgstr "Ingen"
 
@@ -4348,10 +4367,10 @@
 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 @@
 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 @@
 "[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 @@
 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 @@
 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 @@
 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 @@
 
 #, 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 "%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 @@
 
 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 @@
 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"
+
+msgid "Change your Mood"
+msgstr "Endra sinnsstemninga di"
+
+msgid "How do you feel right now?"
+msgstr "Korleis kjenner du deg nett no?"
 
 #, fuzzy
-msgid "Change your Mood"
-msgstr "Endra passord"
+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 "How do you feel right now?"
-msgstr "Eg er ikkje her nett no"
+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 @@
 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"
-
-#, fuzzy
+msgstr "Mobilnummer"
+
 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 ""
-
-#, fuzzy
+msgstr "Ikkje noko oppstartsvindage er tilgjengeleg no"
+
 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."
-
-msgid ""
-"Unable to connect to the mxit HTTP server. Please check your server server "
-"settings."
-msgstr ""
+msgstr "Meldinga du prøver å senda er for stor."
+
+msgid ""
+"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."
+
+msgid "Logging In..."
+msgstr "Loggar på…"
+
+msgid ""
+"Unable to connect to the MXit server. Please check your server settings."
+msgstr ""
+"Klarer ikkje å kopla til MXit-tenaren. Kontroller tenarinnstillingane dine."
+
+msgid "Connecting..."
+msgstr "Koplar til…"
 
 #, fuzzy
-msgid "Logging In..."
-msgstr "Loggar på"
+msgid "The nick name you entered is invalid."
+msgstr "Den innskrivne SecurID-nøkkelen er ugyldig"
 
 #, fuzzy
-msgid ""
-"Unable to connect to the mxit server. Please check your server server "
-"settings."
-msgstr ""
-"Klarer ikkje å kopla til tenaren. Skriv inn adressa til tenaren du vil kopla "
-"deg til."
-
-#, fuzzy
-msgid "Connecting..."
-msgstr "Koplar til"
+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"
-
-#, fuzzy
+msgstr "Registrer ein ny MXit-konto"
+
 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 ""
-
-#, fuzzy
+msgstr "Brukarnamnet er allereie registrert. Vel eit anna brukarnamn."
+
 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 ""
-
-#, fuzzy
+msgstr "Du skreiv ikkje inn tryggleikskoden"
+
 msgid "Security Code"
-msgstr "Tryggleik er slått på"
+msgstr "Tryggleikskode"
 
 #. ask for input
-#, fuzzy
 msgid "Enter Security Code"
-msgstr "Skriv inn koden"
-
-#, fuzzy
+msgstr "Skriv inn tryggleikskoden"
+
 msgid "Your Country"
-msgstr "Land"
-
-#, fuzzy
+msgstr "Landet ditt"
+
 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 ""
-
-#, fuzzy
+msgstr "MXit-kontovalidering"
+
 msgid "Retrieving User Information..."
-msgstr "Tenarinformasjon"
+msgstr "Hentar brukaropplysningar…"
 
 #, fuzzy
+msgid "Loading menu..."
+msgstr "Loggar på…"
+
 msgid "Status Message"
-msgstr "Sende meldingar"
-
-#, fuzzy
+msgstr "Statusmelding"
+
 msgid "Hidden Number"
-msgstr "Mellomnamn"
-
-#, fuzzy
+msgstr "Skjult nummer"
+
 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"
-
-#, fuzzy
+msgstr "WAP-tenar"
+
 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"
-
-#, fuzzy
+msgstr "Sendingsfeil melding"
+
 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 ""
-
-#, fuzzy
+msgstr "Tidsavbrot medan ein venta på svar frå MXit-tenaren."
+
 msgid "Successfully Logged In..."
-msgstr "Blei med i Qun"
-
-#, fuzzy
+msgstr "Du er pålogga…"
+
+#, 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 ""
-
-#, fuzzy
-msgid "Contact Error"
-msgstr "Sambandsfeil"
-
-#, fuzzy
-msgid "Message Sending Error"
-msgstr "Jabber meldingsfeil"
+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"
+
+# var: Jabber meldingsfeil
+msgid "Message Sending Error"
+msgstr "Sendefeil melding"
+
 msgid "Status Error"
-msgstr "Feil i datastraumen"
-
-#, fuzzy
+msgstr "Statusfeil"
+
 msgid "Mood Error"
-msgstr "Ikon-feil"
-
-#, fuzzy
+msgstr "Sinnsstemnings-feil"
+
 msgid "Invitation Error"
-msgstr "Avregistreringsfeil"
-
-#, fuzzy
+msgstr "Invitasjonsfeil"
+
 msgid "Contact Removal Error"
-msgstr "Sambandsfeil"
-
-#, fuzzy
+msgstr "Kontaktfjerningsfeil"
+
 msgid "Subscription Error"
-msgstr "Abonnement"
-
-#, fuzzy
+msgstr "Abonnementsfeil"
+
 msgid "Contact Update Error"
-msgstr "Sambandsfeil"
-
-#, fuzzy
+msgstr "Kontaktoppdateringsfeil"
+
 msgid "File Transfer Error"
-msgstr "Filoverføring"
-
-#, fuzzy
+msgstr "Filoverføringsfeil"
+
+# var: Klarer ikkje å oppretta vennevarsel
 msgid "Cannot create MultiMx room"
-msgstr "Klarer ikkje å oppretta vennevarsel"
-
-#, fuzzy
+msgstr "Klarer ikkje å laga MultiMx-rom"
+
 msgid "MultiMx Invitation Error"
-msgstr "Avregistreringsfeil"
-
-#, fuzzy
+msgstr "MultiMx-invitasjonsfeil"
+
 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 ""
-
-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
+msgstr "Det oppstod ein feil i sambandet mot MXit. (lesefase 0x06)"
+
 msgid "Pending"
-msgstr "Sender"
-
-#, fuzzy
+msgstr "Ventar"
+
 msgid "Invited"
-msgstr "Inviter"
-
-#, fuzzy
+msgstr "Invitert"
+
 msgid "Rejected"
-msgstr "Avvis"
-
-#, fuzzy
+msgstr "Avvist"
+
 msgid "Deleted"
-msgstr "Slett"
+msgstr "Sletta"
 
 msgid "MXit Advertising"
-msgstr ""
-
-#, fuzzy
+msgstr "MXit-annonsering"
+
 msgid "More Information"
-msgstr "Arbeidsinformasjon"
+msgstr "Fleire opplsyningar"
 
 #, c-format
 msgid "No such user: %s"
@@ -6303,15 +6336,15 @@
 
 #. 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 @@
 msgid "Raspberrying %s..."
 msgstr "Rekkjer %s tunga…"
 
-#
 msgid "Required parameters not passed in"
 msgstr "Påkravde parameter ikkje oppgjevne"
 
@@ -6459,7 +6491,7 @@
 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"
 
 #. 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 @@
 
 #. 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 @@
 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 ""
-
-#, fuzzy
+msgstr "Kan ikkje senda teksmeldingar utan godkjenning av vilkåra"
+
+# 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 ""
-
-#, fuzzy
+msgstr "Bot-kontoen har nådd månadsgrensa for lynmeldingar"
+
 msgid "Unable to receive offline messages"
-msgstr "Klarte ikkje å senda meldinga."
-
-#, fuzzy
+msgstr "Klarer ikkje å ta i mot fråkopla meldingar"
+
 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 ""
 "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 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 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[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:"
-
-#, fuzzy, c-format
+msgstr "Klarer ikkje å senda meldinga til %s: %s (%s)"
+
+#, 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 @@
 "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 ""
 "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 @@
 "Vil du fortsetja?"
 
 msgid "C_onnect"
-msgstr "_Koplar til"
-
-#, fuzzy
+msgstr "_Kopla til"
+
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 
 #. 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 @@
 "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 @@
 #. *< version
 #. *  summary
 msgid "SILC Protocol Plugin"
-msgstr "SILC protokolltillegg"
+msgstr "SILC-protokolltillegg"
 
 #. *  description
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
@@ -9815,7 +9840,7 @@
 msgstr "Bruk mellomlager"
 
 msgid "Proxy"
-msgstr "Mellomlager"
+msgstr "Mellomtenar"
 
 msgid "Auth User"
 msgstr "Autentiser brukar"
@@ -9867,7 +9892,7 @@
 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 @@
 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 @@
 
 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 @@
 #. *  summary
 #. *  description
 msgid "Zephyr Protocol Plugin"
-msgstr "Zephyr protokolltillegg"
+msgstr "Zephyr-protokolltillegg"
 
 msgid "Use tzc"
 msgstr "Bruk tzc"
@@ -10495,7 +10521,7 @@
 
 #, 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 @@
 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 @@
 msgstr "Proto_koll:"
 
 msgid "_Username:"
-msgstr "Brukar_namn:"
+msgstr "_Brukarnamn:"
 
 msgid "Remember pass_word"
 msgstr "_Hugs passordet"
@@ -10670,7 +10698,7 @@
 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 @@
 msgstr "_Vert:"
 
 msgid "_Port:"
-msgstr "_Port:"
+msgstr "Po_rt:"
 
 msgid "Pa_ssword:"
 msgstr "P_assord:"
@@ -10730,10 +10758,10 @@
 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"
 
 # 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 @@
 
 #. 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 @@
 
 #. 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"
-
-#, fuzzy
+msgstr "Når fråkopla"
+
 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 @@
 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 @@
 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 @@
 msgstr "Legg til prate_rom…"
 
 msgid "_Delete Group"
-msgstr "_Slett gruppe"
+msgstr "_Slett gruppa"
 
 msgid "_Rename"
 msgstr "_Gje nytt namn"
@@ -11074,8 +11098,9 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 msgid "_Disable"
 msgstr "_Slå av"
 
+# skal det vera hurtigtast her?
 msgid "/Tools"
 msgstr "/V_erktøy"
 
@@ -11384,7 +11409,7 @@
 msgstr "<h1>Samtale med %s</h1>\n"
 
 msgid "Save Conversation"
-msgstr "Lagra samtale"
+msgstr "Lagra samtalen"
 
 msgid "Find"
 msgstr "Finn"
@@ -11435,9 +11460,8 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 msgstr "Estisk"
 
 msgid "Basque"
-msgstr ""
+msgstr "Baskisk"
 
 msgid "Persian"
 msgstr "Persisk"
@@ -11900,7 +11926,7 @@
 msgstr "Mongolsk"
 
 msgid "Bokmål Norwegian"
-msgstr "Norsk bokmål"
+msgstr "Norsk (bokmål)"
 
 msgid "Nepali"
 msgstr "Nepali"
@@ -12032,6 +12058,12 @@
 "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@pidgin.im\">support@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 primærsprå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 @@
 
 #. "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 @@
 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 @@
 "til denne snarvegen:\n"
 "%s"
 
+# var: Smil!
 msgid "Smile!"
-msgstr "Smil!"
+msgstr "Smilefjes"
 
 msgid "_Manage custom smileys"
 msgstr "_Smilefjesbehandling"
@@ -12531,8 +12565,9 @@
 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 @@
 "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 ""
-
-#, fuzzy
+msgstr "syn denne hjelpa og avslutt"
+
 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 @@
 msgstr "%s ønskjer å starta ei biletøkt med deg."
 
 msgid "Incoming Call"
-msgstr ""
+msgstr "Innkomande samtale"
 
 msgid "_Pause"
 msgstr "_Pause"
@@ -12723,8 +12763,10 @@
 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 @@
 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 @@
 msgstr "_Konto:"
 
 msgid "_Buddy name:"
-msgstr "_Vennenamn:"
+msgstr "Venne_namn:"
 
 msgid "Si_gns on"
 msgstr "Lo_ggar på"
@@ -12794,55 +12836,55 @@
 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 @@
 msgstr "Ukjend… . Rapporter feilen."
 
 msgid "(Custom)"
-msgstr ""
-
-#, fuzzy
-msgid "(Default)"
-msgstr "(standard)"
+msgstr "(tilpassa)"
+
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
-
-#, fuzzy
+msgstr "Pidgin sitt standard lydtema"
+
 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,29 +12949,36 @@
 msgid "Theme failed to copy."
 msgstr "Klarte ikkje å kopiera drakta."
 
-msgid "Install Theme"
-msgstr "Installer drakta"
-
-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."
-msgstr ""
-"Vel smilefjesdrakt frå lista nedanfor. Du kan installera nye drakter ved å "
-"dra og sleppa dei ned i draktlista."
-
-msgid "Icon"
-msgstr "Ikon"
+msgid "Theme Selections"
+msgstr "Draktval"
+
+#. Instructions
+msgid ""
+"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 drakta du ønskjer å bruka frå lista nedanfor.\n"
+"Du kan installera nye drakter ved å dra og sleppa dei ned i draktlista."
+
+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"
-
-#. Buddy List Themes
-msgid "Buddy List Theme"
-msgstr "Vennelistedrakt"
+msgstr "Lukk samtalar med _escape-tasten"
 
 #. System Tray
 msgid "System Tray Icon"
@@ -12947,7 +12994,7 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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,78 +13110,27 @@
 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"
-
-#, fuzzy
+msgstr "Før opp _portrekkje det skal lyttast til:"
+
 msgid "_Start:"
-msgstr "_Status:"
-
-#, fuzzy
+msgstr "_Start:"
+
 msgid "_End:"
-msgstr "_Utvid"
+msgstr "_Slutt:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr "s"
-
-#, fuzzy
+msgstr "Vidaresendingstenar (TURN)"
+
 msgid "_TURN server:"
-msgstr "_Tenar:"
-
-#, fuzzy
+msgstr "_TURN-tenar:"
+
 msgid "Use_rname:"
-msgstr "Brukarnamn:"
-
-#, fuzzy
+msgstr "_Brukarnamn:"
+
 msgid "Pass_word:"
-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:"
+msgstr "_Passord:"
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13180,6 +13171,15 @@
 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 @@
 "_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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 msgstr "Tenesteoppdaging"
 
 msgid "_Browse"
-msgstr "_Bla:"
+msgstr "_Bla"
 
 msgid "Server does not exist"
 msgstr "Tenaren finst ikkje"
@@ -13878,7 +13899,7 @@
 "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 @@
 "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 @@
 "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 ""
 "Gjev støtte til muserørsler i samtalevindauge. Dra midtknappen på musa for å "
 "utføra enkelte handlingar:\n"
-" • dra ned og til høgre: lèt deg lukka ei samtale.\n"
+" • dra ned og til høgre: lèt deg lukka ein samtale.\n"
 " • dra opp og til venstre: byter til førre samtale.\n"
 " • dra opp og til høgre: byter til neste samtale."
 
@@ -14098,7 +14119,7 @@
 #. *  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 @@
 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 @@
 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 @@
 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 @@
 
 #. 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 @@
 
 #. 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 @@
 
 #. 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 @@
 msgid "Conversation Entry"
 msgstr "Samtale"
 
+msgid "Conversation History"
+msgstr "Samtalehistorikk"
+
 # Vindauge eller meldingsvindauge?
 msgid "Request Dialog"
 msgstr "Førespurnadsvindauge"
@@ -14456,7 +14481,7 @@
 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 @@
 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 @@
 msgstr "Vis datoar i…"
 
 msgid "Co_nversations:"
-msgstr "_Samtaler:"
+msgstr "_Samtalar:"
 
 # var: For forseinka meldingar
 msgid "For delayed messages"
@@ -14657,37 +14683,31 @@
 "timestamp formats."
 msgstr ""
 "Dette programtillegget tillèt at brukaren tilpassar tidsstempelformata for "
-"samtaler og loggmeldingar."
-
-#, fuzzy
+"samtalar og loggmeldingar."
+
 msgid "Audio"
-msgstr "Auto"
-
-#, fuzzy
+msgstr "Lyd"
+
 msgid "Video"
 msgstr "Video"
 
 msgid "Output"
-msgstr ""
-
-#, fuzzy
+msgstr "Utdata"
+
 msgid "_Plugin"
-msgstr "Tilleggsprogram"
-
-#, fuzzy
+msgstr "_Programtillegg"
+
 msgid "_Device"
-msgstr "Eining"
+msgstr "_Eining"
 
 msgid "Input"
-msgstr ""
-
-#, fuzzy
+msgstr "Inndata"
+
 msgid "P_lugin"
-msgstr "Tilleggsprogram"
-
-#, fuzzy
+msgstr "_Programtillegg"
+
 msgid "D_evice"
-msgstr "Eining"
+msgstr "_Eining"
 
 #. *< magic
 #. *< major version
@@ -14698,18 +14718,17 @@
 #. *< 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 @@
 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 @@
 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,10 +14858,26 @@
 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 @@
 #~ 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 @@
 #~ 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"
 
diff -r 31ea94bea686 -r 20fdc77547e7 po/zh_CN.po
--- a/po/zh_CN.po	Mon Nov 23 17:02:26 2009 +0000
+++ b/po/zh_CN.po	Mon Nov 23 18:10:38 2009 +0000
@@ -2,17 +2,17 @@
 # Copyright (C) 2009 pidgin team.
 # This file is distributed under the same license as the pidgin package.
 # Funda Wang <fundawang@linux.net.cn>, 2003, 2004.
+# Aron Xu <happyaron.xu@gmail.com>, 2009.
+# fujianwzh <fujianwzh@gmail.com>, 2009.
 # liyuekui <liyuekui@gmail.com>, 2009.
-# Aron Xu <aronmalache@163.com>, 2009.
-# fujianwzh <fujianwzh@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@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@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,11 +42,11 @@
 "%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 @@
 "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 @@
 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 @@
 msgstr "(您可能忘记运行“make install”了。)"
 
 msgid "Modify Account"
-msgstr "修改账户"
+msgstr "修改帐号"
 
 msgid "New Account"
-msgstr "新建账户"
+msgstr "新建帐号"
 
 msgid "Protocol:"
 msgstr "协议："
@@ -99,7 +99,7 @@
 
 #. Register checkbox
 msgid "Create this account on the server"
-msgstr "在服务器上创建新帐户"
+msgstr "在服务器上创建新帐号"
 
 #. Cancel button
 #. Cancel
@@ -116,17 +116,17 @@
 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 @@
 
 #, c-format
 msgid "Account: %s (%s)"
-msgstr "账户：%s (%s)"
+msgstr "帐号：%s (%s)"
 
 #, c-format
 msgid ""
@@ -186,10 +186,10 @@
 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 @@
 msgstr "添加到组"
 
 msgid "Account"
-msgstr "账户"
+msgstr "帐号"
 
 msgid "Add Buddy"
 msgstr "添加好友"
@@ -355,7 +355,7 @@
 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 @@
 msgstr "按状态"
 
 msgid "Alphabetically"
-msgstr "按字母序"
+msgstr "按字母顺序"
 
 msgid "By Log Size"
 msgstr "按聊天记录大小"
@@ -535,10 +535,10 @@
 msgstr ""
 "%s\n"
 "\n"
-"Finch 不会尝试重新连接账户，除非您纠正了错误然后重新启用账户。"
+"Finch 不会尝试重新连接帐号，除非您纠正了错误然后重新启用帐号。"
 
 msgid "Re-enable Account"
-msgstr "重新启用账户"
+msgstr "重新启用帐号"
 
 msgid "No such command."
 msgstr "无此命令。"
@@ -616,9 +616,8 @@
 msgid "Enable Sounds"
 msgstr "启用声音"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "无法连接"
+msgstr "已连接。"
 
 msgid "<AUTO-REPLY> "
 msgstr "<自动回复> "
@@ -628,12 +627,11 @@
 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 @@
 msgstr "buddylist：显示好友列表。"
 
 msgid "accounts: Show the accounts window."
-msgstr "accounts：显示账户窗口。"
+msgstr "accounts：显示帐号窗口。"
 
 msgid "debugwin: Show the debug window."
 msgstr "debug窗口：显示调试窗口。"
@@ -999,7 +997,7 @@
 
 #. Account:
 msgid "Account:"
-msgstr "账户："
+msgstr "帐号："
 
 msgid "Buddy name:"
 msgstr "好友名称："
@@ -1061,16 +1059,16 @@
 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 @@
 msgstr "编辑状态"
 
 msgid "Use different status for following accounts"
-msgstr "为下列账户使用不同的状态"
+msgstr "为下列帐号使用不同的状态"
 
 #. Save & Use
 msgid "Save & Use"
@@ -1496,7 +1494,6 @@
 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 @@
 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 @@
 msgstr "Lastlog 插件。"
 
 msgid "accounts"
-msgstr "账户"
+msgstr "帐号"
 
 msgid "Password is required to sign on."
 msgstr "需要密码才能登录。"
@@ -1625,9 +1621,8 @@
 "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 @@
 msgid "The certificate chain presented is invalid."
 msgstr "指定的用户名无效。"
 
-#, fuzzy
 msgid "The certificate has been revoked."
-msgstr "呼叫被终止。"
-
-#, fuzzy
+msgstr "此证书已被吊销。"
+
 msgid "An unknown certificate error occurred."
-msgstr "发生了未知登录错误: %s。"
+msgstr "发生了未知证书错误。"
 
 msgid "(DOES NOT MATCH)"
 msgstr "(不匹配)"
@@ -1684,7 +1677,7 @@
 #. 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 @@
 msgid "SSL Certificate Error"
 msgstr "SSL 证书错误"
 
-#, fuzzy
 msgid "Unable to validate certificate"
-msgstr "无法通过身份验证: %s"
+msgstr ""
 
 #, c-format
 msgid ""
@@ -1721,6 +1713,12 @@
 "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 @@
 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 @@
 
 #, 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 @@
 
 #, c-format
 msgid "Error resolving %s: %d"
-msgstr "解析 %s 时出错: %d"
+msgstr "解析 %s 时出错：%d"
 
 #, c-format
 msgid ""
@@ -1848,11 +1846,11 @@
 
 #, 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 @@
 
 #, 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 @@
 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 @@
 
 #, 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 @@
 "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。"
-
-#, fuzzy
+msgstr ""
+
 msgid "Conference error"
-msgstr "会议已关闭"
+msgstr "会议出错"
 
 msgid "Error with your microphone"
 msgstr ""
@@ -2155,9 +2151,9 @@
 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 @@
 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 @@
 msgstr "电子邮件"
 
 msgid "AIM Account"
-msgstr "AIM 账户"
+msgstr "AIM 帐号"
 
 msgid "XMPP Account"
-msgstr "XMPP 账户"
+msgstr "XMPP 帐号"
 
 #. *< type
 #. *< ui_requirement
@@ -2906,16 +2902,14 @@
 
 #, 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 @@
 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 @@
 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 @@
 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 @@
 
 #, 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 @@
 #. 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 @@
 
 #, c-format
 msgid "Ban on %s"
-msgstr "屏蔽: %s"
+msgstr "屏蔽： %s"
 
 msgid "End of ban list"
 msgstr "屏蔽列表结尾"
@@ -3374,7 +3366,7 @@
 
 #, c-format
 msgid "Users on %s: %s"
-msgstr "%s 上的用户数: %s"
+msgstr "%s 上的用户数：%s"
 
 msgid "Time Response"
 msgstr "时间响应"
@@ -3407,7 +3399,7 @@
 
 #, 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 ""
 "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 @@
 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 ""
 "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 ""
 "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 @@
 "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 ""
 "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 ""
 "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 ""
 "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 @@
 msgstr "未知错误"
 
 msgid "Ad-Hoc Command Failed"
-msgstr "命令已禁用"
+msgstr "Ad-Hoc 命令失败"
 
 msgid "execute"
 msgstr "执行"
@@ -3684,7 +3677,7 @@
 
 #, c-format
 msgid "SASL error: %s"
-msgstr "SASL 错误"
+msgstr "SASL 错误：%s"
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
@@ -3700,7 +3693,7 @@
 
 #, 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 @@
 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 @@
 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 ""
 "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 @@
 
 #, 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 @@
 msgid "None (To pending)"
 msgstr "无(待推迟)"
 
+#. 0
 msgid "None"
 msgstr "无"
 
@@ -4111,37 +4109,37 @@
 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 @@
 msgstr "需要付费"
 
 msgid "Recipient Unavailable"
-msgstr "收件人不可用"
+msgstr "收件人不存在"
 
 msgid "Registration Required"
 msgstr "需要注册"
@@ -4346,17 +4344,17 @@
 
 #, 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 @@
 #. 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 ""
 "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 @@
 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 @@
 
 #, 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 @@
 msgid "No reason"
 msgstr "没有给出理由。"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "您被已 %s 踢出 (%s)"
-
-#, fuzzy, c-format
+msgstr "您已被踢出 (%s)"
+
+#, 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 @@
 
 #, 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 @@
 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 @@
 
 #, 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 @@
 
 #, c-format
 msgid "MSN Error: %s\n"
-msgstr "MSN 错误: %s\n"
+msgstr "MSN 错误：%s\n"
 
 msgid "Other Contacts"
 msgstr "其他联系人"
@@ -4905,15 +4900,15 @@
 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 @@
 
 #, 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 @@
 msgstr ""
 
 msgid "This account does not have email enabled."
-msgstr "此账户没有启用电子邮件。"
+msgstr "此帐号没有启用电子邮件。"
 
 msgid "Send a mobile message."
 msgstr "发送移动消息。"
@@ -4980,7 +4975,7 @@
 msgstr "正在工作"
 
 msgid "Has you"
-msgstr ""
+msgstr "双向好友"
 
 msgid "Home Phone Number"
 msgstr "家庭电话号码"
@@ -5051,13 +5046,11 @@
 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 @@
 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 @@
 
 #, 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 @@
 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 @@
 "\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 @@
 
 #, 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 @@
 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 @@
 msgstr "友好的名称更改太频繁"
 
 msgid "This Hotmail account may not be active."
-msgstr "此 Hotmail 账户可能未激活。"
+msgstr "此 Hotmail 帐号可能未激活。"
 
 msgid "Profile URL"
 msgstr "配置文件 URL"
@@ -5476,7 +5472,7 @@
 
 #, c-format
 msgid "%s is not a valid passport account."
-msgstr "%s 不是有效的通行证账户。"
+msgstr "%s 不是有效的通行证帐号。"
 
 msgid "Service Temporarily Unavailable."
 msgstr "服务暂时不可用。"
@@ -5495,6 +5491,49 @@
 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 @@
 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 @@
 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 @@
 
 #, 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 @@
 #. 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 @@
 #. ask for input
 #, fuzzy
 msgid "Enter Security Code"
-msgstr "输入代码"
+msgstr "输入验证码"
 
 #, fuzzy
 msgid "Your Country"
@@ -5688,6 +5756,9 @@
 msgid "Retrieving User Information..."
 msgstr "服务器信息"
 
+msgid "Loading menu..."
+msgstr ""
+
 #, fuzzy
 msgid "Status Message"
 msgstr "已发消息"
@@ -5733,6 +5804,11 @@
 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 ""
 
 #, 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,39 +5903,6 @@
 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 @@
 
 #, c-format
 msgid "No such user: %s"
-msgstr ""
+msgstr "无此用户：%s"
 
 msgid "User lookup"
 msgstr "用户查找"
@@ -5930,14 +5985,14 @@
 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 @@
 "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 @@
 msgstr "屏幕分辨率(每英寸点数)"
 
 msgid "Base font size (points)"
-msgstr "较大字体"
+msgstr "基本字号(点)"
 
 msgid "User"
 msgstr "用户"
 
 msgid "Headline"
-msgstr "昵称(_H)："
+msgstr "标头"
 
 msgid "Song"
 msgstr "声音"
@@ -6076,9 +6133,9 @@
 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 @@
 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 @@
 #. * 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 @@
 
 #. 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 "打盹"
-
-#, fuzzy, c-format
+msgstr ""
+
+#, c-format
 msgid "%s has slapped you!"
-msgstr "%s 已经将您[%s]添加为好友"
+msgstr ""
 
 #, c-format
 msgid "Slapping %s..."
@@ -6148,15 +6205,15 @@
 
 #. 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 @@
 
 #, c-format
 msgid "%s has high-fived you!"
-msgstr "%s 已登录。"
+msgstr ""
 
 #, c-format
 msgid "High-fiving %s..."
@@ -6180,7 +6237,7 @@
 
 #, c-format
 msgid "%s has punk'd you!"
-msgstr "%s 已登录。"
+msgstr ""
 
 #, c-format
 msgid "Punking %s..."
@@ -6198,7 +6255,7 @@
 
 #, c-format
 msgid "%s has raspberried you!"
-msgstr "%s 已登录。"
+msgstr ""
 
 #, c-format
 msgid "Raspberrying %s..."
@@ -6238,7 +6295,7 @@
 msgstr "用户未找到"
 
 msgid "Account has been disabled"
-msgstr "账户已经被禁用"
+msgstr "帐号已经被禁用"
 
 msgid "The server could not access the directory"
 msgstr "服务器无法访问目录"
@@ -6264,7 +6321,7 @@
 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 @@
 
 #, 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 "服务器端口"
 
 #. 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 @@
 
 #. 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 @@
 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 @@
 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 ""
 "(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 @@
 msgstr "相机"
 
 msgid "Screen Sharing"
-msgstr "用户名"
+msgstr "屏幕共享"
 
 msgid "Free For Chat"
 msgstr "无事闲聊"
@@ -6768,10 +6824,10 @@
 
 #, 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 @@
 
 #. 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 @@
 #, 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)"
-
-#, fuzzy, c-format
+msgstr[0] ""
+
+#, 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
+msgstr "无法发送消息：%s"
+
+#, c-format
 msgid "Unable to send message to %s: %s (%s)"
-msgstr "无法给 %s 发送消息："
-
-#, fuzzy, c-format
+msgstr "无法给 %s 发送消息：%s (%s)"
+
+#, 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 @@
 "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 @@
 #, 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 @@
 msgstr "您应当收到询问确认 %s 的邮件。"
 
 msgid "Account Confirmation Requested"
-msgstr "请求了账户确认"
+msgstr "请求了帐号确认"
 
 #, c-format
 msgid ""
@@ -7103,14 +7157,14 @@
 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 @@
 "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 ""
 "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 @@
 
 #, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
-msgstr "您的命令失败，原因未知。"
+msgstr "无法添加 %s，原因未知。"
 
 #, c-format
 msgid ""
@@ -7248,9 +7300,8 @@
 msgid "C_onnect"
 msgstr "连接(_O)"
 
-#, fuzzy
 msgid "You closed the connection."
-msgstr "服务器关闭了连接。"
+msgstr "您关闭了连接。"
 
 msgid "Get AIM Info"
 msgstr "获得 AIM 信息"
@@ -7262,9 +7313,8 @@
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#, fuzzy
 msgid "End Direct IM Session"
-msgstr "二人世界直连聊天已建立"
+msgstr "结束二人世界直连聊天"
 
 msgid "Direct IM"
 msgstr "二人世界"
@@ -7331,7 +7381,7 @@
 
 #. AIM actions
 msgid "Confirm Account"
-msgstr "确认账户"
+msgstr "确认帐号"
 
 msgid "Display Currently Registered Email Address"
 msgstr "显示当前注册的电子邮件地址"
@@ -7356,8 +7406,9 @@
 "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 @@
 msgstr "仅好友可见"
 
 msgid "Private"
-msgstr "私有"
+msgstr "保密"
 
 msgid "QQ Number"
 msgstr "QQ 号码"
@@ -7476,7 +7527,7 @@
 msgstr "国家/地区"
 
 msgid "Province/State"
-msgstr "省/州"
+msgstr "省/区"
 
 msgid "Zipcode"
 msgstr "邮政编码"
@@ -7485,7 +7536,7 @@
 msgstr "电话号码"
 
 msgid "Authorize adding"
-msgstr "同意吗添加吗？"
+msgstr "加好友须认证"
 
 msgid "Cellphone Number"
 msgstr "手机号码"
@@ -7503,7 +7554,7 @@
 msgstr "公开联系方式"
 
 msgid "College"
-msgstr "大学"
+msgstr "学历"
 
 msgid "Horoscope"
 msgstr "星座"
@@ -7521,7 +7572,7 @@
 msgstr "假"
 
 msgid "Modify Contact"
-msgstr "修改联系人"
+msgstr "修改联系方式"
 
 msgid "Modify Address"
 msgstr "修改地址"
@@ -7539,7 +7590,7 @@
 msgstr "无法更改好友信息。"
 
 msgid "Mobile"
-msgstr "移动"
+msgstr "手机"
 
 msgid "Note"
 msgstr "备注"
@@ -7619,10 +7670,10 @@
 
 #, 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 @@
 msgstr "管理员"
 
 msgid "Notice"
-msgstr "备注"
+msgstr "公告"
 
 msgid "Detail"
 msgstr "详细信息"
@@ -7780,22 +7831,22 @@
 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 @@
 
 #, 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 @@
 msgstr "更改密码"
 
 msgid "Account Information"
-msgstr "帐户信息"
+msgstr "帐号信息"
 
 msgid "Update all QQ Quns"
 msgstr "更新全部 QQ 群"
@@ -7949,10 +8000,10 @@
 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 @@
 
 #, 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 @@
 
 #, 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 @@
 msgstr "套接字错误"
 
 msgid "Getting server"
-msgstr "设置用户信息..."
+msgstr "获取服务器"
 
 msgid "Requesting token"
 msgstr "请求被禁止"
@@ -8037,11 +8088,15 @@
 "%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 ""
 "Server notice From %s: \n"
 "%s"
-msgstr "服务器指令：%s"
+msgstr ""
+"来自 %s 的服务器提示：\n"
+"%s"
 
 msgid "Unknown SERVER CMD"
 msgstr "未知服务器命令"
@@ -8081,7 +8138,7 @@
 msgid "File Send"
 msgstr "发送文件"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d cancelled the transfer of %s"
 msgstr "%d 取消了 %s 的传送"
 
@@ -8146,7 +8203,7 @@
 msgstr "会议已关闭"
 
 msgid "Unable to send message: "
-msgstr "无法发送消息: "
+msgstr "无法发送消息："
 
 #, c-format
 msgid "Unable to send message to %s:"
@@ -8238,6 +8295,7 @@
 msgid "Unknown (0x%04x)<br>"
 msgstr "未知 (0x%04x)<br>"
 
+#, fuzzy
 msgid "Last Known Client"
 msgstr "客户等级"
 
@@ -8255,13 +8313,12 @@
 "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 @@
 
 #, 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 @@
 
 #, 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 @@
 msgstr "让其它人看到您正在使用哪台计算机"
 
 msgid "Your VCard File"
-msgstr "您的 vCard 文件"
+msgstr "您的 VCard 文件"
 
 msgid "Timezone (UTC)"
 msgstr "时区(UTC)"
@@ -9160,48 +9217,48 @@
 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 @@
 "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 @@
 "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 @@
 #. 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 @@
 "%s\n"
 "\n"
 msgstr ""
-"公钥指纹:\n"
+"公钥指纹：\n"
 "%s\n"
 "\n"
 
@@ -9358,7 +9415,7 @@
 "Public Key Babbleprint:\n"
 "%s"
 msgstr ""
-"公钥漏印:\n"
+"公钥漏印：\n"
 "%s"
 
 msgid "Public Key Information"
@@ -9400,43 +9457,43 @@
 
 #, 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 @@
 msgstr "SIP 用户名不能包含空格或 @ 符号"
 
 msgid "SIP connect server not specified"
-msgstr "服务器端口"
+msgstr "没有指定 SIP 连接服务器"
 
 #. *< type
 #. *< ui_requirement
@@ -9497,10 +9554,10 @@
 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 @@
 
 #. username or password missing
 msgid "Username or password missing"
-msgstr "昵称或密码不对"
+msgstr "用户名或密码不全"
 
 #, c-format
 msgid ""
@@ -9636,15 +9693,13 @@
 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 @@
 
 #, 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 @@
 
 #, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr "无法与服务器建立连接"
+msgstr "无法与 %s 建立连接：%s"
 
 msgid "Not at Home"
 msgstr "不在家"
@@ -9766,7 +9821,7 @@
 
 #, 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 ""
 "(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 @@
 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 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 @@
 
 #, 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 @@
 #, 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 @@
 
 #, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
-msgstr "从套接字读取时出错。"
+msgstr "从 %s 读取出错：回复太长(限制为 %d 字节)"
 
 #, c-format
 msgid ""
@@ -10213,11 +10268,11 @@
 
 #, 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 @@
 
 #. Buddy icon
 msgid "Use this buddy _icon for this account:"
-msgstr "用作当前账户头像(_I)："
+msgstr "用作当前帐号头像(_I)："
 
 msgid "Ad_vanced"
 msgstr "高级(_A)"
@@ -10350,19 +10405,19 @@
 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 @@
 "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"
-"\n"
-"您尚未配置即时通讯帐户。要用 %s 开始连接，请单击下方的<b>添加</b>按钮，以便配"
-"置您的第一个帐户。如果您想要让 %s 连接到多个即时通讯帐户，请再次单击<b>添加</"
+"<span size='larger' weight='bold'>欢迎使用 %s！</span>\n"
+"\n"
+"您尚未配置即时通讯帐号。要用 %s 开始连接，请单击下方的<b>添加</b>按钮，以便配"
+"置您的第一个帐号。如果您想要让 %s 连接到多个即时通讯帐号，请再次单击<b>添加</"
 "b>按钮进行配置。\n"
 "\n"
-"如果您想要回到此窗口以便添加、编辑或删除帐户，可以从好友列表中窗口中选择<b>帐"
-"户->添加/编辑</b>"
+"如果您想要回到此窗口以便添加、编辑或删除帐号，可以从好友列表中窗口中选择<b>帐"
+"号->管理帐号</b>"
 
 #. Buddy List
 msgid "Background Color"
@@ -10459,12 +10514,11 @@
 
 #. 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 @@
 
 #. 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 @@
 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 @@
 
 #. Accounts menu
 msgid "/_Accounts"
-msgstr "/账户(_A)"
+msgstr "/帐号(_A)"
 
 msgid "/Accounts/Manage Accounts"
-msgstr "/账户/管理帐户"
+msgstr "/帐号/管理帐号"
 
 #. Tools
 msgid "/_Tools"
@@ -10741,7 +10794,7 @@
 
 #, c-format
 msgid "<b>Account:</b> %s"
-msgstr "<b>账户：</b>%s"
+msgstr "<b>帐号：</b>%s"
 
 #, c-format
 msgid ""
@@ -10769,13 +10822,13 @@
 msgstr "已登录"
 
 msgid "Last Seen"
-msgstr "上次见面"
+msgstr "上次发现"
 
 msgid "Spooky"
 msgstr "健谈"
 
 msgid "Awesome"
-msgstr ""
+msgstr "惊人"
 
 msgid "Rockin'"
 msgstr ""
@@ -10822,7 +10875,7 @@
 #, 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 "%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 @@
 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 @@
 "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"
-"\n"
-"您没有启用帐户。请通过<b>帐户->管理</b>打开<b>帐户</b>窗口，从中启用您的即时"
-"通讯帐户。当您启用帐户之后，才可以登录、设定状态、和朋友交谈。"
+"<span weight='bold' size='larger'>欢迎使用 %s！</span>\n"
+"\n"
+"您没有启用帐号。请通过<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 @@
 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 @@
 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 @@
 msgstr "/对话(_C)"
 
 msgid "/Conversation/New Instant _Message..."
-msgstr "/对话/新即时消息(_M)..."
-
-#, fuzzy
+msgstr "/对话(C)/新即时消息(_M)..."
+
 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 @@
 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 @@
 #, 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 @@
 msgstr "新事件"
 
 msgid "clear: Clears all conversation scrollbacks."
-msgstr "clear: 清除全部对话回滚。"
+msgstr "clear：清除全部对话回滚。"
 
 msgid "Confirm close"
 msgstr "确认关闭"
@@ -11283,7 +11334,7 @@
 msgstr "按组"
 
 msgid "By account"
-msgstr "按账户"
+msgstr "按帐号"
 
 msgid "Save Debug Log"
 msgstr "保存调试聊天记录"
@@ -11591,7 +11642,7 @@
 msgstr "T.M.Thanh 及Gnome 越南语小组"
 
 msgid "Simplified Chinese"
-msgstr "中文(中国)"
+msgstr "中文(中国大陆)"
 
 msgid "Hong Kong Chinese"
 msgstr "中文(香港)"
@@ -11630,8 +11681,8 @@
 "<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 @@
 msgstr "名称(_N)"
 
 msgid "_Account"
-msgstr "账户(_A)"
+msgstr "帐号(_A)"
 
 msgid "Get User Info"
 msgstr "获取用户信息"
@@ -11717,7 +11768,7 @@
 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 @@
 msgstr "新消息(_M)..."
 
 msgid "_Accounts"
-msgstr "账户(_A)"
+msgstr "帐号(_A)"
 
 msgid "Plu_gins"
 msgstr "插件(_G)"
@@ -12193,8 +12244,9 @@
 msgid "display this help and exit"
 msgstr ""
 
+#, fuzzy
 msgid "allow multiple instances"
-msgstr ""
+msgstr "允许打开多个主程序"
 
 msgid "don't automatically login"
 msgstr ""
@@ -12257,12 +12309,12 @@
 #, 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 @@
 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 @@
 "<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 @@
 msgstr "监视对象"
 
 msgid "_Account:"
-msgstr "账户(_A)："
+msgstr "帐号(_A)："
 
 msgid "_Buddy name:"
 msgstr "好友名称(_B)："
@@ -12414,7 +12466,7 @@
 msgstr "仅当我的状态不可用时才监视(_O)"
 
 msgid "_Recurring"
-msgstr "再现(_R)"
+msgstr "重复(_R)"
 
 msgid "Pounce Target"
 msgstr "监视目标"
@@ -12450,24 +12502,22 @@
 msgstr "发送消息"
 
 msgid "Unknown.... Please report this!"
-msgstr "未知的千里眼。请报告此错误！"
+msgstr "未知……请报告此错误！"
 
 msgid "(Custom)"
-msgstr ""
-
-#, fuzzy
-msgid "(Default)"
-msgstr "(默认)"
+msgstr "(自定义)"
+
+msgid "Penguin Pimps"
+msgstr ""
 
 msgid "The default Pidgin sound theme"
-msgstr ""
-
-#, fuzzy
+msgstr "Pidgin 默认声音主题"
+
 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,16 +12528,32 @@
 msgid "Theme failed to copy."
 msgstr "主题复制失败。"
 
-msgid "Install Theme"
-msgstr "安装主题"
-
-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."
+#, fuzzy
+msgid "Theme Selections"
+msgstr "浏览器选择"
+
+#. Instructions
+#, fuzzy
+msgid ""
+"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 "键盘快捷键"
@@ -12495,16 +12561,12 @@
 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 @@
 msgstr "即时消息对话窗口"
 
 msgid "_Hide new IM conversations:"
-msgstr "隐藏新的 IM 对话(_H):"
+msgstr "隐藏新的 IM 对话(_H)："
 
 msgid "When away"
 msgstr "离开时"
@@ -12585,9 +12647,6 @@
 msgid "Font"
 msgstr "字体"
 
-msgid "Use document font from _theme"
-msgstr "使用主题中的文档字体(_T)"
-
 msgid "Use font from _theme"
 msgstr "使用主题中的字体(_T)"
 
@@ -12608,20 +12667,18 @@
 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"
-
-#, fuzzy
+msgstr "使用自动检测到的 IP 地址(_A)：%s"
+
 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,76 +12689,27 @@
 msgid "_Enable automatic router port forwarding"
 msgstr "启用自动路由器端口转发(_E)"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "手动指定要监听的端口范围(_M)"
-
-#, fuzzy
+msgstr "手动指定要监听的端口范围(_M)："
+
 msgid "_Start:"
-msgstr "状态(_S)："
-
-#, fuzzy
+msgstr "起始(_S)："
+
 msgid "_End:"
-msgstr "展开(_E)"
+msgstr "终止(_E)："
 
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr "中继服务器(转)"
-
-#, fuzzy
+msgstr "中继服务器(TURN)"
+
 msgid "_TURN server:"
-msgstr "STUN 服务器(_U)："
-
-#, fuzzy
+msgstr "_TURN 服务器："
+
 msgid "Use_rname:"
-msgstr "用户名："
-
-#, fuzzy
+msgstr "用户名(_R)："
+
 msgid "Pass_word:"
-msgstr "密码："
-
-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 "用户名："
+msgstr "密码(_W)："
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -12742,6 +12750,16 @@
 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 @@
 "手动(_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 @@
 msgstr "对话获得焦点后发声(_F)"
 
 msgid "_Enable sounds:"
-msgstr "开启声音(_E):"
+msgstr "开启声音(_E)："
 
 msgid "V_olume:"
-msgstr "音量(_O):"
+msgstr "音量(_O)："
 
 msgid "Play"
 msgstr "播放"
@@ -12848,25 +12899,19 @@
 msgid "Based on keyboard or mouse use"
 msgstr "根据键盘或鼠标使用"
 
+msgid "_Minutes before becoming idle:"
+msgstr "更改状态前等几分钟(_M)："
+
+#, fuzzy
+msgid "Change to this status when _idle:"
+msgstr "发呆时更改状态(_I)"
+
 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"
-msgstr "发呆时更改状态(_I)"
-
-msgid "Change _status to:"
-msgstr "将状态更改为(_S)："
-
 #. Signon status stuff
 msgid "Status at Startup"
 msgstr "启动时的状态"
@@ -12880,14 +12925,15 @@
 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 @@
 msgstr "对隐私设置的更改将会立即生效。"
 
 msgid "Set privacy for:"
-msgstr "设置隐私的账户："
+msgstr "设置隐私的帐号："
 
 #. Remove All button
 msgid "Remove Al_l"
@@ -13001,7 +13047,7 @@
 
 #. 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 @@
 msgstr "添加表情"
 
 msgid "_Image:"
-msgstr "图像(_I):"
+msgstr "图像(_I)："
 
 #. Shortcut text
 msgid "S_hortcut text:"
-msgstr "快捷方式文本："
+msgstr "快捷方式文本(_H)："
 
 msgid "Smiley"
 msgstr "表情"
@@ -13048,10 +13094,10 @@
 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 @@
 
 #, 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 @@
 msgid "Pidgin smileys"
 msgstr "Pidgin 表情"
 
-msgid "Penguin Pimps"
-msgstr ""
-
 msgid "Selecting this disables graphical emoticons."
 msgstr "选择此选项将禁用图形化表情。"
 
@@ -13235,7 +13278,7 @@
 msgstr "小"
 
 msgid "Smaller versions of the default smilies"
-msgstr ""
+msgstr "默认表情的小图像版本"
 
 msgid "Response Probability:"
 msgstr "响应可能性："
@@ -13245,7 +13288,7 @@
 
 #. msg_difference spinner
 msgid "Maximum response timeout:"
-msgstr "最大响应超时:"
+msgstr "最大响应超时："
 
 msgid "minutes"
 msgstr "分钟"
@@ -13304,7 +13347,7 @@
 msgstr "得分相等时使用上个好友"
 
 msgid "Point values to use for account..."
-msgstr "账户的权值..."
+msgstr "帐号的权值..."
 
 #. *< type
 #. *< ui_requirement
@@ -13397,14 +13440,14 @@
 "<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 ""
 "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 @@
 " • Drag up and then to the right to switch to the next conversation."
 msgstr ""
 "允许在对话窗口中支持鼠标手势。\n"
-"拖曳鼠标中键可执行特定操作:\n"
+"拖曳鼠标中键可执行特定操作：\n"
 "\n"
 "·向下再向右可关闭对话。\n"
 "·向上再向左可切换到上个对话。\n"
@@ -13559,7 +13602,7 @@
 
 #. Label
 msgid "Select all accounts that buddies should be auto-added to."
-msgstr "选择要将好友自动添加到哪些账户。"
+msgstr "选择要将好友自动添加到哪些帐号。"
 
 #. *< type
 #. *< ui_requirement
@@ -13581,10 +13624,10 @@
 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 @@
 "<b>Buddy Note</b>: %s"
 msgstr ""
 "\n"
-"<b>好友备注</b>: %s"
+"<b>好友备注</b>：%s"
 
 msgid "History"
 msgstr "历史"
@@ -13841,6 +13884,10 @@
 msgid "Conversation Entry"
 msgstr "对话项"
 
+#, fuzzy
+msgid "Conversation History"
+msgstr "对话项"
+
 msgid "Request Dialog"
 msgstr "请求对话框"
 
@@ -14095,13 +14142,13 @@
 #. *< 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 @@
 "timestamp formats."
 msgstr "此插件允许用户自定义会话和聊天记录消息的时间戳格式。"
 
-#, fuzzy
 msgid "Audio"
-msgstr "自动"
+msgstr "音频"
 
 #, fuzzy
 msgid "Video"
@@ -14195,24 +14241,20 @@
 msgid "Output"
 msgstr ""
 
-#, fuzzy
 msgid "_Plugin"
-msgstr "插件"
-
-#, fuzzy
+msgstr "插件(_P)"
+
 msgid "_Device"
-msgstr "设备"
+msgstr "设备(_D)"
 
 msgid "Input"
 msgstr ""
 
-#, fuzzy
 msgid "P_lugin"
-msgstr "插件"
-
-#, fuzzy
+msgstr "插件(_L)"
+
 msgid "D_evice"
-msgstr "设备"
+msgstr "设备(_E)"
 
 #. *< magic
 #. *< major version
@@ -14223,9 +14265,8 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Voice/Video Settings"
-msgstr "编辑设置"
+msgstr "音频/视频 设置"
 
 #. *< name
 #. *< version
@@ -14299,8 +14340,9 @@
 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 @@
 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 @@
 #~ 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 "用户非活跃超时(以分钟计)"
 
 #~ 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@pidgin."
@@ -14424,7 +14487,7 @@
 #~ "  -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 @@
 #~ "  -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 ""
 #~ "%s\n"
 #~ "\n"
-#~ "%s 将不会尝试重新连接账户，除非您纠正了错误然后重新启用账户。"
+#~ "%s 将不会尝试重新连接帐号，除非您纠正了错误然后重新启用帐号。"
 
 #~ msgid "User has typed something and stopped"
 #~ msgstr "用户打了几个字，停了一下"