pidgin: 83524d78: Updated traditional Chinese translations...

darkrain42 at pidgin.im darkrain42 at pidgin.im
Thu Aug 6 03:05:25 EDT 2009


-----------------------------------------------------------------
Revision: 83524d788808ede71470a5dd37e9256a1626559b
Ancestor: 777ab9dc454b6d4eae3d6fd5dba94209644a994f
Author: ambrose.li at gmail.com
Date: 2009-08-06T07:01:04
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/83524d788808ede71470a5dd37e9256a1626559b

Modified files:
        po/ChangeLog po/zh_HK.po po/zh_TW.po

ChangeLog: 

Updated traditional Chinese translations. Closes #9850.

-------------- next part --------------
============================================================
--- po/ChangeLog	b2fa269b7b6a1e3c35a91a6eca233092285e452b
+++ po/ChangeLog	fc90b670e078b9096ffadf47601abe7fb172e801
@@ -7,8 +7,10 @@ version 2.6.0
 	  Aldabaldetreku)
 	* Bengali translation updated (Samia Niamatullah)
 	* Catalan translation updated (Josep Puigdemont)
+	* Chinese (Hong Kong) translation updated (Ambrose C. Li)
 	* Chinese (Simplified) translation updated under new
 	  translator (Aron Xu)
+	* Chinese (Traditional) translation updated (Ambrose C. Li)
 	* Czech translation updated (David Vachulka)
 	* Dutch translation updated (Dani?l Heres)
 	* English (British) translation updated (Luke Ross)
============================================================
--- po/zh_HK.po	d84cfe4cab21f887612cd9cc5054e27cb8140a0f
+++ po/zh_HK.po	be210c21ff7e91b80e329019accfb06b2f871841
@@ -1,11 +1,14 @@
-# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.19 2008/08/24 21:23:04 acli Exp
+# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.20 2009/08/04 05:20:24 acli Exp
 # ---
 # Pidgin's Traditional Chinese translation
-# Copyright (C) 2002-2008, Paladin R. Liu <paladin at ms1.hinet.net>
-# Copyright (C) 2003-2008, Ambrose C. Li <acli at ada.dhs.org>
+# Copyright (C) 2002-2009, Paladin R. Liu <paladin at ms1.hinet.net>
+# Copyright (C) 2003-2009, Ambrose C. Li <ambrose.li at gmail.com>
 #
+# PLEASE DO NOT ATTEMPT TO UPDATE THIS FILE IF THERE ARE NO
+# LINE NUMBERS (LINES BEGINNING WITH #:) IN THIS FILE.
+#
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.562 2009/02/27 04:50:13 acli Exp $
+# $InternalId: zh_TW.po,v 1.594 2009/08/06 05:26:27 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -19,7 +22,7 @@
 #        screen name ? user name ??????????!
 # ????
 # (01?52?58?) wing: hmm. does "screen name" mean "user name" now, or has it actually always meant "user name"?
-# (02?09?45?) KingAnt: wing: They're the same thing.  If you're unhappy with the change please email the Pidgin-devel mailing list.  (I'm unhappy with the change.)
+# (02?09?45?) KingAnt: wing: They're the same thing.  If you're unhappy with the change please email the gaim-devel mailing list.  (I'm unhappy with the change.)
 # ----------------------------------------------------------
 # SILC??:???????????????????,??? (^^;)
 # - Key ??????,??:?Key Exchange????????????
@@ -49,10 +52,10 @@ msgstr ""
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.5.5\n"
+"Project-Id-Version: Pidgin 2.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-06 15:04-0700\n"
-"PO-Revision-Date: 2009-02-25 09:57-0500\n"
+"POT-Creation-Date: 2009-08-05 23:59-0700\n"
+"PO-Revision-Date: 2009-07-30 01:53-0500\n"
 "Last-Translator: Ambrose Li <ambrose.li at gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <community at linuxhall.org>\n"
 "MIME-Version: 1.0\n"
@@ -637,11 +640,12 @@ msgstr "???????,??? msgid "Message was not sent, because you are not signed on."
 msgstr "???????,????????:"
 
-# XXX ?????
+# NOTE ???????????????
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
+# NOTE ???????????????
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
@@ -920,12 +924,12 @@ msgstr "????"
 msgid "System Log"
 msgstr "????"
 
-#, fuzzy
 msgid "Calling ... "
-msgstr "???..."
+msgstr "???..."
 
+# NOTE ????????
 msgid "Hangup"
-msgstr ""
+msgstr "??"
 
 #. Number of actions
 msgid "Accept"
@@ -934,26 +938,28 @@ msgstr "??"
 msgid "Reject"
 msgstr "??"
 
+#  XXX ?? - acli 20090730
 msgid "Call in progress."
-msgstr ""
+msgstr "????"
 
 msgid "The call has been terminated."
-msgstr ""
+msgstr "??????"
 
 #, c-format
 msgid "%s wishes to start an audio session with you."
-msgstr ""
+msgstr "%s ???????????"
 
+# XXX ??? - acli 20090730
 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
-msgstr ""
+msgstr "%s ?????????????????????"
 
-#, fuzzy
 msgid "You have rejected the call."
-msgstr "??????%s%s"
+msgstr "???????"
 
+# FIXME ??,?????? - acli 20090730
 msgid "call: Make an audio call."
-msgstr ""
+msgstr "call:?????"
 
 msgid "Emails"
 msgstr "????"
@@ -1207,8 +1213,9 @@ msgstr "??????????? msgid "From last sent message"
 msgstr "???????????"
 
+# NOTE Using Paladin's wording from 2009/02/27 - acli 20090806
 msgid "Never"
-msgstr "??"
+msgstr "?????"
 
 msgid "Show Idle Time"
 msgstr "??????"
@@ -1232,7 +1239,7 @@ msgid "Report Idle time"
 msgstr "?????????"
 
 msgid "Report Idle time"
-msgstr "??????(_R)"
+msgstr "??????"
 
 msgid "Change status when idle"
 msgstr "???????"
@@ -1303,7 +1310,7 @@ msgid "Others talk in chat"
 msgstr "???????"
 
 msgid "Others talk in chat"
-msgstr "????????"
+msgstr "?????????"
 
 msgid "Someone says your username in chat"
 msgstr "?????????????"
@@ -1361,8 +1368,9 @@ msgstr "??????????? 
 # XXX: ?? ???????????? Enable Sound ??? - c9s, 08 Dec 27 12/27/2008
 # XXX ??????? Enable Sound,????????,?????????? - 20090226 acli
+# NOTE Using Paladin's wording from 2009/02/27 - acli 20090806
 msgid "Always"
-msgstr "??"
+msgstr "?????"
 
 # NOTE ???? by c9s (http://developer.pidgin.im/ticket/7917) - 20090226 acli
 msgid "Only when available"
@@ -1510,7 +1518,7 @@ msgid "%s sent a message in %s"
 
 #, c-format
 msgid "%s sent a message in %s"
-msgstr "%s ? %s ?????????"
+msgstr "%s ? %s ????????"
 
 msgid "Buddy signs on/off"
 msgstr "????/??"
@@ -1620,22 +1628,27 @@ msgstr ""
 "\n"
 "Fetching TinyURL..."
 msgstr ""
+"\n"
+"?? TinyURL ?..."
 
+# XXX ?? - 20090729 acli
 msgid "Only create TinyURL for urls of this length or greater"
-msgstr ""
+msgstr "?????????????????? TinyURL"
 
+# XXX ?? - 20090729 acli
 msgid "TinyURL (or other) address prefix"
-msgstr ""
+msgstr "TinyURL(????)????"
 
-#, fuzzy
 msgid "TinyURL"
-msgstr "????"
+msgstr "TinyURL"
 
 msgid "TinyURL plugin"
-msgstr ""
+msgstr "TinyURL ??"
 
+# NOTE ?? copying ???????,???????????,??????,????????????
+# XXX ?? - 20090729 acli
 msgid "When receiving a message with URL(s), TinyURL for easier copying"
-msgstr ""
+msgstr "????????????,?? TinyURL ????,?????"
 
 msgid "accounts"
 msgstr "????"
@@ -1692,9 +1705,9 @@ msgstr "???????"
 
 # XXX ??:
 # XXX gtk/gtkft.c - ?Unknown?????????????,???????
-# XXX libPidgin/account.c - ?Unknown????????????,???????(??????????,
+# XXX libgaim/account.c - ?Unknown????????????,???????(??????????,
 # XXX                      ?????????????????????????)
-# XXX libPidgin/protocols/* - ?Unknown?????????,????????(??????????????)
+# XXX libgaim/protocols/* - ?Unknown?????????,????????(??????????????)
 # XXX                       ??????(??? Pidgin ????????)
 # XXX - Ambrose 20061123
 msgid "Unknown"
@@ -1751,29 +1764,37 @@ msgstr "????(_V)"
 msgid "_View Certificate..."
 msgstr "????(_V)"
 
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
+# FIXME ?????? - acli 20070913
 #, c-format
 msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr "?%s??????????,?????????"
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"?%s??????????????%s?,???????????????????"
+"?????"
 
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr "?%s????????????"
-
+#. Had no CA pool, so couldn't verify the chain *and*
+#. * the subject name isn't valid.
+#. * I think this is bad enough to warrant a fatal error. It's
+#. * not likely anyway...
+#.
+#. TODO: Probably wrong.
 #. TODO: Make this error either block the ensuing SSL
 #. connection error until the user dismisses this one, or
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
+#. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "SSL ????"
 
 msgid "Invalid certificate chain"
 msgstr "??????"
 
+#. The subject name is correct, but we weren't able to verify the
+#. * chain because there was no pool of root CAs found. Prompt the user
+#. * to validate it.
+#.
 #. vrq will be completed by user_auth
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
@@ -1781,8 +1802,21 @@ msgstr ""
 msgstr ""
 "????????,???????????? (root certificate) ?????"
 
+#. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
+#, c-format
 msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr "?%s??????????,?????????"
+
+#. FIXME 2.6.1
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr "?%s????????????"
+
+#. vrq will be completed by user_auth
+msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr "????????? Pidgin ????????????"
 
@@ -1798,19 +1832,6 @@ msgstr "??????????? msgid "Invalid certificate authority signature"
 msgstr "???????????"
 
-# FIXME ?????? - acli 20070913
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"?%s??????????????%s?,???????????????????"
-"?????"
-
 #. Make messages
 #, c-format
 msgid ""
@@ -1847,7 +1868,7 @@ msgstr "+++ %s ??"
 msgstr "+++ %s ??"
 
 #. Unknown error
-#. Unknown error!
+#, c-format
 msgid "Unknown error"
 msgstr "????"
 
@@ -1894,10 +1915,8 @@ msgstr "%s ????? (%s)?"
 msgid "%s left the room (%s)."
 msgstr "%s ????? (%s)?"
 
-# NOTE????????????Yahoo! ??????Conference?????????
-#, fuzzy
 msgid "Invite to chat"
-msgstr "???????"
+msgstr "???????"
 
 #. Put our happy label in it.
 msgid ""
@@ -2040,6 +2059,10 @@ msgstr "??? %2$s ?? %1$s"
 msgstr "??? %2$s ?? %1$s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "?? <A HREF=\"file://%s\">%s</A> ????"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "?? %s ????"
 
@@ -2236,9 +2259,9 @@ msgstr "(%s) %s <????>:%s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <????>:%s\n"
 
-#, fuzzy
+# FIXME ?????? - acli 20090731
 msgid "Error creating conference."
-msgstr "??????"
+msgstr "???????"
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
@@ -2663,7 +2686,6 @@ msgstr "??????????? 
 # XXX ??????(???) - 20061025
 #. * description
-#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
@@ -2672,7 +2694,7 @@ msgstr ""
 "at your own risk!"
 msgstr ""
 "??????,???????????????????????????? "
-"Adium?Fire?Messenger Plus!?MSN Messenger,?? Trillian?\n"
+"Adium?Fire?Messenger Plus!?MSN Messenger?aMSN??? Trillian?\n"
 "\n"
 "??:???????????,?????????????,????!"
 
@@ -2717,7 +2739,6 @@ msgstr "?????,????? msgid "Save messages sent to an offline user as pounce."
 msgstr "?????,????????????????????"
 
-#, fuzzy
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
@@ -2751,9 +2772,8 @@ msgstr "????,?????? msgid "Do not ask. Always save in pounce."
 msgstr "????,???????????????????"
 
-#, fuzzy
 msgid "One Time Password"
-msgstr "????"
+msgstr "?????"
 
 #. *< type
 #. *< ui_requirement
@@ -2762,13 +2782,13 @@ msgid "One Time Password Support"
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr ""
+msgstr "???????"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "????????"
 
 #. *  description
 msgid ""
@@ -2968,18 +2988,15 @@ msgstr ""
 "??? ActiveTCL;?????? TCL ?????,?? http://www.activestate."
 "com ????? ActiveTCL?\n"
 
-# FIXME ????toolkit?- 20071023 acli
-#, fuzzy
 msgid ""
 "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
 "im/BonjourWindows for more information."
 msgstr ""
-"??? Apple ? Bonjour For Windows toolkit,?????? http://d.pidgin.im/"
-"BonjourWindows ?? FAQ ???"
+"??? Apple ??Bonjour For Windows???,?????? http://d.pidgin.im/"
+"BonjourWindows ???"
 
-#, fuzzy
 msgid "Unable to listen for incoming IM connections"
-msgstr "?????????????\n"
+msgstr "?????????????"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -3033,24 +3050,20 @@ msgstr "??????,???? msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "??????,???????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create socket: %s"
-msgstr ""
-"???? Socket:\n"
-"%s"
+msgstr "???? Socket:%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to bind socket to port: %s"
-msgstr "???? Socket ????"
+msgstr "???? Socket ????:%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to listen on socket: %s"
-msgstr ""
-"???? Socket:\n"
-"%s"
+msgstr "???? Socket:%s"
 
 msgid "Error communicating with local mDNSResponder."
-msgstr "?????mDNSResponder???????"
+msgstr "????? mDNSResponder ???????"
 
 msgid "Invalid proxy settings"
 msgstr "??????????"
@@ -3059,7 +3072,7 @@ msgstr ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
-"??????????????????,??????????????????"
+"??????????????????,???????????????????"
 
 msgid "Token Error"
 msgstr "????"
@@ -3095,17 +3108,14 @@ msgstr "?????????..."
 msgid "Load buddylist from file..."
 msgstr "?????????..."
 
-#, fuzzy
 msgid "You must fill in all registration fields"
-msgstr "?????????"
+msgstr "????????????"
 
-#, fuzzy
 msgid "Passwords do not match"
-msgstr "????????"
+msgstr "????????"
 
-#, fuzzy
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "?????????????\n"
+msgstr "???????,???????"
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "?? Gadu-Gadu ?????"
@@ -3120,9 +3130,8 @@ msgid "Enter captcha text"
 msgstr "???(????)"
 
 msgid "Enter captcha text"
-msgstr ""
+msgstr "???????????"
 
-#, fuzzy
 msgid "Captcha"
 msgstr "????"
 
@@ -3265,9 +3274,9 @@ msgstr "?????(_N):"
 msgid "Chat _name:"
 msgstr "?????(_N):"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "?????????"
+msgstr "?????????%s?:%s"
 
 #. 1. connect to server
 #. connect to the server
@@ -3280,9 +3289,8 @@ msgstr "??????????"
 msgid "This chat name is already in use"
 msgstr "??????????"
 
-#, fuzzy
 msgid "Not connected to the server"
-msgstr "?????????"
+msgstr "????????"
 
 msgid "Find buddies..."
 msgstr "????..."
@@ -3323,9 +3331,8 @@ msgstr "Gadu-Gadu ???"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu ???"
 
-#, fuzzy
 msgid "GG server"
-msgstr "???????..."
+msgstr "Gadu-Gadu ???"
 
 #, c-format
 msgid "Unknown command: %s"
@@ -3341,7 +3348,6 @@ msgstr "??????"
 msgid "File Transfer Failed"
 msgstr "??????"
 
-#, fuzzy
 msgid "Unable to open a listening port."
 msgstr "????????"
 
@@ -3365,11 +3371,9 @@ msgstr "%s ?????"
 #.
 #. TODO: what to do here - do we really have to disconnect?
 #. TODO: do we really want to disconnect on a failure to write?
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with server: %s"
-msgstr ""
-"?????????????:\n"
-"%s"
+msgstr "?????????????:%s"
 
 msgid "View MOTD"
 msgstr "?????? (MOTD)"
@@ -3380,9 +3384,8 @@ msgstr "??(_P):"
 msgid "_Password:"
 msgstr "??(_P):"
 
-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "IRC ??????????"
+msgstr "IRC ?????????????????"
 
 # XXX ??
 msgid "SSL support unavailable"
@@ -3392,13 +3395,13 @@ msgstr "????"
 msgstr "????"
 
 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "??????%s?"
+msgstr "????:%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Server closed the connection"
-msgstr "????????"
+msgstr "????????"
 
 msgid "Users"
 msgstr "???"
@@ -3590,13 +3593,12 @@ msgstr "??????????? #. We only want to do the following dance if the connection
 #. has not been successfully completed.  If it has, just
 #. notify the user that their /nick command didn't go.
-#, fuzzy, c-format
+#, c-format
 msgid "The nickname \"%s\" is already being used."
-msgstr "??????????"
+msgstr "???%s???????"
 
-#, fuzzy
 msgid "Nickname in use"
-msgstr "??"
+msgstr "???????"
 
 msgid "Cannot change nick"
 msgstr "??????"
@@ -3833,13 +3835,11 @@ msgstr "??"
 msgid "execute"
 msgstr "??"
 
-#, fuzzy
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr "??????????? TLS/SSL,???? TLS/SSL ???"
+msgstr "??????? TLS/SSL,???? TLS/SSL ???"
 
-#, fuzzy
 msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "???????,???? TLS/SSL ???"
+msgstr "?????,???? TLS/SSL ???"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "????????????????????"
@@ -3853,57 +3853,44 @@ msgstr "????"
 msgid "Plaintext Authentication"
 msgstr "????"
 
-#, fuzzy
 msgid "SASL authentication failed"
-msgstr "????"
+msgstr "SASL ????"
 
-#, fuzzy
 msgid "Invalid response from server"
-msgstr "????????????"
+msgstr "???????????"
 
 msgid "Server does not use any supported authentication method"
 msgstr "???????????????????"
 
 msgid "You require encryption, but it is not available on this server."
-msgstr "???????,????????????"
+msgstr "?????,????????????"
 
 # XXX ?????,??????
 msgid "Invalid challenge from server"
 msgstr "?????????????"
 
-# NOTE OSCAR ???????? http://aimdoc.sourceforge.net/OSCARdoc/,?????????
-#, fuzzy, c-format
+#, c-format
 msgid "SASL error: %s"
-msgstr "SASL ??"
+msgstr "SASL ??:%s"
 
 msgid "The BOSH connection manager terminated your session."
-msgstr ""
+msgstr "BOSH ???????????????"
 
-#, fuzzy
 msgid "No session ID given"
-msgstr "??????"
+msgstr "??????????"
 
-# NOTE Jabber ??? Stream Error ???,? <unsupported-version/>
-# NOTE ? http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#, fuzzy
 msgid "Unsupported version of BOSH protocol"
-msgstr "?????? XMPP ??"
+msgstr "???? BOSH ????"
 
-#, fuzzy
 msgid "Unable to establish a connection with the server"
-msgstr ""
-"??????????:\n"
-"%s"
+msgstr "??????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr ""
-"??????????:\n"
-"%s"
+msgstr "??????????:%s"
 
-#, fuzzy
 msgid "Unable to establish SSL connection"
-msgstr "???????"
+msgstr "???? SSL ??"
 
 msgid "Full Name"
 msgstr "??"
@@ -3920,6 +3907,11 @@ msgstr "????"
 msgid "Street Address"
 msgstr "????"
 
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "??(?)"
 
@@ -3972,9 +3964,8 @@ msgstr "????"
 
 # NOTE Debian ??local???????
 # XXX
-#, fuzzy
 msgid "Local Time"
-msgstr "?????:"
+msgstr "?????:"
 
 msgid "Priority"
 msgstr "????"
@@ -3989,11 +3980,10 @@ msgid "%s ago"
 
 #, c-format
 msgid "%s ago"
-msgstr ""
+msgstr "%s?"
 
-#, fuzzy
 msgid "Logged Off"
-msgstr "???"
+msgstr "???"
 
 # NOTE: ????????????,?????????,??????
 # NOTE: ????????????????,???,?????PO???????
@@ -4019,7 +4009,6 @@ msgstr "?????"
 msgid "Temporarily Hide From"
 msgstr "?????"
 
-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "????????"
 
@@ -4028,7 +4017,6 @@ msgstr "?????????"
 
 # NOTE Jabber????Subscribe???????????????
 # NOTE ? http://www.jabber.org/user/userguide.html
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -4162,9 +4150,8 @@ msgid "Invalid Server"
 msgstr "????????????"
 
 msgid "Invalid Server"
-msgstr "???????"
+msgstr "????????"
 
-# NOTE????????????Yahoo! ??????Conference?????????
 # XXX
 msgid "Enter a Conference Server"
 msgstr "???????"
@@ -4175,26 +4162,23 @@ msgstr "?????"
 msgid "Find Rooms"
 msgstr "?????"
 
-#, fuzzy
+# NOTE ?? http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
 msgid "Affiliations:"
-msgstr "??:"
+msgstr "????:"
 
-#, fuzzy
 msgid "No users found"
-msgstr "?????????"
+msgstr "????????"
 
-#, fuzzy
 msgid "Roles:"
-msgstr "??"
+msgstr "??:"
 
-#, fuzzy
 msgid "Ping timed out"
 msgstr "Ping??"
 
 msgid ""
 "Unable to find alternative XMPP connection methods after failing to connect "
 "directly."
-msgstr ""
+msgstr "??????,???????? XMPP ?????"
 
 msgid "Invalid XMPP ID"
 msgstr "XMPP ????"
@@ -4202,9 +4186,9 @@ msgstr "XMPP ????,????
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP ????,?????????"
 
-#, fuzzy
+# FIXME ????????? 20070518 acli
 msgid "Malformed BOSH URL"
-msgstr "?????????"
+msgstr "??? BOSH ??"
 
 #, c-format
 msgid "Registration of %s@%s successful"
@@ -4272,10 +4256,6 @@ msgstr "??????"
 msgid "Change Registration"
 msgstr "??????"
 
-#, fuzzy
-msgid "Malformed BOSH Connect Server"
-msgstr "?????????"
-
 msgid "Error unregistering account"
 msgstr "????????"
 
@@ -4295,7 +4275,7 @@ msgid "Server doesn't support blocking"
 msgstr "???????"
 
 msgid "Server doesn't support blocking"
-msgstr ""
+msgstr "????????"
 
 msgid "Not Authorized"
 msgstr "???"
@@ -4612,16 +4592,16 @@ msgstr "??????? %s"
 msgid "Unable to ban user %s"
 msgstr "??????? %s"
 
-#  XXX ???(??)??? - ambrose 20070415
+#  NOTE ?? http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
 #  NOTE: Unknown affiliation ? owner?admin?member?outcast?none ???????????
 #, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "?????:?%s?"
+msgstr "???????:?%s?"
 
-#  XXX ?? - ambrose 20070415
+#  NOTE ?? http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "?????? %s ???????%s?"
+msgstr "?????? %s ??????????????%s?"
 
 #  XXX ?? - ambrose 20070415
 #  NOTE: Unknown role ? moderator?participant?visitor?none ???????????
@@ -4642,19 +4622,20 @@ msgstr "?? Ping ??? %s"
 msgid "Unable to ping user %s"
 msgstr "?? Ping ??? %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
-msgstr "???????? %s ,??????????????"
+msgstr "?????%s ,??????????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
-msgstr "???????? %s ,???????????"
+msgstr "?????%s ,???????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
 "buzzes now."
-msgstr "???????? %s ,????????????????"
+msgstr ""
+"?????%s ,???????????????,????????????"
 
 # XXX ???? - acli 20070913
 #, c-format
@@ -4670,38 +4651,38 @@ msgstr "%s???????"
 msgid "%s has buzzed you!"
 msgstr "%s???????"
 
-#, fuzzy, c-format
+# XXX ??? - acli 20090730
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "??????? %s,???? JID ????"
+msgstr "??? %s ??????,???? JID ????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr "??????? %s,??????????"
+msgstr "??? %s ??????,??????????"
 
 #  NOTE?not subscribed to user presence??????SUB_TO?? subscription
 #  FIXME ???????????,????? PO ??????(??To??);
 #  FIXME ??????,???? presence ???????????-acli 20070614
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
-msgstr "??????? %s,????????"
+msgstr "??? %s ??????,????????"
 
-#, fuzzy
 msgid "Media Initiation Failed"
-msgstr "????"
+msgstr "????????"
 
-#  FIXME ???? - acli 20070614
-#, fuzzy, c-format
+#  FIXME ???? - acli 20090730
+#, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
-msgstr "?????????? %s ???? Resource"
+msgstr "???? %s ???? Resource ???????"
 
 msgid "Select a Resource"
 msgstr "???? Resource"
 
-#, fuzzy
+# XXX ?? - acli 20090730
 msgid "Initiate Media"
-msgstr "?????(_C)"
+msgstr "????"
 
 msgid "config:  Configure a chat room."
 msgstr "config:???????"
@@ -4721,23 +4702,21 @@ msgstr "ban &lt;???&gt; [??]? msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;???&gt; [??]:???????????"
 
-#  XXX ???(??)??? - ambrose 20070415
-#, fuzzy
+#  NOTE ?? http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
 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 ""
-"affiliate &lt;???&gt; &lt;owner|admin|member|outcast|none&gt;: ?????"
-"?????????"
+"affiliate &lt;???&gt; &lt;owner|admin|member|outcast|none&gt; [??1] [?"
+"?2] ...: ???????????????,?????????????????"
 
 #  NOTE ???? by ambrose
-#, fuzzy
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with an role or set users' role with the room."
 msgstr ""
-"role &lt;???&gt; &lt;moderator|participant|visitor|none&gt;: ??????"
-"?????????"
+"role &lt;???&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; [??]:??????????"
@@ -4798,7 +4777,7 @@ msgid "BOSH URL"
 msgstr "?????????"
 
 msgid "BOSH URL"
-msgstr ""
+msgstr "BOSH ??"
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
@@ -4860,32 +4839,29 @@ msgstr "?????(_A)"
 msgid "_Accept Defaults"
 msgstr "?????(_A)"
 
-#, fuzzy
 msgid "No reason"
 msgstr "??????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "?? %s ??:(%s)"
+msgstr "?????:(%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Kicked (%s)"
-msgstr "? %s ?? (%s)"
+msgstr "???? (%s)"
 
-#, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "???????????"
+msgstr "??????????????\n"
 
-#, fuzzy
+# XXX ?????????? 20090305 acli
 msgid "Transfer was closed."
-msgstr "??????"
+msgstr "???????"
 
-#, fuzzy
 msgid "Failed to open the file"
-msgstr "???????%s?:%s"
+msgstr "??????"
 
 msgid "Failed to open in-band bytestream"
-msgstr ""
+msgstr "??????????"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -5228,9 +5204,25 @@ msgstr "????????"
 msgid "Non-IM Contacts"
 msgstr "????????"
 
-#, fuzzy, c-format
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr "%s ????,<a href='msn-wink://%s'>???????????</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s ????,??????????"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr "%s ?????????,<a href='audio://%s'>???????</a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s ?????????,??????????"
+
+#, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
-msgstr "%s ????????????,??????????????"
+msgstr "%s ????????????,??????????????"
 
 msgid "Nudge"
 msgstr "??"
@@ -5387,6 +5379,27 @@ msgstr "MSN ?? SSL ?????? msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN ?? SSL ??????,????????? SSL ????"
 
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr "?????????%s?,???????????????????????"
+
+msgid "Unable to Add"
+msgstr "????"
+
+msgid "Authorization Request Message:"
+msgstr "??????:"
+
+msgid "Please authorize me!"
+msgstr "???????!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "??(_O)"
+
 msgid "Error retrieving profile"
 msgstr "???????????"
 
@@ -5579,13 +5592,14 @@ msgstr "%s ????!"
 msgid "%s just sent you a Nudge!"
 msgstr "%s ????!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "????(?? %d)"
+msgstr "????(?? %d):%s"
 
 msgid "Unable to add user"
 msgstr "???????"
 
+#. Unknown error!
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "????(?? %d)"
@@ -5657,25 +5671,21 @@ msgstr ""
 "%s ???????????:\n"
 "%s"
 
-#, fuzzy
 msgid "Our protocol is not supported by the server"
-msgstr "??????????????????"
+msgstr "?????????????????"
 
-#, fuzzy
 msgid "Error parsing HTTP"
-msgstr "?? HTTP ???????"
+msgstr "?? HTTP ??????"
 
-#, fuzzy
 msgid "You have signed on from another location"
-msgstr "??????????"
+msgstr "?????????"
 
 #  XXX
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
-msgstr "?????? MSN ???,????????"
+msgstr "?????? MSN ???,????????"
 
-#, fuzzy
 msgid "The MSN servers are going down temporarily"
-msgstr "MSN ?????????"
+msgstr "MSN ????????"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5704,13 +5714,15 @@ msgstr "???????"
 msgid "Retrieving buddy list"
 msgstr "???????"
 
-#, fuzzy, c-format
+# FIXME ???????? - acli 20090803
+#, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
-msgstr "%s ????????????,??????????????"
+msgstr "%s ????? webcam,??????????????"
 
+# FIXME ???????? - acli 20090803
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s ????????????,??????????????"
+msgstr "%s ????? webcam ??,??????????????"
 
 msgid "Away From Computer"
 msgstr "?????"
@@ -5908,15 +5920,15 @@ msgstr "??????,?? %d? msgstr "??????,?? %d:%s"
 
 # NOTE ??? %s ?????
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s Your password is %zu characters, which is longer than the maximum length "
 "of %d.  Please shorten your password at http://profileedit.myspace.com/index."
 "cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s ???????? %d ???,?????? MySpaceIM ?? %d ???????"
-"?? http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings."
-"changePassword ?????????,?????"
+"%s ???????? %zu ???,??? %d ????????? http://"
+"profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
+"?????????,?????"
 
 msgid "Incorrect username or password"
 msgstr "????????"
@@ -6021,6 +6033,8 @@ msgstr ""
 "visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
 "to set your username."
 msgstr ""
+"?????????????????,???? http://editprofile.myspace.com/"
+"index.cfm?fuseaction=profile.username  ????????"
 
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM:?????????"
@@ -6285,9 +6299,9 @@ msgstr "????:0x%X"
 msgid "Unknown error: 0x%X"
 msgstr "????:0x%X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "?? Ping ??? %s"
+msgstr "????:%s"
 
 #  XXX ??
 #, c-format
@@ -6418,7 +6432,6 @@ msgstr "%s ??????,??? "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s ??????,???????????????"
 
-#, fuzzy
 msgid ""
 "Unable to connect to server. Please enter the address of the server to which "
 "you wish to connect."
@@ -6446,10 +6459,9 @@ msgstr "??????"
 msgid "Server port"
 msgstr "??????"
 
-# XXX ?? - 20061025
-#, fuzzy
+# NOTE ?? http://pidgin.im/pipermail/translators/2009-July/000394.html
 msgid "Received unexpected response from "
-msgstr "????????? HTTP ???"
+msgstr "???????????,????? "
 
 #. username connecting too frequently
 msgid ""
@@ -6459,12 +6471,13 @@ msgstr ""
 "????/????????????????????????????????,"
 "????????????????"
 
-#, fuzzy, c-format
+# NOTE ?? http://pidgin.im/pipermail/translators/2009-July/000394.html
+#, c-format
 msgid "Error requesting "
-msgstr "?? %s ???????"
+msgstr "?????????,????? "
 
 msgid "AOL does not allow your screen name to authenticate here"
-msgstr ""
+msgstr "AOL ????????????"
 
 msgid "Could not join chat room"
 msgstr "???????"
@@ -6472,9 +6485,8 @@ msgstr "???????"
 msgid "Invalid chat room name"
 msgstr "???????"
 
-#, fuzzy
 msgid "Received invalid data on connection with server"
-msgstr "???????????????"
+msgstr "??????????????"
 
 #. *< type
 #. *< ui_requirement
@@ -6521,7 +6533,6 @@ msgstr "??????????? msgid "Received invalid data on connection with remote user."
 msgstr "???????????????????"
 
-#, fuzzy
 msgid "Unable to establish a connection with the remote user."
 msgstr "?????????????"
 
@@ -6581,7 +6592,7 @@ msgstr "????"
 msgid "Request denied"
 msgstr "????"
 
-# NOTE?Busted???SNAC payload?????Luke Schierer?#Pidgin??
+# NOTE?Busted???SNAC payload?????Luke Schierer?#gaim??
 # NOTE ?????????????????????
 msgid "Busted SNAC payload"
 msgstr "SNAC????"
@@ -6740,17 +6751,15 @@ msgid "Buddy Comment"
 msgstr "????"
 
 msgid "Buddy Comment"
-msgstr "????"
+msgstr "????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr ""
-"??????????:\n"
-"%s"
+msgstr "??????????:%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "?????????"
+msgstr "????? BOS ???:%s"
 
 msgid "Username sent"
 msgstr "????????"
@@ -6762,14 +6771,14 @@ msgstr "?????"
 msgid "Finalizing connection"
 msgstr "?????"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to sign on as %s because the username is invalid.  Usernames must be "
 "a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"????:??? %s ????,??????????????????????;"
-"?????????,?????????????;?????????"
+"??? %s ????,??????????????????????;?????"
+"????,?????????????;?????????"
 
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
@@ -6787,14 +6796,13 @@ msgstr "????"
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
-msgstr "??????"
+msgstr "????????"
 
+# XXX?suspend?????????
 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
-msgstr "??????????"
+msgstr "?????????"
 
 #  NOTE????????????????????
 #  NOTE ???? by Ambrose
@@ -6803,22 +6811,21 @@ msgstr "?????? AOL ???
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "?????? AOL ???????"
 
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "????????????????? %s ??"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait a minute and "
 "try again. If you continue to try, you will need to wait even longer."
 msgstr ""
-"????/????????????????????????????????,"
+"????/????????????????????????????????,"
 "????????????????"
 
-#, fuzzy
 msgid "The SecurID key entered is invalid"
-msgstr "????? SecurID ????"
+msgstr "????? SecurID ???"
 
 msgid "Enter SecurID"
 msgstr "??? SecurID"
@@ -6826,12 +6833,6 @@ msgstr "??????????? msgid "Enter the 6 digit number from the digital display."
 msgstr "?????????????????"
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "??(_O)"
-
 msgid "Password sent"
 msgstr "??????"
 
@@ -6841,12 +6842,6 @@ msgstr "?????????,? msgid "Please authorize me so I can add you to my buddy list."
 msgstr "?????????,?????????????????"
 
-msgid "Authorization Request Message:"
-msgstr "??????:"
-
-msgid "Please authorize me!"
-msgstr "???????!"
-
 msgid "No reason given."
 msgstr "???????"
 
@@ -7149,18 +7144,15 @@ msgstr "???????"
 msgid "Away message too long."
 msgstr "???????"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"?????????%s?,??????????????????????;???"
-"??????,?????????????;?????????"
+"???????%s?,??????????????????????;?????"
+"????,?????????????;?????????"
 
-msgid "Unable to Add"
-msgstr "????"
-
 msgid "Unable to Retrieve Buddy List"
 msgstr "????????"
 
@@ -7174,18 +7166,18 @@ msgstr "???"
 msgid "Orphans"
 msgstr "???"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
-"???????????????,?????????? %s???????????"
-"??"
+"???????????????,?????????? %s????????,??"
+"???"
 
 msgid "(no name)"
 msgstr "(????)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "??? %s ??????,?????"
 
@@ -7224,7 +7216,7 @@ msgstr "????"
 msgid "Authorization Denied"
 msgstr "????"
 
-# NOTE: ??????? #Pidgin ? MrHappy ? deryni ???
+# NOTE: ??????? #gaim ? MrHappy ? deryni ???
 # NOTE: KingAnt ?????????,??????
 msgid "_Exchange:"
 msgstr "????(_E):"
@@ -7241,10 +7233,10 @@ msgid "Buddy Comment for %s"
 
 #, c-format
 msgid "Buddy Comment for %s"
-msgstr "%s ?????"
+msgstr "%s ?????"
 
 msgid "Buddy Comment:"
-msgstr "????:"
+msgstr "????:"
 
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
@@ -7263,7 +7255,7 @@ msgid "Edit Buddy Comment"
 
 #. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
-msgstr "??????"
+msgstr "??????"
 
 msgid "Get Status Msg"
 msgstr "??????"
@@ -7275,12 +7267,12 @@ msgstr "??????"
 msgid "Re-request Authorization"
 msgstr "??????"
 
-# NOTE Require??????,??????
+# NOTE ????Require??????????????,??????????,?????
 msgid "Require authorization"
-msgstr "????"
+msgstr "????"
 
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
-msgstr "???????????????????(??????????!)"
+msgstr "??????????????(??????????!)"
 
 msgid "ICQ Privacy Options"
 msgstr "ICQ ????"
@@ -7354,9 +7346,8 @@ msgstr "????????"
 msgid "Search for Buddy by Information"
 msgstr "????????"
 
-#, fuzzy
 msgid "Use clientLogin"
-msgstr "???????"
+msgstr "?? clientLogin"
 
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
@@ -7492,9 +7483,8 @@ msgstr "????"
 msgid "Phone Number"
 msgstr "????"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "?????"
+msgstr "????????"
 
 msgid "Cellphone Number"
 msgstr "??????"
@@ -7558,40 +7548,37 @@ msgstr "??"
 msgid "Note"
 msgstr "??"
 
+# NOTE ???QQ???????(??)
 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "????"
+msgstr "????"
 
 msgid "Change his/her memo as you like"
-msgstr ""
+msgstr "???????"
 
-#, fuzzy
 msgid "_Modify"
-msgstr "??"
+msgstr "??(_M)"
 
-#, fuzzy
 msgid "Memo Modify"
-msgstr "??"
+msgstr "????"
 
-#, fuzzy
+# XXX ??????????says????????? - acli 20090305
 msgid "Server says:"
-msgstr "?????"
+msgstr "?????:"
 
 msgid "Your request was accepted."
-msgstr ""
+msgstr "???????"
 
 msgid "Your request was rejected."
-msgstr ""
+msgstr "???????"
 
-# NOTE Require??????,??????
 #, c-format
 msgid "%u requires verification"
 msgstr "%u ????"
 
-#, fuzzy
+# XXX ?? - acli 20090803
 msgid "Add buddy question"
-msgstr "?????????????"
+msgstr "?????????"
 
 msgid "Enter answer here"
 msgstr "??????"
@@ -7608,14 +7595,16 @@ msgstr "????,?????? msgid "Sorry, you're not my style."
 msgstr "????,??????..."
 
+# NOTE ???? =P
 #, c-format
 msgid "%u needs authorization"
-msgstr "%u ????"
+msgstr "%u ????"
 
-#, fuzzy
+# NOTE ??????,??????Enter request here???Would you be my friend??
 msgid "Add buddy authorize"
-msgstr "?????????????"
+msgstr "??????"
 
+# NOTE ????????????:?
 msgid "Enter request here"
 msgstr "??????"
 
@@ -7633,7 +7622,7 @@ msgid "Failed sending authorize"
 msgstr "??? QQ ??"
 
 msgid "Failed sending authorize"
-msgstr "??????"
+msgstr "??????"
 
 #, c-format
 msgid "Failed removing buddy %u"
@@ -7692,10 +7681,10 @@ msgid "Requesting"
 msgstr "??"
 
 msgid "Requesting"
-msgstr ""
+msgstr "???"
 
 msgid "Admin"
-msgstr ""
+msgstr "???"
 
 msgid "Notice"
 msgstr "??"
@@ -7721,19 +7710,17 @@ msgstr "?????"
 msgid "Input request here"
 msgstr "?????"
 
-#  NOTE QQ?member???????
 #, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "???? Qun %s (%u)"
+msgstr "?????? %s (%u)"
 
-#  NOTE QQ?member???????
 msgid "Successfully joined Qun"
-msgstr "???? Qun"
+msgstr "??????"
 
 # NOTE ?? QQ_ROOM_JOIN_DENIED
 #, c-format
 msgid "Qun %u denied from joining"
-msgstr "?? Qun %u ???"
+msgstr "???? %u ???"
 
 msgid "QQ Qun Operation"
 msgstr "QQ ????"
@@ -7742,15 +7729,15 @@ msgid "Join Qun, Unknown Reply"
 msgstr "??:"
 
 msgid "Join Qun, Unknown Reply"
-msgstr "?? Qun,?????"
+msgstr "?????????????"
 
 msgid "Quit Qun"
-msgstr "?? Qun"
+msgstr "????"
 
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
-msgstr "???,???????,???????? (Qun) ???"
+msgstr "???,???????,????????? (Qun) ???"
 
 #  NOTE ??????????,?????????????????
 #  NOTE(???tu?????du?)??????(?vous???Sie?),
@@ -7760,14 +7747,14 @@ msgid "Successfully changed Qun members"
 
 #  NOTE QQ?member???????
 msgid "Successfully changed Qun members"
-msgstr "?????? Qun ??"
+msgstr "??????????"
 
 # FIXME ?? ambrose 20070415
 msgid "Successfully changed Qun information"
 msgstr "?????? Qun ??"
 
 msgid "You have successfully created a Qun"
-msgstr "???????? (Qun)"
+msgstr "????????? (Qun)"
 
 msgid "Would you like to set up detailed information now?"
 msgstr "??????????????"
@@ -7775,9 +7762,10 @@ msgstr "??"
 msgid "Setup"
 msgstr "??"
 
-#, fuzzy, c-format
+# NOTE %s ??reason?
+#, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr "??? %d ?????? %d"
+msgstr "??? %u ?????? %u,????%s?"
 
 #, c-format
 msgid "%u request to join Qun %u"
@@ -7785,11 +7773,12 @@ msgid "Failed to join Qun %u, operated b
 
 #, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr ""
+msgstr "???? %u ??,?????? %u"
 
+# NOTE %s ??reason?
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr ""
+msgstr "<b>??? %2$u ???????? %1$u,????%3$s?</b>"
 
 # XXX?Remove Buddy???Remove Contact?????Pidgin????;????????
 #, c-format
@@ -7803,9 +7792,9 @@ msgstr "<b>??? %u ????</b>
 
 # XXX ??:
 # XXX gtk/gtkft.c - ?Unknown?????????????,???????
-# XXX libPidgin/account.c - ?Unknown????????????,???????(??????????,
+# XXX libgaim/account.c - ?Unknown????????????,???????(??????????,
 # XXX                      ?????????????????????????)
-# XXX libPidgin/protocols/* - ?Unknown?????????,????????(??????????????)
+# XXX libgaim/protocols/* - ?Unknown?????????,????????(??????????????)
 # XXX                       ??????(??? Pidgin ????????)
 # XXX - Ambrose 20061123
 #, c-format
@@ -7868,9 +7857,12 @@ msgstr "<b>?????</b>:%s<br>\
 msgid "<b>Server</b>: %s<br>\n"
 msgstr "<b>?????</b>:%s<br>\n"
 
-#, fuzzy, c-format
+#  NOTE ??:???????
+#  NOTE ?????,?? Client Tag ???????????? (qq2007?QQ2008??)
+#  NOTE ?OSCAR????????? (Capabilities) ??????
+#, 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"
@@ -7929,7 +7921,7 @@ msgid "and more, please let me know... t
 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 "<p><i>????????????????...</i><br>\n"
@@ -7951,14 +7943,13 @@ msgid "Update all QQ Quns"
 msgstr "????"
 
 msgid "Update all QQ Quns"
-msgstr ""
+msgstr "???? QQ ?"
 
 msgid "About OpenQ"
 msgstr "?? OpenQ"
 
-#, fuzzy
 msgid "Modify Buddy Memo"
-msgstr "????"
+msgstr "??????"
 
 #. *< type
 #. *< ui_requirement
@@ -8000,7 +7991,7 @@ msgid "Show chat room when msg comes"
 msgstr "?????????"
 
 msgid "Show chat room when msg comes"
-msgstr ""
+msgstr "???????????????"
 
 # XXX 20080810 acli - ??????,????
 msgid "Keep alive interval (seconds)"
@@ -8010,7 +8001,6 @@ msgstr "???????"
 msgid "Update interval (seconds)"
 msgstr "???????"
 
-#, fuzzy
 msgid "Unable to decrypt server reply"
 msgstr "?????????"
 
@@ -8030,7 +8020,7 @@ msgid "Activation required"
 #. need activation
 #. need activation
 msgid "Activation required"
-msgstr "??????"
+msgstr "???????"
 
 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
@@ -8048,9 +8038,11 @@ msgstr "????"
 msgid "Captcha Image"
 msgstr "????"
 
+# NOTE ??????Enter code???????????????
 msgid "Enter code"
-msgstr "?????"
+msgstr "??????"
 
+# NOTE ????
 msgid "QQ Captcha Verification"
 msgstr "QQ ????"
 
@@ -8073,17 +8065,15 @@ msgstr "Socket ??"
 msgid "Socket error"
 msgstr "Socket ??"
 
-#, fuzzy
 msgid "Getting server"
-msgstr "???????..."
+msgstr "????????"
 
 # XXX ???????????(?????)- acli 20080930
 msgid "Requesting token"
 msgstr "?????"
 
-#, fuzzy
 msgid "Unable to resolve hostname"
-msgstr "?????????"
+msgstr "????????"
 
 msgid "Invalid server or port"
 msgstr "?????????"
@@ -8138,15 +8128,14 @@ msgstr "QQ ????"
 msgid "QQ Qun Command"
 msgstr "QQ ????"
 
-#, fuzzy
 msgid "Unable to decrypt login reply"
-msgstr "?????????"
+msgstr "????????"
 
 msgid "Unknown LOGIN CMD"
 msgstr "???????"
 
 msgid "Unknown CLIENT CMD"
-msgstr "????????"
+msgstr "????????"
 
 #, c-format
 msgid "%d has declined the file %s"
@@ -8272,7 +8261,6 @@ msgstr "??????..."
 msgid "Create New Conference..."
 msgstr "??????..."
 
-# NOTE????????????Yahoo! ??????Conference?????????
 msgid "Invite user to a conference"
 msgstr "??????????"
 
@@ -8285,12 +8273,11 @@ msgstr ""
 "??????????????,??????????%s????????????"
 "??,???????????,????????????????"
 
-# NOTE????????????Yahoo! ??????Conference?????????
 msgid "Invite to Conference"
 msgstr "???????"
 
 msgid "Invite to Conference..."
-msgstr "???????"
+msgstr "???????..."
 
 #  XXX ??? - 20061029
 msgid "Send TEST Announcement"
@@ -9131,7 +9118,6 @@ msgstr "????????"
 msgid "Disconnected by server"
 msgstr "????????"
 
-#, fuzzy
 msgid "Error connecting to SILC Server"
 msgstr "??? SILC ????????"
 
@@ -9145,22 +9131,16 @@ msgstr "??????"
 msgid "Performing key exchange"
 msgstr "??????"
 
-#, fuzzy
 msgid "Unable to load SILC key pair"
-msgstr "???? SILC ?????"
+msgstr "???? SILC ?????"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "??? SILC ????"
 
-#, fuzzy
-msgid "Unable to not load SILC key pair"
-msgstr "???? SILC ?????"
-
 msgid "Out of memory"
 msgstr "?????"
 
-#, fuzzy
 msgid "Unable to initialize SILC protocol"
 msgstr "????? SILC ??"
 
@@ -9461,9 +9441,8 @@ msgstr "?? SILC ??????..
 msgid "Creating SILC key pair..."
 msgstr "?? SILC ??????..."
 
-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "???? SILC ?????\n"
+msgstr "???? SILC ?????"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9601,7 +9580,6 @@ msgstr "??:????"
 msgid "Failure: Authentication failed"
 msgstr "??:????"
 
-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
 msgstr "????? SILC ??????"
 
@@ -9609,20 +9587,18 @@ msgstr "???"
 msgid "John Noname"
 msgstr "???"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
-msgstr "???? SILC ?????:%s"
+msgstr "???? SILC ?????:%s"
 
 msgid "Unable to create connection"
 msgstr "??????"
 
-#, fuzzy
 msgid "Unknown server response"
-msgstr "?????????"
+msgstr "????????"
 
-#, fuzzy
 msgid "Unable to create listen socket"
-msgstr "???? Socket"
+msgstr "?????? Socket"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP ?????????????@???"
@@ -9685,7 +9661,6 @@ msgstr "Yahoo ??"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo ????"
 
@@ -9717,9 +9692,8 @@ msgstr "Yahoo ??????"
 msgid "Yahoo Chat port"
 msgstr "Yahoo ??????"
 
-#, fuzzy
 msgid "Yahoo JAPAN ID..."
-msgstr "Yahoo ??"
+msgstr "Yahoo JAPAN ??..."
 
 #. *< type
 #. *< ui_requirement
@@ -9731,12 +9705,11 @@ msgstr "Yahoo ??"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "Yahoo ????"
+msgstr "Yahoo JAPAN ????"
 
 msgid "Your SMS was not delivered"
-msgstr ""
+msgstr "????????"
 
 # NOTE ???? by Ambrose
 msgid "Your Yahoo! message did not get sent."
@@ -9763,28 +9736,24 @@ msgstr "??????"
 msgstr "??????"
 
 #. Some error in the received stream
-#, fuzzy
 msgid "Received invalid data"
-msgstr "???????????????"
+msgstr "???????"
 
 #. security lock from too many failed login attempts
-#, fuzzy
 msgid ""
 "Account locked: Too many failed login attempts.  Logging into the Yahoo! "
 "website may fix this."
-msgstr "??????? %d?????? Yahoo!,????????????????"
+msgstr "??????:??????????? Yahoo ???????????"
 
 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
-msgstr "??????? %d?????? Yahoo!,????????????????"
+msgstr "??????:??????? Yahoo ???????????"
 
 #. username or password missing
-#, fuzzy
 msgid "Username or password missing"
-msgstr "????????"
+msgstr "?????????"
 
 #, c-format
 msgid ""
@@ -9809,18 +9778,18 @@ msgstr "??????"
 msgid "Ignore buddy?"
 msgstr "??????"
 
+# NOTE???????????????? - acli 20090730
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "???????????????? Yahoo! ???"
+msgstr "??????????????? Yahoo! ???"
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "??????? %d?????? Yahoo!,????????????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "??????%1$s???????%3$s??????????????%2$s??"
 
-#, fuzzy
 msgid "Unable to add buddy to server list"
 msgstr "????????????????"
 
@@ -9829,21 +9798,16 @@ msgstr "[ ??? %s/%s/%s.swf ] %s"
 msgstr "[ ??? %s/%s/%s.swf ] %s"
 
 # XXX ?? - 20061025
-#, fuzzy
 msgid "Received unexpected HTTP response from server"
-msgstr "????????? HTTP ???"
+msgstr "????????? HTTP ??"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr ""
-"? %s ?????????:\n"
-"%s"
+msgstr "? %s ?????????:%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr ""
-"??????????:\n"
-"%s"
+msgstr "??? %s ????:%s"
 
 msgid "Not at Home"
 msgstr "???"
@@ -9885,7 +9849,7 @@ msgstr "????????"
 msgid "Don't Appear Permanently Offline"
 msgstr "????????"
 
-# NOTE #Pidgin ? Vann ? LSchiere ?:????????????????,???????
+# NOTE #gaim ? Vann ? LSchiere ?:????????????????,???????
 # NOTE Yahoo ??Chat????????????
 msgid "Join in Chat"
 msgstr "????????????"
@@ -9901,9 +9865,9 @@ msgid "Select the ID you want to activat
 msgstr "?? Doodle"
 
 msgid "Select the ID you want to activate"
-msgstr ""
+msgstr "???????? ID"
 
-# NOTE #Pidgin ? Vann ? LSchiere ?:????????????????,???????
+# NOTE #gaim ? Vann ? LSchiere ?:????????????????,???????
 # NOTE Yahoo ??Chat????????????
 msgid "Join whom in chat?"
 msgstr "????????"
@@ -9926,9 +9890,9 @@ msgstr "?????"
 msgid "Unable to connect."
 msgstr "?????"
 
-# TODO - ???? - 20061028
+# NOTE ?? http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=descriptor&qrytype=en&x=0&y=0
 msgid "Unable to establish file descriptor."
-msgstr "?????????"
+msgstr "?????????"
 
 #, c-format
 msgid "%s is trying to send you a group of %d files.\n"
@@ -10000,12 +9964,9 @@ msgstr "??????????? msgstr "?????????????"
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s ???????(?)?????%s????,????%s??"
+msgid "%s has declined to join."
+msgstr "%s ?????????"
 
-msgid "Invitation Rejected"
-msgstr "??????"
-
 msgid "Failed to join chat"
 msgstr "???????"
 
@@ -10059,7 +10020,6 @@ msgstr "?????????"
 msgid "User Rooms"
 msgstr "?????????"
 
-#, fuzzy
 msgid "Connection problem with the YCHT server"
 msgstr "? YCHT ?????????"
 
@@ -10183,7 +10143,7 @@ msgstr "TZC ??"
 # NOTE: ??Zephyr???????????,??????
 # NOTE: aatharuv: Most zephyr clients use ".anyone" to store the Zephyr
 # NOTE: buddylist. The export to .anyone option controls whether you want
-# NOTE: Pidgin to write to .anyone upon logout. Some people use multiple
+# NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
 msgid "Export to .anyone"
@@ -10195,7 +10155,7 @@ msgstr "??? .zephyr.subs ?"
 # NOTE: ??Zephyr???????????,??????
 # NOTE: aatharuv: Most zephyr clients use ".anyone" to store the Zephyr
 # NOTE: buddylist. The export to .anyone option controls whether you want
-# NOTE: Pidgin to write to .anyone upon logout. Some people use multiple
+# NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
 msgid "Import from .anyone"
@@ -10213,17 +10173,18 @@ msgstr "????"
 msgid "Exposure"
 msgstr "????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "???? HTTP ????????:%s\n"
+msgstr "???? HTTP ????????:%s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP ????????? %d"
 
-#, fuzzy, c-format
+# NOTE ?? http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=tunnel&qrytype=en&x=35&y=11
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
-msgstr "????:HTTP ?????????? %d ??????"
+msgstr "????:HTTP ???????????? %d ??"
 
 #, c-format
 msgid "Error resolving %s"
@@ -10468,12 +10429,15 @@ msgstr "???????"
 msgid "Address already in use."
 msgstr "???????"
 
+# NOTE ?? %s ?? filename
 #, c-format
 msgid "Error Reading %s"
 msgstr "?? %s ???????"
 
-# NOTE ?They??????????????,?????????????????
-#, fuzzy, c-format
+# NOTE ??? %s ? description,??? %s ? filename_full
+# NOTE ??????If we could not parse the file then show the user an error message?
+# NOTE ?????reading????????????????
+#, c-format
 msgid ""
 "An error was encountered reading your %s.  The file has not been loaded, and "
 "the old file has been renamed to %s~."
@@ -10525,8 +10489,8 @@ msgstr "????????(_I):"
 msgid "Use this buddy _icon for this account:"
 msgstr "????????(_I):"
 
-msgid "_Advanced"
-msgstr "????(_A)"
+msgid "Ad_vanced"
+msgstr "????(_V)"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "?? GNOME ????????"
@@ -10590,9 +10554,8 @@ msgstr "??????????? msgid "Create _this new account on the server"
 msgstr "????????????(_T)"
 
-#, fuzzy
-msgid "_Proxy"
-msgstr "?????"
+msgid "P_roxy"
+msgstr "?????(_R)"
 
 msgid "Enabled"
 msgstr "??"
@@ -10639,9 +10602,8 @@ msgstr "??????????? msgid "Please update the necessary fields."
 msgstr "?????????????"
 
-#, fuzzy
 msgid "A_ccount"
-msgstr "??"
+msgstr "??(_C)"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10666,17 +10628,14 @@ msgstr "????(_M)"
 msgid "I_M"
 msgstr "????(_M)"
 
-#, fuzzy
 msgid "_Audio Call"
-msgstr "?????(_A)"
+msgstr "????(_A)"
 
 msgid "Audio/_Video Call"
-msgstr ""
+msgstr "??/????"
 
-# XXX ??
-#, fuzzy
 msgid "_Video Call"
-msgstr "????"
+msgstr "????(_V)"
 
 msgid "_Send File..."
 msgstr "????(_S)..."
@@ -10687,11 +10646,9 @@ msgstr "????(_L)"
 msgid "View _Log"
 msgstr "????(_L)"
 
-#, fuzzy
 msgid "Hide When Offline"
 msgstr "?????"
 
-#, fuzzy
 msgid "Show When Offline"
 msgstr "?????"
 
@@ -10823,9 +10780,8 @@ msgstr "/??/??(_C)"
 msgid "/Tools/_Certificates"
 msgstr "/??/??(_C)"
 
-#, fuzzy
 msgid "/Tools/Custom Smile_ys"
-msgstr "/??/??(_Y)"
+msgstr "/??/????(_Y)"
 
 msgid "/Tools/Plu_gins"
 msgstr "/??/??(_G)"
@@ -10955,8 +10911,9 @@ msgstr "????"
 msgid "By status"
 msgstr "????"
 
+# XXX ?? 20090305 acli
 msgid "By recent log activity"
-msgstr ""
+msgstr "????????"
 
 #, c-format
 msgid "%s disconnected"
@@ -10973,7 +10930,7 @@ msgid "SSL FAQs"
 msgstr "????"
 
 msgid "SSL FAQs"
-msgstr ""
+msgstr "SSL ????"
 
 msgid "Welcome back!"
 msgstr "????!"
@@ -11105,109 +11062,99 @@ msgid "The background color for the budd
 msgstr "????"
 
 msgid "The background color for the buddy list"
-msgstr ""
+msgstr "?????????"
 
-#, fuzzy
 msgid "Layout"
-msgstr "???"
+msgstr "??"
 
 msgid "The layout of icons, name, and status of the blist"
-msgstr ""
+msgstr "????????????????"
 
 #. Group
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "????"
+msgstr "??????????"
 
 msgid "The background color of an expanded group"
-msgstr ""
+msgstr "???????????????"
 
-#, fuzzy
+# NOTE ??gtkblist-theme-loader????,????????????PidginThemeFont(???????????),??
 msgid "Expanded Text"
-msgstr "??(_E)"
+msgstr "????????"
 
 msgid "The text information for when a group is expanded"
-msgstr ""
+msgstr "?????????????????"
 
-#, fuzzy
 msgid "Collapsed Background Color"
-msgstr "??????"
+msgstr "??????????"
 
 msgid "The background color of a collapsed group"
-msgstr ""
+msgstr "??????????????"
 
-#, fuzzy
 msgid "Collapsed Text"
-msgstr "??(_C)"
+msgstr "????????"
 
 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "?????????????????"
 
 #. Buddy
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "??????"
+msgstr "??/????????"
 
 msgid "The background color of a contact or chat"
-msgstr ""
+msgstr "?????????????"
 
-#, fuzzy
 msgid "Contact Text"
-msgstr "??"
+msgstr "???????"
 
+# NOTE "the text font and color to be used for expanded contacts" (blist-theme.h)
+# NOTE ??deryni???,?contact???,??????priority buddy
+# NOTE ??contact???,????????contact???????contact????buddy
+# NOTE ???,???text information for when a contact is expanded?????contact???
 msgid "The text information for when a contact is expanded"
-msgstr ""
+msgstr "????????????????????"
 
-#, fuzzy
 msgid "On-line Text"
-msgstr "??"
+msgstr "???????"
 
 msgid "The text information for when a buddy is online"
-msgstr ""
+msgstr "?????????????????"
 
-#, fuzzy
 msgid "Away Text"
-msgstr "??"
+msgstr "???????"
 
 msgid "The text information for when a buddy is away"
-msgstr ""
+msgstr "?????????????????"
 
-#, fuzzy
 msgid "Off-line Text"
-msgstr "??"
+msgstr "???????"
 
 msgid "The text information for when a buddy is off-line"
-msgstr ""
+msgstr "?????????????????"
 
-# XXX ??? - acli 20070914
-#, fuzzy
 msgid "Idle Text"
-msgstr "????"
+msgstr "???????"
 
 msgid "The text information for when a buddy is idle"
-msgstr ""
+msgstr "?????????????????"
 
-#, fuzzy
 msgid "Message Text"
-msgstr "????"
+msgstr "??????????"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr ""
+msgstr "????????????????????"
 
 msgid "Message (Nick Said) Text"
-msgstr ""
+msgstr "????????????"
 
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nick"
-msgstr ""
+msgstr "????????????????????????"
 
-#, fuzzy
 msgid "The text information for a buddy's status"
-msgstr "?? %s ?????"
+msgstr "????????????"
 
 # XXX ?????? - acli 20070913
-#, fuzzy
 msgid "Type the host name for this certificate."
 msgstr "???????????????"
 
@@ -11259,7 +11206,6 @@ msgstr "??????"
 msgid "Get Away Message"
 msgstr "??????"
 
-#, fuzzy
 msgid "Last Said"
 msgstr "????"
 
@@ -11308,21 +11254,18 @@ msgstr "/??/??????(_R)"
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/??/??????(_R)"
 
-#, fuzzy
+# XXX ???  - acli 20090730
 msgid "/Conversation/M_edia"
-msgstr "/??/??(_O)"
+msgstr "/??/??(_E)"
 
-#, fuzzy
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/??/??(_O)"
+msgstr "/??/??/????(_A)"
 
-#, fuzzy
 msgid "/Conversation/Media/_Video Call"
-msgstr "/??/??(_O)"
+msgstr "/??/??/????(_V)"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/??/??????(_L)"
+msgstr "/??/??/??/????(_C)"
 
 msgid "/Conversation/Se_nd File..."
 msgstr "/??/????(_N)..."
@@ -11396,17 +11339,15 @@ msgstr "/??/??????"
 msgid "/Conversation/View Log"
 msgstr "/??/??????"
 
-#, fuzzy
+# XXX ??? - acli 20090730
 msgid "/Conversation/Media/Audio Call"
-msgstr "/??/??"
+msgstr "/??/??/????"
 
-#, fuzzy
 msgid "/Conversation/Media/Video Call"
-msgstr "/??/??????"
+msgstr "/??/??/????"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/??/??"
+msgstr "/??/??/??/????"
 
 msgid "/Conversation/Send File..."
 msgstr "/??/????..."
@@ -11606,7 +11547,7 @@ msgid "voice and video"
 msgstr "???"
 
 msgid "voice and video"
-msgstr ""
+msgstr "???????"
 
 msgid "support"
 msgstr "??"
@@ -11744,9 +11685,8 @@ msgstr "????"
 msgid "Hungarian"
 msgstr "????"
 
-#, fuzzy
 msgid "Armenian"
-msgstr "?????"
+msgstr "?????"
 
 msgid "Indonesian"
 msgstr "???"
@@ -11769,9 +11709,9 @@ msgstr "Ubuntu ?????????msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu ?????????????"
 
-#, fuzzy
+# NOTE ?? http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
 msgid "Khmer"
-msgstr "??"
+msgstr "???"
 
 # NOTE ?? http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
 # NOTE ?:KDE ??????
@@ -11871,8 +11811,9 @@ msgstr "???"
 msgid "Swedish"
 msgstr "???"
 
+# NOTE ?? http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=swahili&qrytype=en&x=29&y=7
 msgid "Swahili"
-msgstr ""
+msgstr "?????"
 
 # NOTE ?? http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
 # NOTE ?????????,?????????(?????)??????
@@ -11955,7 +11896,7 @@ msgstr ""
 msgid ""
 "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr ""
-"<FONT SIZE=\"4\">IRC ??</FONT> irc.freenode.net ?? #pidgin ??<BR><BR>"
+"<FONT SIZE=\"4\">IRC ??:</FONT>irc.freenode.net ?? #pidgin ??<BR><BR>"
 
 #, c-format
 msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel at conference.pidgin.im<BR><BR>"
@@ -11965,8 +11906,8 @@ msgstr "?????"
 msgid "Current Developers"
 msgstr "?????"
 
-# NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on Pidgin ;-)
-# NOTE Luke Schierer ?:?????????,????? Pidgin ???
+# NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on gaim ;-)
+# NOTE Luke Schierer ?:?????????,????? gaim ???
 # NOTE ???????????????????????????????......
 # NOTE ??????????,????????????????? :P
 msgid "Crazy Patch Writers"
@@ -12199,14 +12140,6 @@ msgstr "??????(_D)"
 msgid "File transfer _details"
 msgstr "??????(_D)"
 
-#. Pause button
-msgid "_Pause"
-msgstr "??(_P)"
-
-#. Resume button
-msgid "_Resume"
-msgstr "??(_R)"
-
 #  NOTE Nautilus???????,Abiword?????????,??????
 msgid "Paste as Plain _Text"
 msgstr "?????(_T)"
@@ -12226,7 +12159,6 @@ msgstr "????????"
 msgid "Hyperlink visited color"
 msgstr "????????"
 
-#, fuzzy
 msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "????????(????)??????????"
 
@@ -12264,21 +12196,18 @@ msgstr ""
 msgstr ""
 "?????????????????????????,???????????"
 
-#, fuzzy
 msgid "Color to draw the name of a whispered action message."
-msgstr "??????????????????,???????????"
+msgstr "?????????????????,???????????"
 
 msgid "Whisper Message Name Color"
 msgstr "????????"
 
-#, fuzzy
 msgid "Color to draw the name of a whispered message."
-msgstr "??????????????????,???????????"
+msgstr "???????????,???????????"
 
 msgid "Typing notification color"
 msgstr "??????"
 
-#, fuzzy
 msgid "The color to use for the typing notification"
 msgstr "???????????"
 
@@ -12292,7 +12221,7 @@ msgstr "??????"
 msgid "Enable typing notification"
 msgstr "??????"
 
-# NOTE "Defaulting to PNG" ?? Pidgin ?????????????? PNG ??
+# NOTE "Defaulting to PNG" ?? gaim ?????????????? PNG ??
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12302,7 +12231,7 @@ msgstr ""
 "\n"
 "???? PNG ????"
 
-# NOTE "Defaulting to PNG" ?? Pidgin ?????????????? PNG ??
+# NOTE "Defaulting to PNG" ?? gaim ?????????????? PNG ??
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -12539,7 +12468,7 @@ msgstr "%s %s????%s -h????
 #  FIXME
 #  NOTE hard-code ????Pidgin?????,????????(?????),?????,?????????
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12561,6 +12490,7 @@ msgstr ""
 "\n"
 "  -c, --config=DIR    ???????\n"
 "  -d, --debug         ????????????\n"
+"  -f, --force-online  ????????,?????????\n"
 "  -h, --help          ?????????\n"
 "  -m, --multiple      ????????Pidgin??\n"
 "  -n, --nologin       ?????\n"
@@ -12571,7 +12501,7 @@ msgstr ""
 
 #  FIXME
 #  NOTE hard-code ????Pidgin?????,????????(?????),?????,?????????
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12592,6 +12522,7 @@ msgstr ""
 "\n"
 "  -c, --config=DIR    ???????\n"
 "  -d, --debug         ????????????\n"
+"  -f, --force-online  ????????,?????????\n"
 "  -h, --help          ?????????\n"
 "  -m, --multiple      ????????Pidgin??\n"
 "  -n, --nologin       ?????\n"
@@ -12626,23 +12557,25 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
+# XXX ??? - acli 20090730
 msgid "/_Media"
-msgstr ""
+msgstr "/??(_M)"
 
+# XXX ?? - acli 20090730
 msgid "/Media/_Hangup"
-msgstr ""
+msgstr "/??/??(_H)"
 
-#, fuzzy
+# XXX ?? - acli 20090730
 msgid "Calling..."
-msgstr "???..."
+msgstr "???..."
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr ""
+msgstr "%s ????????/?????"
 
 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr ""
+msgstr "%s ???????????"
 
 #, c-format
 msgid "%s has %d new message."
@@ -12671,9 +12604,8 @@ msgstr "??????????? "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "??????????????,????????"
 
-#, fuzzy
 msgid "No message"
-msgstr "?????"
+msgstr "????"
 
 msgid "Open All Messages"
 msgstr "??????"
@@ -12681,16 +12613,18 @@ msgstr "<span weight=\"bold\" size=\"lar
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">????!</span>"
 
-#, fuzzy
+# XXX ?????????????????????????
+# XXX ??,?????? - acli 20090730
 msgid "New Pounces"
-msgstr "????????"
+msgstr "??????????"
 
+# XXX ??????????? - acli 20090730
 msgid "Dismiss"
-msgstr ""
+msgstr "??"
 
-#, fuzzy
+# XXX ??,?????? - acli 20090730
 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 "???????????"
@@ -12738,7 +12672,6 @@ msgstr "????"
 msgid "Select a file"
 msgstr "????"
 
-#, fuzzy
 msgid "Modify Buddy Pounce"
 msgstr "????????"
 
@@ -12815,64 +12748,59 @@ msgstr "????"
 msgid "Pounce Target"
 msgstr "????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Started typing"
 msgstr "????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Paused while typing"
 msgstr "????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Signed on"
 msgstr "??"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Returned from being idle"
-msgstr "%s ????? (%s)"
+msgstr "?????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Returned from being away"
-msgstr "??"
+msgstr "?????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Stopped typing"
 msgstr "????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Signed off"
 msgstr "??"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Became idle"
 msgstr "??"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Went away"
-msgstr "????"
+msgstr "??"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Sent a message"
 msgstr "????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown.... Please report this!"
-msgstr "???????????????!"
+msgstr "???????......???????!"
 
-# XXX ??? - 20061025
-#, fuzzy
+# XXX ??? - 20090730
 msgid "Theme failed to unpack."
-msgstr "?????????"
+msgstr "??????????"
 
-# XXX ??? - 20061025
-#, fuzzy
 msgid "Theme failed to load."
-msgstr "?????????"
+msgstr "?????????"
 
-# XXX ??? - 20061025
-#, fuzzy
 msgid "Theme failed to copy."
-msgstr "?????????"
+msgstr "?????????"
 
 #  NOTE ???????????????,??????????
 msgid "Install Theme"
@@ -12895,9 +12823,8 @@ msgstr "???? Escape ????
 msgstr "???? Escape ?????(_O)"
 
 #. Buddy List Themes
-#, fuzzy
 msgid "Buddy List Theme"
-msgstr "????"
+msgstr "??????"
 
 #. System Tray
 msgid "System Tray Icon"
@@ -12909,9 +12836,8 @@ msgstr "??????"
 msgid "On unread messages"
 msgstr "??????"
 
-#, fuzzy
 msgid "Conversation Window"
-msgstr "????????"
+msgstr "????"
 
 msgid "_Hide new IM conversations:"
 msgstr "??????????(_H):"
@@ -13017,9 +12943,9 @@ msgstr "<span style=\"italic\">?:stu
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">?:stunserver.org</span>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "???? IP ??(_A)"
+msgstr "????????? IP ??(_A):%s"
 
 msgid "Public _IP:"
 msgstr "??IP (_I):"
@@ -13039,9 +12965,10 @@ msgstr "?????(_E):"
 msgid "_End port:"
 msgstr "?????(_E):"
 
+# NOTE ?? http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=relay&qrytype=en&x=29&y=11
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr ""
+msgstr "????? (TURN)"
 
 msgid "Proxy Server &amp; Browser"
 msgstr "?????????"
@@ -13223,7 +13150,7 @@ msgid "_Auto-reply:"
 msgstr "????????????"
 
 msgid "_Auto-reply:"
-msgstr "????????:"
+msgstr "????????(_A):"
 
 msgid "When both away and idle"
 msgstr "?????????"
@@ -13388,11 +13315,10 @@ msgstr "??:%s"
 msgid "Status for %s"
 msgstr "??:%s"
 
-# XXX 20080810 acli - ??
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
-msgstr "??????????????,?????????"
+msgstr "?%s??????,?????????"
 
 msgid "Custom Smiley"
 msgstr "????"
@@ -13406,28 +13332,26 @@ msgstr "????"
 msgid "Add Smiley"
 msgstr "????"
 
-#, fuzzy
 msgid "_Image:"
-msgstr "??(_I)"
+msgstr "??(_I):"
 
+# XXX ?? - 20090305 acli
 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "??"
+msgstr "????(_H):"
 
 msgid "Smiley"
 msgstr "??"
 
-#, fuzzy
+# XXX ?? - 20090305 acli
 msgid "Shortcut Text"
-msgstr "??"
+msgstr "????"
 
 msgid "Custom Smiley Manager"
 msgstr "??????"
 
-#, fuzzy
 msgid "Select Buddy Icon"
-msgstr "????"
+msgstr "??????"
 
 msgid "Click to change your buddyicon for this account."
 msgstr "?????????????"
@@ -13512,7 +13436,6 @@ msgstr "???????"
 msgid "Cannot send launcher"
 msgstr "???????"
 
-#, fuzzy
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
 "this launcher instead of this launcher itself."
@@ -13547,9 +13470,8 @@ msgstr "???????%s?,?
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "???????%s?,????,?????????"
 
-#, fuzzy
 msgid "_Open Link"
-msgstr "?????????(_O):"
+msgstr "????(_O)"
 
 msgid "_Copy Link Location"
 msgstr "??????(_C)"
@@ -13557,9 +13479,21 @@ msgstr "????????(_C)"
 msgid "_Copy Email Address"
 msgstr "????????(_C)"
 
+msgid "_Open File"
+msgstr "????(_O)"
+
+msgid "Open _Containing Directory"
+msgstr "??????(_C)"
+
 msgid "Save File"
 msgstr "????"
 
+msgid "_Play Sound"
+msgstr "????(_P)"
+
+msgid "_Save File"
+msgstr "????(_S)"
+
 msgid "Select color"
 msgstr "????"
 
@@ -13584,6 +13518,9 @@ msgstr "????(_O)"
 msgid "_Open Mail"
 msgstr "????(_O)"
 
+msgid "_Pause"
+msgstr "??(_P)"
+
 # TODO ??? - 20080826
 msgid "_Edit"
 msgstr "??(_E)"
@@ -13655,80 +13592,73 @@ msgstr "??????????? msgid "Displays statistical information about your buddies' availability"
 msgstr "????????????????"
 
-#, fuzzy
+#  NOTE ???Select an XMPP server to query????????
 msgid "Server name request"
-msgstr "?????"
+msgstr "???????"
 
-# NOTE????????????Yahoo! ??????Conference?????????
-# XXX
-#, fuzzy
+#  XXX ?????,?????????,?????????? - acli 20090803
 msgid "Enter an XMPP Server"
-msgstr "???????"
+msgstr "??? XMPP ?????"
 
-#, fuzzy
 msgid "Select an XMPP server to query"
-msgstr "??????????"
+msgstr "????? XMPP ???"
 
-#  XXX ??
-#, fuzzy
+#  NOTE ????
+#  FIXME ?????? - acli 20090730
 msgid "Find Services"
-msgstr "???????"
+msgstr "????"
 
-#, fuzzy
 msgid "Add to Buddy List"
-msgstr "??????"
+msgstr "???????"
 
-#, fuzzy
+# NOTE ?? http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=gateway&qrytype=en&x=27&y=7
 msgid "Gateway"
-msgstr "??"
+msgstr "???"
 
-#, fuzzy
 msgid "Directory"
-msgstr "????"
+msgstr "??"
 
-#, fuzzy
+# NOTE ?? http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=collection&qrytype=en&x=30&y=9
+# NOTE ?? http://wiki.jabbercn.org/index.php?title=XEP-0060&variant=zh-hant
 msgid "PubSub Collection"
-msgstr "????"
+msgstr "PubSub ????"
 
-#, fuzzy
+# NOTE ?? http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=leaf&qrytype=en&x=37&y=11
+# NOTE ?? http://wiki.jabbercn.org/index.php?title=XEP-0060&variant=zh-hant
 msgid "PubSub Leaf"
-msgstr "PubSub ??"
+msgstr "PubSub ????"
 
-#, fuzzy
 msgid ""
 "\n"
 "<b>Description:</b> "
-msgstr "??"
+msgstr ""
+"\n"
+"<b>??:</b>"
 
 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "??????"
+msgstr "????"
 
-#, fuzzy
 msgid "_Browse"
-msgstr "???(_B):"
+msgstr "??(_B)"
 
-#, fuzzy
 msgid "Server does not exist"
-msgstr "??????"
+msgstr "??????"
 
-#, fuzzy
 msgid "Server does not support service discovery"
-msgstr "???????????????????"
+msgstr "??????????"
 
-#, fuzzy
 msgid "XMPP Service Discovery"
-msgstr "??????"
+msgstr "XMPP ????"
 
+#  FIXME ?????? - acli 20090730
 msgid "Allows browsing and registering services."
-msgstr ""
+msgstr "??????????"
 
-#, fuzzy
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
-msgstr "??? XMPP ????????????"
+msgstr "????????????? XMPP ??????"
 
 msgid "Buddy is idle"
 msgstr "????"
@@ -14137,7 +14067,6 @@ msgstr "??????????? msgstr "????????????"
 
 #. *  summary
-#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editing a common score in real-time."
@@ -14267,7 +14196,6 @@ msgstr "????????"
 msgid "Highlighted Message Name Color"
 msgstr "????????"
 
-#, fuzzy
 msgid "Typing Notification Color"
 msgstr "??????"
 
@@ -14302,23 +14230,20 @@ msgstr ""
 msgstr ""
 
 # XXX ?????,???????????,???????? - acli 20080511
-#, fuzzy
 msgid "Disable Typing Notification Text"
-msgstr "??????"
+msgstr "??????"
 
-#, fuzzy
 msgid "GTK+ Theme Control Settings"
-msgstr "Pidgin GTK+ ??????"
+msgstr "GTK+ ????????"
 
-#, fuzzy
 msgid "Colors"
-msgstr "??"
+msgstr "??"
 
 msgid "Fonts"
 msgstr "??"
 
 msgid "Miscellaneous"
-msgstr ""
+msgstr "??"
 
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc?????"
@@ -14359,10 +14284,10 @@ msgstr "????"
 msgid "New Version Available"
 msgstr "????"
 
+# NOTE ???Later?????????(??:????????,??????,?????)
 msgid "Later"
-msgstr "??"
+msgstr "????"
 
-# NOTE: ui_name, ui_website - ?????ui_website??ui_name??????(quit message),ui_name?????pidgin?
 msgid "Download Now"
 msgstr "????"
 
@@ -14406,7 +14331,6 @@ msgstr "??????????? 
 # XXX ?????? - acli 20080508
 #. *< summary
-#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for use when no physical keyboard is present."
@@ -14465,103 +14389,85 @@ msgstr "??????????? msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "???????????????????????"
 
-#, fuzzy
 msgid "Just logged in"
-msgstr "????"
+msgstr "????"
 
-#, fuzzy
 msgid "Just logged out"
-msgstr "????"
+msgstr "????"
 
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
+"???????/\n"
+"????????"
 
-# TODO ??????????????,?????????????
-# NOTE ???? by Paladin
-#, fuzzy
 msgid "Icon for Chat"
-msgstr "?????"
+msgstr "????????"
 
-#  NOTE?Ignore??????????,? gtkprefs.c ???Ignore?
-#  NOTE ??????????,?????????
-#, fuzzy
 msgid "Ignored"
-msgstr "??"
+msgstr "???"
 
-#, fuzzy
+#  NOTE?Founder????????????
 msgid "Founder"
-msgstr "???"
+msgstr "???"
 
-#, fuzzy
+#. A user in a chat room who has special privileges.
 msgid "Operator"
-msgstr "Opera"
+msgstr "???"
 
+#  NOTE ?????????????????,Konversation?????,Chatzilla???????
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
 msgid "Half Operator"
-msgstr ""
+msgstr "??"
 
-# NOTE ?????????????????????????
-#, fuzzy
 msgid "Authorization dialog"
-msgstr "????"
+msgstr "????"
 
-# TODO ??? - 20061025
-#, fuzzy
 msgid "Error dialog"
-msgstr "????"
+msgstr "??????"
 
-# XXX 20070518
-#, fuzzy
 msgid "Information dialog"
-msgstr "??"
+msgstr "??????"
 
 msgid "Mail dialog"
-msgstr ""
+msgstr "????"
 
-#  XXX ????????,????????? - ambrose 20070415
-#, fuzzy
+#  XXX ????????,????????? - ambrose 20090730
 msgid "Question dialog"
-msgstr "???? (Request Dialog)"
+msgstr "????"
 
-#, fuzzy
 msgid "Warning dialog"
-msgstr "????"
+msgstr "??????"
 
 msgid "What kind of dialog is this?"
-msgstr ""
+msgstr "??????????"
 
-#, fuzzy
 msgid "Status Icons"
-msgstr "??:%s"
+msgstr "????"
 
-#  XXX ?????,?????????????????(?!)
-#, fuzzy
+# XXX ?? - acli 20090730
 msgid "Chatroom Emblems"
-msgstr "????? (Locale)"
+msgstr "?????"
 
-#, fuzzy
 msgid "Dialog Icons"
-msgstr "????"
+msgstr "????"
 
-#, fuzzy
 msgid "Pidgin Icon Theme Editor"
-msgstr "Pidgin GTK+ ??????"
+msgstr "Pidgin ???????"
 
-#, fuzzy
 msgid "Contact"
-msgstr "????"
+msgstr "??"
 
-#, fuzzy
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "????"
+msgstr "Pidgin ?????????"
 
-#, fuzzy
 msgid "Edit Buddylist Theme"
-msgstr "????"
+msgstr "????????"
 
 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "??????"
 
 #. *< type
 #. *< ui_requirement
@@ -14570,16 +14476,14 @@ msgstr ""
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "Pidgin GTK+ ??????"
+msgstr "Pidgin ?????"
 
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "Pidgin GTK+ ??????"
+msgstr "Pidgin ??????"
 
 #. *< type
 #. *< ui_requirement
@@ -14737,9 +14641,10 @@ msgstr "??????????? msgid "_Keep Buddy List window on top:"
 msgstr "??????????????(_K);"
 
+# NOTE ???? by Ambrose 20090806, see Always/Never
 #. XXX: Did this ever work?
 msgid "Only when docked"
-msgstr "???????"
+msgstr "???????"
 
 msgid "Windows Pidgin Options"
 msgstr "Windows ? Pidgin ??"
@@ -14747,7 +14652,6 @@ msgstr "Windows ? Pidgin ?????msgid "Options specific to Pidgin for Windows."
 msgstr "Windows ? Pidgin ??????"
 
-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "?? Windows ? Pidgin ?????,????????????"
@@ -14791,6 +14695,27 @@ msgstr "??? XMPP ?????? msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "??? XMPP ????????????"
 
+#~ msgid "_Resume"
+#~ msgstr "??(_R)"
+
+#~ msgid "Unable to not load SILC key pair"
+#~ msgstr "???? SILC ???"
+
+#~ msgid ""
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ msgstr "%s ???????(?)?????%s????,????%s??"
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "??????"
+
+#~ msgid "Invite message"
+#~ msgstr "????"
+
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr "?????????????,?????????????"
+
 #~ msgid "Cannot open socket"
 #~ msgstr "????Socket"
 
@@ -14816,23 +14741,10 @@ msgstr "??? XMPP ?????? #~ msgid "Read error"
 #~ msgstr "????"
 
-#~ msgid ""
-#~ "Could not establish a connection with the server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "??????????:\n"
-#~ "%s"
-
-#~ msgid "Write error"
-#~ msgstr "????"
-
 # NOTE ??????(??)
 #~ msgid "Last Activity"
 #~ msgstr "????"
 
-#~ msgid "Service Discovery Info"
-#~ msgstr "??????"
-
 #  FIXME acli 2070914
 #~ msgid "Service Discovery Items"
 #~ msgstr "??????"
@@ -14856,9 +14768,6 @@ msgstr "??? XMPP ?????? #~ msgid "Ad-Hoc Commands"
 #~ msgstr "????"
 
-#~ msgid "PubSub Service"
-#~ msgstr "PubSub ??"
-
 #~ msgid "SOCKS5 Bytestreams"
 #~ msgstr "SOCKS5 ?????"
 
@@ -14884,7 +14793,7 @@ msgstr "??? XMPP ?????? # NOTE Jabber ??? Stream Error ???,? <unsupported-version/>
 # NOTE ? http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
 #~ msgid "Software Version"
-#~ msgstr "????"
+#~ msgstr "????"
 
 #~ msgid "Stream Initiation"
 #~ msgstr "????"
@@ -14930,7 +14839,7 @@ msgstr "??? XMPP ?????? #~ msgstr "Jingle ??"
 
 #~ msgid "User Nickname"
-#~ msgstr "?????"
+#~ msgstr "?????"
 
 #~ msgid "Jingle ICE UDP"
 #~ msgstr "Jingle ICE UDP"
@@ -14939,7 +14848,7 @@ msgstr "??? XMPP ?????? #~ msgstr "Jingle ICE TCP"
 
 #~ msgid "Jingle Video"
-#~ msgstr "Jingle ??"
+#~ msgstr "Jingle ??"
 
 #~ msgid "Jingle DTMF"
 #~ msgstr "Jingle DTMF"
@@ -14948,7 +14857,7 @@ msgstr "??? XMPP ?????? #~ msgstr "?????"
 
 #~ msgid "Public Key Publishing"
-#~ msgstr "???????"
+#~ msgstr "????"
 
 # NOTE Jabber ?????
 #~ msgid "User Browsing"
@@ -14971,6 +14880,9 @@ msgstr "??? XMPP ?????? #~ msgid "Hop Check"
 #~ msgstr "?????"
 
+#~ msgid "Write error"
+#~ msgstr "????"
+
 #~ msgid "Read Error"
 #~ msgstr "????"
 
@@ -14992,14 +14904,11 @@ msgstr "??? XMPP ?????? # XXX ??
 #~ msgid ""
 #~ "You have been logged out because you logged in at another workstation."
-#~ msgstr "??????,?????????????"
+#~ msgstr "??????,?????????????"
 
 #~ msgid "Error. SSL support is not installed."
 #~ msgstr "??:???? SSL ???"
 
-#~ msgid "Incorrect password."
-#~ msgstr "?????"
-
 #~ msgid ""
 #~ "Could not connect to BOS server:\n"
 #~ "%s"
@@ -15007,14 +14916,17 @@ msgstr "??? XMPP ?????? #~ "????? BOS ???:\n"
 #~ "%s"
 
-#~ msgid "You may be disconnected shortly.  Check %s for updates."
-#~ msgstr "???????????????? %s ????????"
+#~ msgid "Invalid username."
+#~ msgstr "????????"
 
+#~ msgid "Incorrect password."
+#~ msgstr "?????"
+
 #~ msgid "Could Not Connect"
 #~ msgstr "????"
 
-#~ msgid "Invalid username."
-#~ msgstr "????????"
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "???????????????? %s ????????"
 
 #~ msgid "Could not decrypt server reply"
 #~ msgstr "?????????"
@@ -15046,81 +14958,6 @@ msgstr "??? XMPP ?????? #~ msgid "Could not create listen socket"
 #~ msgstr "???? Socket ??"
 
-#~ msgid "Could not resolve hostname"
-#~ msgstr "??????"
-
-#, fuzzy
-#~ msgid "Incorrect Password"
-#~ msgstr "????"
-
-#~ msgid ""
-#~ "Could not establish a connection with %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "??? %s ????:\n"
-#~ "%s"
-
-#~ msgid "Yahoo Japan"
-#~ msgstr "Yahoo Japan"
-
-#~ msgid "Japan Pager server"
-#~ msgstr "?????(????)"
-
-#~ msgid "Japan file transfer server"
-#~ msgstr "???????(????)"
-
-#~ msgid ""
-#~ "Lost connection with server\n"
-#~ "%s"
-#~ msgstr ""
-#~ "?????????????\n"
-#~ "%s"
-
-#~ msgid "Could not resolve host name"
-#~ msgstr "??????"
-
-#, fuzzy
-#~ msgid ""
-#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
-#~ "was found."
-#~ msgstr "??????????? TLS/SSL,???? TLS/SSL ???"
-
-#~ msgid "Conversation Window Hiding"
-#~ msgstr "??????????"
-
-#~ msgid "More Data needed"
-#~ msgstr "????????"
-
-#~ msgid "Please provide a shortcut to associate with the smiley."
-#~ msgstr "????????????????"
-
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "?????????????"
-
-#~ msgid "Activate which ID?"
-#~ msgstr "????? ID?"
-
-#~ msgid "Cursor Color"
-#~ msgstr "????"
-
-#  XXX ?????????,????????????????
-#~ msgid "Secondary Cursor Color"
-#~ msgstr "??????"
-
-#~ msgid "Interface colors"
-#~ msgstr "????"
-
-#~ msgid "Widget Sizes"
-#~ msgstr "Widget ??"
-
-#~ msgid "Invite message"
-#~ msgstr "????"
-
-#~ msgid ""
-#~ "Please enter the name of the user you wish to invite,\n"
-#~ "along with an optional invite message."
-#~ msgstr "?????????????,?????????????"
-
 #~ msgid "Looking up %s"
 #~ msgstr "?? %s ?"
 
@@ -15148,19 +14985,19 @@ msgstr "??? XMPP ?????? 
 #~ msgid ""
 #~ "A message has been dropped, you are exceeding the server speed limit."
-#~ msgstr "?????,??????????????????"
+#~ msgstr "?????,??????????????????"
 
 #~ msgid "Chat in %s is not available."
 #~ msgstr "? %s ??????"
 
 #~ msgid "You are sending messages too fast to %s."
-#~ msgstr "????? %s ???????"
+#~ msgstr "????? %s ???????"
 
 #~ msgid "You missed an IM from %s because it was too big."
-#~ msgstr "??????? %s ?????,???????"
+#~ msgstr "??????? %s ?????,???????"
 
 #~ msgid "You missed an IM from %s because it was sent too fast."
-#~ msgstr "??????? %s ?????,???????????"
+#~ msgstr "??????? %s ?????,???????????"
 
 #~ msgid "Failure."
 #~ msgstr "???"
@@ -15203,15 +15040,15 @@ msgstr "??? XMPP ?????? #~ msgstr "???????????"
 
 #~ msgid "Your warning level is currently too high to log in."
-#~ msgstr "??????????????,???????"
+#~ msgstr "??????????????,???????"
 
 #~ msgid ""
 #~ "You have been connecting and disconnecting too frequently.  Wait ten "
 #~ "minutes and try again.  If you continue to try, you will need to wait "
 #~ "even longer."
 #~ msgstr ""
-#~ "????/???????????????????????????????"
-#~ "?,????????????????"
+#~ "????/????????????????????????????????"
+#~ "?,????????????????"
 
 #~ msgid "An unknown signon error has occurred: %s."
 #~ msgstr "????????????:%s?"
@@ -15220,7 +15057,7 @@ msgstr "??? XMPP ?????? #~ msgstr "??????? %d ?????:%s"
 
 #~ msgid "Invalid Groupname"
-#~ msgstr "???????"
+#~ msgstr "???????"
 
 #~ msgid "Connection Closed"
 #~ msgstr "????"
@@ -15229,16 +15066,16 @@ msgstr "??? XMPP ?????? #~ msgstr "?????..."
 
 #~ msgid "TOC has come back from its pause. You may now send messages again."
-#~ msgstr "TOC ???????????????????????"
+#~ msgstr "TOC ???????????????????????"
 
 #~ msgid "Password Change Successful"
 #~ msgstr "??????"
 
 #~ msgid "Get Dir Info"
-#~ msgstr "?????????"
+#~ msgstr "?????????"
 
 #~ msgid "Set Dir Info"
-#~ msgstr "?????????"
+#~ msgstr "?????????"
 
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "???? %s ????!"
@@ -15261,26 +15098,73 @@ msgstr "??? XMPP ?????? #~ msgstr[1] "%s ?? %s ?? %d ???:%s (%.2f %s)%s%s"
 
 #~ msgid "%s requests you to send them a file"
-#~ msgstr "%s ?????????(?)?"
+#~ msgstr "%s ?????????(?)?"
 
 #~ msgid "TOC Protocol Plugin"
 #~ msgstr "TOC ????"
 
+#~ msgid "Activate which ID?"
+#~ msgstr "????? ID?"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "?????(????)"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "???????(????)"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "?????????????\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "??????"
+
 #~ msgid "%s Options"
 #~ msgstr "%s ??"
 
 #~ msgid "Proxy Options"
 #~ msgstr "???????"
 
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "??????????"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "STUN ???(_U):"
+
+#~ msgid "More Data needed"
+#~ msgstr "????????"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "????????????????"
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "?????????????"
+
+#~ msgid "Cursor Color"
+#~ msgstr "????"
+
+#  XXX ?????????,????????????????
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "??????"
+
+#~ msgid "Interface colors"
+#~ msgstr "????"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Widget ??"
+
 #~ msgid "By log size"
-#~ msgstr "??????"
+#~ msgstr "??????"
 
 #~ msgid "_Open Link in Browser"
 #~ msgstr "?????????(_O)"
 
-#~ msgid "ST_UN server:"
-#~ msgstr "STUN ???(_U):"
-
 #~ msgid "Smiley _Image"
 #~ msgstr "????(_I)"
 
@@ -15306,14 +15190,6 @@ msgstr "??? XMPP ?????? #~ msgstr[0] "????????(%d ?????????)"
 #~ msgstr[1] "????????(%d ?????????)"
 
-#, fuzzy
-#~ msgid "Add buddy Q&A"
-#~ msgstr "????"
-
-#, fuzzy
-#~ msgid "Can not decrypt get server reply"
-#~ msgstr "????????"
-
 #~ msgid "Keep alive error"
 #~ msgstr "Keep Alive??"
 
@@ -15324,14 +15200,9 @@ msgstr "??? XMPP ?????? #~ "?????????????:\n"
 #~ "%d, %s"
 
-#, fuzzy
-#~ msgid "Connecting server ..."
-#~ msgstr "?????"
-
 #~ msgid "Failed to send IM."
 #~ msgstr "?????????"
 
-#, fuzzy
 #~ msgid "Not a member of room \"%s\"\n"
 #~ msgstr "??????%s????\n"
 
@@ -15493,10 +15364,6 @@ msgstr "??? XMPP ?????? #~ msgid "QQ Server Notice"
 #~ msgstr "QQ ?????"
 
-#, fuzzy
-#~ msgid "Network disconnected"
-#~ msgstr "??????"
-
 #~ msgid "developer"
 #~ msgstr "???"
 
============================================================
--- po/zh_TW.po	342a5567e0ab6a54c9601282f79369b8df7d419b
+++ po/zh_TW.po	7a95fffdbfdada273d060c0e6c962159c55fe3a9
@@ -1,9 +1,12 @@
 # Pidgin's Traditional Chinese translation
-# Copyright (C) 2002-2008, Paladin R. Liu <paladin at ms1.hinet.net>
-# Copyright (C) 2003-2008, Ambrose C. Li <acli at ada.dhs.org>
+# Copyright (C) 2002-2009, Paladin R. Liu <paladin at ms1.hinet.net>
+# Copyright (C) 2003-2009, Ambrose C. Li <ambrose.li at gmail.com>
 #
+# PLEASE DO NOT ATTEMPT TO UPDATE THIS FILE IF THERE ARE NO
+# LINE NUMBERS (LINES BEGINNING WITH #:) IN THIS FILE.
+#
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.562 2009/02/27 04:50:13 acli Exp $
+# $InternalId: zh_TW.po,v 1.594 2009/08/06 05:26:27 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -17,7 +20,7 @@
 #        screen name ? user name ??????????!
 # ????
 # (01?52?58?) wing: hmm. does "screen name" mean "user name" now, or has it actually always meant "user name"?
-# (02?09?45?) KingAnt: wing: They're the same thing.  If you're unhappy with the change please email the Pidgin-devel mailing list.  (I'm unhappy with the change.)
+# (02?09?45?) KingAnt: wing: They're the same thing.  If you're unhappy with the change please email the gaim-devel mailing list.  (I'm unhappy with the change.)
 # ----------------------------------------------------------
 # SILC??:???????????????????,??? (^^;)
 # - Key ??????,??:?Key Exchange????????????
@@ -47,10 +50,10 @@ msgstr ""
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.5.5\n"
+"Project-Id-Version: Pidgin 2.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-06 15:04-0700\n"
-"PO-Revision-Date: 2009-02-25 09:57-0500\n"
+"POT-Creation-Date: 2009-08-05 23:59-0700\n"
+"PO-Revision-Date: 2009-07-30 01:53-0500\n"
 "Last-Translator: Ambrose Li <ambrose.li at gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n at linux.org.tw>\n"
 "MIME-Version: 1.0\n"
@@ -635,11 +638,12 @@ msgstr "???????,??? msgid "Message was not sent, because you are not signed on."
 msgstr "???????,????????:"
 
-# XXX ?????
+# NOTE ???????????????
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
+# NOTE ???????????????
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
@@ -918,12 +922,12 @@ msgstr "????"
 msgid "System Log"
 msgstr "????"
 
-#, fuzzy
 msgid "Calling ... "
-msgstr "???..."
+msgstr "???..."
 
+# NOTE ????????
 msgid "Hangup"
-msgstr ""
+msgstr "??"
 
 #. Number of actions
 msgid "Accept"
@@ -932,26 +936,28 @@ msgstr "??"
 msgid "Reject"
 msgstr "??"
 
+#  XXX ?? - acli 20090730
 msgid "Call in progress."
-msgstr ""
+msgstr "????"
 
 msgid "The call has been terminated."
-msgstr ""
+msgstr "??????"
 
 #, c-format
 msgid "%s wishes to start an audio session with you."
-msgstr ""
+msgstr "%s ???????????"
 
+# XXX ??? - acli 20090730
 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
-msgstr ""
+msgstr "%s ?????????????????????"
 
-#, fuzzy
 msgid "You have rejected the call."
-msgstr "??????%s%s"
+msgstr "???????"
 
+# FIXME ??,?????? - acli 20090730
 msgid "call: Make an audio call."
-msgstr ""
+msgstr "call:?????"
 
 msgid "Emails"
 msgstr "????"
@@ -1205,8 +1211,9 @@ msgstr "??????????? msgid "From last sent message"
 msgstr "???????????"
 
+# NOTE Using Paladin's wording from 2009/02/27 - acli 20090806
 msgid "Never"
-msgstr "??"
+msgstr "?????"
 
 msgid "Show Idle Time"
 msgstr "??????"
@@ -1230,7 +1237,7 @@ msgid "Report Idle time"
 msgstr "?????????"
 
 msgid "Report Idle time"
-msgstr "??????(_R)"
+msgstr "??????"
 
 msgid "Change status when idle"
 msgstr "???????"
@@ -1301,7 +1308,7 @@ msgid "Others talk in chat"
 msgstr "???????"
 
 msgid "Others talk in chat"
-msgstr "????????"
+msgstr "?????????"
 
 msgid "Someone says your username in chat"
 msgstr "?????????????"
@@ -1359,8 +1366,9 @@ msgstr "??????????? 
 # XXX: ?? ???????????? Enable Sound ??? - c9s, 08 Dec 27 12/27/2008
 # XXX ??????? Enable Sound,????????,?????????? - 20090226 acli
+# NOTE Using Paladin's wording from 2009/02/27 - acli 20090806
 msgid "Always"
-msgstr "??"
+msgstr "?????"
 
 # NOTE ???? by c9s (http://developer.pidgin.im/ticket/7917) - 20090226 acli
 msgid "Only when available"
@@ -1508,7 +1516,7 @@ msgid "%s sent a message in %s"
 
 #, c-format
 msgid "%s sent a message in %s"
-msgstr "%s ? %s ?????????"
+msgstr "%s ? %s ????????"
 
 msgid "Buddy signs on/off"
 msgstr "????/??"
@@ -1618,22 +1626,27 @@ msgstr ""
 "\n"
 "Fetching TinyURL..."
 msgstr ""
+"\n"
+"?? TinyURL ?..."
 
+# XXX ?? - 20090729 acli
 msgid "Only create TinyURL for urls of this length or greater"
-msgstr ""
+msgstr "?????????????????? TinyURL"
 
+# XXX ?? - 20090729 acli
 msgid "TinyURL (or other) address prefix"
-msgstr ""
+msgstr "TinyURL(????)????"
 
-#, fuzzy
 msgid "TinyURL"
-msgstr "????"
+msgstr "TinyURL"
 
 msgid "TinyURL plugin"
-msgstr ""
+msgstr "TinyURL ??"
 
+# NOTE ?? copying ???????,???????????,??????,????????????
+# XXX ?? - 20090729 acli
 msgid "When receiving a message with URL(s), TinyURL for easier copying"
-msgstr ""
+msgstr "????????????,?? TinyURL ????,?????"
 
 msgid "accounts"
 msgstr "????"
@@ -1690,9 +1703,9 @@ msgstr "???????"
 
 # XXX ??:
 # XXX gtk/gtkft.c - ?Unknown?????????????,???????
-# XXX libPidgin/account.c - ?Unknown????????????,???????(??????????,
+# XXX libgaim/account.c - ?Unknown????????????,???????(??????????,
 # XXX                      ?????????????????????????)
-# XXX libPidgin/protocols/* - ?Unknown?????????,????????(??????????????)
+# XXX libgaim/protocols/* - ?Unknown?????????,????????(??????????????)
 # XXX                       ??????(??? Pidgin ????????)
 # XXX - Ambrose 20061123
 msgid "Unknown"
@@ -1749,29 +1762,37 @@ msgstr "????(_V)"
 msgid "_View Certificate..."
 msgstr "????(_V)"
 
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
+# FIXME ?????? - acli 20070913
 #, c-format
 msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr "?%s??????????,?????????"
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"?%s??????????????%s?,???????????????????"
+"?????"
 
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr "?%s????????????"
-
+#. Had no CA pool, so couldn't verify the chain *and*
+#. * the subject name isn't valid.
+#. * I think this is bad enough to warrant a fatal error. It's
+#. * not likely anyway...
+#.
+#. TODO: Probably wrong.
 #. TODO: Make this error either block the ensuing SSL
 #. connection error until the user dismisses this one, or
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
+#. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "SSL ????"
 
 msgid "Invalid certificate chain"
 msgstr "??????"
 
+#. The subject name is correct, but we weren't able to verify the
+#. * chain because there was no pool of root CAs found. Prompt the user
+#. * to validate it.
+#.
 #. vrq will be completed by user_auth
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
@@ -1779,8 +1800,21 @@ msgstr ""
 msgstr ""
 "????????,???????????? (root certificate) ?????"
 
+#. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
+#, c-format
 msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr "?%s??????????,?????????"
+
+#. FIXME 2.6.1
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr "?%s????????????"
+
+#. vrq will be completed by user_auth
+msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr "????????? Pidgin ????????????"
 
@@ -1796,19 +1830,6 @@ msgstr "??????????? msgid "Invalid certificate authority signature"
 msgstr "???????????"
 
-# FIXME ?????? - acli 20070913
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"?%s??????????????%s?,???????????????????"
-"?????"
-
 #. Make messages
 #, c-format
 msgid ""
@@ -1845,7 +1866,7 @@ msgstr "+++ %s ??"
 msgstr "+++ %s ??"
 
 #. Unknown error
-#. Unknown error!
+#, c-format
 msgid "Unknown error"
 msgstr "????"
 
@@ -1892,10 +1913,8 @@ msgstr "%s ????? (%s)?"
 msgid "%s left the room (%s)."
 msgstr "%s ????? (%s)?"
 
-# NOTE????????????Yahoo! ??????Conference?????????
-#, fuzzy
 msgid "Invite to chat"
-msgstr "???????"
+msgstr "???????"
 
 #. Put our happy label in it.
 msgid ""
@@ -2038,6 +2057,10 @@ msgstr "??? %2$s ?? %1$s"
 msgstr "??? %2$s ?? %1$s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "?? <A HREF=\"file://%s\">%s</A> ????"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "?? %s ????"
 
@@ -2234,9 +2257,9 @@ msgstr "(%s) %s <????>:%s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <????>:%s\n"
 
-#, fuzzy
+# FIXME ?????? - acli 20090731
 msgid "Error creating conference."
-msgstr "??????"
+msgstr "???????"
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
@@ -2661,7 +2684,6 @@ msgstr "??????????? 
 # XXX ??????(???) - 20061025
 #. * description
-#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
@@ -2670,7 +2692,7 @@ msgstr ""
 "at your own risk!"
 msgstr ""
 "??????,???????????????????????????? "
-"Adium?Fire?Messenger Plus!?MSN Messenger,?? Trillian?\n"
+"Adium?Fire?Messenger Plus!?MSN Messenger?aMSN??? Trillian?\n"
 "\n"
 "??:???????????,?????????????,????!"
 
@@ -2715,7 +2737,6 @@ msgstr "?????,????? msgid "Save messages sent to an offline user as pounce."
 msgstr "?????,????????????????????"
 
-#, fuzzy
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
@@ -2749,9 +2770,8 @@ msgstr "????,?????? msgid "Do not ask. Always save in pounce."
 msgstr "????,???????????????????"
 
-#, fuzzy
 msgid "One Time Password"
-msgstr "????"
+msgstr "?????"
 
 #. *< type
 #. *< ui_requirement
@@ -2760,13 +2780,13 @@ msgid "One Time Password Support"
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr ""
+msgstr "???????"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "????????"
 
 #. *  description
 msgid ""
@@ -2966,18 +2986,15 @@ msgstr ""
 "??? ActiveTCL;?????? TCL ?????,?? http://www.activestate."
 "com ????? ActiveTCL?\n"
 
-# FIXME ????toolkit?- 20071023 acli
-#, fuzzy
 msgid ""
 "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
 "im/BonjourWindows for more information."
 msgstr ""
-"??? Apple ? Bonjour For Windows toolkit,?????? http://d.pidgin.im/"
-"BonjourWindows ?? FAQ ???"
+"??? Apple ??Bonjour For Windows???,?????? http://d.pidgin.im/"
+"BonjourWindows ???"
 
-#, fuzzy
 msgid "Unable to listen for incoming IM connections"
-msgstr "?????????????\n"
+msgstr "?????????????"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -3031,24 +3048,20 @@ msgstr "??????,???? msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "??????,???????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create socket: %s"
-msgstr ""
-"???? Socket:\n"
-"%s"
+msgstr "???? Socket:%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to bind socket to port: %s"
-msgstr "???? Socket ????"
+msgstr "???? Socket ????:%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to listen on socket: %s"
-msgstr ""
-"???? Socket:\n"
-"%s"
+msgstr "???? Socket:%s"
 
 msgid "Error communicating with local mDNSResponder."
-msgstr "?????mDNSResponder???????"
+msgstr "????? mDNSResponder ???????"
 
 msgid "Invalid proxy settings"
 msgstr "??????????"
@@ -3057,7 +3070,7 @@ msgstr ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
-"??????????????????,??????????????????"
+"??????????????????,???????????????????"
 
 msgid "Token Error"
 msgstr "????"
@@ -3093,17 +3106,14 @@ msgstr "?????????..."
 msgid "Load buddylist from file..."
 msgstr "?????????..."
 
-#, fuzzy
 msgid "You must fill in all registration fields"
-msgstr "?????????"
+msgstr "????????????"
 
-#, fuzzy
 msgid "Passwords do not match"
-msgstr "????????"
+msgstr "????????"
 
-#, fuzzy
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "?????????????\n"
+msgstr "???????,???????"
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "?? Gadu-Gadu ?????"
@@ -3118,9 +3128,8 @@ msgid "Enter captcha text"
 msgstr "???(????)"
 
 msgid "Enter captcha text"
-msgstr ""
+msgstr "???????????"
 
-#, fuzzy
 msgid "Captcha"
 msgstr "????"
 
@@ -3263,9 +3272,9 @@ msgstr "?????(_N):"
 msgid "Chat _name:"
 msgstr "?????(_N):"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "?????????"
+msgstr "?????????%s?:%s"
 
 #. 1. connect to server
 #. connect to the server
@@ -3278,9 +3287,8 @@ msgstr "??????????"
 msgid "This chat name is already in use"
 msgstr "??????????"
 
-#, fuzzy
 msgid "Not connected to the server"
-msgstr "?????????"
+msgstr "????????"
 
 msgid "Find buddies..."
 msgstr "????..."
@@ -3321,9 +3329,8 @@ msgstr "Gadu-Gadu ???"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu ???"
 
-#, fuzzy
 msgid "GG server"
-msgstr "???????..."
+msgstr "Gadu-Gadu ???"
 
 #, c-format
 msgid "Unknown command: %s"
@@ -3339,7 +3346,6 @@ msgstr "??????"
 msgid "File Transfer Failed"
 msgstr "??????"
 
-#, fuzzy
 msgid "Unable to open a listening port."
 msgstr "????????"
 
@@ -3363,11 +3369,9 @@ msgstr "%s ?????"
 #.
 #. TODO: what to do here - do we really have to disconnect?
 #. TODO: do we really want to disconnect on a failure to write?
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with server: %s"
-msgstr ""
-"?????????????:\n"
-"%s"
+msgstr "?????????????:%s"
 
 msgid "View MOTD"
 msgstr "?????? (MOTD)"
@@ -3378,9 +3382,8 @@ msgstr "??(_P):"
 msgid "_Password:"
 msgstr "??(_P):"
 
-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "IRC ??????????"
+msgstr "IRC ?????????????????"
 
 # XXX ??
 msgid "SSL support unavailable"
@@ -3390,13 +3393,13 @@ msgstr "????"
 msgstr "????"
 
 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "??????%s?"
+msgstr "????:%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Server closed the connection"
-msgstr "????????"
+msgstr "????????"
 
 msgid "Users"
 msgstr "???"
@@ -3588,13 +3591,12 @@ msgstr "??????????? #. We only want to do the following dance if the connection
 #. has not been successfully completed.  If it has, just
 #. notify the user that their /nick command didn't go.
-#, fuzzy, c-format
+#, c-format
 msgid "The nickname \"%s\" is already being used."
-msgstr "??????????"
+msgstr "???%s???????"
 
-#, fuzzy
 msgid "Nickname in use"
-msgstr "??"
+msgstr "???????"
 
 msgid "Cannot change nick"
 msgstr "??????"
@@ -3831,13 +3833,11 @@ msgstr "??"
 msgid "execute"
 msgstr "??"
 
-#, fuzzy
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr "??????????? TLS/SSL,???? TLS/SSL ???"
+msgstr "??????? TLS/SSL,???? TLS/SSL ???"
 
-#, fuzzy
 msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "???????,???? TLS/SSL ???"
+msgstr "?????,???? TLS/SSL ???"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "????????????????????"
@@ -3851,57 +3851,44 @@ msgstr "????"
 msgid "Plaintext Authentication"
 msgstr "????"
 
-#, fuzzy
 msgid "SASL authentication failed"
-msgstr "????"
+msgstr "SASL ????"
 
-#, fuzzy
 msgid "Invalid response from server"
-msgstr "????????????"
+msgstr "???????????"
 
 msgid "Server does not use any supported authentication method"
 msgstr "???????????????????"
 
 msgid "You require encryption, but it is not available on this server."
-msgstr "???????,????????????"
+msgstr "?????,????????????"
 
 # XXX ?????,??????
 msgid "Invalid challenge from server"
 msgstr "?????????????"
 
-# NOTE OSCAR ???????? http://aimdoc.sourceforge.net/OSCARdoc/,?????????
-#, fuzzy, c-format
+#, c-format
 msgid "SASL error: %s"
-msgstr "SASL ??"
+msgstr "SASL ??:%s"
 
 msgid "The BOSH connection manager terminated your session."
-msgstr ""
+msgstr "BOSH ???????????????"
 
-#, fuzzy
 msgid "No session ID given"
-msgstr "??????"
+msgstr "??????????"
 
-# NOTE Jabber ??? Stream Error ???,? <unsupported-version/>
-# NOTE ? http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#, fuzzy
 msgid "Unsupported version of BOSH protocol"
-msgstr "?????? XMPP ??"
+msgstr "???? BOSH ????"
 
-#, fuzzy
 msgid "Unable to establish a connection with the server"
-msgstr ""
-"??????????:\n"
-"%s"
+msgstr "??????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr ""
-"??????????:\n"
-"%s"
+msgstr "??????????:%s"
 
-#, fuzzy
 msgid "Unable to establish SSL connection"
-msgstr "???????"
+msgstr "???? SSL ??"
 
 msgid "Full Name"
 msgstr "??"
@@ -3918,6 +3905,11 @@ msgstr "????"
 msgid "Street Address"
 msgstr "????"
 
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "??(?)"
 
@@ -3970,9 +3962,8 @@ msgstr "????"
 
 # NOTE Debian ??local???????
 # XXX
-#, fuzzy
 msgid "Local Time"
-msgstr "?????:"
+msgstr "?????:"
 
 msgid "Priority"
 msgstr "????"
@@ -3987,11 +3978,10 @@ msgid "%s ago"
 
 #, c-format
 msgid "%s ago"
-msgstr ""
+msgstr "%s?"
 
-#, fuzzy
 msgid "Logged Off"
-msgstr "???"
+msgstr "???"
 
 # NOTE: ????????????,?????????,??????
 # NOTE: ????????????????,???,?????PO???????
@@ -4017,7 +4007,6 @@ msgstr "?????"
 msgid "Temporarily Hide From"
 msgstr "?????"
 
-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "????????"
 
@@ -4026,7 +4015,6 @@ msgstr "?????????"
 
 # NOTE Jabber????Subscribe???????????????
 # NOTE ? http://www.jabber.org/user/userguide.html
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -4160,9 +4148,8 @@ msgid "Invalid Server"
 msgstr "????????????"
 
 msgid "Invalid Server"
-msgstr "???????"
+msgstr "????????"
 
-# NOTE????????????Yahoo! ??????Conference?????????
 # XXX
 msgid "Enter a Conference Server"
 msgstr "???????"
@@ -4173,26 +4160,23 @@ msgstr "?????"
 msgid "Find Rooms"
 msgstr "?????"
 
-#, fuzzy
+# NOTE ?? http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
 msgid "Affiliations:"
-msgstr "??:"
+msgstr "????:"
 
-#, fuzzy
 msgid "No users found"
-msgstr "?????????"
+msgstr "????????"
 
-#, fuzzy
 msgid "Roles:"
-msgstr "??"
+msgstr "??:"
 
-#, fuzzy
 msgid "Ping timed out"
 msgstr "Ping??"
 
 msgid ""
 "Unable to find alternative XMPP connection methods after failing to connect "
 "directly."
-msgstr ""
+msgstr "??????,???????? XMPP ?????"
 
 msgid "Invalid XMPP ID"
 msgstr "XMPP ????"
@@ -4200,9 +4184,9 @@ msgstr "XMPP ????,????
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP ????,?????????"
 
-#, fuzzy
+# FIXME ????????? 20070518 acli
 msgid "Malformed BOSH URL"
-msgstr "?????????"
+msgstr "??? BOSH ??"
 
 #, c-format
 msgid "Registration of %s@%s successful"
@@ -4270,10 +4254,6 @@ msgstr "??????"
 msgid "Change Registration"
 msgstr "??????"
 
-#, fuzzy
-msgid "Malformed BOSH Connect Server"
-msgstr "?????????"
-
 msgid "Error unregistering account"
 msgstr "????????"
 
@@ -4293,7 +4273,7 @@ msgid "Server doesn't support blocking"
 msgstr "???????"
 
 msgid "Server doesn't support blocking"
-msgstr ""
+msgstr "????????"
 
 msgid "Not Authorized"
 msgstr "???"
@@ -4610,16 +4590,16 @@ msgstr "??????? %s"
 msgid "Unable to ban user %s"
 msgstr "??????? %s"
 
-#  XXX ???(??)??? - ambrose 20070415
+#  NOTE ?? http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
 #  NOTE: Unknown affiliation ? owner?admin?member?outcast?none ???????????
 #, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "?????:?%s?"
+msgstr "???????:?%s?"
 
-#  XXX ?? - ambrose 20070415
+#  NOTE ?? http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "?????? %s ???????%s?"
+msgstr "?????? %s ??????????????%s?"
 
 #  XXX ?? - ambrose 20070415
 #  NOTE: Unknown role ? moderator?participant?visitor?none ???????????
@@ -4640,19 +4620,20 @@ msgstr "?? Ping ??? %s"
 msgid "Unable to ping user %s"
 msgstr "?? Ping ??? %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
-msgstr "???????? %s ,??????????????"
+msgstr "?????%s ,??????????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
-msgstr "???????? %s ,???????????"
+msgstr "?????%s ,???????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
 "buzzes now."
-msgstr "???????? %s ,????????????????"
+msgstr ""
+"?????%s ,???????????????,????????????"
 
 # XXX ???? - acli 20070913
 #, c-format
@@ -4668,38 +4649,38 @@ msgstr "%s???????"
 msgid "%s has buzzed you!"
 msgstr "%s???????"
 
-#, fuzzy, c-format
+# XXX ??? - acli 20090730
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "??????? %s,???? JID ????"
+msgstr "??? %s ??????,???? JID ????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr "??????? %s,??????????"
+msgstr "??? %s ??????,??????????"
 
 #  NOTE?not subscribed to user presence??????SUB_TO?? subscription
 #  FIXME ???????????,????? PO ??????(??To??);
 #  FIXME ??????,???? presence ???????????-acli 20070614
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
-msgstr "??????? %s,????????"
+msgstr "??? %s ??????,????????"
 
-#, fuzzy
 msgid "Media Initiation Failed"
-msgstr "????"
+msgstr "????????"
 
-#  FIXME ???? - acli 20070614
-#, fuzzy, c-format
+#  FIXME ???? - acli 20090730
+#, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
-msgstr "?????????? %s ???? Resource"
+msgstr "???? %s ???? Resource ???????"
 
 msgid "Select a Resource"
 msgstr "???? Resource"
 
-#, fuzzy
+# XXX ?? - acli 20090730
 msgid "Initiate Media"
-msgstr "?????(_C)"
+msgstr "????"
 
 msgid "config:  Configure a chat room."
 msgstr "config:???????"
@@ -4719,23 +4700,21 @@ msgstr "ban &lt;???&gt; [??]? msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;???&gt; [??]:???????????"
 
-#  XXX ???(??)??? - ambrose 20070415
-#, fuzzy
+#  NOTE ?? http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
 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 ""
-"affiliate &lt;???&gt; &lt;owner|admin|member|outcast|none&gt;: ?????"
-"?????????"
+"affiliate &lt;???&gt; &lt;owner|admin|member|outcast|none&gt; [??1] [?"
+"?2] ...: ???????????????,?????????????????"
 
 #  NOTE ???? by ambrose
-#, fuzzy
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with an role or set users' role with the room."
 msgstr ""
-"role &lt;???&gt; &lt;moderator|participant|visitor|none&gt;: ??????"
-"?????????"
+"role &lt;???&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; [??]:??????????"
@@ -4796,7 +4775,7 @@ msgid "BOSH URL"
 msgstr "?????????"
 
 msgid "BOSH URL"
-msgstr ""
+msgstr "BOSH ??"
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
@@ -4858,32 +4837,29 @@ msgstr "?????(_A)"
 msgid "_Accept Defaults"
 msgstr "?????(_A)"
 
-#, fuzzy
 msgid "No reason"
 msgstr "??????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "?? %s ??:(%s)"
+msgstr "?????:(%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Kicked (%s)"
-msgstr "? %s ?? (%s)"
+msgstr "???? (%s)"
 
-#, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "???????????"
+msgstr "??????????????\n"
 
-#, fuzzy
+# XXX ?????????? 20090305 acli
 msgid "Transfer was closed."
-msgstr "??????"
+msgstr "???????"
 
-#, fuzzy
 msgid "Failed to open the file"
-msgstr "???????%s?:%s"
+msgstr "??????"
 
 msgid "Failed to open in-band bytestream"
-msgstr ""
+msgstr "??????????"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -5226,9 +5202,25 @@ msgstr "????????"
 msgid "Non-IM Contacts"
 msgstr "????????"
 
-#, fuzzy, c-format
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr "%s ????,<a href='msn-wink://%s'>???????????</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s ????,??????????"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr "%s ?????????,<a href='audio://%s'>???????</a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s ?????????,??????????"
+
+#, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
-msgstr "%s ????????????,??????????????"
+msgstr "%s ????????????,??????????????"
 
 msgid "Nudge"
 msgstr "??"
@@ -5385,6 +5377,27 @@ msgstr "MSN ?? SSL ?????? msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN ?? SSL ??????,????????? SSL ????"
 
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr "?????????%s?,???????????????????????"
+
+msgid "Unable to Add"
+msgstr "????"
+
+msgid "Authorization Request Message:"
+msgstr "??????:"
+
+msgid "Please authorize me!"
+msgstr "???????!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "??(_O)"
+
 msgid "Error retrieving profile"
 msgstr "???????????"
 
@@ -5577,13 +5590,14 @@ msgstr "%s ????!"
 msgid "%s just sent you a Nudge!"
 msgstr "%s ????!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "????(?? %d)"
+msgstr "????(?? %d):%s"
 
 msgid "Unable to add user"
 msgstr "???????"
 
+#. Unknown error!
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "????(?? %d)"
@@ -5655,25 +5669,21 @@ msgstr ""
 "%s ???????????:\n"
 "%s"
 
-#, fuzzy
 msgid "Our protocol is not supported by the server"
-msgstr "??????????????????"
+msgstr "?????????????????"
 
-#, fuzzy
 msgid "Error parsing HTTP"
-msgstr "?? HTTP ???????"
+msgstr "?? HTTP ??????"
 
-#, fuzzy
 msgid "You have signed on from another location"
-msgstr "??????????"
+msgstr "?????????"
 
 #  XXX
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
-msgstr "?????? MSN ???,????????"
+msgstr "?????? MSN ???,????????"
 
-#, fuzzy
 msgid "The MSN servers are going down temporarily"
-msgstr "MSN ?????????"
+msgstr "MSN ????????"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5702,13 +5712,15 @@ msgstr "???????"
 msgid "Retrieving buddy list"
 msgstr "???????"
 
-#, fuzzy, c-format
+# FIXME ???????? - acli 20090803
+#, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
-msgstr "%s ????????????,??????????????"
+msgstr "%s ????? webcam,??????????????"
 
+# FIXME ???????? - acli 20090803
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s ????????????,??????????????"
+msgstr "%s ????? webcam ??,??????????????"
 
 msgid "Away From Computer"
 msgstr "?????"
@@ -5906,15 +5918,15 @@ msgstr "??????,?? %d? msgstr "??????,?? %d:%s"
 
 # NOTE ??? %s ?????
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s Your password is %zu characters, which is longer than the maximum length "
 "of %d.  Please shorten your password at http://profileedit.myspace.com/index."
 "cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s ???????? %d ???,?????? MySpaceIM ?? %d ???????"
-"?? http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings."
-"changePassword ?????????,?????"
+"%s ???????? %zu ???,??? %d ????????? http://"
+"profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
+"?????????,?????"
 
 msgid "Incorrect username or password"
 msgstr "????????"
@@ -6019,6 +6031,8 @@ msgstr ""
 "visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
 "to set your username."
 msgstr ""
+"?????????????????,???? http://editprofile.myspace.com/"
+"index.cfm?fuseaction=profile.username  ????????"
 
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM:?????????"
@@ -6283,9 +6297,9 @@ msgstr "????:0x%X"
 msgid "Unknown error: 0x%X"
 msgstr "????:0x%X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "?? Ping ??? %s"
+msgstr "????:%s"
 
 #  XXX ??
 #, c-format
@@ -6416,7 +6430,6 @@ msgstr "%s ??????,??? "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s ??????,???????????????"
 
-#, fuzzy
 msgid ""
 "Unable to connect to server. Please enter the address of the server to which "
 "you wish to connect."
@@ -6444,10 +6457,9 @@ msgstr "??????"
 msgid "Server port"
 msgstr "??????"
 
-# XXX ?? - 20061025
-#, fuzzy
+# NOTE ?? http://pidgin.im/pipermail/translators/2009-July/000394.html
 msgid "Received unexpected response from "
-msgstr "????????? HTTP ???"
+msgstr "???????????,????? "
 
 #. username connecting too frequently
 msgid ""
@@ -6457,12 +6469,13 @@ msgstr ""
 "????/????????????????????????????????"
 "?,????????????????"
 
-#, fuzzy, c-format
+# NOTE ?? http://pidgin.im/pipermail/translators/2009-July/000394.html
+#, c-format
 msgid "Error requesting "
-msgstr "?? %s ???????"
+msgstr "?????????,????? "
 
 msgid "AOL does not allow your screen name to authenticate here"
-msgstr ""
+msgstr "AOL ????????????"
 
 msgid "Could not join chat room"
 msgstr "???????"
@@ -6470,9 +6483,8 @@ msgstr "???????"
 msgid "Invalid chat room name"
 msgstr "???????"
 
-#, fuzzy
 msgid "Received invalid data on connection with server"
-msgstr "???????????????"
+msgstr "??????????????"
 
 #. *< type
 #. *< ui_requirement
@@ -6519,7 +6531,6 @@ msgstr "??????????? msgid "Received invalid data on connection with remote user."
 msgstr "???????????????????"
 
-#, fuzzy
 msgid "Unable to establish a connection with the remote user."
 msgstr "?????????????"
 
@@ -6579,7 +6590,7 @@ msgstr "????"
 msgid "Request denied"
 msgstr "????"
 
-# NOTE?Busted???SNAC payload?????Luke Schierer?#Pidgin??
+# NOTE?Busted???SNAC payload?????Luke Schierer?#gaim??
 # NOTE ?????????????????????
 msgid "Busted SNAC payload"
 msgstr "SNAC????"
@@ -6738,17 +6749,15 @@ msgid "Buddy Comment"
 msgstr "????"
 
 msgid "Buddy Comment"
-msgstr "????"
+msgstr "????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr ""
-"??????????:\n"
-"%s"
+msgstr "??????????:%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "?????????"
+msgstr "????? BOS ???:%s"
 
 msgid "Username sent"
 msgstr "????????"
@@ -6760,14 +6769,14 @@ msgstr "?????"
 msgid "Finalizing connection"
 msgstr "?????"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to sign on as %s because the username is invalid.  Usernames must be "
 "a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"????:??? %s ????,??????????????????????;"
-"?????????,?????????????;?????????"
+"??? %s ????,??????????????????????;?????"
+"????,?????????????;?????????"
 
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
@@ -6785,14 +6794,13 @@ msgstr "????"
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
-msgstr "??????"
+msgstr "????????"
 
+# XXX?suspend?????????
 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
-msgstr "??????????"
+msgstr "?????????"
 
 #  NOTE????????????????????
 #  NOTE ???? by Ambrose
@@ -6801,22 +6809,21 @@ msgstr "?????? AOL ???
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "?????? AOL ???????"
 
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "????????????????? %s ??"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait a minute and "
 "try again. If you continue to try, you will need to wait even longer."
 msgstr ""
-"????/????????????????????????????????"
+"????/????????????????????????????????"
 "?,????????????????"
 
-#, fuzzy
 msgid "The SecurID key entered is invalid"
-msgstr "????? SecurID ????"
+msgstr "????? SecurID ???"
 
 msgid "Enter SecurID"
 msgstr "??? SecurID"
@@ -6824,12 +6831,6 @@ msgstr "??????????? msgid "Enter the 6 digit number from the digital display."
 msgstr "?????????????????"
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "??(_O)"
-
 msgid "Password sent"
 msgstr "??????"
 
@@ -6839,12 +6840,6 @@ msgstr "?????????,? msgid "Please authorize me so I can add you to my buddy list."
 msgstr "?????????,?????????????????"
 
-msgid "Authorization Request Message:"
-msgstr "??????:"
-
-msgid "Please authorize me!"
-msgstr "???????!"
-
 msgid "No reason given."
 msgstr "???????"
 
@@ -7147,18 +7142,15 @@ msgstr "???????"
 msgid "Away message too long."
 msgstr "???????"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"?????????%s?,??????????????????????;???"
-"??????,?????????????;?????????"
+"???????%s?,??????????????????????;?????"
+"????,?????????????;?????????"
 
-msgid "Unable to Add"
-msgstr "????"
-
 msgid "Unable to Retrieve Buddy List"
 msgstr "????????"
 
@@ -7172,18 +7164,18 @@ msgstr "???"
 msgid "Orphans"
 msgstr "???"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
-"???????????????,?????????? %s???????????"
-"??"
+"???????????????,?????????? %s????????,??"
+"???"
 
 msgid "(no name)"
 msgstr "(????)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "??? %s ??????,?????"
 
@@ -7222,7 +7214,7 @@ msgstr "????"
 msgid "Authorization Denied"
 msgstr "????"
 
-# NOTE: ??????? #Pidgin ? MrHappy ? deryni ???
+# NOTE: ??????? #gaim ? MrHappy ? deryni ???
 # NOTE: KingAnt ?????????,??????
 msgid "_Exchange:"
 msgstr "????(_E):"
@@ -7239,10 +7231,10 @@ msgid "Buddy Comment for %s"
 
 #, c-format
 msgid "Buddy Comment for %s"
-msgstr "%s ?????"
+msgstr "%s ?????"
 
 msgid "Buddy Comment:"
-msgstr "????:"
+msgstr "????:"
 
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
@@ -7261,7 +7253,7 @@ msgid "Edit Buddy Comment"
 
 #. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
-msgstr "??????"
+msgstr "??????"
 
 msgid "Get Status Msg"
 msgstr "??????"
@@ -7273,12 +7265,12 @@ msgstr "??????"
 msgid "Re-request Authorization"
 msgstr "??????"
 
-# NOTE Require??????,??????
+# NOTE ????Require??????????????,??????????,?????
 msgid "Require authorization"
-msgstr "????"
+msgstr "????"
 
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
-msgstr "???????????????????(??????????!)"
+msgstr "??????????????(??????????!)"
 
 msgid "ICQ Privacy Options"
 msgstr "ICQ ????"
@@ -7352,9 +7344,8 @@ msgstr "????????"
 msgid "Search for Buddy by Information"
 msgstr "????????"
 
-#, fuzzy
 msgid "Use clientLogin"
-msgstr "???????"
+msgstr "?? clientLogin"
 
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
@@ -7490,9 +7481,8 @@ msgstr "????"
 msgid "Phone Number"
 msgstr "????"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "?????"
+msgstr "????????"
 
 msgid "Cellphone Number"
 msgstr "??????"
@@ -7556,40 +7546,37 @@ msgstr "??"
 msgid "Note"
 msgstr "??"
 
+# NOTE ???QQ???????(??)
 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "????"
+msgstr "????"
 
 msgid "Change his/her memo as you like"
-msgstr ""
+msgstr "???????"
 
-#, fuzzy
 msgid "_Modify"
-msgstr "??"
+msgstr "??(_M)"
 
-#, fuzzy
 msgid "Memo Modify"
-msgstr "??"
+msgstr "????"
 
-#, fuzzy
+# XXX ??????????says????????? - acli 20090305
 msgid "Server says:"
-msgstr "?????"
+msgstr "?????:"
 
 msgid "Your request was accepted."
-msgstr ""
+msgstr "???????"
 
 msgid "Your request was rejected."
-msgstr ""
+msgstr "???????"
 
-# NOTE Require??????,??????
 #, c-format
 msgid "%u requires verification"
 msgstr "%u ????"
 
-#, fuzzy
+# XXX ?? - acli 20090803
 msgid "Add buddy question"
-msgstr "?????????????"
+msgstr "?????????"
 
 msgid "Enter answer here"
 msgstr "??????"
@@ -7606,14 +7593,16 @@ msgstr "????,?????? msgid "Sorry, you're not my style."
 msgstr "????,??????..."
 
+# NOTE ???? =P
 #, c-format
 msgid "%u needs authorization"
-msgstr "%u ????"
+msgstr "%u ????"
 
-#, fuzzy
+# NOTE ??????,??????Enter request here???Would you be my friend??
 msgid "Add buddy authorize"
-msgstr "?????????????"
+msgstr "??????"
 
+# NOTE ????????????:?
 msgid "Enter request here"
 msgstr "??????"
 
@@ -7631,7 +7620,7 @@ msgid "Failed sending authorize"
 msgstr "??? QQ ??"
 
 msgid "Failed sending authorize"
-msgstr "??????"
+msgstr "??????"
 
 #, c-format
 msgid "Failed removing buddy %u"
@@ -7690,10 +7679,10 @@ msgid "Requesting"
 msgstr "??"
 
 msgid "Requesting"
-msgstr ""
+msgstr "???"
 
 msgid "Admin"
-msgstr ""
+msgstr "???"
 
 msgid "Notice"
 msgstr "??"
@@ -7719,19 +7708,17 @@ msgstr "?????"
 msgid "Input request here"
 msgstr "?????"
 
-#  NOTE QQ?member???????
 #, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "???? Qun %s (%u)"
+msgstr "?????? %s (%u)"
 
-#  NOTE QQ?member???????
 msgid "Successfully joined Qun"
-msgstr "???? Qun"
+msgstr "??????"
 
 # NOTE ?? QQ_ROOM_JOIN_DENIED
 #, c-format
 msgid "Qun %u denied from joining"
-msgstr "?? Qun %u ???"
+msgstr "???? %u ???"
 
 msgid "QQ Qun Operation"
 msgstr "QQ ????"
@@ -7740,15 +7727,15 @@ msgid "Join Qun, Unknown Reply"
 msgstr "??:"
 
 msgid "Join Qun, Unknown Reply"
-msgstr "?? Qun,?????"
+msgstr "?????????????"
 
 msgid "Quit Qun"
-msgstr "?? Qun"
+msgstr "????"
 
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
-msgstr "???,???????,???????? (Qun) ???"
+msgstr "???,???????,????????? (Qun) ???"
 
 #  NOTE ??????????,?????????????????
 #  NOTE(???tu?????du?)??????(?vous???Sie?),
@@ -7758,14 +7745,14 @@ msgid "Successfully changed Qun members"
 
 #  NOTE QQ?member???????
 msgid "Successfully changed Qun members"
-msgstr "?????? Qun ??"
+msgstr "??????????"
 
 # FIXME ?? ambrose 20070415
 msgid "Successfully changed Qun information"
 msgstr "?????? Qun ??"
 
 msgid "You have successfully created a Qun"
-msgstr "???????? (Qun)"
+msgstr "????????? (Qun)"
 
 msgid "Would you like to set up detailed information now?"
 msgstr "??????????????"
@@ -7773,9 +7760,10 @@ msgstr "??"
 msgid "Setup"
 msgstr "??"
 
-#, fuzzy, c-format
+# NOTE %s ??reason?
+#, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr "??? %d ?????? %d"
+msgstr "??? %u ?????? %u,????%s?"
 
 #, c-format
 msgid "%u request to join Qun %u"
@@ -7783,11 +7771,12 @@ msgid "Failed to join Qun %u, operated b
 
 #, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr ""
+msgstr "???? %u ??,?????? %u"
 
+# NOTE %s ??reason?
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr ""
+msgstr "<b>??? %2$u ???????? %1$u,????%3$s?</b>"
 
 # XXX?Remove Buddy???Remove Contact?????Pidgin????;????????
 #, c-format
@@ -7801,9 +7790,9 @@ msgstr "<b>??? %u ????</b>
 
 # XXX ??:
 # XXX gtk/gtkft.c - ?Unknown?????????????,???????
-# XXX libPidgin/account.c - ?Unknown????????????,???????(??????????,
+# XXX libgaim/account.c - ?Unknown????????????,???????(??????????,
 # XXX                      ?????????????????????????)
-# XXX libPidgin/protocols/* - ?Unknown?????????,????????(??????????????)
+# XXX libgaim/protocols/* - ?Unknown?????????,????????(??????????????)
 # XXX                       ??????(??? Pidgin ????????)
 # XXX - Ambrose 20061123
 #, c-format
@@ -7866,9 +7855,12 @@ msgstr "<b>?????</b>:%s<br>\
 msgid "<b>Server</b>: %s<br>\n"
 msgstr "<b>?????</b>:%s<br>\n"
 
-#, fuzzy, c-format
+#  NOTE ??:???????
+#  NOTE ?????,?? Client Tag ???????????? (qq2007?QQ2008??)
+#  NOTE ?OSCAR????????? (Capabilities) ??????
+#, 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"
@@ -7927,7 +7919,7 @@ msgid "and more, please let me know... t
 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 "<p><i>????????????????...</i><br>\n"
@@ -7949,14 +7941,13 @@ msgid "Update all QQ Quns"
 msgstr "????"
 
 msgid "Update all QQ Quns"
-msgstr ""
+msgstr "???? QQ ?"
 
 msgid "About OpenQ"
 msgstr "?? OpenQ"
 
-#, fuzzy
 msgid "Modify Buddy Memo"
-msgstr "????"
+msgstr "??????"
 
 #. *< type
 #. *< ui_requirement
@@ -7998,7 +7989,7 @@ msgid "Show chat room when msg comes"
 msgstr "?????????"
 
 msgid "Show chat room when msg comes"
-msgstr ""
+msgstr "???????????????"
 
 # XXX 20080810 acli - ??????,????
 msgid "Keep alive interval (seconds)"
@@ -8008,7 +7999,6 @@ msgstr "???????"
 msgid "Update interval (seconds)"
 msgstr "???????"
 
-#, fuzzy
 msgid "Unable to decrypt server reply"
 msgstr "?????????"
 
@@ -8028,7 +8018,7 @@ msgid "Activation required"
 #. need activation
 #. need activation
 msgid "Activation required"
-msgstr "??????"
+msgstr "???????"
 
 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
@@ -8046,9 +8036,11 @@ msgstr "????"
 msgid "Captcha Image"
 msgstr "????"
 
+# NOTE ??????Enter code???????????????
 msgid "Enter code"
-msgstr "?????"
+msgstr "??????"
 
+# NOTE ????
 msgid "QQ Captcha Verification"
 msgstr "QQ ????"
 
@@ -8071,17 +8063,15 @@ msgstr "Socket ??"
 msgid "Socket error"
 msgstr "Socket ??"
 
-#, fuzzy
 msgid "Getting server"
-msgstr "???????..."
+msgstr "????????"
 
 # XXX ???????????(?????)- acli 20080930
 msgid "Requesting token"
 msgstr "?????"
 
-#, fuzzy
 msgid "Unable to resolve hostname"
-msgstr "?????????"
+msgstr "????????"
 
 msgid "Invalid server or port"
 msgstr "?????????"
@@ -8136,15 +8126,14 @@ msgstr "QQ ????"
 msgid "QQ Qun Command"
 msgstr "QQ ????"
 
-#, fuzzy
 msgid "Unable to decrypt login reply"
-msgstr "?????????"
+msgstr "????????"
 
 msgid "Unknown LOGIN CMD"
 msgstr "???????"
 
 msgid "Unknown CLIENT CMD"
-msgstr "????????"
+msgstr "????????"
 
 #, c-format
 msgid "%d has declined the file %s"
@@ -8270,7 +8259,6 @@ msgstr "??????..."
 msgid "Create New Conference..."
 msgstr "??????..."
 
-# NOTE????????????Yahoo! ??????Conference?????????
 msgid "Invite user to a conference"
 msgstr "??????????"
 
@@ -8283,12 +8271,11 @@ msgstr ""
 "??????????????,??????????%s????????????"
 "??,???????????,????????????????"
 
-# NOTE????????????Yahoo! ??????Conference?????????
 msgid "Invite to Conference"
 msgstr "???????"
 
 msgid "Invite to Conference..."
-msgstr "???????"
+msgstr "???????..."
 
 #  XXX ??? - 20061029
 msgid "Send TEST Announcement"
@@ -9125,7 +9112,6 @@ msgstr "????????"
 msgid "Disconnected by server"
 msgstr "????????"
 
-#, fuzzy
 msgid "Error connecting to SILC Server"
 msgstr "??? SILC ????????"
 
@@ -9139,22 +9125,16 @@ msgstr "?????"
 msgid "Performing key exchange"
 msgstr "?????"
 
-#, fuzzy
 msgid "Unable to load SILC key pair"
-msgstr "???? SILC ???"
+msgstr "???? SILC ???"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "??? SILC ????"
 
-#, fuzzy
-msgid "Unable to not load SILC key pair"
-msgstr "???? SILC ???"
-
 msgid "Out of memory"
 msgstr "?????"
 
-#, fuzzy
 msgid "Unable to initialize SILC protocol"
 msgstr "????? SILC ??"
 
@@ -9455,9 +9435,8 @@ msgstr "?? SILC ????..."
 msgid "Creating SILC key pair..."
 msgstr "?? SILC ????..."
 
-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "???? SILC ???\n"
+msgstr "???? SILC ???"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9595,7 +9574,6 @@ msgstr "??:????"
 msgid "Failure: Authentication failed"
 msgstr "??:????"
 
-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
 msgstr "????? SILC ??????"
 
@@ -9603,20 +9581,18 @@ msgstr "???"
 msgid "John Noname"
 msgstr "???"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
-msgstr "???? SILC ???:%s"
+msgstr "???? SILC ???:%s"
 
 msgid "Unable to create connection"
 msgstr "??????"
 
-#, fuzzy
 msgid "Unknown server response"
-msgstr "?????????"
+msgstr "????????"
 
-#, fuzzy
 msgid "Unable to create listen socket"
-msgstr "???? Socket"
+msgstr "?????? Socket"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP ?????????????@???"
@@ -9679,7 +9655,6 @@ msgstr "Yahoo ??"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo ????"
 
@@ -9711,9 +9686,8 @@ msgstr "Yahoo ??????"
 msgid "Yahoo Chat port"
 msgstr "Yahoo ??????"
 
-#, fuzzy
 msgid "Yahoo JAPAN ID..."
-msgstr "Yahoo ??"
+msgstr "Yahoo JAPAN ??..."
 
 #. *< type
 #. *< ui_requirement
@@ -9725,12 +9699,11 @@ msgstr "Yahoo ??"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "Yahoo ????"
+msgstr "Yahoo JAPAN ????"
 
 msgid "Your SMS was not delivered"
-msgstr ""
+msgstr "????????"
 
 # NOTE ???? by Ambrose
 msgid "Your Yahoo! message did not get sent."
@@ -9757,28 +9730,24 @@ msgstr "??????"
 msgstr "??????"
 
 #. Some error in the received stream
-#, fuzzy
 msgid "Received invalid data"
-msgstr "???????????????"
+msgstr "???????"
 
 #. security lock from too many failed login attempts
-#, fuzzy
 msgid ""
 "Account locked: Too many failed login attempts.  Logging into the Yahoo! "
 "website may fix this."
-msgstr "??????? %d?????? Yahoo!,????????????????"
+msgstr "??????:??????????? Yahoo ???????????"
 
 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
-msgstr "??????? %d?????? Yahoo!,????????????????"
+msgstr "??????:??????? Yahoo ???????????"
 
 #. username or password missing
-#, fuzzy
 msgid "Username or password missing"
-msgstr "????????"
+msgstr "?????????"
 
 #, c-format
 msgid ""
@@ -9803,18 +9772,18 @@ msgstr "??????"
 msgid "Ignore buddy?"
 msgstr "??????"
 
+# NOTE???????????????? - acli 20090730
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "???????????????? Yahoo! ???"
+msgstr "??????????????? Yahoo! ???"
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "??????? %d?????? Yahoo!,????????????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "??????%1$s???????%3$s??????????????%2$s??"
 
-#, fuzzy
 msgid "Unable to add buddy to server list"
 msgstr "????????????????"
 
@@ -9823,21 +9792,16 @@ msgstr "[ ??? %s/%s/%s.swf ] %s"
 msgstr "[ ??? %s/%s/%s.swf ] %s"
 
 # XXX ?? - 20061025
-#, fuzzy
 msgid "Received unexpected HTTP response from server"
-msgstr "????????? HTTP ???"
+msgstr "????????? HTTP ??"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr ""
-"? %s ?????????:\n"
-"%s"
+msgstr "? %s ?????????:%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr ""
-"??????????:\n"
-"%s"
+msgstr "??? %s ????:%s"
 
 msgid "Not at Home"
 msgstr "???"
@@ -9879,7 +9843,7 @@ msgstr "????????"
 msgid "Don't Appear Permanently Offline"
 msgstr "????????"
 
-# NOTE #Pidgin ? Vann ? LSchiere ?:????????????????,???????
+# NOTE #gaim ? Vann ? LSchiere ?:????????????????,???????
 # NOTE Yahoo ??Chat????????????
 msgid "Join in Chat"
 msgstr "????????????"
@@ -9895,9 +9859,9 @@ msgid "Select the ID you want to activat
 msgstr "?? Doodle"
 
 msgid "Select the ID you want to activate"
-msgstr ""
+msgstr "???????? ID"
 
-# NOTE #Pidgin ? Vann ? LSchiere ?:????????????????,???????
+# NOTE #gaim ? Vann ? LSchiere ?:????????????????,???????
 # NOTE Yahoo ??Chat????????????
 msgid "Join whom in chat?"
 msgstr "????????"
@@ -9920,9 +9884,9 @@ msgstr "?????"
 msgid "Unable to connect."
 msgstr "?????"
 
-# TODO - ???? - 20061028
+# NOTE ?? http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=descriptor&qrytype=en&x=0&y=0
 msgid "Unable to establish file descriptor."
-msgstr "?????????"
+msgstr "?????????"
 
 #, c-format
 msgid "%s is trying to send you a group of %d files.\n"
@@ -9994,12 +9958,9 @@ msgstr "??????????? msgstr "?????????????"
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s ???????(?)?????%s????,????%s??"
+msgid "%s has declined to join."
+msgstr "%s ?????????"
 
-msgid "Invitation Rejected"
-msgstr "??????"
-
 msgid "Failed to join chat"
 msgstr "???????"
 
@@ -10053,7 +10014,6 @@ msgstr "?????????"
 msgid "User Rooms"
 msgstr "?????????"
 
-#, fuzzy
 msgid "Connection problem with the YCHT server"
 msgstr "? YCHT ?????????"
 
@@ -10177,7 +10137,7 @@ msgstr "TZC ??"
 # NOTE: ??Zephyr???????????,??????
 # NOTE: aatharuv: Most zephyr clients use ".anyone" to store the Zephyr
 # NOTE: buddylist. The export to .anyone option controls whether you want
-# NOTE: Pidgin to write to .anyone upon logout. Some people use multiple
+# NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
 msgid "Export to .anyone"
@@ -10189,7 +10149,7 @@ msgstr "??? .zephyr.subs ?"
 # NOTE: ??Zephyr???????????,??????
 # NOTE: aatharuv: Most zephyr clients use ".anyone" to store the Zephyr
 # NOTE: buddylist. The export to .anyone option controls whether you want
-# NOTE: Pidgin to write to .anyone upon logout. Some people use multiple
+# NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
 msgid "Import from .anyone"
@@ -10207,17 +10167,18 @@ msgstr "????"
 msgid "Exposure"
 msgstr "????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "???? HTTP ????????:%s\n"
+msgstr "???? HTTP ????????:%s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP ????????? %d"
 
-#, fuzzy, c-format
+# NOTE ?? http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=tunnel&qrytype=en&x=35&y=11
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
-msgstr "????:HTTP ?????????? %d ??????"
+msgstr "????:HTTP ???????????? %d ??"
 
 #, c-format
 msgid "Error resolving %s"
@@ -10462,12 +10423,15 @@ msgstr "???????"
 msgid "Address already in use."
 msgstr "???????"
 
+# NOTE ?? %s ?? filename
 #, c-format
 msgid "Error Reading %s"
 msgstr "?? %s ???????"
 
-# NOTE ?They??????????????,?????????????????
-#, fuzzy, c-format
+# NOTE ??? %s ? description,??? %s ? filename_full
+# NOTE ??????If we could not parse the file then show the user an error message?
+# NOTE ?????reading????????????????
+#, c-format
 msgid ""
 "An error was encountered reading your %s.  The file has not been loaded, and "
 "the old file has been renamed to %s~."
@@ -10519,8 +10483,8 @@ msgstr "????????(_I):"
 msgid "Use this buddy _icon for this account:"
 msgstr "????????(_I):"
 
-msgid "_Advanced"
-msgstr "????(_A)"
+msgid "Ad_vanced"
+msgstr "????(_V)"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "?? GNOME ????????"
@@ -10584,9 +10548,8 @@ msgstr "??????????? msgid "Create _this new account on the server"
 msgstr "????????????(_T)"
 
-#, fuzzy
-msgid "_Proxy"
-msgstr "?????"
+msgid "P_roxy"
+msgstr "?????(_R)"
 
 msgid "Enabled"
 msgstr "??"
@@ -10633,9 +10596,8 @@ msgstr "??????????? msgid "Please update the necessary fields."
 msgstr "?????????????"
 
-#, fuzzy
 msgid "A_ccount"
-msgstr "??"
+msgstr "??(_C)"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10660,17 +10622,14 @@ msgstr "????(_M)"
 msgid "I_M"
 msgstr "????(_M)"
 
-#, fuzzy
 msgid "_Audio Call"
-msgstr "?????(_A)"
+msgstr "????(_A)"
 
 msgid "Audio/_Video Call"
-msgstr ""
+msgstr "??/????"
 
-# XXX ??
-#, fuzzy
 msgid "_Video Call"
-msgstr "????"
+msgstr "????(_V)"
 
 msgid "_Send File..."
 msgstr "????(_S)..."
@@ -10681,11 +10640,9 @@ msgstr "????(_L)"
 msgid "View _Log"
 msgstr "????(_L)"
 
-#, fuzzy
 msgid "Hide When Offline"
 msgstr "?????"
 
-#, fuzzy
 msgid "Show When Offline"
 msgstr "?????"
 
@@ -10817,9 +10774,8 @@ msgstr "/??/??(_C)"
 msgid "/Tools/_Certificates"
 msgstr "/??/??(_C)"
 
-#, fuzzy
 msgid "/Tools/Custom Smile_ys"
-msgstr "/??/??(_Y)"
+msgstr "/??/????(_Y)"
 
 msgid "/Tools/Plu_gins"
 msgstr "/??/??(_G)"
@@ -10949,8 +10905,9 @@ msgstr "????"
 msgid "By status"
 msgstr "????"
 
+# XXX ?? 20090305 acli
 msgid "By recent log activity"
-msgstr ""
+msgstr "????????"
 
 #, c-format
 msgid "%s disconnected"
@@ -10967,7 +10924,7 @@ msgid "SSL FAQs"
 msgstr "????"
 
 msgid "SSL FAQs"
-msgstr ""
+msgstr "SSL ????"
 
 msgid "Welcome back!"
 msgstr "????!"
@@ -11099,109 +11056,99 @@ msgid "The background color for the budd
 msgstr "????"
 
 msgid "The background color for the buddy list"
-msgstr ""
+msgstr "?????????"
 
-#, fuzzy
 msgid "Layout"
-msgstr "???"
+msgstr "??"
 
 msgid "The layout of icons, name, and status of the blist"
-msgstr ""
+msgstr "????????????????"
 
 #. Group
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "????"
+msgstr "??????????"
 
 msgid "The background color of an expanded group"
-msgstr ""
+msgstr "???????????????"
 
-#, fuzzy
+# NOTE ??gtkblist-theme-loader????,????????????PidginThemeFont(???????????),??
 msgid "Expanded Text"
-msgstr "??(_E)"
+msgstr "????????"
 
 msgid "The text information for when a group is expanded"
-msgstr ""
+msgstr "?????????????????"
 
-#, fuzzy
 msgid "Collapsed Background Color"
-msgstr "??????"
+msgstr "??????????"
 
 msgid "The background color of a collapsed group"
-msgstr ""
+msgstr "??????????????"
 
-#, fuzzy
 msgid "Collapsed Text"
-msgstr "??(_C)"
+msgstr "????????"
 
 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "?????????????????"
 
 #. Buddy
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "??????"
+msgstr "??/????????"
 
 msgid "The background color of a contact or chat"
-msgstr ""
+msgstr "?????????????"
 
-#, fuzzy
 msgid "Contact Text"
-msgstr "??"
+msgstr "???????"
 
+# NOTE "the text font and color to be used for expanded contacts" (blist-theme.h)
+# NOTE ??deryni???,?contact???,??????priority buddy
+# NOTE ??contact???,????????contact???????contact????buddy
+# NOTE ???,???text information for when a contact is expanded?????contact???
 msgid "The text information for when a contact is expanded"
-msgstr ""
+msgstr "????????????????????"
 
-#, fuzzy
 msgid "On-line Text"
-msgstr "??"
+msgstr "???????"
 
 msgid "The text information for when a buddy is online"
-msgstr ""
+msgstr "?????????????????"
 
-#, fuzzy
 msgid "Away Text"
-msgstr "??"
+msgstr "???????"
 
 msgid "The text information for when a buddy is away"
-msgstr ""
+msgstr "?????????????????"
 
-#, fuzzy
 msgid "Off-line Text"
-msgstr "??"
+msgstr "???????"
 
 msgid "The text information for when a buddy is off-line"
-msgstr ""
+msgstr "?????????????????"
 
-# XXX ??? - acli 20070914
-#, fuzzy
 msgid "Idle Text"
-msgstr "????"
+msgstr "???????"
 
 msgid "The text information for when a buddy is idle"
-msgstr ""
+msgstr "?????????????????"
 
-#, fuzzy
 msgid "Message Text"
-msgstr "????"
+msgstr "??????????"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr ""
+msgstr "????????????????????"
 
 msgid "Message (Nick Said) Text"
-msgstr ""
+msgstr "????????????"
 
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nick"
-msgstr ""
+msgstr "????????????????????????"
 
-#, fuzzy
 msgid "The text information for a buddy's status"
-msgstr "?? %s ?????"
+msgstr "????????????"
 
 # XXX ?????? - acli 20070913
-#, fuzzy
 msgid "Type the host name for this certificate."
 msgstr "???????????????"
 
@@ -11253,7 +11200,6 @@ msgstr "??????"
 msgid "Get Away Message"
 msgstr "??????"
 
-#, fuzzy
 msgid "Last Said"
 msgstr "????"
 
@@ -11302,21 +11248,18 @@ msgstr "/??/??????(_R)"
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/??/??????(_R)"
 
-#, fuzzy
+# XXX ???  - acli 20090730
 msgid "/Conversation/M_edia"
-msgstr "/??/??(_O)"
+msgstr "/??/??(_E)"
 
-#, fuzzy
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/??/??(_O)"
+msgstr "/??/??/????(_A)"
 
-#, fuzzy
 msgid "/Conversation/Media/_Video Call"
-msgstr "/??/??(_O)"
+msgstr "/??/??/????(_V)"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/??/??????(_L)"
+msgstr "/??/??/??/????(_C)"
 
 msgid "/Conversation/Se_nd File..."
 msgstr "/??/????(_N)..."
@@ -11390,17 +11333,15 @@ msgstr "/??/??????"
 msgid "/Conversation/View Log"
 msgstr "/??/??????"
 
-#, fuzzy
+# XXX ??? - acli 20090730
 msgid "/Conversation/Media/Audio Call"
-msgstr "/??/??"
+msgstr "/??/??/????"
 
-#, fuzzy
 msgid "/Conversation/Media/Video Call"
-msgstr "/??/??????"
+msgstr "/??/??/????"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/??/??"
+msgstr "/??/??/??/????"
 
 msgid "/Conversation/Send File..."
 msgstr "/??/????..."
@@ -11600,7 +11541,7 @@ msgid "voice and video"
 msgstr "???"
 
 msgid "voice and video"
-msgstr ""
+msgstr "???????"
 
 msgid "support"
 msgstr "??"
@@ -11738,9 +11679,8 @@ msgstr "????"
 msgid "Hungarian"
 msgstr "????"
 
-#, fuzzy
 msgid "Armenian"
-msgstr "?????"
+msgstr "?????"
 
 msgid "Indonesian"
 msgstr "???"
@@ -11763,9 +11703,9 @@ msgstr "Ubuntu ?????????msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu ????????????"
 
-#, fuzzy
+# NOTE ?? http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
 msgid "Khmer"
-msgstr "??"
+msgstr "???"
 
 # NOTE ?? http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
 # NOTE ?:KDE ??????
@@ -11865,8 +11805,9 @@ msgstr "???"
 msgid "Swedish"
 msgstr "???"
 
+# NOTE ?? http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=swahili&qrytype=en&x=29&y=7
 msgid "Swahili"
-msgstr ""
+msgstr "?????"
 
 # NOTE ?? http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
 # NOTE ?????????,?????????(?????)??????
@@ -11949,7 +11890,7 @@ msgstr ""
 msgid ""
 "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr ""
-"<FONT SIZE=\"4\">IRC ??</FONT> irc.freenode.net ?? #pidgin ??<BR><BR>"
+"<FONT SIZE=\"4\">IRC ??:</FONT>irc.freenode.net ?? #pidgin ??<BR><BR>"
 
 #, c-format
 msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel at conference.pidgin.im<BR><BR>"
@@ -11959,8 +11900,8 @@ msgstr "?????"
 msgid "Current Developers"
 msgstr "?????"
 
-# NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on Pidgin ;-)
-# NOTE Luke Schierer ?:?????????,????? Pidgin ???
+# NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on gaim ;-)
+# NOTE Luke Schierer ?:?????????,????? gaim ???
 # NOTE ???????????????????????????????......
 # NOTE ??????????,????????????????? :P
 msgid "Crazy Patch Writers"
@@ -12193,14 +12134,6 @@ msgstr "??????(_D)"
 msgid "File transfer _details"
 msgstr "??????(_D)"
 
-#. Pause button
-msgid "_Pause"
-msgstr "??(_P)"
-
-#. Resume button
-msgid "_Resume"
-msgstr "??(_R)"
-
 #  NOTE Nautilus???????,Abiword?????????,??????
 msgid "Paste as Plain _Text"
 msgstr "?????(_T)"
@@ -12220,7 +12153,6 @@ msgstr "????????"
 msgid "Hyperlink visited color"
 msgstr "????????"
 
-#, fuzzy
 msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "????????(????)??????????"
 
@@ -12258,21 +12190,18 @@ msgstr ""
 msgstr ""
 "?????????????????????????,???????????"
 
-#, fuzzy
 msgid "Color to draw the name of a whispered action message."
-msgstr "??????????????????,???????????"
+msgstr "?????????????????,???????????"
 
 msgid "Whisper Message Name Color"
 msgstr "????????"
 
-#, fuzzy
 msgid "Color to draw the name of a whispered message."
-msgstr "??????????????????,???????????"
+msgstr "???????????,???????????"
 
 msgid "Typing notification color"
 msgstr "??????"
 
-#, fuzzy
 msgid "The color to use for the typing notification"
 msgstr "???????????"
 
@@ -12286,7 +12215,7 @@ msgstr "??????"
 msgid "Enable typing notification"
 msgstr "??????"
 
-# NOTE "Defaulting to PNG" ?? Pidgin ?????????????? PNG ??
+# NOTE "Defaulting to PNG" ?? gaim ?????????????? PNG ??
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12296,7 +12225,7 @@ msgstr ""
 "\n"
 "???? PNG ????"
 
-# NOTE "Defaulting to PNG" ?? Pidgin ?????????????? PNG ??
+# NOTE "Defaulting to PNG" ?? gaim ?????????????? PNG ??
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -12533,7 +12462,7 @@ msgstr "%s %s????%s -h????
 #  FIXME
 #  NOTE hard-code ????Pidgin?????,????????(?????),?????,?????????
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12555,6 +12484,7 @@ msgstr ""
 "\n"
 "  -c, --config=DIR    ???????\n"
 "  -d, --debug         ????????????\n"
+"  -f, --force-online  ????????,?????????\n"
 "  -h, --help          ?????????\n"
 "  -m, --multiple      ????????Pidgin??\n"
 "  -n, --nologin       ?????\n"
@@ -12565,7 +12495,7 @@ msgstr ""
 
 #  FIXME
 #  NOTE hard-code ????Pidgin?????,????????(?????),?????,?????????
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12586,6 +12516,7 @@ msgstr ""
 "\n"
 "  -c, --config=DIR    ???????\n"
 "  -d, --debug         ????????????\n"
+"  -f, --force-online  ????????,?????????\n"
 "  -h, --help          ?????????\n"
 "  -m, --multiple      ????????Pidgin??\n"
 "  -n, --nologin       ?????\n"
@@ -12620,23 +12551,25 @@ msgstr ""
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
+# XXX ??? - acli 20090730
 msgid "/_Media"
-msgstr ""
+msgstr "/??(_M)"
 
+# XXX ?? - acli 20090730
 msgid "/Media/_Hangup"
-msgstr ""
+msgstr "/??/??(_H)"
 
-#, fuzzy
+# XXX ?? - acli 20090730
 msgid "Calling..."
-msgstr "???..."
+msgstr "???..."
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr ""
+msgstr "%s ????????/?????"
 
 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr ""
+msgstr "%s ???????????"
 
 #, c-format
 msgid "%s has %d new message."
@@ -12665,9 +12598,8 @@ msgstr "??????????? "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "??????????????,????????"
 
-#, fuzzy
 msgid "No message"
-msgstr "?????"
+msgstr "????"
 
 msgid "Open All Messages"
 msgstr "??????"
@@ -12675,16 +12607,18 @@ msgstr "<span weight=\"bold\" size=\"lar
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">????!</span>"
 
-#, fuzzy
+# XXX ?????????????????????????
+# XXX ??,?????? - acli 20090730
 msgid "New Pounces"
-msgstr "????????"
+msgstr "??????????"
 
+# XXX ??????????? - acli 20090730
 msgid "Dismiss"
-msgstr ""
+msgstr "??"
 
-#, fuzzy
+# XXX ??,?????? - acli 20090730
 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 "???????????"
@@ -12732,7 +12666,6 @@ msgstr "????"
 msgid "Select a file"
 msgstr "????"
 
-#, fuzzy
 msgid "Modify Buddy Pounce"
 msgstr "????????"
 
@@ -12809,64 +12742,59 @@ msgstr "????"
 msgid "Pounce Target"
 msgstr "????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Started typing"
 msgstr "????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Paused while typing"
 msgstr "????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Signed on"
 msgstr "??"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Returned from being idle"
-msgstr "%s ????? (%s)"
+msgstr "?????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Returned from being away"
-msgstr "??"
+msgstr "?????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Stopped typing"
 msgstr "????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Signed off"
 msgstr "??"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Became idle"
 msgstr "??"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Went away"
-msgstr "????"
+msgstr "??"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Sent a message"
 msgstr "????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown.... Please report this!"
-msgstr "???????????????!"
+msgstr "???????......???????!"
 
-# XXX ??? - 20061025
-#, fuzzy
+# XXX ??? - 20090730
 msgid "Theme failed to unpack."
-msgstr "?????????"
+msgstr "??????????"
 
-# XXX ??? - 20061025
-#, fuzzy
 msgid "Theme failed to load."
-msgstr "?????????"
+msgstr "?????????"
 
-# XXX ??? - 20061025
-#, fuzzy
 msgid "Theme failed to copy."
-msgstr "?????????"
+msgstr "?????????"
 
 #  NOTE ???????????????,??????????
 msgid "Install Theme"
@@ -12889,9 +12817,8 @@ msgstr "???? Escape ????
 msgstr "???? Escape ?????(_O)"
 
 #. Buddy List Themes
-#, fuzzy
 msgid "Buddy List Theme"
-msgstr "????"
+msgstr "??????"
 
 #. System Tray
 msgid "System Tray Icon"
@@ -12903,9 +12830,8 @@ msgstr "??????"
 msgid "On unread messages"
 msgstr "??????"
 
-#, fuzzy
 msgid "Conversation Window"
-msgstr "????????"
+msgstr "????"
 
 msgid "_Hide new IM conversations:"
 msgstr "??????????(_H):"
@@ -13011,9 +12937,9 @@ msgstr "<span style=\"italic\">?:stu
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">?:stunserver.org</span>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "???? IP ??(_A)"
+msgstr "????????? IP ??(_A):%s"
 
 msgid "Public _IP:"
 msgstr "??IP (_I):"
@@ -13033,9 +12959,10 @@ msgstr "?????(_E):"
 msgid "_End port:"
 msgstr "?????(_E):"
 
+# NOTE ?? http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=relay&qrytype=en&x=29&y=11
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr ""
+msgstr "????? (TURN)"
 
 msgid "Proxy Server &amp; Browser"
 msgstr "?????????"
@@ -13217,7 +13144,7 @@ msgid "_Auto-reply:"
 msgstr "????????????"
 
 msgid "_Auto-reply:"
-msgstr "????????:"
+msgstr "????????(_A):"
 
 msgid "When both away and idle"
 msgstr "?????????"
@@ -13382,11 +13309,10 @@ msgstr "??:%s"
 msgid "Status for %s"
 msgstr "??:%s"
 
-# XXX 20080810 acli - ??
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
-msgstr "??????????????,?????????"
+msgstr "?%s??????,?????????"
 
 msgid "Custom Smiley"
 msgstr "????"
@@ -13400,28 +13326,26 @@ msgstr "????"
 msgid "Add Smiley"
 msgstr "????"
 
-#, fuzzy
 msgid "_Image:"
-msgstr "??(_I)"
+msgstr "??(_I):"
 
+# XXX ?? - 20090305 acli
 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "??"
+msgstr "????(_H):"
 
 msgid "Smiley"
 msgstr "??"
 
-#, fuzzy
+# XXX ?? - 20090305 acli
 msgid "Shortcut Text"
-msgstr "??"
+msgstr "????"
 
 msgid "Custom Smiley Manager"
 msgstr "??????"
 
-#, fuzzy
 msgid "Select Buddy Icon"
-msgstr "????"
+msgstr "??????"
 
 msgid "Click to change your buddyicon for this account."
 msgstr "?????????????"
@@ -13506,7 +13430,6 @@ msgstr "???????"
 msgid "Cannot send launcher"
 msgstr "???????"
 
-#, fuzzy
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
 "this launcher instead of this launcher itself."
@@ -13541,9 +13464,8 @@ msgstr "???????%s?,?
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "???????%s?,????,?????????"
 
-#, fuzzy
 msgid "_Open Link"
-msgstr "?????????(_O):"
+msgstr "????(_O)"
 
 msgid "_Copy Link Location"
 msgstr "??????(_C)"
@@ -13551,9 +13473,21 @@ msgstr "????????(_C)"
 msgid "_Copy Email Address"
 msgstr "????????(_C)"
 
+msgid "_Open File"
+msgstr "????(_O)"
+
+msgid "Open _Containing Directory"
+msgstr "??????(_C)"
+
 msgid "Save File"
 msgstr "????"
 
+msgid "_Play Sound"
+msgstr "????(_P)"
+
+msgid "_Save File"
+msgstr "????(_S)"
+
 msgid "Select color"
 msgstr "????"
 
@@ -13578,6 +13512,9 @@ msgstr "????(_O)"
 msgid "_Open Mail"
 msgstr "????(_O)"
 
+msgid "_Pause"
+msgstr "??(_P)"
+
 # TODO ??? - 20080826
 msgid "_Edit"
 msgstr "??(_E)"
@@ -13649,80 +13586,73 @@ msgstr "??????????? msgid "Displays statistical information about your buddies' availability"
 msgstr "????????????????"
 
-#, fuzzy
+#  NOTE ???Select an XMPP server to query????????
 msgid "Server name request"
-msgstr "?????"
+msgstr "???????"
 
-# NOTE????????????Yahoo! ??????Conference?????????
-# XXX
-#, fuzzy
+#  XXX ?????,?????????,?????????? - acli 20090803
 msgid "Enter an XMPP Server"
-msgstr "???????"
+msgstr "??? XMPP ?????"
 
-#, fuzzy
 msgid "Select an XMPP server to query"
-msgstr "??????????"
+msgstr "????? XMPP ???"
 
-#  XXX ??
-#, fuzzy
+#  NOTE ????
+#  FIXME ?????? - acli 20090730
 msgid "Find Services"
-msgstr "???????"
+msgstr "????"
 
-#, fuzzy
 msgid "Add to Buddy List"
-msgstr "??????"
+msgstr "???????"
 
-#, fuzzy
+# NOTE ?? http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=gateway&qrytype=en&x=27&y=7
 msgid "Gateway"
-msgstr "??"
+msgstr "???"
 
-#, fuzzy
 msgid "Directory"
-msgstr "????"
+msgstr "??"
 
-#, fuzzy
+# NOTE ?? http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=collection&qrytype=en&x=30&y=9
+# NOTE ?? http://wiki.jabbercn.org/index.php?title=XEP-0060&variant=zh-hant
 msgid "PubSub Collection"
-msgstr "????"
+msgstr "PubSub ????"
 
-#, fuzzy
+# NOTE ?? http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=leaf&qrytype=en&x=37&y=11
+# NOTE ?? http://wiki.jabbercn.org/index.php?title=XEP-0060&variant=zh-hant
 msgid "PubSub Leaf"
-msgstr "PubSub ??"
+msgstr "PubSub ????"
 
-#, fuzzy
 msgid ""
 "\n"
 "<b>Description:</b> "
-msgstr "??"
+msgstr ""
+"\n"
+"<b>??:</b>"
 
 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "??????"
+msgstr "????"
 
-#, fuzzy
 msgid "_Browse"
-msgstr "???(_B):"
+msgstr "??(_B)"
 
-#, fuzzy
 msgid "Server does not exist"
-msgstr "??????"
+msgstr "??????"
 
-#, fuzzy
 msgid "Server does not support service discovery"
-msgstr "???????????????????"
+msgstr "??????????"
 
-#, fuzzy
 msgid "XMPP Service Discovery"
-msgstr "??????"
+msgstr "XMPP ????"
 
+#  FIXME ?????? - acli 20090730
 msgid "Allows browsing and registering services."
-msgstr ""
+msgstr "??????????"
 
-#, fuzzy
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
-msgstr "??? XMPP ????????????"
+msgstr "????????????? XMPP ??????"
 
 msgid "Buddy is idle"
 msgstr "????"
@@ -14131,7 +14061,6 @@ msgstr "??????????? msgstr "????????????"
 
 #. *  summary
-#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editing a common score in real-time."
@@ -14261,7 +14190,6 @@ msgstr "????????"
 msgid "Highlighted Message Name Color"
 msgstr "????????"
 
-#, fuzzy
 msgid "Typing Notification Color"
 msgstr "??????"
 
@@ -14296,23 +14224,20 @@ msgstr ""
 msgstr ""
 
 # XXX ?????,???????????,???????? - acli 20080511
-#, fuzzy
 msgid "Disable Typing Notification Text"
-msgstr "??????"
+msgstr "??????"
 
-#, fuzzy
 msgid "GTK+ Theme Control Settings"
-msgstr "Pidgin GTK+ ??????"
+msgstr "GTK+ ????????"
 
-#, fuzzy
 msgid "Colors"
-msgstr "??"
+msgstr "??"
 
 msgid "Fonts"
 msgstr "??"
 
 msgid "Miscellaneous"
-msgstr ""
+msgstr "??"
 
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc?????"
@@ -14353,10 +14278,10 @@ msgstr "????"
 msgid "New Version Available"
 msgstr "????"
 
+# NOTE ???Later?????????(??:????????,??????,?????)
 msgid "Later"
-msgstr "??"
+msgstr "????"
 
-# NOTE: ui_name, ui_website - ?????ui_website??ui_name??????(quit message),ui_name?????pidgin?
 msgid "Download Now"
 msgstr "????"
 
@@ -14400,7 +14325,6 @@ msgstr "??????????? 
 # XXX ?????? - acli 20080508
 #. *< summary
-#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for use when no physical keyboard is present."
@@ -14459,103 +14383,85 @@ msgstr "??????????? msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "???????????????????????"
 
-#, fuzzy
 msgid "Just logged in"
-msgstr "????"
+msgstr "????"
 
-#, fuzzy
 msgid "Just logged out"
-msgstr "????"
+msgstr "????"
 
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
+"???????/\n"
+"????????"
 
-# TODO ??????????????,?????????????
-# NOTE ???? by Paladin
-#, fuzzy
 msgid "Icon for Chat"
-msgstr "?????"
+msgstr "????????"
 
-#  NOTE?Ignore??????????,? gtkprefs.c ???Ignore?
-#  NOTE ??????????,?????????
-#, fuzzy
 msgid "Ignored"
-msgstr "??"
+msgstr "???"
 
-#, fuzzy
+#  NOTE?Founder????????????
 msgid "Founder"
-msgstr "???"
+msgstr "???"
 
-#, fuzzy
+#. A user in a chat room who has special privileges.
 msgid "Operator"
-msgstr "Opera"
+msgstr "???"
 
+#  NOTE ?????????????????,Konversation?????,Chatzilla???????
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
 msgid "Half Operator"
-msgstr ""
+msgstr "??"
 
-# NOTE ?????????????????????????
-#, fuzzy
 msgid "Authorization dialog"
-msgstr "????"
+msgstr "????"
 
-# TODO ??? - 20061025
-#, fuzzy
 msgid "Error dialog"
-msgstr "????"
+msgstr "??????"
 
-# XXX 20070518
-#, fuzzy
 msgid "Information dialog"
-msgstr "??"
+msgstr "??????"
 
 msgid "Mail dialog"
-msgstr ""
+msgstr "????"
 
-#  XXX ????????,????????? - ambrose 20070415
-#, fuzzy
+#  XXX ????????,????????? - ambrose 20090730
 msgid "Question dialog"
-msgstr "???? (Request Dialog)"
+msgstr "????"
 
-#, fuzzy
 msgid "Warning dialog"
-msgstr "????"
+msgstr "??????"
 
 msgid "What kind of dialog is this?"
-msgstr ""
+msgstr "??????????"
 
-#, fuzzy
 msgid "Status Icons"
-msgstr "??:%s"
+msgstr "????"
 
-#  XXX ?????,?????????????????(?!)
-#, fuzzy
+# XXX ?? - acli 20090730
 msgid "Chatroom Emblems"
-msgstr "????? (Locale)"
+msgstr "?????"
 
-#, fuzzy
 msgid "Dialog Icons"
-msgstr "????"
+msgstr "????"
 
-#, fuzzy
 msgid "Pidgin Icon Theme Editor"
-msgstr "Pidgin GTK+ ??????"
+msgstr "Pidgin ???????"
 
-#, fuzzy
 msgid "Contact"
-msgstr "????"
+msgstr "??"
 
-#, fuzzy
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "????"
+msgstr "Pidgin ?????????"
 
-#, fuzzy
 msgid "Edit Buddylist Theme"
-msgstr "????"
+msgstr "????????"
 
 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "??????"
 
 #. *< type
 #. *< ui_requirement
@@ -14564,16 +14470,14 @@ msgstr ""
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "Pidgin GTK+ ??????"
+msgstr "Pidgin ?????"
 
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "Pidgin GTK+ ??????"
+msgstr "Pidgin ??????"
 
 #. *< type
 #. *< ui_requirement
@@ -14731,9 +14635,10 @@ msgstr "??????????? msgid "_Keep Buddy List window on top:"
 msgstr "??????????????(_K);"
 
+# NOTE ???? by Ambrose 20090806, see Always/Never
 #. XXX: Did this ever work?
 msgid "Only when docked"
-msgstr "???????"
+msgstr "???????"
 
 msgid "Windows Pidgin Options"
 msgstr "Windows ? Pidgin ??"
@@ -14741,7 +14646,6 @@ msgstr "Windows ? Pidgin ?????msgid "Options specific to Pidgin for Windows."
 msgstr "Windows ? Pidgin ??????"
 
-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "?? Windows ? Pidgin ?????,????????????"
@@ -14785,6 +14689,27 @@ msgstr "??? XMPP ?????? msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "??? XMPP ????????????"
 
+#~ msgid "_Resume"
+#~ msgstr "??(_R)"
+
+#~ msgid "Unable to not load SILC key pair"
+#~ msgstr "???? SILC ???"
+
+#~ msgid ""
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ msgstr "%s ???????(?)?????%s????,????%s??"
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "??????"
+
+#~ msgid "Invite message"
+#~ msgstr "????"
+
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr "?????????????,?????????????"
+
 #~ msgid "Cannot open socket"
 #~ msgstr "????Socket"
 
@@ -14810,23 +14735,10 @@ msgstr "??? XMPP ?????? #~ msgid "Read error"
 #~ msgstr "????"
 
-#~ msgid ""
-#~ "Could not establish a connection with the server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "??????????:\n"
-#~ "%s"
-
-#~ msgid "Write error"
-#~ msgstr "????"
-
 # NOTE ??????(??)
 #~ msgid "Last Activity"
 #~ msgstr "????"
 
-#~ msgid "Service Discovery Info"
-#~ msgstr "??????"
-
 #  FIXME acli 2070914
 #~ msgid "Service Discovery Items"
 #~ msgstr "??????"
@@ -14850,9 +14762,6 @@ msgstr "??? XMPP ?????? #~ msgid "Ad-Hoc Commands"
 #~ msgstr "????"
 
-#~ msgid "PubSub Service"
-#~ msgstr "PubSub ??"
-
 #~ msgid "SOCKS5 Bytestreams"
 #~ msgstr "SOCKS5 ?????"
 
@@ -14965,6 +14874,9 @@ msgstr "??? XMPP ?????? #~ msgid "Hop Check"
 #~ msgstr "?????"
 
+#~ msgid "Write error"
+#~ msgstr "????"
+
 #~ msgid "Read Error"
 #~ msgstr "????"
 
@@ -14991,9 +14903,6 @@ msgstr "??? XMPP ?????? #~ msgid "Error. SSL support is not installed."
 #~ msgstr "??:???? SSL ???"
 
-#~ msgid "Incorrect password."
-#~ msgstr "?????"
-
 #~ msgid ""
 #~ "Could not connect to BOS server:\n"
 #~ "%s"
@@ -15001,14 +14910,17 @@ msgstr "??? XMPP ?????? #~ "????? BOS ???:\n"
 #~ "%s"
 
-#~ msgid "You may be disconnected shortly.  Check %s for updates."
-#~ msgstr "???????????????? %s ????????"
+#~ msgid "Invalid username."
+#~ msgstr "????????"
 
+#~ msgid "Incorrect password."
+#~ msgstr "?????"
+
 #~ msgid "Could Not Connect"
 #~ msgstr "????"
 
-#~ msgid "Invalid username."
-#~ msgstr "????????"
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "???????????????? %s ????????"
 
 #~ msgid "Could not decrypt server reply"
 #~ msgstr "?????????"
@@ -15040,81 +14952,6 @@ msgstr "??? XMPP ?????? #~ msgid "Could not create listen socket"
 #~ msgstr "???? Socket ??"
 
-#~ msgid "Could not resolve hostname"
-#~ msgstr "??????"
-
-#, fuzzy
-#~ msgid "Incorrect Password"
-#~ msgstr "????"
-
-#~ msgid ""
-#~ "Could not establish a connection with %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "??? %s ????:\n"
-#~ "%s"
-
-#~ msgid "Yahoo Japan"
-#~ msgstr "Yahoo Japan"
-
-#~ msgid "Japan Pager server"
-#~ msgstr "?????(????)"
-
-#~ msgid "Japan file transfer server"
-#~ msgstr "???????(????)"
-
-#~ msgid ""
-#~ "Lost connection with server\n"
-#~ "%s"
-#~ msgstr ""
-#~ "?????????????\n"
-#~ "%s"
-
-#~ msgid "Could not resolve host name"
-#~ msgstr "??????"
-
-#, fuzzy
-#~ msgid ""
-#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
-#~ "was found."
-#~ msgstr "??????????? TLS/SSL,???? TLS/SSL ???"
-
-#~ msgid "Conversation Window Hiding"
-#~ msgstr "??????????"
-
-#~ msgid "More Data needed"
-#~ msgstr "????????"
-
-#~ msgid "Please provide a shortcut to associate with the smiley."
-#~ msgstr "????????????????"
-
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "?????????????"
-
-#~ msgid "Activate which ID?"
-#~ msgstr "????? ID?"
-
-#~ msgid "Cursor Color"
-#~ msgstr "????"
-
-#  XXX ?????????,????????????????
-#~ msgid "Secondary Cursor Color"
-#~ msgstr "??????"
-
-#~ msgid "Interface colors"
-#~ msgstr "????"
-
-#~ msgid "Widget Sizes"
-#~ msgstr "Widget ??"
-
-#~ msgid "Invite message"
-#~ msgstr "????"
-
-#~ msgid ""
-#~ "Please enter the name of the user you wish to invite,\n"
-#~ "along with an optional invite message."
-#~ msgstr "?????????????,?????????????"
-
 #~ msgid "Looking up %s"
 #~ msgstr "?? %s ?"
 
@@ -15260,21 +15097,68 @@ msgstr "??? XMPP ?????? #~ msgid "TOC Protocol Plugin"
 #~ msgstr "TOC ????"
 
+#~ msgid "Activate which ID?"
+#~ msgstr "????? ID?"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "?????(????)"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "???????(????)"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "?????????????\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "??????"
+
 #~ msgid "%s Options"
 #~ msgstr "%s ??"
 
 #~ msgid "Proxy Options"
 #~ msgstr "???????"
 
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "??????????"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "STUN ???(_U):"
+
+#~ msgid "More Data needed"
+#~ msgstr "????????"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "????????????????"
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "?????????????"
+
+#~ msgid "Cursor Color"
+#~ msgstr "????"
+
+#  XXX ?????????,????????????????
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "??????"
+
+#~ msgid "Interface colors"
+#~ msgstr "????"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Widget ??"
+
 #~ msgid "By log size"
 #~ msgstr "??????"
 
 #~ msgid "_Open Link in Browser"
 #~ msgstr "?????????(_O)"
 
-#~ msgid "ST_UN server:"
-#~ msgstr "STUN ???(_U):"
-
 #~ msgid "Smiley _Image"
 #~ msgstr "????(_I)"
 
@@ -15300,14 +15184,6 @@ msgstr "??? XMPP ?????? #~ msgstr[0] "????????(%d ?????????)"
 #~ msgstr[1] "????????(%d ?????????)"
 
-#, fuzzy
-#~ msgid "Add buddy Q&A"
-#~ msgstr "????"
-
-#, fuzzy
-#~ msgid "Can not decrypt get server reply"
-#~ msgstr "????????"
-
 #~ msgid "Keep alive error"
 #~ msgstr "Keep Alive??"
 
@@ -15318,14 +15194,9 @@ msgstr "??? XMPP ?????? #~ "?????????????:\n"
 #~ "%d, %s"
 
-#, fuzzy
-#~ msgid "Connecting server ..."
-#~ msgstr "?????"
-
 #~ msgid "Failed to send IM."
 #~ msgstr "?????????"
 
-#, fuzzy
 #~ msgid "Not a member of room \"%s\"\n"
 #~ msgstr "??????%s????\n"
 
@@ -15487,10 +15358,6 @@ msgstr "??? XMPP ?????? #~ msgid "QQ Server Notice"
 #~ msgstr "QQ ?????"
 
-#, fuzzy
-#~ msgid "Network disconnected"
-#~ msgstr "??????"
-
 #~ msgid "developer"
 #~ msgstr "???"
 


More information about the Commits mailing list