pidgin: ca2d41f7: Updated Simplified Chinese translation a...

darkrain42 at pidgin.im darkrain42 at pidgin.im
Mon Aug 31 23:00:52 EDT 2009


-----------------------------------------------------------------
Revision: ca2d41f7cbac42546ba0d185253fd00a5b404204
Ancestor: 193869c7b6c12d13ccb96d731ceb8fe5f3a82f2d
Author: darkrain42 at pidgin.im
Date: 2009-09-01T02:54:01
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ca2d41f7cbac42546ba0d185253fd00a5b404204

Modified files:
        pidgin/gtkdialogs.c po/ChangeLog po/zh_CN.po

ChangeLog: 

Updated Simplified Chinese translation and email update. Closes #10165.

In committing this, I fixed these "fatal errors":
./zh_CN.po:2941: `msgid' and `msgstr' entries do not both end with '\n'
./zh_CN.po:4526: `msgid' and `msgstr' entries do not both end with '\n'
./zh_CN.po:8848: `msgid' and `msgstr' entries do not both end with '\n'
./zh_CN.po:9303: `msgid' and `msgstr' entries do not both end with '\n'
./zh_CN.po:9545: `msgid' and `msgstr' entries do not both end with '\n'
./zh_CN.po:10358: `msgid' and `msgstr[0]' entries do not both end with '\n'
./zh_CN.po:12888: `msgid' and `msgstr' entries do not both begin with '\n'
msgfmt: found 7 fatal error

-------------- next part --------------
============================================================
--- pidgin/gtkdialogs.c	d86f2a7cba0c0416018e0e43e3bc43ba74bda0ad
+++ pidgin/gtkdialogs.c	29ad7ec38b32b7be7a1d6beae86b43385704f6e0
@@ -230,7 +230,7 @@ static const struct translator translato
 	{N_("Turkish"),             "tr", "Serdar Soytetir", "tulliana at gmail.com"},
 	{N_("Urdu"),                "ur", "RKVS Raman", "rkvsraman at gmail.com"},
 	{N_("Vietnamese"),          "vi", N_("T.M.Thanh and the Gnome-Vi Team"), "gnomevi-list at lists.sf.net"},
-	{N_("Simplified Chinese"),  "zh_CN", "Aron Xu", "aronmalache at 163.com"},
+	{N_("Simplified Chinese"),  "zh_CN", "Aron Xu", "happyaron.xu at gmail.com"},
 	{N_("Hong Kong Chinese"),   "zh_HK", "Abel Cheung", "abelindsay at gmail.com"},
 	{N_("Hong Kong Chinese"),   "zh_HK", "Ambrose C. Li", "acli at ada.dhs.org"},
 	{N_("Hong Kong Chinese"),   "zh_HK", "Paladin R. Liu", "paladin at ms1.hinet.net"},
============================================================
--- po/ChangeLog	d0ea1b2d55d2936e612599928a115d75aa2110bc
+++ po/ChangeLog	22704431ecbfbac165ad08ca01e092cd69781a82
@@ -2,6 +2,7 @@ version 2.6.2
 
 version 2.6.2
 	* Basque translation updated (Mikel Pascual Aldabaldetreku)
+	* Chinese (Simplified) translation updated (Aron Xu)
 	* Finnish translation updated (Timo Jyrinki)
 	* French translation updated (?ric Boumaour)
 	* German translation updated (Jochen Kemnade)
============================================================
--- po/zh_CN.po	754158bfc563105ac693bbaa8e04d5ff0d09152f
+++ po/zh_CN.po	f60779ec212022d01f90fc25d54fcc8d7a32b2cb
@@ -4,18 +4,20 @@
 # Funda Wang <fundawang at linux.net.cn>, 2003, 2004.
 # liyuekui <liyuekui at gmail.com>, 2009.
 # Aron Xu <aronmalache at 163.com>, 2009.
+# fujianwzh <fujianwzh at gmail.com>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: pidgin HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-06 15:04-0700\n"
-"PO-Revision-Date: 2009-04-23 00:32+0800\n"
+"POT-Creation-Date: 2009-08-31 19:52-0700\n"
+"PO-Revision-Date: 2009-08-23 22:12+0800\n"
 "Last-Translator: Aron Xu <aronmalache at 163.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh at googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -24,7 +26,7 @@ msgid "%s. Try `%s -h' for more informat
 
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
-msgstr "%s???"%s -h"?????\n"
+msgstr "%s???"%s -h"????????\n"
 
 #, c-format
 msgid ""
@@ -40,10 +42,10 @@ msgstr ""
 "%s\n"
 "??: %s [??]...\n"
 "\n"
-"  -c, --config=??   ??"??"??????\n"
+"  -c, --config=??   ????????????\n"
 "  -d, --debug         ????????????\n"
 "  -h, --help          ???????\n"
-"  -n, --nologin       ?????\n"
+"  -n, --nologin       ?????\n"
 "  -v, --version       ?????????\n"
 
 #, c-format
@@ -74,7 +76,7 @@ msgid "(You probably forgot to 'make ins
 msgstr "????????"
 
 msgid "(You probably forgot to 'make install'.)"
-msgstr "(???????"make install"?)"
+msgstr "(???????"make install"??)"
 
 msgid "Modify Account"
 msgstr "????"
@@ -86,7 +88,7 @@ msgid "Username:"
 msgstr "??:"
 
 msgid "Username:"
-msgstr "???:"
+msgstr "???:"
 
 msgid "Password:"
 msgstr "??:"
@@ -96,7 +98,7 @@ msgid "Create this account on the server
 
 #. Register checkbox
 msgid "Create this account on the server"
-msgstr "???????????"
+msgstr "??????????"
 
 #. Cancel button
 #. Cancel
@@ -138,14 +140,14 @@ msgid "Add buddy to your list?"
 msgstr "%s%s%s%s ??? %s ????%s%s"
 
 msgid "Add buddy to your list?"
-msgstr "?????????"
+msgstr "??????????"
 
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s ??? %s ?????%s%s"
 
 msgid "Authorize buddy?"
-msgstr "????"
+msgstr "????"
 
 msgid "Authorize"
 msgstr "??"
@@ -158,12 +160,12 @@ msgstr ""
 "Online: %d\n"
 "Total: %d"
 msgstr ""
-"??: %d\n"
-"??: %d"
+"??:%d\n"
+"??:%d"
 
 #, c-format
 msgid "Account: %s (%s)"
-msgstr "??:%s(%s)"
+msgstr "??:%s (%s)"
 
 #, c-format
 msgid ""
@@ -171,7 +173,7 @@ msgstr ""
 "Last Seen: %s ago"
 msgstr ""
 "\n"
-"????:%s?"
+"????:%s ?"
 
 msgid "Default"
 msgstr "??"
@@ -195,7 +197,7 @@ msgid "Alias (optional)"
 msgstr "???"
 
 msgid "Alias (optional)"
-msgstr "?????(??)"
+msgstr "??(??)"
 
 msgid "Add in group"
 msgstr "????"
@@ -229,7 +231,7 @@ msgid "You can edit more information fro
 msgstr "????"
 
 msgid "You can edit more information from the context menu later."
-msgstr "??????????????????"
+msgstr "??????????????????"
 
 msgid "Error adding group"
 msgstr "?????"
@@ -262,7 +264,7 @@ msgid "Get Info"
 msgstr "????..."
 
 msgid "Get Info"
-msgstr "??"
+msgstr "????"
 
 msgid "Add Buddy Pounce"
 msgstr "???????"
@@ -284,16 +286,16 @@ msgid "Set Alias"
 msgstr "???"
 
 msgid "Set Alias"
-msgstr "????"
+msgstr "????"
 
 msgid "Enter empty string to reset the name."
 msgstr "????????????"
 
 msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr "????????????????????"
+msgstr "?????????????????????"
 
 msgid "Removing this group will also remove all the buddies in the group"
-msgstr "????????????????"
+msgstr "?????????????????"
 
 #, c-format
 msgid "Are you sure you want to remove %s?"
@@ -317,7 +319,7 @@ msgid "View Log"
 msgstr "????"
 
 msgid "View Log"
-msgstr "????"
+msgstr "??????"
 
 #. General
 msgid "Nickname"
@@ -329,7 +331,7 @@ msgid "On Mobile"
 msgstr "??"
 
 msgid "On Mobile"
-msgstr "??"
+msgstr "??????"
 
 msgid "New..."
 msgstr "??..."
@@ -352,7 +354,7 @@ msgid ""
 msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
-msgstr "????????/????????????"
+msgstr "????????/????????????"
 
 #. Not multiline
 #. Not masked?
@@ -361,10 +363,10 @@ msgid "New Instant Message"
 msgstr "??"
 
 msgid "New Instant Message"
-msgstr "?????"
+msgstr "????"
 
 msgid "Please enter the username or alias of the person you would like to IM."
-msgstr "???????????/?????????"
+msgstr "?????????????????????"
 
 msgid "Channel"
 msgstr "??"
@@ -381,7 +383,7 @@ msgid ""
 msgid ""
 "Please enter the username or alias of the person whose log you would like to "
 "view."
-msgstr "?????????????????/?????????"
+msgstr "???????????????????????????"
 
 #. Create the "Options" frame.
 msgid "Options"
@@ -397,10 +399,10 @@ msgid "View Log..."
 msgstr "????..."
 
 msgid "View Log..."
-msgstr "????..."
+msgstr "??????..."
 
 msgid "View All Logs"
-msgstr "??????"
+msgstr "????????"
 
 msgid "Show"
 msgstr "??"
@@ -421,7 +423,7 @@ msgid "By Log Size"
 msgstr "????"
 
 msgid "By Log Size"
-msgstr "?????"
+msgstr "???????"
 
 msgid "Buddy"
 msgstr "??"
@@ -453,7 +455,7 @@ msgid "X.509 certificate import failed"
 msgstr "??????"
 
 msgid "X.509 certificate import failed"
-msgstr "X.509 ??????"
+msgstr "?? X.509 ????"
 
 msgid "Select a PEM certificate"
 msgstr "?? PEM ??"
@@ -470,10 +472,10 @@ msgid "X.509 certificate export failed"
 msgstr "??????"
 
 msgid "X.509 certificate export failed"
-msgstr "X.509 ??????"
+msgstr "?? X.509 ????"
 
 msgid "PEM X.509 Certificate Export"
-msgstr "PEM X.509 ????"
+msgstr "?? PEM X.509 ??"
 
 #, c-format
 msgid "Certificate for %s"
@@ -486,6 +488,10 @@ msgstr ""
 "SHA1 fingerprint:\n"
 "%s"
 msgstr ""
+"???:%s\n"
+"\n"
+"SHA1 ??:\n"
+"%s"
 
 msgid "SSL Host Certificate"
 msgstr "SSL ????"
@@ -513,7 +519,7 @@ msgid "%s (%s)"
 
 #, c-format
 msgid "%s (%s)"
-msgstr "%s(%s)"
+msgstr "%s (%s)"
 
 #, c-format
 msgid "%s disconnected."
@@ -528,7 +534,7 @@ msgstr ""
 msgstr ""
 "%s\n"
 "\n"
-"Finch ???????????,?????????????????"
+"Finch ??????????,?????????????????"
 
 msgid "Re-enable Account"
 msgstr "??????"
@@ -536,13 +542,13 @@ msgid ""
 msgid ""
 "The account has disconnected and you are no longer in this chat. You will be "
 "automatically rejoined in the chat when the account reconnects."
-msgstr ""
+msgstr "?????,????????????????????????????"
 
 msgid "No such command."
-msgstr "????????"
+msgstr "?????"
 
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr "????: ??????????????"
+msgstr "????:??????????????"
 
 msgid "Your command failed for an unknown reason."
 msgstr "??????,?????"
@@ -557,7 +563,7 @@ msgid "Message was not sent, because you
 msgstr "????????????"
 
 msgid "Message was not sent, because you are not signed on."
-msgstr "?????,????????"
+msgstr "?????,????????"
 
 #, c-format
 msgid "%s (%s -- %s)"
@@ -579,7 +585,7 @@ msgid "Logging started. Future messages 
 msgstr "??????????"
 
 msgid "Logging started. Future messages in this conversation will be logged."
-msgstr "???????????????????????"
+msgstr "?????????????????????????"
 
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
@@ -604,7 +610,7 @@ msgid "Enable Logging"
 msgstr "??"
 
 msgid "Enable Logging"
-msgstr "????"
+msgstr "??????"
 
 msgid "Enable Sounds"
 msgstr "????"
@@ -612,74 +618,73 @@ msgstr "<????> "
 msgid "<AUTO-REPLY> "
 msgstr "<????> "
 
-#, fuzzy, c-format
+#, c-format
 msgid "List of %d user:\n"
 msgid_plural "List of %d users:\n"
-msgstr[0] "%d ??????:\n"
-msgstr[1] "%d ??????:\n"
+msgstr[0] "%d ??????:\n"
 
 msgid "Supported debug options are:  version"
-msgstr "????????: version"
+msgstr "????????:version"
 
 msgid "No such command (in this context)."
-msgstr "???????(?????)?"
+msgstr "??????????"
 
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
 "??"/help &lt;??&gt;"???????????\n"
-"???????????:\n"
+"???????????:\n"
 
 #, c-format
 msgid ""
 "%s is not a valid message class. See '/help msgcolor' for valid message "
 "classes."
-msgstr "%s ????????????'/help msgcolor' ????????"
+msgstr "%s ?????????????"/help msgcolor"????????"
 
 #, c-format
 msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
-msgstr ""
+msgstr "%s ???????????\"/help msgcolor\"?????????"
 
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
-msgstr "say &lt;??&gt;: ??????,??????????"
+msgstr "say &lt;??&gt;:??????,??????????"
 
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr "me &lt;??&gt;: ???????? IRC ??????"
+msgstr "me &lt;??&gt;:???????? IRC ??????"
 
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
-msgstr "debug &lt;??&gt;: ???????????????"
+msgstr "debug &lt;??&gt;:???????????????"
 
 msgid "clear: Clears the conversation scrollback."
-msgstr "clear: ???????"
+msgstr "clear:???????"
 
 msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr "help &lt;??&gt;: ??????????"
+msgstr "help &lt;??&gt;:??????????"
 
 msgid "users:  Show the list of users in the chat."
-msgstr "users: ???????????"
+msgstr "users:???????????"
 
 msgid "plugins: Show the plugins window."
-msgstr "plugins: ???????"
+msgstr "plugins:???????"
 
 msgid "buddylist: Show the buddylist."
-msgstr "buddylist: ???????"
+msgstr "buddylist:???????"
 
 msgid "accounts: Show the accounts window."
 msgstr "accounts:???????"
 
 msgid "debugwin: Show the debug window."
-msgstr ""
+msgstr "debug??:???????"
 
 msgid "prefs: Show the preference window."
-msgstr ""
+msgstr "prefs:????????"
 
 msgid "statuses: Show the savedstatuses window."
-msgstr ""
+msgstr "statuses:?????????"
 
 msgid ""
 "msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
@@ -688,6 +693,13 @@ msgstr ""
 "background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
 "cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
 msgstr ""
+"msgcolor &lt;??&gt; &lt;??&gt; &lt;??&gt;:??????????????"
+"???<br>   \n"
+"&lt;??&gt;:receive(??),send(??),highlight(??),action(??),"
+"timestamp(???)<br>   \n"
+"&lt;??/??&gt;:black(?),red(?),green(?),blue(?),white(?),gray"
+"(?),darkgray(??),magenta(?),cyan(?),default(??)<br><br>\n"
+"??:<br>    msgcolor send cyan default"
 
 msgid "Unable to open file."
 msgstr "???????"
@@ -703,16 +715,15 @@ msgid "Filter:"
 msgstr "??"
 
 msgid "Filter:"
-msgstr "??:"
+msgstr "???:"
 
 msgid "Pause"
 msgstr "??"
 
-#, fuzzy, c-format
+#, c-format
 msgid "File Transfers - %d%% of %d file"
 msgid_plural "File Transfers - %d%% of %d files"
-msgstr[0] "???? - ??? %d%%,? %d ???"
-msgstr[1] "???? - ??? %d%%,? %d ???"
+msgstr[0] "???? - %2$d ????? %1$d%%"
 
 #. Create the window.
 msgid "File Transfers"
@@ -741,29 +752,29 @@ msgid "Clear finished transfers"
 msgstr "????????????"
 
 msgid "Clear finished transfers"
-msgstr "????????"
+msgstr "????????"
 
 msgid "Stop"
 msgstr "??"
 
 msgid "Waiting for transfer to begin"
-msgstr "??????"
+msgstr "????????"
 
 msgid "Canceled"
 msgstr "???"
 
 msgid "Failed"
-msgstr "???"
+msgstr "??"
 
 #, c-format
 msgid "%.2f KiB/s"
-msgstr "%.2f KB/?"
+msgstr "%.2f KiB/?"
 
 msgid "Sent"
 msgstr "???"
 
 msgid "Received"
-msgstr "???"
+msgstr "???"
 
 msgid "Finished"
 msgstr "???"
@@ -805,10 +816,10 @@ msgid "No logs were found"
 msgstr "?????"??????"???????????"
 
 msgid "No logs were found"
-msgstr "??????"
+msgstr "????????"
 
 msgid "Total log size:"
-msgstr "??????:"
+msgstr "????????:"
 
 #. Search box *********
 msgid "Scroll/Search: "
@@ -816,7 +827,7 @@ msgid "Conversations in %s"
 
 #, c-format
 msgid "Conversations in %s"
-msgstr "? %s ???"
+msgstr "? %s ????"
 
 #, c-format
 msgid "Conversations with %s"
@@ -828,11 +839,11 @@ msgstr "????"
 msgid "System Log"
 msgstr "????"
 
-msgid "Calling ... "
+msgid "Calling..."
 msgstr "????..."
 
 msgid "Hangup"
-msgstr ""
+msgstr "??"
 
 #. Number of actions
 msgid "Accept"
@@ -842,42 +853,41 @@ msgid "Call in progress."
 msgstr "??"
 
 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 ???????????"
 
 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
-msgstr ""
+msgstr "%s ???????????????????"
 
 msgid "You have rejected the call."
-msgstr "???????"
+msgstr "????????"
 
 msgid "call: Make an audio call."
-msgstr "??:?????"
+msgstr "??:?????"
 
 msgid "Emails"
 msgstr "????"
 
 msgid "You have mail!"
-msgstr "?????!"
+msgstr "????!"
 
 msgid "Sender"
-msgstr "???"
+msgstr "???"
 
 msgid "Subject"
 msgstr "??"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
-msgstr[0] "%s(%s) ? %d ?????"
-msgstr[1] "%s(%s) ? %d ?????"
+msgstr[0] "%s (%s) ? %d ?????"
 
 msgid "New Mail"
 msgstr "???"
@@ -893,7 +903,7 @@ msgid "IM"
 msgstr "??"
 
 msgid "IM"
-msgstr "??"
+msgstr "??"
 
 msgid "Invite"
 msgstr "??"
@@ -911,7 +921,7 @@ msgid "unloading plugin failed"
 msgstr "??????"
 
 msgid "unloading plugin failed"
-msgstr ""
+msgstr "??????"
 
 #, c-format
 msgid ""
@@ -922,28 +932,28 @@ msgstr ""
 "Website: %s\n"
 "Filename: %s\n"
 msgstr ""
-"??: %s\n"
-"??: %s\n"
-"??: %s\n"
-"??: %s\n"
-"??: %s\n"
-"???: %s\n"
+"??:%s\n"
+"??:%s\n"
+"??:%s\n"
+"??:%s\n"
+"??:%s\n"
+"???:%s\n"
 
 msgid "Plugin need to be loaded before you can configure it."
-msgstr "???????????????"
+msgstr "???????????????"
 
 msgid "No configuration options for this plugin."
 msgstr "?????????"
 
 msgid "Error loading plugin"
-msgstr "???????"
+msgstr "???????"
 
 msgid "The selected file is not a valid plugin."
-msgstr ""
+msgstr "?????????????"
 
 msgid ""
 "Please open the debug window and try again to see the exact error message."
-msgstr ""
+msgstr "????????????????????"
 
 msgid "Select plugin to install"
 msgstr "???????"
@@ -966,7 +976,7 @@ msgid "Please enter a buddy to pounce."
 msgstr "???"
 
 msgid "Please enter a buddy to pounce."
-msgstr "??????????"
+msgstr "?????????????"
 
 msgid "New Buddy Pounce"
 msgstr "???????"
@@ -975,7 +985,7 @@ msgid "Pounce Who"
 msgstr "???????"
 
 msgid "Pounce Who"
-msgstr "????"
+msgstr "???????"
 
 #. Account:
 msgid "Account:"
@@ -986,13 +996,13 @@ msgid "Pounce When Buddy..."
 
 #. Create the "Pounce When Buddy..." frame.
 msgid "Pounce When Buddy..."
-msgstr "???????..."
+msgstr "??????????..."
 
 msgid "Signs on"
-msgstr "??"
+msgstr "??"
 
 msgid "Signs off"
-msgstr "??"
+msgstr "??"
 
 msgid "Goes away"
 msgstr "??"
@@ -1010,7 +1020,7 @@ msgid "Pauses while typing"
 msgstr "????"
 
 msgid "Pauses while typing"
-msgstr "?????"
+msgstr "????"
 
 msgid "Stops typing"
 msgstr "????"
@@ -1023,7 +1033,7 @@ msgid "Open an IM window"
 msgstr "??"
 
 msgid "Open an IM window"
-msgstr "????????"
+msgstr "??????"
 
 msgid "Pop up a notification"
 msgstr "????"
@@ -1038,69 +1048,69 @@ msgid "Pounce only when my status is not
 msgstr "????"
 
 msgid "Pounce only when my status is not Available"
-msgstr "?????????????"
+msgstr "?????????????"
 
 msgid "Recurring"
-msgstr "??"
+msgstr "??"
 
 msgid "Cannot create pounce"
-msgstr "??????"
+msgstr "???????"
 
 msgid "You do not have any accounts."
 msgstr "??????"
 
 msgid "You must create an account first before you can create a pounce."
-msgstr ""
+msgstr "???????????????????"
 
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "??????? %s ? %s ???????"
+msgstr "??????? %s ? %s ?????????"
 
 msgid "Buddy Pounces"
 msgstr "?????"
 
 #, c-format
 msgid "%s has started typing to you (%s)"
-msgstr "%s ??????(%s)"
+msgstr "%s ?????? (%s)"
 
 #, c-format
 msgid "%s has paused while typing to you (%s)"
-msgstr "%s ??????????(%s)"
+msgstr "%s ?????????? (%s)"
 
 #, c-format
 msgid "%s has signed on (%s)"
-msgstr "%s ???(%s)"
+msgstr "%s ??? (%s)"
 
 #, c-format
 msgid "%s has returned from being idle (%s)"
-msgstr "%s ????(%s)"
+msgstr "%s ???? (%s)"
 
 #, c-format
 msgid "%s has returned from being away (%s)"
-msgstr "%s ???(%s)"
+msgstr "%s ??? (%s)"
 
 #, c-format
 msgid "%s has stopped typing to you (%s)"
-msgstr "%s ???????(%s)"
+msgstr "%s ??????? (%s)"
 
 #, c-format
 msgid "%s has signed off (%s)"
-msgstr "%s ???(%s)"
+msgstr "%s ??? (%s)"
 
 #, c-format
 msgid "%s has become idle (%s)"
-msgstr "%s ????(%s)"
+msgstr "%s ???? (%s)"
 
 #, c-format
 msgid "%s has gone away. (%s)"
-msgstr "%s ???(%s)"
+msgstr "%s ????(%s)"
 
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s ????????(%s)"
 
 msgid "Unknown pounce event. Please report this!"
-msgstr "?????????????!"
+msgstr "?????????????????!"
 
 msgid "Based on keyboard use"
 msgstr "??????"
@@ -1118,10 +1128,10 @@ msgid "Notify buddies when you are typin
 msgstr "??????"
 
 msgid "Notify buddies when you are typing"
-msgstr "????????????"
+msgstr "?????????"
 
 msgid "Log format"
-msgstr "????"
+msgstr "??????"
 
 msgid "Log IMs"
 msgstr "????"
@@ -1145,19 +1155,19 @@ msgid "Conversations"
 msgstr "??????"
 
 msgid "Conversations"
-msgstr "??"
+msgstr "??"
 
 msgid "Logging"
-msgstr "??"
+msgstr "????"
 
 msgid "You must fill all the required fields."
-msgstr "??????????"
+msgstr "?????????????"
 
 msgid "The required fields are underlined."
-msgstr "????????????"
+msgstr "???????????????"
 
 msgid "Not implemented yet."
-msgstr "????"
+msgstr "????????"
 
 msgid "Save File..."
 msgstr "????..."
@@ -1169,29 +1179,29 @@ msgid "Hit 'Enter' to find more rooms of
 msgstr "????..."
 
 msgid "Hit 'Enter' to find more rooms of this category."
-msgstr "?'Enter'??????????????"
+msgstr "?????????????????"
 
 msgid "Get"
 msgstr "??"
 
 #. Create the window.
 msgid "Room List"
-msgstr "????"
+msgstr "?????"
 
 msgid "Buddy logs in"
-msgstr "????"
+msgstr "????"
 
 msgid "Buddy logs out"
-msgstr "????"
+msgstr "????"
 
 msgid "Message received"
-msgstr "?????"
+msgstr "????"
 
 msgid "Message received begins conversation"
-msgstr "?????????"
+msgstr "?????????"
 
 msgid "Message sent"
-msgstr "?????"
+msgstr "????"
 
 msgid "Person enters chat"
 msgstr "??????"
@@ -1209,7 +1219,7 @@ msgid "GStreamer Failure"
 msgstr "????????????"
 
 msgid "GStreamer Failure"
-msgstr "GStreamer ??"
+msgstr "GStreamer ??"
 
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer ??????"
@@ -1230,13 +1240,13 @@ msgid "Console Beep"
 msgstr "??"
 
 msgid "Console Beep"
-msgstr "?????"
+msgstr "????"
 
 msgid "Command"
 msgstr "??"
 
 msgid "No Sound"
-msgstr "???"
+msgstr "??"
 
 msgid "Sound Method"
 msgstr "????"
@@ -1249,7 +1259,7 @@ msgstr ""
 "Sound Command\n"
 "(%s for filename)"
 msgstr ""
-"????(_O):\n"
+"????:\n"
 "(%s ?????)"
 
 #. Sound options
@@ -1325,13 +1335,13 @@ msgid "Please enter a non-empty title fo
 msgstr "?????"
 
 msgid "Please enter a non-empty title for the status."
-msgstr "???????????"
+msgstr "????????????"
 
 msgid "Duplicate title"
 msgstr "????"
 
 msgid "Please enter a different title for the status."
-msgstr "?????????????"
+msgstr "????????????"
 
 msgid "Substatus"
 msgstr "???"
@@ -1362,7 +1372,7 @@ msgid "Error loading the plugin."
 msgstr "??"
 
 msgid "Error loading the plugin."
-msgstr "????????"
+msgstr "????????"
 
 msgid "Couldn't find X display"
 msgstr "??? X ??"
@@ -1371,7 +1381,7 @@ msgid "This plugin cannot be loaded beca
 msgstr "?????"
 
 msgid "This plugin cannot be loaded because it was not built with X11 support."
-msgstr ""
+msgstr "???????,??????? X11 ???"
 
 msgid "GntClipboard"
 msgstr ""
@@ -1386,11 +1396,11 @@ msgid "%s just signed on"
 
 #, c-format
 msgid "%s just signed on"
-msgstr "%s ????"
+msgstr "%s ????"
 
 #, c-format
 msgid "%s just signed off"
-msgstr "%s ????"
+msgstr "%s ????"
 
 #, c-format
 msgid "%s sent you a message"
@@ -1405,38 +1415,38 @@ msgid "Buddy signs on/off"
 msgstr "%s ? %s ??????"
 
 msgid "Buddy signs on/off"
-msgstr "????/??"
+msgstr "????/??"
 
 msgid "You receive an IM"
-msgstr "???? IM"
+msgstr "????????"
 
 msgid "Someone speaks in a chat"
-msgstr "??????????????????"
+msgstr "????????"
 
 msgid "Someone says your name in a chat"
-msgstr "????????????"
+msgstr "?????????????"
 
 msgid "Notify with a toaster when"
 msgstr ""
 
 msgid "Beep too!"
-msgstr ""
+msgstr "??????!"
 
 msgid "Set URGENT for the terminal window."
 msgstr ""
 
 msgid "GntGf"
-msgstr ""
+msgstr "GntGf"
 
 msgid "Toaster plugin"
 msgstr ""
 
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
-msgstr "<b>? %s ? %s ???</b><br>"
+msgstr "<b>? %s ? %s ???</b><br>"
 
 msgid "History Plugin Requires Logging"
-msgstr "????????"
+msgstr "??????????"
 
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
@@ -1444,18 +1454,46 @@ msgstr ""
 "Enabling logs for instant messages and/or chats will activate history for "
 "the same conversation type(s)."
 msgstr ""
+"??????? ??->???->???? ???\n"
+"\n"
+"????????????????????????"
 
 msgid "GntHistory"
 msgstr "GntHistory"
 
 msgid "Shows recently logged conversations in new conversations."
-msgstr "?????????????????"
+msgstr "???????????????????"
 
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
 msgstr "??????,?????????????????"
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"???? TinyURL..."
+
+#, fuzzy
+msgid "Only create TinyURL for URLs of this length or greater"
+msgstr "??????????? URL ?? TinyURL"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "TinyURL (???)????"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "TinyURL ??"
+
+#, fuzzy
+msgid "When receiving a message with URL(s), use TinyURL for easier copying"
+msgstr "?????? URL ????????? TinyURL ?????"
+
 msgid "Online"
 msgstr "??"
 
@@ -1478,54 +1516,32 @@ msgid "Nested Subgroup"
 msgstr "???"
 
 msgid "Nested Subgroup"
-msgstr ""
+msgstr "????"
 
 msgid "Nested Grouping (experimental)"
-msgstr ""
+msgstr "???(???)"
 
 msgid "Provides alternate buddylist grouping options."
 msgstr "?????????"
 
 msgid "Lastlog"
-msgstr "????"
+msgstr "??????"
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr ""
 
-#, fuzzy
 msgid "GntLastlog"
-msgstr "??"
+msgstr "GntLastlog"
 
 msgid "Lastlog plugin."
 msgstr "Lastlog ???"
 
-#, c-format
-msgid ""
-"\n"
-"Fetching TinyURL..."
-msgstr ""
-
-msgid "Only create TinyURL for urls of this length or greater"
-msgstr ""
-
-msgid "TinyURL (or other) address prefix"
-msgstr ""
-
-msgid "TinyURL"
-msgstr "TinyURL"
-
-msgid "TinyURL plugin"
-msgstr "TinyURL ??"
-
-msgid "When receiving a message with URL(s), TinyURL for easier copying"
-msgstr ""
-
 msgid "accounts"
 msgstr "??"
 
 msgid "Password is required to sign on."
-msgstr "?????????"
+msgstr "?????????"
 
 #, c-format
 msgid "Enter password for %s (%s)"
@@ -1582,9 +1598,44 @@ msgstr "????"
 msgid "buddy list"
 msgstr "????"
 
-msgid "(DOES NOT MATCH)"
+msgid "The certificate is self-signed and cannot be automatically checked."
 msgstr ""
 
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr ""
+
+#, fuzzy
+msgid "The certificate is not valid yet."
+msgstr "?????????????"
+
+msgid "The certificate has expired and should not be considered valid."
+msgstr ""
+
+#. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
+msgid "The certificate presented is not issued to this domain."
+msgstr ""
+
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr "?????????,??????????"
+
+#, fuzzy
+msgid "The certificate chain presented is invalid."
+msgstr "?????????"
+
+#, fuzzy
+msgid "The certificate has been revoked."
+msgstr "??????"
+
+#, fuzzy
+msgid "An unknown certificate error occurred."
+msgstr "?????????: %s?"
+
+msgid "(DOES NOT MATCH)"
+msgstr "(???)"
+
 #. Make messages
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
@@ -1598,7 +1649,7 @@ msgid "Single-use Certificate Verificati
 
 #. TODO: Find what the handle ought to be
 msgid "Single-use Certificate Verification"
-msgstr ""
+msgstr "???????"
 
 #. Scheme name
 #. Pool name
@@ -1622,61 +1673,24 @@ msgstr "????(_V)..."
 msgid "_View Certificate..."
 msgstr "????(_V)..."
 
-#. 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."
+msgid "The certificate for %s could not be validated."
 msgstr ""
 
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr ""
-
-#. 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
 msgid "SSL Certificate Error"
 msgstr "SSL ????"
 
 #, fuzzy
-msgid "Invalid certificate chain"
-msgstr "?????"
+msgid "Unable to validate certificate"
+msgstr "????????: %s"
 
-#. vrq will be completed by user_auth
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
-
-#. vrq will be completed by user_auth
-msgid ""
-"The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr ""
-
 #, c-format
 msgid ""
-"The certificate chain presented by %s does not have a valid digital "
-"signature from the Certificate Authority from which it claims to have a "
-"signature."
+"The certificate claims to be from \"%s\" instead. This could mean that you "
+"are not connecting to the service you believe you are."
 msgstr ""
 
-msgid "Invalid certificate authority signature"
-msgstr ""
-
-#. 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 ""
-
 #. Make messages
 #, c-format
 msgid ""
@@ -1700,14 +1714,13 @@ msgid "+++ %s signed on"
 
 #, c-format
 msgid "+++ %s signed on"
-msgstr "+++ %s ???"
+msgstr "+++ %s ???"
 
 #, c-format
 msgid "+++ %s signed off"
-msgstr "+++ %s ???"
+msgstr "+++ %s ???"
 
 #. Unknown error
-#. Unknown error!
 msgid "Unknown error"
 msgstr "????"
 
@@ -1740,11 +1753,11 @@ msgid "You are now known as %s"
 
 #, c-format
 msgid "You are now known as %s"
-msgstr "????? %s"
+msgstr "????? %s"
 
 #, c-format
 msgid "%s is now known as %s"
-msgstr "%s ???? %s?"
+msgstr "%s ???? %s?"
 
 #, c-format
 msgid "%s left the room."
@@ -1755,7 +1768,7 @@ msgid "Invite to chat"
 msgstr "%s ??????(%s)?"
 
 msgid "Invite to chat"
-msgstr "????"
+msgstr "????"
 
 #. Put our happy label in it.
 msgid ""
@@ -1765,7 +1778,7 @@ msgid "Failed to get connection: %s"
 
 #, c-format
 msgid "Failed to get connection: %s"
-msgstr "??????: %s"
+msgstr "??????: %s"
 
 #, c-format
 msgid "Failed to get name: %s"
@@ -1809,7 +1822,7 @@ msgid "Resolver process exited without a
 
 #, c-format
 msgid "Resolver process exited without answering our request"
-msgstr ""
+msgstr "?????????????"
 
 #, c-format
 msgid "Thread creation failure: %s"
@@ -1846,7 +1859,7 @@ msgid "Cannot send a file of 0 bytes."
 msgstr "??????"
 
 msgid "Cannot send a file of 0 bytes."
-msgstr "???? 0 ??????"
+msgstr "???? 0 ?????"
 
 msgid "Cannot send a directory."
 msgstr "???????"
@@ -1894,25 +1907,29 @@ msgstr "???? %2$s ? %1$s ?? msgstr "???? %2$s ? %1$s ??"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "?? %s ????"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "?? %s ????"
 
 msgid "File transfer complete"
 msgstr "??????"
 
-#, c-format
-msgid "You canceled the transfer of %s"
+#, fuzzy, c-format
+msgid "You cancelled the transfer of %s"
 msgstr "???? %s ???"
 
 msgid "File transfer cancelled"
-msgstr "???????"
+msgstr "???????"
 
-#, c-format
-msgid "%s canceled the transfer of %s"
+#, fuzzy, c-format
+msgid "%s cancelled the transfer of %s"
 msgstr "%s ??? %s ???"
 
-#, c-format
-msgid "%s canceled the file transfer"
+#, fuzzy, c-format
+msgid "%s cancelled the file transfer"
 msgstr "%s ???????"
 
 #, c-format
@@ -1960,19 +1977,19 @@ msgid "The handler for \"irc\" URLs"
 msgstr ""icq"URL ?????"
 
 msgid "The handler for \"irc\" URLs"
-msgstr ""
+msgstr ""irc"URL ?????"
 
 msgid "The handler for \"msnim\" URLs"
-msgstr ""
+msgstr ""msnim"URL ?????"
 
 msgid "The handler for \"sip\" URLs"
-msgstr ""
+msgstr ""sip"URL ?????"
 
 msgid "The handler for \"xmpp\" URLs"
-msgstr ""
+msgstr ""xmpp"URL ?????"
 
 msgid "The handler for \"ymsgr\" URLs"
-msgstr ""
+msgstr ""ymsgr"URL ?????"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
@@ -2056,7 +2073,7 @@ msgid "Logging of this conversation fail
 msgstr ""
 
 msgid "Logging of this conversation failed."
-msgstr "?????????"
+msgstr "?????????"
 
 msgid "XML"
 msgstr "XML"
@@ -2078,7 +2095,7 @@ msgid "<font color=\"red\"><b>Unable to 
 "</b></font> %s<br/>\n"
 
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
-msgstr "<font color=\"red\"><b>???????!</b></font>"
+msgstr "<font color=\"red\"><b>?????????!</b></font>"
 
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
@@ -2088,16 +2105,42 @@ msgstr "(%s) %s <????>: %s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <????>: %s\n"
 
+msgid ""
+"No codecs found. Install some GStreamer codecs found in GStreamer plugins "
+"packages."
+msgstr ""
+
+msgid ""
+"No codecs left. Your codec preferences in fs-codecs.conf are too strict."
+msgstr ""
+
 #, fuzzy
-msgid "Error creating conference."
+msgid "A non-recoverable Farsight2 error has occurred."
+msgstr "?????????: %s?"
+
+#, fuzzy
+msgid "Conference error."
+msgstr "?????"
+
+msgid "Error with your microphone."
+msgstr ""
+
+msgid "Error with your webcam."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Error creating session: %s"
 msgstr "??????"
 
+msgid "Error creating conference."
+msgstr "??????"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "????? %s,????? %s?"
 
 msgid "This plugin has not defined an ID."
-msgstr ""
+msgstr "??????? ID?"
 
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
@@ -2118,14 +2161,14 @@ msgid "Unable to load the plugin"
 msgstr "???? %s ????????????????"
 
 msgid "Unable to load the plugin"
-msgstr "??????"
+msgstr "??????"
 
 #, c-format
 msgid "The required plugin %s was unable to load."
-msgstr "???? %s ?????"
+msgstr "???? %s ?????"
 
 msgid "Unable to load your plugin."
-msgstr "?????????"
+msgstr "?????????"
 
 #, c-format
 msgid "%s requires %s, but it failed to unload."
@@ -2337,17 +2380,18 @@ msgstr "???? IPC ??,??
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "???? IPC ??,?????????? IPC ???"
 
-msgid "Join/Part Hiding Configuration"
-msgstr "??/??????"
+msgid "Hide Joins/Parts"
+msgstr ""
 
-msgid "Minimum Room Size"
+#. Translators: Followed by an input request a number of people
+msgid "For rooms with more than this many people"
 msgstr ""
 
-msgid "User Inactivity Timeout (in minutes)"
+msgid "If user has not spoken in this many minutes"
 msgstr ""
 
 msgid "Apply hiding rules to buddies"
-msgstr ""
+msgstr "?????????"
 
 #. *< type
 #. *< ui_requirement
@@ -2385,7 +2429,7 @@ msgid "%s has signed off."
 
 #, c-format
 msgid "%s has signed off."
-msgstr "%s ????"
+msgstr "%s ????"
 
 msgid "One or more messages may have been undeliverable."
 msgstr ""
@@ -2448,7 +2492,7 @@ msgid "General Log Reading Configuration
 
 #. Add general preferences.
 msgid "General Log Reading Configuration"
-msgstr "????????"
+msgstr "??????????"
 
 msgid "Fast size calculations"
 msgstr "??????"
@@ -2458,7 +2502,7 @@ msgid "Log Directory"
 
 #. Add Log Directory preferences.
 msgid "Log Directory"
-msgstr "????"
+msgstr "??????"
 
 #. *< type
 #. *< ui_requirement
@@ -2467,16 +2511,15 @@ msgid "Log Reader"
 #. *< priority
 #. *< id
 msgid "Log Reader"
-msgstr "?????"
+msgstr "???????"
 
 #. *< name
 #. *< version
 #. * summary
 msgid "Includes other IM clients' logs in the log viewer."
-msgstr "?????????????????????"
+msgstr "?????????????????????????"
 
 #. * 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"
@@ -2484,23 +2527,22 @@ msgstr ""
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
-"?????,????????????????????????????????"
-"? Adium?Fire?Messenger Plus!?MSN Messenger ? Trillian?\n"
+"???????,??????????????????????????????"
+"????? Adium?Fire?Messenger Plus!?MSN Messenger ? Trillian?\n"
 "\n"
-"??:??????????,?????????????!"
+"??:?????? alpha ????,?????????????!"
 
 msgid "Mono Plugin Loader"
-msgstr "Mono ?????"
+msgstr "Mono ?????"
 
 msgid "Loads .NET plugins with Mono."
-msgstr "?? Mono ??? .NET ???"
+msgstr "?? Mono ??? .NET ???"
 
 msgid "Add new line in IMs"
 msgstr ""
 
-#, fuzzy
 msgid "Add new line in Chats"
-msgstr "??????"
+msgstr "????????"
 
 #. *< magic
 #. *< major version
@@ -2560,9 +2602,8 @@ msgstr ""
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
-#, fuzzy
 msgid "One Time Password"
-msgstr "????"
+msgstr "?????"
 
 #. *< type
 #. *< ui_requirement
@@ -2571,7 +2612,7 @@ msgid "One Time Password Support"
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr ""
+msgstr "???????"
 
 #. *< name
 #. *< version
@@ -2593,13 +2634,13 @@ msgid "Perl Plugin Loader"
 #. *< priority
 #. *< id
 msgid "Perl Plugin Loader"
-msgstr "Perl ?????"
+msgstr "Perl ?????"
 
 #. *< name
 #. *< version
 #. *< summary
 msgid "Provides support for loading perl plugins."
-msgstr "???? Perl ??????"
+msgstr "???? Perl ??????"
 
 msgid "Psychic Mode"
 msgstr ""
@@ -2624,9 +2665,8 @@ msgstr "?????????"
 msgid "Display notification message in conversations"
 msgstr "?????????"
 
-#, fuzzy
 msgid "Raise psychic conversations"
-msgstr "?????"
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -2642,7 +2682,7 @@ msgid "Test to see that all signals are 
 #. *  summary
 #. *  description
 msgid "Test to see that all signals are working properly."
-msgstr "?????????????????"
+msgstr "????????????????"
 
 #. *< type
 #. *< ui_requirement
@@ -2662,7 +2702,7 @@ msgid "X.509 Certificates"
 
 #. Scheme name
 msgid "X.509 Certificates"
-msgstr ""
+msgstr "X.509 ??"
 
 #. *< type
 #. *< ui_requirement
@@ -2730,7 +2770,7 @@ msgid "%s has signed on."
 
 #, c-format
 msgid "%s has signed on."
-msgstr "%s ????"
+msgstr "%s ????"
 
 msgid "Notify When"
 msgstr "????"
@@ -2742,7 +2782,7 @@ msgid "Buddy _Signs On/Off"
 msgstr "????(_I)"
 
 msgid "Buddy _Signs On/Off"
-msgstr "????/??(_S)"
+msgstr "????/??(_S)"
 
 #. *< type
 #. *< ui_requirement
@@ -2763,10 +2803,10 @@ msgid "Tcl Plugin Loader"
 msgstr "????/?????/?????????????"
 
 msgid "Tcl Plugin Loader"
-msgstr "Tcl ?????"
+msgstr "Tcl ?????"
 
 msgid "Provides support for loading Tcl plugins"
-msgstr "???? Tcl ?????"
+msgstr "???? Tcl ?????"
 
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
@@ -2778,9 +2818,8 @@ msgstr ""
 "im/BonjourWindows for more information."
 msgstr ""
 
-#, fuzzy
 msgid "Unable to listen for incoming IM connections"
-msgstr "??????? IM ??\n"
+msgstr "??????? IM ??"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2831,24 +2870,24 @@ 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 ""
 "???????:\n"
 "%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to bind socket to port: %s"
 msgstr "???????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to listen on socket: %s"
 msgstr ""
 "???????:\n"
 "%s"
 
 msgid "Error communicating with local mDNSResponder."
-msgstr "??? DNS ??????"
+msgstr "??? mDNSResponder ??????"
 
 msgid "Invalid proxy settings"
 msgstr "???????"
@@ -2878,31 +2917,28 @@ msgid "Couldn't load buddylist"
 msgstr "??? %s ?? %s ????"
 
 msgid "Couldn't load buddylist"
-msgstr "????????"
+msgstr "????????"
 
 msgid "Load Buddylist..."
-msgstr "??????..."
+msgstr "??????..."
 
 msgid "Buddylist loaded successfully!"
-msgstr "????????!"
+msgstr "????????!"
 
 msgid "Save buddylist..."
 msgstr "??????..."
 
 msgid "Load buddylist from file..."
-msgstr "?????????..."
+msgstr "?????????..."
 
-#, fuzzy
 msgid "You must fill in all registration fields"
 msgstr "???????"
 
-#, fuzzy
 msgid "Passwords do not match"
 msgstr "??????"
 
-#, fuzzy
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "??????????????\n"
+msgstr "??????????????"
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "????? Gadu-Gadu ??"
@@ -2919,7 +2955,6 @@ msgstr ""
 msgid "Enter captcha text"
 msgstr ""
 
-#, fuzzy
 msgid "Captcha"
 msgstr "????"
 
@@ -2948,7 +2983,7 @@ msgid "Only online"
 msgstr "?"
 
 msgid "Only online"
-msgstr "???"
+msgstr "???"
 
 msgid "Find buddies"
 msgstr "????"
@@ -3060,14 +3095,14 @@ msgstr "???(_N):"
 msgid "Chat _name:"
 msgstr "???(_N):"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "?????????"
+msgstr "???????"
 
 #. 1. connect to server
 #. connect to the server
 msgid "Connecting"
-msgstr "???"
+msgstr "????"
 
 msgid "Chat error"
 msgstr "????"
@@ -3075,7 +3110,6 @@ msgstr "??????????"
 msgid "This chat name is already in use"
 msgstr "??????????"
 
-#, fuzzy
 msgid "Not connected to the server"
 msgstr "????????"
 
@@ -3118,9 +3152,8 @@ msgstr "Gadu-Gadu ??"
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu ??"
 
-#, fuzzy
 msgid "GG server"
-msgstr "??????..."
+msgstr ""
 
 #, c-format
 msgid "Unknown command: %s"
@@ -3136,7 +3169,6 @@ msgstr "??????"
 msgid "File Transfer Failed"
 msgstr "??????"
 
-#, fuzzy
 msgid "Unable to open a listening port."
 msgstr "?????????"
 
@@ -3160,10 +3192,10 @@ msgstr "%s ? MOTD"
 #.
 #. 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"
+"????????:\n"
 "%s"
 
 msgid "View MOTD"
@@ -3175,9 +3207,8 @@ msgstr "??(_P):"
 msgid "_Password:"
 msgstr "??(_P):"
 
-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "IRC ????????"
+msgstr "IRC ????????????"
 
 msgid "SSL support unavailable"
 msgstr "SSL ?????"
@@ -3186,11 +3217,11 @@ msgstr "????"
 msgstr "????"
 
 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
 msgstr "????? %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Server closed the connection"
 msgstr "?????????"
 
@@ -3251,7 +3282,7 @@ msgid "End of ban list"
 msgstr "??: %s"
 
 msgid "End of ban list"
-msgstr "??????"
+msgstr "??????"
 
 #, c-format
 msgid "You are banned from %s."
@@ -3290,7 +3321,7 @@ msgid "%s has changed the topic to: %s"
 
 #, c-format
 msgid "%s has changed the topic to: %s"
-msgstr "%s ?????: %s"
+msgstr "%s ?????:%s"
 
 #, c-format
 msgid "%s has cleared the topic."
@@ -3298,7 +3329,7 @@ msgid "The topic for %s is: %s"
 
 #, c-format
 msgid "The topic for %s is: %s"
-msgstr "%s ????: %s"
+msgstr "%s ????:%s"
 
 #, c-format
 msgid "Unknown message '%s'"
@@ -3321,14 +3352,14 @@ msgid "No such channel"
 msgstr "IRC ?????????:"
 
 msgid "No such channel"
-msgstr "???????"
+msgstr "????"
 
 #. does this happen?
 msgid "no such channel"
 msgstr "???????"
 
 msgid "User is not logged in"
-msgstr "?????"
+msgstr "?????"
 
 msgid "No such nick or channel"
 msgstr "??????????"
@@ -3341,20 +3372,20 @@ msgid "Invitation only"
 msgstr "?? %s ?????"
 
 msgid "Invitation only"
-msgstr "???"
+msgstr "???"
 
 #, c-format
 msgid "You have been kicked by %s: (%s)"
-msgstr "?? %s: %s ???"
+msgstr "??? %s ?? (%s)"
 
 #. Remove user from channel
 #, c-format
 msgid "Kicked by %s (%s)"
-msgstr "? %s (%s) ??"
+msgstr "? %s ?? (%s) "
 
 #, c-format
 msgid "mode (%s %s) by %s"
-msgstr "? %3$s ??(%1$s %2$s)"
+msgstr "? %3$s ???? (%1$s %2$s)"
 
 msgid "Invalid nickname"
 msgstr "?????"
@@ -3394,11 +3425,11 @@ msgid "PING reply -- Lag: %lu seconds"
 
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
-msgstr "PING ?? -- ??: %lu ?"
+msgstr "PING ?? -- ??: %lu ?"
 
 #, c-format
 msgid "Cannot join %s: Registration is required."
-msgstr "???? %s:????"
+msgstr "???? %s:?????"
 
 msgid "Cannot join channel"
 msgstr "??????"
@@ -3419,7 +3450,7 @@ msgid "ctcp <nick> <msg>: sends ctcp msg
 msgstr "away [??]: ??????,???????????"
 
 msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
-msgstr ""
+msgstr "ctcp <nick> <msg>:??????? CTCP ???"
 
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: ? chanserv ????"
@@ -3435,27 +3466,27 @@ msgstr ""
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
 msgstr ""
-"devoice &lt;??1&gt; [??2]......: ???????????,??????????"
+"devoice &lt;??1&gt; [??2]......: ??????????,??????????"
 "(+m)??????????????"
 
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
-msgstr "invite &lt;??&gt; [??]: ????????????,???????"
+msgstr "invite &lt;??&gt; [???]: ????????????,???????"
 
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"j &lt;??1&gt;[,??][,......] [??1[,??2][,......]]: ?????????,???"
-"???????????"
+"j &lt;???1&gt;[,???][,......] [??1[,??2][,......]]: ?????????,?"
+"?????????????"
 
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"join &lt;??1&gt;[,??][,......] [??1[,??2][,......]]: ?????????,??"
-"????????????"
+"join &lt;???1&gt;[,???][,......] [??1[,??2][,......]]: ?????????,"
+"??????????????"
 
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
@@ -3466,7 +3497,7 @@ msgstr ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 msgstr ""
-"list: ????????????<i>??,?????????????????</i>"
+"list:????????????<i>??,?????????????????</i>"
 
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;??????&gt;: ?????"
@@ -3494,9 +3525,8 @@ msgstr "nickserv: ? nickserv ???
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: ? nickserv ????"
 
-#, fuzzy
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
-msgstr "me &lt;??&gt;: ???????? IRC ??????"
+msgstr "notice &lt;??&gt;: ???????????"
 
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
@@ -3515,7 +3545,7 @@ msgid ""
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
-msgstr "part [??] [??]: ???????????,?????????"
+msgstr "part [???] [??]: ???????????,?????????"
 
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
@@ -3525,18 +3555,18 @@ msgid ""
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
-msgstr "query &lt;??&gt; &lt;??&gt;: ?????????(?????)?"
+msgstr "query &lt;??&gt; &lt;??&gt;: ?????????(?????)?"
 
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [??]: ?????????,?????????"
 
 msgid "quote [...]:  Send a raw command to the server."
-msgstr "quot [......]: ???????????"
+msgstr "quote [......]: ???????????"
 
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
-msgstr "remove &lt;??&gt; [??]: ??????????????????"
+msgstr "remove &lt;??&gt; [??]: ???????????????????"
 
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: ?? IRC ????????????"
@@ -3553,8 +3583,7 @@ msgid ""
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
-msgstr ""
-"voice &lt;??1&gt; [??2]: ??????????????????????"
+msgstr "voice &lt;??1&gt; [??2] ...:??????????????????"
 
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
@@ -3562,11 +3591,10 @@ msgid "whois [server] &lt;nick&gt;:  Get
 msgstr "wallops &lt;??&gt;: ????????????,??????"
 
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
-msgstr "whois [???] &lt;??&gt;: ???????"
+msgstr "whois [???] &lt;??&gt;:???????"
 
-#, fuzzy
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr "whois [???] &lt;??&gt;: ???????"
+msgstr "whois [???] &lt;??&gt;:???????"
 
 #, c-format
 msgid "Reply time from %s: %lu seconds"
@@ -3584,39 +3612,33 @@ msgstr "????"
 msgid "Unknown Error"
 msgstr "????"
 
-#, fuzzy
 msgid "Ad-Hoc Command Failed"
 msgstr "?????"
 
-#, fuzzy
 msgid "execute"
-msgstr "???"
+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 ??,????? TLS/SSL ???"
+msgstr "??? TLS/SSL ??,???? TLS/SSL ???"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "??????????????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
-msgstr "???????????????????????????????"
+msgstr "%s ????????????????????????????"
 
 msgid "Plaintext Authentication"
 msgstr "?????"
 
-#, fuzzy
 msgid "SASL authentication failed"
 msgstr "????"
 
-#, fuzzy
 msgid "Invalid response from server"
 msgstr "?????????"
 
@@ -3624,12 +3646,12 @@ msgid "You require encryption, but it is
 msgstr "?????????????????"
 
 msgid "You require encryption, but it is not available on this server."
-msgstr ""
+msgstr "?????,???????"
 
 msgid "Invalid challenge from server"
 msgstr "????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "SASL error: %s"
 msgstr "SASL ??"
 
@@ -3645,7 +3667,7 @@ msgstr "??????????"
 msgid "Unable to establish a connection with the server"
 msgstr "??????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
 msgstr "??????????"
 
@@ -3667,6 +3689,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 "????"
 
@@ -3727,14 +3754,13 @@ msgid "%s ago"
 
 #, c-format
 msgid "%s ago"
-msgstr ""
+msgstr "%s ?"
 
-#, fuzzy
 msgid "Logged Off"
-msgstr "???"
+msgstr "???"
 
 msgid "Middle Name"
-msgstr "??"
+msgstr "??"
 
 msgid "Address"
 msgstr "??"
@@ -3746,22 +3772,26 @@ msgid "Logo"
 msgstr "??"
 
 msgid "Logo"
-msgstr "??"
+msgstr "Logo"
 
+#, fuzzy, c-format
+msgid ""
+"%s will no longer be able to see your status updates.  Do you want to "
+"continue?"
+msgstr "????????????? %s??????????"
+
+msgid "Cancel Presence Notification"
+msgstr "???????"
+
 msgid "Un-hide From"
 msgstr "????"
 
 msgid "Temporarily Hide From"
 msgstr "????"
 
-#. && NOT ME
-msgid "Cancel Presence Notification"
-msgstr "???????"
-
 msgid "(Re-)Request authorization"
 msgstr "(??)????"
 
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -3774,10 +3804,10 @@ msgid "Chatty"
 msgstr "??"
 
 msgid "Chatty"
-msgstr "??"
+msgstr "?????"
 
 msgid "Extended Away"
-msgstr "????"
+msgstr "??"
 
 msgid "Do Not Disturb"
 msgstr "????"
@@ -3811,9 +3841,8 @@ msgstr "?????:%s"
 msgid "Server Instructions: %s"
 msgstr "?????:%s"
 
-#, fuzzy
 msgid "Fill in one or more fields to search for any matching XMPP users."
-msgstr "???????????? Jabber ???"
+msgstr "???????????? XMPP ???"
 
 msgid "Email Address"
 msgstr "??????"
@@ -3838,7 +3867,7 @@ msgid "_Room:"
 msgstr "????"
 
 msgid "_Room:"
-msgstr "??(_R):"
+msgstr "???(_R):"
 
 msgid "_Server:"
 msgstr "???(_S):"
@@ -3848,10 +3877,10 @@ msgid "%s is not a valid room name"
 
 #, c-format
 msgid "%s is not a valid room name"
-msgstr "%s ????????"
+msgstr "%s ?????????"
 
 msgid "Invalid Room Name"
-msgstr "??????"
+msgstr "???????"
 
 #, c-format
 msgid "%s is not a valid server name"
@@ -3862,10 +3891,10 @@ msgid "%s is not a valid room handle"
 
 #, c-format
 msgid "%s is not a valid room handle"
-msgstr "%s ?????????"
+msgstr "%s ??????????"
 
 msgid "Invalid Room Handle"
-msgstr "????????"
+msgstr "????????"
 
 msgid "Configuration error"
 msgstr "????"
@@ -3874,10 +3903,10 @@ msgid "Room Configuration Error"
 msgstr "????"
 
 msgid "Room Configuration Error"
-msgstr "??????"
+msgstr "???????"
 
 msgid "This room is not capable of being configured"
-msgstr "?????????"
+msgstr "??????????"
 
 msgid "Registration error"
 msgstr "????"
@@ -3886,7 +3915,7 @@ msgid "Error retrieving room list"
 msgstr "????? MUC ????????"
 
 msgid "Error retrieving room list"
-msgstr "?????????"
+msgstr "??????????"
 
 msgid "Invalid Server"
 msgstr "??????"
@@ -3898,19 +3927,17 @@ msgid "Find Rooms"
 msgstr "???????????"
 
 msgid "Find Rooms"
-msgstr "????"
+msgstr "?????"
 
-#, fuzzy
 msgid "Affiliations:"
-msgstr "??:"
+msgstr "????:"
 
 msgid "No users found"
 msgstr "????????"
 
 msgid "Roles:"
-msgstr "??:"
+msgstr "??:"
 
-#, fuzzy
 msgid "Ping timed out"
 msgstr "Ping ??"
 
@@ -3925,9 +3952,8 @@ msgstr ""
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
-#, fuzzy
 msgid "Malformed BOSH URL"
-msgstr "?????????"
+msgstr ""
 
 #, c-format
 msgid "Registration of %s@%s successful"
@@ -3954,7 +3980,7 @@ msgid "State"
 msgstr "??????"
 
 msgid "State"
-msgstr "?/?"
+msgstr "?/?"
 
 msgid "Postal code"
 msgstr "????"
@@ -3995,11 +4021,6 @@ msgstr "????"
 msgid "Change Registration"
 msgstr "????"
 
-#, fuzzy
-msgid "Malformed BOSH Connect Server"
-msgstr "?????????"
-
-#, fuzzy
 msgid "Error unregistering account"
 msgstr "????????"
 
@@ -4028,7 +4049,7 @@ msgid "Now Listening"
 msgstr "??"
 
 msgid "Now Listening"
-msgstr ""
+msgstr "????"
 
 msgid "Both"
 msgstr "??"
@@ -4051,19 +4072,15 @@ msgstr "??"
 msgid "Subscription"
 msgstr "??"
 
-#, fuzzy
 msgid "Mood Text"
 msgstr "??"
 
-#, fuzzy
 msgid "Allow Buzz"
 msgstr "??"
 
-#, fuzzy
 msgid "Tune Artist"
 msgstr "??"
 
-#, fuzzy
 msgid "Tune Title"
 msgstr "??"
 
@@ -4073,7 +4090,6 @@ msgstr ""
 msgid "Tune Genre"
 msgstr ""
 
-#, fuzzy
 msgid "Tune Comment"
 msgstr "????"
 
@@ -4136,9 +4152,8 @@ msgstr "?????"
 msgid "Item Not Found"
 msgstr "?????"
 
-#, fuzzy
 msgid "Malformed XMPP ID"
-msgstr "Jabber ID ????"
+msgstr "XMPP ID ????"
 
 msgid "Not Acceptable"
 msgstr "????"
@@ -4267,21 +4282,21 @@ msgstr "?????? %s"
 msgid "Unable to ban user %s"
 msgstr "?????? %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "???????: %s"
+msgstr "???????:%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "??????(%s)?"
+msgstr "??????%s ??"%s"?"
 
 #, c-format
 msgid "Unknown role: \"%s\""
-msgstr "????:"%s""
+msgstr "????:"%s""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to set role \"%s\" for user: %s"
-msgstr "??????: %s"
+msgstr "?????%2$s ??"%1$s"??"
 
 #, c-format
 msgid "Unable to kick user %s"
@@ -4291,15 +4306,15 @@ 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 ????,?????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
 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."
@@ -4312,60 +4327,56 @@ msgid "Buzz"
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
-msgstr ""
+msgstr "????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has buzzed you!"
-msgstr "%s ????[%s]?????"
+msgstr "%s ?????????!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "??? %s ?????"
+msgstr "??? %s ???????:??? JID?"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr "??? %s ????,?????????"
+msgstr "??? %s ???????:?????"
 
-#, 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 "?????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
 msgstr "??????????????/?????????"
 
-#, fuzzy
 msgid "Select a Resource"
-msgstr "????"
+msgstr "????"
 
-#, fuzzy
 msgid "Initiate Media"
-msgstr "????(_C)"
+msgstr "???????"
 
 msgid "config:  Configure a chat room."
-msgstr "config: ??????"
+msgstr "??:??????"
 
 msgid "configure:  Configure a chat room."
-msgstr "configure: ??????"
+msgstr "??:??????"
 
 msgid "part [room]:  Leave the room."
-msgstr "part [??]: ??????"
+msgstr "part [???]: ??????"
 
 msgid "register:  Register with a chat room."
-msgstr "register: ??????"
+msgstr "??:??????"
 
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [???]: ????????"
 
-#, fuzzy
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
-msgstr "ban &lt;??&gt; [??]: ???????????"
+msgstr "ban &lt;??&gt; [??]: ????????????"
 
 msgid ""
 "affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
@@ -4375,21 +4386,19 @@ msgid ""
 #, fuzzy
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
-"users with an role or set users' role with the room."
+"users with a role or set users' role with the room."
 msgstr ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: ???????"
-"?????"
+"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: ???????"
+"??????"
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr "invite &lt;??&gt; [??]: ?????????"
+msgstr "invite &lt;??&gt; [??]: ??????????"
 
-#, fuzzy
 msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
-msgstr "join: &lt;??&gt; [???]: ??????????????"
+msgstr "join: &lt;???&gt; [??]: ??????????????"
 
-#, fuzzy
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
-msgstr "kick &lt;??&gt; [??]: ???????????"
+msgstr "kick &lt;??&gt; [??]: ????????????"
 
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
@@ -4419,7 +4428,7 @@ msgid "Require SSL/TLS"
 msgstr "?"
 
 msgid "Require SSL/TLS"
-msgstr ""
+msgstr "?? SSL/TLS"
 
 msgid "Force old (port 5223) SSL"
 msgstr "??? SSL(5223 ??)"
@@ -4472,7 +4481,7 @@ msgid "(Code %s)"
 
 #, c-format
 msgid "(Code %s)"
-msgstr " (?? %s)"
+msgstr "(?? %s)"
 
 msgid "XML Parse error"
 msgstr "XML ????"
@@ -4489,43 +4498,36 @@ msgid "Create New Room"
 msgstr "?? %s ??"
 
 msgid "Create New Room"
-msgstr "?????"
+msgstr "??????"
 
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
-msgstr "?????????????????,???????????"
+msgstr "??????????????????,???????????"
 
 msgid "_Configure Room"
-msgstr "????(_C)"
+msgstr "?????(_C)"
 
 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 ?? (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Kicked (%s)"
-msgstr "? %s (%s) ??"
+msgstr "? %s ?? (%s) "
 
-#, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "???????????"
+msgstr "???????????\n"
 
-#, fuzzy
 msgid "Transfer was closed."
-msgstr "??????"
+msgstr "??????????"
 
-#, fuzzy
-msgid "Failed to open the file"
-msgstr "????"%s":%s"
-
 msgid "Failed to open in-band bytestream"
 msgstr ""
 
@@ -4536,61 +4538,53 @@ msgstr "??????"
 msgid "File Send Failed"
 msgstr "??????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, invalid JID"
-msgstr "??? %s ?????"
+msgstr "??? %s ????:??? JID"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, user is not online"
-msgstr "??? %s ????,?????????"
+msgstr "??? %s ????:?????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr "??? %s ????,?????????"
+msgstr "??? %s ????:???????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "??????????????/?????????"
 
-#, fuzzy
 msgid "Edit User Mood"
-msgstr "????"
+msgstr "??????"
 
 msgid "Please select your mood from the list."
 msgstr ""
 
-#, fuzzy
 msgid "Set"
-msgstr "??(_S)"
+msgstr "??"
 
-#, fuzzy
 msgid "Set Mood..."
-msgstr "????..."
+msgstr "????..."
 
-#, fuzzy
 msgid "Set User Nickname"
-msgstr "??????"
+msgstr "??????"
 
-#, fuzzy
 msgid "Please specify a new nickname for you."
-msgstr "??? %s ????"
+msgstr "????????????"
 
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
 msgstr ""
 
-#, fuzzy
 msgid "Set Nickname..."
-msgstr "??"
+msgstr "????..."
 
-#, fuzzy
 msgid "Actions"
 msgstr "??"
 
-#, fuzzy
 msgid "Select an action"
-msgstr "????"
+msgstr "??????"
 
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
@@ -4600,15 +4594,14 @@ msgid "Buddy Add error"
 msgstr "????"%s"?"
 
 msgid "Buddy Add error"
-msgstr ""
+msgstr "??????"
 
-#, fuzzy
 msgid "The username specified does not exist."
-msgstr "?????????"
+msgstr "??????????"
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "%s (%s) ?????????"
+msgstr "%s ??????????(%s)"
 
 #, c-format
 msgid ""
@@ -4625,11 +4618,11 @@ msgid "Unable to parse message"
 
 #, c-format
 msgid "Unable to parse message"
-msgstr "??????"
+msgstr "??????"
 
 #, c-format
 msgid "Syntax Error (probably a client bug)"
-msgstr "??(??????? bug)"
+msgstr "????(??????? bug)"
 
 #, c-format
 msgid "Invalid email address"
@@ -4645,11 +4638,11 @@ msgid "Already logged in"
 
 #, c-format
 msgid "Already logged in"
-msgstr "???"
+msgstr "???"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid username"
-msgstr "????"
+msgstr "?????"
 
 #, c-format
 msgid "Invalid friendly name"
@@ -4721,7 +4714,7 @@ msgid "Not logged in"
 
 #, c-format
 msgid "Not logged in"
-msgstr "???"
+msgstr "???"
 
 #, c-format
 msgid "Service temporarily unavailable"
@@ -4793,7 +4786,7 @@ msgid "Passport not verified"
 
 #, c-format
 msgid "Passport not verified"
-msgstr "Passport ???"
+msgstr "??????"
 
 #, c-format
 msgid "Bad friend file"
@@ -4803,8 +4796,8 @@ msgstr "???"
 msgid "Not expected"
 msgstr "???"
 
-#, c-format
-msgid "Friendly name changes too rapidly"
+#, fuzzy
+msgid "Friendly name is changing too rapidly"
 msgstr "??????????"
 
 #, c-format
@@ -4825,15 +4818,14 @@ msgid "Kids Passport without parental co
 
 #, c-format
 msgid "Kids Passport without parental consent"
-msgstr "???????? Passport"
+msgstr "???????????"
 
 #, c-format
 msgid "Passport account not yet verified"
-msgstr "Passport ?????"
+msgstr "????????"
 
-#, fuzzy
 msgid "Passport account suspended"
-msgstr "Passport ?????"
+msgstr "?????????"
 
 #, c-format
 msgid "Bad ticket"
@@ -4847,32 +4839,45 @@ msgstr "MSN ??: %s\n"
 msgid "MSN Error: %s\n"
 msgstr "MSN ??: %s\n"
 
-#, fuzzy
 msgid "Other Contacts"
-msgstr "?????"
+msgstr "?????"
 
-#, fuzzy
 msgid "Non-IM Contacts"
-msgstr "?????"
+msgstr "????????"
 
-#, fuzzy, c-format
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr ""
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+
+#, 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 ""
+msgstr "????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has nudged you!"
-msgstr "%s ????[%s]?????"
+msgstr "%s ????????,??????!"
 
 #, c-format
 msgid "Nudging %s..."
-msgstr ""
+msgstr "?????? %s ,?????????..."
 
-#, fuzzy
 msgid "Email Address..."
-msgstr "??????"
+msgstr "??????..."
 
 msgid "Your new MSN friendly name is too long."
 msgstr "?? MSN ???????"
@@ -4908,11 +4913,10 @@ msgstr "??"
 msgid "Disallow"
 msgstr "??"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Blocked Text for %s"
 msgstr "%s ?????"
 
-#, fuzzy
 msgid "No text is blocked for this account."
 msgstr "??????????(_I):"
 
@@ -4921,37 +4925,32 @@ msgstr ""
 "MSN servers are currently blocking the following regular expressions:<br/>%s"
 msgstr ""
 
-#, fuzzy
 msgid "This account does not have email enabled."
-msgstr "? Hotmail ????????"
+msgstr "????????????"
 
 msgid "Send a mobile message."
 msgstr "???????"
 
 msgid "Page"
-msgstr "??"
+msgstr ""
 
 msgid "Playing a game"
-msgstr ""
+msgstr "?????"
 
-#, fuzzy
 msgid "Working"
-msgstr "??"
+msgstr "????"
 
 msgid "Has you"
 msgstr ""
 
-#, fuzzy
 msgid "Home Phone Number"
-msgstr "????????..."
+msgstr "??????"
 
-#, fuzzy
 msgid "Work Phone Number"
-msgstr "????????..."
+msgstr "??????"
 
-#, fuzzy
 msgid "Mobile Phone Number"
-msgstr "????????..."
+msgstr "??????"
 
 msgid "Be Right Back"
 msgstr "????"
@@ -4971,21 +4970,17 @@ msgstr "????"
 #. saveable
 #. should be user_settable some day
 #. independent
-#, fuzzy
 msgid "Artist"
 msgstr "??"
 
-#, fuzzy
 msgid "Album"
-msgstr "Adium"
+msgstr "??"
 
-#, fuzzy
 msgid "Game Title"
-msgstr "??"
+msgstr "????"
 
-#, fuzzy
 msgid "Office Title"
-msgstr "??"
+msgstr "????"
 
 msgid "Set Friendly Name..."
 msgstr "???????..."
@@ -5020,6 +5015,29 @@ 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 "????????"
 
@@ -5036,13 +5054,13 @@ msgid "Hobbies and Interests"
 msgstr "??"
 
 msgid "Hobbies and Interests"
-msgstr "?????"
+msgstr "????"
 
 msgid "A Little About Me"
-msgstr "????"
+msgstr "????"
 
 msgid "Social"
-msgstr "??"
+msgstr "????"
 
 msgid "Marital Status"
 msgstr "????"
@@ -5063,7 +5081,7 @@ msgid "Humor"
 msgstr "??"
 
 msgid "Humor"
-msgstr ""
+msgstr "??"
 
 msgid "Music"
 msgstr "??"
@@ -5075,7 +5093,7 @@ msgid "Personal"
 msgstr "????"
 
 msgid "Personal"
-msgstr "??"
+msgstr "????"
 
 msgid "Significant Other"
 msgstr ""
@@ -5164,17 +5182,16 @@ msgstr ""
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 msgstr ""
-"MSN ????????????????????????,???????????"
-"?????"
+"MSN ??????????????????????,?????????????"
+"???"
 
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr "?????????????????????????"
 
-#, fuzzy
 msgid "View web profile"
-msgstr "?????"
+msgstr "?? Web ????"
 
 #. *< type
 #. *< ui_requirement
@@ -5191,9 +5208,8 @@ msgstr "?? HTTP ??"
 msgid "Use HTTP Method"
 msgstr "?? HTTP ??"
 
-#, fuzzy
 msgid "HTTP Method Server"
-msgstr "IPC ?????"
+msgstr "HTTP ?????"
 
 msgid "Show custom smileys"
 msgstr "???????:"
@@ -5201,38 +5217,35 @@ msgstr "nudge:????????
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge:?????????,????????"
 
-#, fuzzy
 msgid "Windows Live ID authentication:Unable to connect"
-msgstr "??: ??????"
+msgstr "Windows Live ID ??:????"
 
-#, fuzzy
 msgid "Windows Live ID authentication:Invalid response"
-msgstr "??: ??????"
+msgstr "Windows Live ID ??:????"
 
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ???????????!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "????"
+msgstr "???? (%d): %s"
 
 msgid "Unable to add user"
 msgstr "??????"
 
-#, fuzzy, c-format
+#. Unknown error!
+#, c-format
 msgid "Unknown error (%d)"
-msgstr "????"
+msgstr "???? (%d)"
 
-#, fuzzy
 msgid "The following users are missing from your addressbook"
-msgstr "?????????"
+msgstr "????????????"
 
-#, fuzzy
 msgid "Mobile message was not sent because it was too long."
-msgstr "?????,????????"
+msgstr "?????,???????"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
 "automatically be signed out at that time.  Please finish any conversations "
@@ -5247,33 +5260,21 @@ msgid_plural ""
 "\n"
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
-msgstr[0] ""
-"MSN ?????? %d ?????????????,??????????????"
-"?????????\n"
-"\n"
-"?????,?????????"
-msgstr[1] ""
-"MSN ?????? %d ?????????????,??????????????"
-"?????????\n"
-"\n"
-"?????,?????????"
+msgstr[0] "?????,???????"
 
 msgid ""
 "Message was not sent because the system is unavailable. This normally "
 "happens when the user is blocked or does not exist."
 msgstr ""
 
-#, fuzzy
 msgid "Message was not sent because messages are being sent too quickly."
-msgstr "?????,?????????:"
+msgstr "?????,??????????"
 
-#, fuzzy
 msgid "Message was not sent because an unknown encoding error occurred."
-msgstr "?????,?????????:"
+msgstr "?????,????????????"
 
-#, fuzzy
 msgid "Message was not sent because an unknown error occurred."
-msgstr "?????,?????????:"
+msgstr "?????,??????????"
 
 msgid "Writing error"
 msgstr "????"
@@ -5289,22 +5290,18 @@ msgstr ""
 "%s ????????:\n"
 "%s"
 
-#, fuzzy
 msgid "Our protocol is not supported by the server"
 msgstr "??????????"
 
-#, fuzzy
 msgid "Error parsing HTTP"
 msgstr "?? HTTP ???"
 
-#, fuzzy
 msgid "You have signed on from another location"
-msgstr "???????????????"
+msgstr "???????????????"
 
 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 ?????????"
 
@@ -5314,7 +5311,7 @@ msgid ""
 
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
-msgstr "?? MSN ??????????????????"
+msgstr "?? MSN ????????????????"
 
 msgid "Handshaking"
 msgstr "??"
@@ -5334,16 +5331,16 @@ msgstr "????????"
 msgid "Retrieving buddy list"
 msgstr "????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
-msgstr "%s ??????????,??????"
+msgstr "%s ???????????,??????"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s ??????????,??????"
+#, fuzzy, c-format
+msgid "%s invited you to view his/her webcam, but this is not yet supported."
+msgstr "%s ???????????,??????"
 
 msgid "Away From Computer"
-msgstr "????"
+msgstr "??"
 
 msgid "On The Phone"
 msgstr "????"
@@ -5378,18 +5375,19 @@ msgstr "?????,????? msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "?????,?????????:"
 
-#, fuzzy
 msgid "Delete Buddy from Address Book?"
-msgstr "??????"
+msgstr "?????????"
 
-#, fuzzy
 msgid "Do you want to delete this buddy from your address book as well?"
-msgstr "?????????????"
+msgstr "??????????????????"
 
-#, fuzzy
 msgid "The username specified is invalid."
 msgstr "?????????"
 
+#, c-format
+msgid "Friendly name changes too rapidly"
+msgstr "??????????"
+
 msgid "This Hotmail account may not be active."
 msgstr "? Hotmail ????????"
 
@@ -5406,9 +5404,8 @@ msgstr "???? URL"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "MSN Protocol Plugin"
-msgstr "AIM ????"
+msgstr "MSN ????"
 
 #, c-format
 msgid "%s is not a valid group."
@@ -5419,19 +5416,19 @@ msgid "%s on %s (%s)"
 
 #, c-format
 msgid "%s on %s (%s)"
-msgstr "%2$s(%3$s) ?? %1$s"
+msgstr "%2$s ?? %1$s (%3$s)"
 
 #, c-format
 msgid "Unable to add user on %s (%s)"
-msgstr "??? %s(%s) ?????"
+msgstr "??? %s ????? (%s)"
 
 #, c-format
 msgid "Unable to block user on %s (%s)"
-msgstr "??? %s(%s) ?????"
+msgstr "??? %s ????? (%s)"
 
 #, c-format
 msgid "Unable to permit user on %s (%s)"
-msgstr "???? %s(%s) ????"
+msgstr "???? %s ???? (%s)"
 
 #, c-format
 msgid "%s could not be added because your buddy list is full."
@@ -5462,62 +5459,53 @@ msgstr ""
 msgid "No such user: %s"
 msgstr ""
 
-#, fuzzy
 msgid "User lookup"
-msgstr "????"
+msgstr "????"
 
 msgid "Reading challenge"
 msgstr "????"
 
-#, fuzzy
 msgid "Unexpected challenge length from server"
 msgstr "????????"
 
-#, fuzzy
 msgid "Logging in"
-msgstr "??"
+msgstr "??"
 
-#, fuzzy
 msgid "MySpaceIM - No Username Set"
-msgstr "???"
+msgstr "MySpaceIM - ??????"
 
 msgid "You appear to have no MySpace username."
-msgstr ""
+msgstr "??? MySpace ????"
 
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
+msgstr "?????????(??:????!)"
 
-#, fuzzy
 msgid "Lost connection with server"
-msgstr ""
-"?????????\n"
-"%s"
+msgstr "????????"
 
 #. Can't write _()'d strings in array initializers. Workaround.
 #. khc: then use N_() in the array initializer and use _() when they are
 #. used
-#, fuzzy
 msgid "New mail messages"
-msgstr "????"
+msgstr "????"
 
 msgid "New blog comments"
-msgstr ""
+msgstr "?????"
 
 msgid "New profile comments"
 msgstr ""
 
 msgid "New friend requests!"
-msgstr ""
+msgstr "????!"
 
 msgid "New picture comments"
-msgstr ""
+msgstr "?????"
 
 msgid "MySpace"
-msgstr ""
+msgstr "MySpace"
 
-#, fuzzy
 msgid "IM Friends"
-msgstr "??????(_I)"
+msgstr "??????"
 
 #, c-format
 msgid ""
@@ -5526,15 +5514,14 @@ msgid_plural ""
 msgid_plural ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
-msgstr[0] ""
+msgstr[0] "??????"
 
-#, fuzzy
 msgid "Add contacts from server"
-msgstr "?????????"
+msgstr "?????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Protocol error, code %d: %s"
-msgstr "????????? %d"
+msgstr "????,?? %d: %s"
 
 #, c-format
 msgid ""
@@ -5543,37 +5530,30 @@ msgstr ""
 "cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
-#, fuzzy
 msgid "Incorrect username or password"
-msgstr "???????"
+msgstr "????????"
 
 msgid "MySpaceIM Error"
-msgstr ""
+msgstr "MySpaceIM ??"
 
-#, fuzzy
 msgid "Invalid input condition"
-msgstr "????"
+msgstr "???????"
 
-#, fuzzy
 msgid "Failed to add buddy"
-msgstr "??????????"
+msgstr "??????"
 
-#, fuzzy
 msgid "'addbuddy' command failed."
-msgstr "?????????..."
+msgstr ""????" ?????"
 
-#, fuzzy
 msgid "persist command failed"
 msgstr "?????"
 
-#, fuzzy
 msgid "Failed to remove buddy"
-msgstr "??????????"
+msgstr "??????"
 
 msgid "'delbuddy' command failed"
 msgstr ""
 
-#, fuzzy
 msgid "blocklist command failed"
 msgstr "?????"
 
@@ -5589,19 +5569,17 @@ msgid "Add friends from MySpace.com"
 msgstr ""
 
 msgid "Add friends from MySpace.com"
-msgstr ""
+msgstr "? MySpace.com ????"
 
-#, fuzzy
 msgid "Importing friends failed"
 msgstr "???????"
 
 #. TODO: find out how
 msgid "Find people..."
-msgstr "????..."
+msgstr "??..."
 
-#, fuzzy
 msgid "Change IM name..."
-msgstr "????..."
+msgstr "?? IM ??..."
 
 msgid "myim URL handler"
 msgstr ""
@@ -5616,35 +5594,31 @@ msgid "Show headline in status text"
 msgstr ""
 
 msgid "Show headline in status text"
-msgstr ""
+msgstr "???????????"
 
 msgid "Send emoticons"
 msgstr "????"
 
 msgid "Screen resolution (dots per inch)"
-msgstr ""
+msgstr "?????(?????)"
 
-#, fuzzy
 msgid "Base font size (points)"
 msgstr "????"
 
 msgid "User"
 msgstr "??"
 
-#, fuzzy
 msgid "Headline"
 msgstr "??(_H):"
 
-#, fuzzy
 msgid "Song"
 msgstr "??"
 
 msgid "Total Friends"
-msgstr ""
+msgstr "????"
 
-#, fuzzy
 msgid "Client Version"
-msgstr "????"
+msgstr "?????"
 
 msgid ""
 "An error occurred while trying to set the username.  Please try again, or "
@@ -5652,31 +5626,27 @@ msgstr ""
 "to set your username."
 msgstr ""
 
-#, fuzzy
 msgid "MySpaceIM - Username Available"
-msgstr "?????"
+msgstr "MySpaceIM - ?????"
 
 msgid "This username is available. Would you like to set it?"
-msgstr ""
+msgstr "????????????????????"
 
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
-msgstr ""
+msgstr "????,?????!"
 
 msgid "MySpaceIM - Please Set a Username"
-msgstr ""
+msgstr "MySpaceIM - ????????"
 
-#, fuzzy
 msgid "This username is unavailable."
-msgstr "???????????"
+msgstr "????????"
 
-#, fuzzy
 msgid "Please try another username:"
-msgstr "??? %s ????"
+msgstr "?????????:"
 
 #. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
 msgid "No username set"
-msgstr "???"
+msgstr "??????"
 
 msgid "Please enter a username to check its availability:"
 msgstr ""
@@ -5690,7 +5660,7 @@ msgstr ""
 msgid "Zap"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has zapped you!"
 msgstr "%s ????[%s]?????"
 
@@ -5702,7 +5672,7 @@ msgstr ""
 msgid "Whack"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has whacked you!"
 msgstr "%s ????[%s]?????"
 
@@ -5713,11 +5683,10 @@ msgstr ""
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
-#, fuzzy
 msgid "Torch"
 msgstr "??"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has torched you!"
 msgstr "????????"
 
@@ -5729,9 +5698,9 @@ msgstr ""
 msgid "Smooch"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has smooched you!"
-msgstr "%s ????"
+msgstr "%s ????"
 
 #, c-format
 msgid "Smooching %s..."
@@ -5741,20 +5710,19 @@ msgstr ""
 msgid "Hug"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has hugged you!"
-msgstr "%s ????"
+msgstr "%s ????"
 
 #, c-format
 msgid "Hugging %s..."
 msgstr ""
 
 #. Slap means "to hit someone with an open/flat hand"
-#, fuzzy
 msgid "Slap"
 msgstr "??"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has slapped you!"
 msgstr "%s ????[%s]?????"
 
@@ -5763,15 +5731,14 @@ msgstr ""
 msgstr ""
 
 #. Goose means "to pinch someone on their butt"
-#, fuzzy
 msgid "Goose"
 msgstr "??"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has goosed you!"
 msgstr "%s ???"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Goosing %s..."
 msgstr "?? %s"
 
@@ -5781,9 +5748,9 @@ msgstr ""
 msgid "High-five"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has high-fived you!"
-msgstr "%s ????"
+msgstr "%s ????"
 
 #, c-format
 msgid "High-fiving %s..."
@@ -5795,9 +5762,9 @@ msgstr ""
 msgid "Punk"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has punk'd you!"
-msgstr "%s ????"
+msgstr "%s ????"
 
 #, c-format
 msgid "Punking %s..."
@@ -5813,9 +5780,9 @@ msgstr ""
 msgid "Raspberry"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has raspberried you!"
-msgstr "%s ????"
+msgstr "%s ????"
 
 #, c-format
 msgid "Raspberrying %s..."
@@ -5875,7 +5842,6 @@ msgstr "???????"
 msgid "Master archive is misconfigured"
 msgstr "???????"
 
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "?????????????"
 
@@ -5890,9 +5856,8 @@ msgstr "??????????? msgid "You have reached your limit for the number of contacts allowed"
 msgstr "???????????????"
 
-#, fuzzy
 msgid "You have entered an incorrect username"
-msgstr "??????????"
+msgstr "??????????"
 
 msgid "An error occurred while updating the directory"
 msgstr "??????????"
@@ -5915,7 +5880,7 @@ msgstr "????: 0x%X"
 msgid "Unknown error: 0x%X"
 msgstr "????: 0x%X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
 msgstr "?? ping ?? %s"
 
@@ -6043,7 +6008,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."
@@ -6071,8 +6035,9 @@ msgstr "?????"
 msgid "Server port"
 msgstr "?????"
 
-#, fuzzy
-msgid "Received unexpected response from "
+#. Note to translators: %s in this string is a URL
+#, fuzzy, c-format
+msgid "Received unexpected response from %s"
 msgstr "?????????? HTTP ???"
 
 #. username connecting too frequently
@@ -6083,22 +6048,21 @@ msgstr ""
 "????????????????,??????????????,??????"
 "?????"
 
+#. Note to translators: The first %s is a URL, the second is an
+#. error message.
 #, fuzzy, c-format
-msgid "Error requesting "
-msgstr "????????"
+msgid "Error requesting %s: %s"
+msgstr "?????"
 
 msgid "AOL does not allow your screen name to authenticate here"
-msgstr ""
+msgstr "AOL ?????????????????"
 
-#, fuzzy
 msgid "Could not join chat room"
-msgstr "????"
+msgstr "???????"
 
-#, fuzzy
 msgid "Invalid chat room name"
-msgstr "??????"
+msgstr "????????"
 
-#, fuzzy
 msgid "Received invalid data on connection with server"
 msgstr "??????????????????"
 
@@ -6147,12 +6111,11 @@ msgstr ""
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-#, fuzzy
 msgid "Unable to establish a connection with the remote user."
 msgstr "?????????????"
 
 msgid "Direct IM established"
-msgstr "???????"
+msgstr "???????????"
 
 #, c-format
 msgid ""
@@ -6213,10 +6176,10 @@ msgid "Warning level too high (sender)"
 msgstr "????/??"
 
 msgid "Warning level too high (sender)"
-msgstr ""
+msgstr "?????????"
 
 msgid "Warning level too high (receiver)"
-msgstr ""
+msgstr "?????????"
 
 msgid "User temporarily unavailable"
 msgstr "???????"
@@ -6243,7 +6206,7 @@ msgstr ""
 "your AIM/ICQ account.)"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
 "different encodings selected, or %s has a buggy client.)"
@@ -6313,7 +6276,6 @@ msgstr "??"
 msgid "Camera"
 msgstr "??"
 
-#, fuzzy
 msgid "Screen Sharing"
 msgstr "???"
 
@@ -6341,17 +6303,16 @@ msgstr "????"
 msgid "Buddy Comment"
 msgstr "????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "????????????:\n"
 "%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to BOS server: %s"
 msgstr "?????????"
 
-#, fuzzy
 msgid "Username sent"
 msgstr "???"
 
@@ -6362,16 +6323,16 @@ 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 ??,????????????????????????,"
 "???????,?????????????,????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr "?????????? %s ?????"
 
@@ -6387,12 +6348,10 @@ msgstr "?????"
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
-msgstr "?????"
+msgstr "??????"
 
 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
 msgstr "????????"
 
@@ -6400,12 +6359,12 @@ 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."
@@ -6413,7 +6372,6 @@ msgstr ""
 "????????????????,??????????????,??????"
 "?????"
 
-#, fuzzy
 msgid "The SecurID key entered is invalid"
 msgstr "??? SecurID ?????"
 
@@ -6423,12 +6381,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 "?????"
 
@@ -6438,12 +6390,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 "???????"
 
@@ -6516,46 +6462,40 @@ msgstr "??(_D)"
 msgid "_Decline"
 msgstr "??(_D)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
-msgstr[0] "???? %2$s ? %1$hu ???,??????????"
-msgstr[1] "???? %2$s ? %1$hu ???,??????????"
+msgstr[0] "??(_D)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
-msgstr[0] "???? %2$s ? %1$hu ???,??????????"
-msgstr[1] "???? %2$s ? %1$hu ???,??????????"
+msgstr[0] "??(_D)"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
-msgstr[0] "???? %2$s ? %1$hu ???,???????????"
-msgstr[1] "???? %2$s ? %1$hu ???,???????????"
+msgstr[0] "??(_D)"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You missed %hu message from %s because his/her warning level is too high."
 msgid_plural ""
 "You missed %hu messages from %s because his/her warning level is too high."
-msgstr[0] "???? %2$s ? %1$hu ???,????/?????????"
-msgstr[1] "???? %2$s ? %1$hu ???,????/?????????"
+msgstr[0] "??(_D)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You missed %hu message from %s because your warning level is too high."
 msgid_plural ""
 "You missed %hu messages from %s because your warning level is too high."
-msgstr[0] "???? %2$s ? %1$hu ???,????????????"
-msgstr[1] "???? %2$s ? %1$hu ???,????????????"
+msgstr[0] "??(_D)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
-msgstr[0] "???? %2$s ? %1$hu ???,?????"
-msgstr[1] "???? %2$s ? %1$hu ???,?????"
+msgstr[0] "??(_D)"
 
 #. Data is assumed to be the destination bn
 #, c-format
@@ -6580,7 +6520,7 @@ msgid "Capabilities"
 msgstr "????"
 
 msgid "Capabilities"
-msgstr "??"
+msgstr "??"
 
 msgid "Profile"
 msgstr "????"
@@ -6634,10 +6574,10 @@ msgstr "????"
 msgid "Pop-Up Message"
 msgstr "????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
-msgstr[0] "???????? %s ??"
+msgstr[0] "????"
 
 #, c-format
 msgid "No results found for email address %s"
@@ -6650,29 +6590,29 @@ msgstr "???????"
 msgid "Account Confirmation Requested"
 msgstr "???????"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name differs "
 "from the original."
 msgstr "?? 0x%04x:????????,??????????????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
 msgstr "?? 0x%04x:????????,?????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name is too "
 "long."
 msgstr "?? 0x%04x:????????,????????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr "?? 0x%04x:??????????,?????????????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
@@ -6713,33 +6653,33 @@ msgstr ""
 "?????????????????????????????;????????"
 "?????"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
 "truncated for you."
 msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated for you."
-msgstr[0] "?????????????? %d ?????????????"
-msgstr[1] "?????????????? %d ?????????????"
+msgstr[0] ""
+"?????????????????????????????;????????"
+"?????"
 
 msgid "Profile too long."
 msgstr "???????"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
 "truncated for you."
 msgid_plural ""
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
-msgstr[0] "?????????????? %d ???????????????"
-msgstr[1] "?????????????? %d ???????????????"
+msgstr[0] "???????"
 
 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, "
@@ -6748,15 +6688,9 @@ msgstr ""
 "?????? %s,????????????????????????,?????"
 "??,?????????????,????????"
 
-#, fuzzy
-msgid "Unable to Add"
-msgstr "????"
-
-#, fuzzy
 msgid "Unable to Retrieve Buddy List"
 msgstr "????????"
 
-#, fuzzy
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few minutes."
@@ -6767,7 +6701,7 @@ 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."
@@ -6777,11 +6711,11 @@ msgstr "(???)"
 msgid "(no name)"
 msgstr "(???)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "??????,?????"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The user %s has given you permission to add him or her to your buddy list.  "
 "Do you want to add this user?"
@@ -6829,7 +6763,7 @@ msgid "You have selected to open a Direc
 
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
-msgstr "????? %s ?????????"
+msgstr "????? %s ???????????"
 
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
@@ -6840,6 +6774,10 @@ msgstr "??(_O)"
 msgid "C_onnect"
 msgstr "??(_O)"
 
+#, fuzzy
+msgid "You closed the connection."
+msgstr "?????????"
+
 msgid "Get AIM Info"
 msgstr "?? AIM ??"
 
@@ -6850,6 +6788,10 @@ msgstr "??????"
 msgid "Get Status Msg"
 msgstr "??????"
 
+#, fuzzy
+msgid "End Direct IM Session"
+msgstr "???????????"
+
 msgid "Direct IM"
 msgstr "????"
 
@@ -6868,7 +6810,6 @@ msgstr "???????"
 msgid "The new formatting is invalid."
 msgstr "???????"
 
-#, fuzzy
 msgid "Username formatting can change only capitalization and whitespace."
 msgstr "???????????????"
 
@@ -6900,22 +6841,19 @@ msgstr "??(_S)"
 msgid "_Search"
 msgstr "??(_S)"
 
-#, fuzzy
 msgid "Set User Info (web)..."
-msgstr "??????(URL)..."
+msgstr "??????(web)..."
 
 #. This only happens when connecting with the old-style BUCP login
-#, fuzzy
 msgid "Change Password (web)"
-msgstr "????(URL)"
+msgstr "????(web)"
 
-#, fuzzy
 msgid "Configure IM Forwarding (web)"
-msgstr "?? IM ??(URL)"
+msgstr "??????(web)"
 
 #. ICQ actions
 msgid "Set Privacy Options..."
-msgstr "??????..."
+msgstr "??????..."
 
 #. AIM actions
 msgid "Confirm Account"
@@ -6936,11 +6874,9 @@ msgstr "???????"
 msgid "Search for Buddy by Information"
 msgstr "???????"
 
-#, fuzzy
 msgid "Use clientLogin"
-msgstr "?????"
+msgstr "???????"
 
-#, fuzzy
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -6954,18 +6890,18 @@ msgid "Asking %s to connect to us at %s:
 
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr "?? %s ??? %s:%hu ??????"
+msgstr "?? %s ??? %s:%hu ??????"
 
 #, c-format
 msgid "Attempting to connect to %s:%hu."
-msgstr "??????? %s:%hu?"
+msgstr "??????? %s:%hu?"
 
 msgid "Attempting to connect via proxy server."
 msgstr "??????????????"
 
 #, c-format
 msgid "%s has just asked to directly connect to %s"
-msgstr "%s ????? %s ????"
+msgstr "%s ????? %s ??????????"
 
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
@@ -7050,16 +6986,14 @@ msgstr "??"
 msgid "Other"
 msgstr "??"
 
-#, fuzzy
 msgid "Visible"
-msgstr "??"
+msgstr "??"
 
 msgid "Friend Only"
-msgstr ""
+msgstr "?????"
 
-#, fuzzy
 msgid "Private"
-msgstr "??"
+msgstr "??"
 
 msgid "QQ Number"
 msgstr "QQ ??"
@@ -7068,7 +7002,7 @@ msgid "Province/State"
 msgstr "??/??"
 
 msgid "Province/State"
-msgstr "?"
+msgstr "?/?"
 
 msgid "Zipcode"
 msgstr "????"
@@ -7076,9 +7010,8 @@ msgstr "????"
 msgid "Phone Number"
 msgstr "????"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "????"
+msgstr "???????"
 
 msgid "Cellphone Number"
 msgstr "????"
@@ -7086,64 +7019,50 @@ msgstr "????"
 msgid "Personal Introduction"
 msgstr "????"
 
-#, fuzzy
 msgid "City/Area"
-msgstr "??"
+msgstr "??/??"
 
-#, fuzzy
 msgid "Publish Mobile"
-msgstr "????"
+msgstr "????"
 
-#, fuzzy
 msgid "Publish Contact"
-msgstr "??????"
+msgstr "??????"
 
 msgid "College"
 msgstr "??"
 
-#, fuzzy
 msgid "Horoscope"
 msgstr "??"
 
-#, fuzzy
 msgid "Zodiac"
-msgstr "??"
+msgstr "??"
 
-#, fuzzy
 msgid "Blood"
-msgstr "???"
+msgstr "??"
 
-#, fuzzy
 msgid "True"
-msgstr "???"
+msgstr "?"
 
-#, fuzzy
 msgid "False"
-msgstr "???"
+msgstr "?"
 
-#, fuzzy
 msgid "Modify Contact"
-msgstr "????"
+msgstr "?????"
 
-#, fuzzy
 msgid "Modify Address"
-msgstr "????"
+msgstr "????"
 
-#, fuzzy
 msgid "Modify Extended Information"
-msgstr "??????"
+msgstr "??????"
 
-#, fuzzy
 msgid "Modify Information"
-msgstr "??????"
+msgstr "????"
 
-#, fuzzy
 msgid "Update"
-msgstr "????"
+msgstr "??"
 
-#, fuzzy
 msgid "Could not change buddy information."
-msgstr "????????"
+msgstr "?????????"
 
 msgid "Mobile"
 msgstr "??"
@@ -7152,97 +7071,82 @@ msgstr "??"
 msgstr "??"
 
 #. 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
 msgid "Server says:"
-msgstr "????"
+msgstr "?????:"
 
 msgid "Your request was accepted."
-msgstr ""
+msgstr "????????"
 
 msgid "Your request was rejected."
-msgstr ""
+msgstr "????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u requires verification"
-msgstr "????"
+msgstr "%u ????"
 
-#, fuzzy
 msgid "Add buddy question"
-msgstr "?????????"
+msgstr "??????"
 
-#, fuzzy
 msgid "Enter answer here"
-msgstr "??????"
+msgstr "??????"
 
 msgid "Send"
 msgstr "??"
 
-#, fuzzy
 msgid "Invalid answer."
-msgstr "????"
+msgstr "??????"
 
 msgid "Authorization denied message:"
 msgstr "??????:"
 
-#, fuzzy
 msgid "Sorry, you're not my style."
-msgstr "??,??????..."
+msgstr "???,??????..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u needs authorization"
-msgstr "?? %d ??????"
+msgstr "%u ??????"
 
-#, fuzzy
 msgid "Add buddy authorize"
-msgstr "?????????"
+msgstr "??????"
 
-#, fuzzy
 msgid "Enter request here"
 msgstr "??????"
 
 msgid "Would you be my friend?"
-msgstr "???????????"
+msgstr "???????????"
 
-#, fuzzy
 msgid "QQ Buddy"
-msgstr "????"
+msgstr "QQ ??"
 
-#, fuzzy
 msgid "Add buddy"
 msgstr "????"
 
-#, fuzzy
 msgid "Invalid QQ Number"
-msgstr "??? QQ ??"
+msgstr "??? QQ ??"
 
-#, fuzzy
 msgid "Failed sending authorize"
-msgstr "??????????!"
+msgstr "??????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed removing buddy %u"
-msgstr "??????????"
+msgstr "???? %u ??"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed removing me from %d's buddy list"
-msgstr "%s ?????????????"
+msgstr "%d ?????????????"
 
-#, fuzzy
 msgid "No reason given"
 msgstr "???????"
 
@@ -7254,9 +7158,9 @@ msgstr "?????????"
 msgid "Would you like to add him?"
 msgstr "?????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected by %s"
-msgstr "??"
+msgstr "? %s ??"
 
 #, c-format
 msgid "Message: %s"
@@ -7271,89 +7175,73 @@ msgstr "QQ ?"
 msgid "QQ Qun"
 msgstr "QQ ?"
 
-#, fuzzy
 msgid "Please enter Qun number"
-msgstr "??? %s ????"
+msgstr "???????"
 
-#, fuzzy
 msgid "You can only search for permanent Qun\n"
-msgstr "??????? QQ ?\n"
+msgstr "?????????\n"
 
-#, fuzzy
 msgid "(Invalid UTF-8 string)"
-msgstr "???????"
+msgstr "(??? UTF-8 ???)"
 
-#, fuzzy
 msgid "Not member"
-msgstr "?????"
+msgstr "???"
 
-#, fuzzy
 msgid "Member"
-msgstr "????"
+msgstr "??"
 
-#, fuzzy
 msgid "Requesting"
-msgstr "?????"
+msgstr "??????"
 
-#, fuzzy
 msgid "Admin"
-msgstr "Adium"
+msgstr "???"
 
-#, fuzzy
 msgid "Notice"
 msgstr "??"
 
-#, fuzzy
 msgid "Detail"
-msgstr "??"
+msgstr "????"
 
 msgid "Creator"
 msgstr "???"
 
-#, fuzzy
 msgid "About me"
-msgstr "?? %s"
+msgstr "???"
 
-#, fuzzy
 msgid "Category"
-msgstr "????"
+msgstr "??"
 
-#, fuzzy
 msgid "The Qun does not allow others to join"
-msgstr "??????????"
+msgstr "??????????"
 
-#, fuzzy
 msgid "Join QQ Qun"
-msgstr "????"
+msgstr "?? QQ ?"
 
 msgid "Input request here"
 msgstr "??????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "?????????"
+msgstr "????? %s (%u)"
 
-#, fuzzy
 msgid "Successfully joined Qun"
-msgstr "?????????"
+msgstr "?????"
 
 #, c-format
 msgid "Qun %u denied from joining"
-msgstr ""
+msgstr "? %u ????"
 
 msgid "QQ Qun Operation"
 msgstr "QQ ???"
 
-#, fuzzy
 msgid "Failed:"
-msgstr "???"
+msgstr "??:"
 
 msgid "Join Qun, Unknown Reply"
-msgstr ""
+msgstr "???,?????"
 
-#, fuzzy
 msgid "Quit Qun"
-msgstr "QQ ?"
+msgstr "???"
 
 msgid ""
 "Note, if you are the creator, \n"
@@ -7362,51 +7250,47 @@ msgstr ""
 "???,???????,\n"
 "???????????"
 
-#, fuzzy
 msgid "Sorry, you are not our style"
-msgstr "??,??????..."
+msgstr "???,?????????..."
 
-#, fuzzy
 msgid "Successfully changed Qun members"
-msgstr "?????????"
+msgstr "????????"
 
-#, fuzzy
 msgid "Successfully changed Qun information"
-msgstr "?????????"
+msgstr "????????"
 
 msgid "You have successfully created a Qun"
 msgstr "?????????"
 
-#, fuzzy
 msgid "Would you like to set up detailed information now?"
-msgstr "?????????????"
+msgstr "?????????????"
 
 msgid "Setup"
 msgstr "??"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr "?? %d ???? %d ?"
+msgstr "?? %u ???? %u ?,?????:%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u request to join Qun %u"
-msgstr "?? %d ???? %d ?"
+msgstr "?? %u ???? %u ?"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr "??????????"
+msgstr "??? %u ?????? %u ???"
 
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Removed buddy %u.</b>"
-msgstr "????"
+msgstr "<b>???? %u?</b>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>New buddy %u joined.</b>"
-msgstr "????"
+msgstr "<b>??? %u ????</b>"
 
 #, c-format
 msgid "Unknown-%d"
@@ -7416,24 +7300,20 @@ msgid " VIP"
 msgstr "??"
 
 msgid " VIP"
-msgstr ""
+msgstr " VIP"
 
 msgid " TCP"
-msgstr ""
+msgstr " TCP"
 
-#, fuzzy
 msgid " FromMobile"
 msgstr "??"
 
-#, fuzzy
 msgid " BindMobile"
 msgstr "??"
 
-#, fuzzy
 msgid " Video"
-msgstr "????"
+msgstr "??"
 
-#, fuzzy
 msgid " Zone"
 msgstr "?"
 
@@ -7446,27 +7326,26 @@ msgstr "????"
 msgid "Invalid name"
 msgstr "????"
 
-#, fuzzy
 msgid "Select icon..."
-msgstr "?????..."
+msgstr "????..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>????</b>: %s<br>\n"
+msgstr "<b>????</b>: %d-%d-%d, %d:%d:%d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Total Online Buddies</b>: %d<br>\n"
-msgstr "<b>??????</b>: %d<br>\n"
+msgstr "<b>??????</b>: %d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>????</b>: %s<br>\n"
+msgstr "<b>????</b>:: %d-%d-%d, %d:%d:%d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Server</b>: %s<br>\n"
-msgstr "<b>??? IP</b>: %s: %d<br>\n"
+msgstr "<b>???</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
 msgstr "<b>????</b>: %s<br>\n"
 
@@ -7474,56 +7353,53 @@ msgstr "<b>????</b>: %s<br>\n"
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>????</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>My Internet IP</b>: %s:%d<br>\n"
-msgstr "<b>????</b>: %s<br>\n"
+msgstr "<b>?? Internet IP</b>: %s:%d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Sent</b>: %lu<br>\n"
 msgstr "<b>??????</b>: %d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Resend</b>: %lu<br>\n"
 msgstr "<b>????</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Lost</b>: %lu<br>\n"
 msgstr "<b>????</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Received</b>: %lu<br>\n"
 msgstr "<b>????</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Received Duplicate</b>: %lu<br>\n"
 msgstr "<b>???? IP</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Time</b>: %d-%d-%d, %d:%d:%d<br>\n"
 msgstr "<b>????</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>IP</b>: %s<br>\n"
-msgstr "<b>??? IP</b>: %s: %d<br>\n"
+msgstr "<b>IP</b>: %s<br>\n"
 
 msgid "Login Information"
 msgstr "????"
 
 msgid "<p><b>Original Author</b>:<br>\n"
-msgstr ""
+msgstr "<p><b>????</b>:<br>\n"
 
 msgid "<p><b>Code Contributors</b>:<br>\n"
-msgstr ""
+msgstr "<p><b>?????</b>:<br>\n"
 
-#, fuzzy
 msgid "<p><b>Lovely Patch Writers</b>:<br>\n"
 msgstr "<b>????</b>: %s<br>\n"
 
-#, fuzzy
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>??????</b>: %d<br>\n"
 
-#, fuzzy
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
 msgstr "<b>????</b>: %s<br>\n"
 
@@ -7536,31 +7412,27 @@ msgstr ""
 msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "About OpenQ %s"
-msgstr "?? %s"
+msgstr "?? OpenQ %s"
 
-#, fuzzy
 msgid "Change Icon"
-msgstr "????"
+msgstr "????"
 
 msgid "Change Password"
 msgstr "????"
 
-#, fuzzy
 msgid "Account Information"
-msgstr "????"
+msgstr "????"
 
 msgid "Update all QQ Quns"
-msgstr ""
+msgstr "???? QQ ?"
 
-#, fuzzy
 msgid "About OpenQ"
-msgstr "?? %s"
+msgstr "?? OpenQ"
 
-#, fuzzy
 msgid "Modify Buddy Memo"
-msgstr "????"
+msgstr "??????"
 
 #. *< type
 #. *< ui_requirement
@@ -7572,59 +7444,50 @@ msgstr "????"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "QQ Protocol Plugin"
 msgstr "QQ ????"
 
-#, fuzzy
 msgid "Auto"
-msgstr "??"
+msgstr "??"
 
-#, fuzzy
 msgid "Select Server"
-msgstr "????"
+msgstr "?????"
 
 msgid "QQ2005"
-msgstr ""
+msgstr "QQ2005"
 
 msgid "QQ2007"
-msgstr ""
+msgstr "QQ2007"
 
 msgid "QQ2008"
-msgstr ""
+msgstr "QQ2008"
 
-#, fuzzy
 msgid "Connect by TCP"
-msgstr "???"
+msgstr "?? TCP ??"
 
-#, fuzzy
 msgid "Show server notice"
-msgstr "?????"
+msgstr "???????"
 
-#, fuzzy
 msgid "Show server news"
-msgstr "?????"
+msgstr "???????"
 
 msgid "Show chat room when msg comes"
-msgstr ""
+msgstr "???????????"
 
-#, fuzzy
 msgid "Keep alive interval (seconds)"
 msgstr "??????"
 
-#, fuzzy
 msgid "Update interval (seconds)"
 msgstr "??????"
 
-#, fuzzy
 msgid "Unable to decrypt server reply"
-msgstr "?????????"
+msgstr "?????????"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid token len, %d"
 msgstr "?????"
 
@@ -7635,40 +7498,33 @@ msgstr ""
 #. need activation
 #. need activation
 #. need activation
-#, fuzzy
 msgid "Activation required"
-msgstr "????"
+msgstr "????"
 
 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "???? %s ???..."
 
-#, fuzzy
 msgid "Checking captcha"
 msgstr "???? %s ???..."
 
-#, fuzzy
 msgid "Failed captcha verification"
 msgstr "Yahoo! ????"
 
-#, fuzzy
 msgid "Captcha Image"
 msgstr "????"
 
-#, fuzzy
 msgid "Enter code"
-msgstr "????"
+msgstr "????"
 
 msgid "QQ Captcha Verification"
 msgstr ""
 
-#, fuzzy
 msgid "Enter the text from the image"
-msgstr "??????"
+msgstr "?????????"
 
 #, c-format
 msgid "Unknown reply when checking password (0x%02X)"
@@ -7683,31 +7539,25 @@ msgstr "?????"
 msgid "Socket error"
 msgstr "?????"
 
-#, fuzzy
 msgid "Getting server"
 msgstr "??????..."
 
-#, fuzzy
 msgid "Requesting token"
 msgstr "?????"
 
-#, fuzzy
 msgid "Unable to resolve hostname"
-msgstr "?????????"
+msgstr "???????"
 
-#, fuzzy
 msgid "Invalid server or port"
-msgstr "????"
+msgstr "????????"
 
-#, fuzzy
 msgid "Connecting to server"
-msgstr "??? SILC ???"
+msgstr "????????"
 
-#, fuzzy
 msgid "QQ Error"
-msgstr "QQ ???"
+msgstr "QQ ??"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Server News:\n"
 "%s\n"
@@ -7715,23 +7565,22 @@ msgstr "ICQ ?????"
 "%s"
 msgstr "ICQ ?????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s:%s"
-msgstr "%s(%s)"
+msgstr "%s:%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "From %s:"
-msgstr "??"
+msgstr "?? %s:"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Server notice From %s: \n"
 "%s"
 msgstr "?????:%s"
 
-#, fuzzy
 msgid "Unknown SERVER CMD"
-msgstr "????"
+msgstr "???????"
 
 #, c-format
 msgid ""
@@ -7739,21 +7588,17 @@ msgstr ""
 "Room %u, reply 0x%02X"
 msgstr ""
 
-#, fuzzy
 msgid "QQ Qun Command"
-msgstr "??"
+msgstr "QQ ???"
 
-#, fuzzy
 msgid "Unable to decrypt login reply"
-msgstr "?????????"
+msgstr "???????????"
 
-#, fuzzy
 msgid "Unknown LOGIN CMD"
-msgstr "????"
+msgstr "??????"
 
-#, fuzzy
 msgid "Unknown CLIENT CMD"
-msgstr "????"
+msgstr "???????"
 
 #, c-format
 msgid "%d has declined the file %s"
@@ -7762,8 +7607,8 @@ msgstr "????"
 msgid "File Send"
 msgstr "????"
 
-#, c-format
-msgid "%d canceled the transfer of %s"
+#, fuzzy, c-format
+msgid "%d cancelled the transfer of %s"
 msgstr "%d ??? %s ???"
 
 #, c-format
@@ -7779,13 +7624,13 @@ msgid "Notes Address Book Information"
 msgstr "? %s ???"
 
 msgid "Notes Address Book Information"
-msgstr "Notes ?????"
+msgstr "Notes ?????"
 
 msgid "Invite Group to Conference..."
 msgstr "???????..."
 
 msgid "Get Notes Address Book Info"
-msgstr "?? Notes ?????"
+msgstr "?? Notes ?????"
 
 msgid "Sending Handshake"
 msgstr "????"
@@ -7794,16 +7639,16 @@ msgid "Handshake Acknowledged, Sending L
 msgstr "??????"
 
 msgid "Handshake Acknowledged, Sending Login"
-msgstr ""
+msgstr "????,??????"
 
 msgid "Waiting for Login Acknowledgement"
-msgstr ""
+msgstr "????????"
 
 msgid "Login Redirected"
 msgstr "??????"
 
 msgid "Forcing Login"
-msgstr "????"
+msgstr "????"
 
 msgid "Login Acknowledged"
 msgstr "?????"
@@ -7829,7 +7674,6 @@ msgstr "??????: "
 msgid "Unable to send message: "
 msgstr "??????: "
 
-#, fuzzy
 msgid "Place Closed"
 msgstr "???"
 
@@ -7916,7 +7760,6 @@ msgstr "?? (0x%04x)<br>"
 msgid "Unknown (0x%04x)<br>"
 msgstr "?? (0x%04x)<br>"
 
-#, fuzzy
 msgid "Last Known Client"
 msgstr "????"
 
@@ -7929,7 +7772,7 @@ msgstr ""
 msgid "An ambiguous user ID was entered"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
 "select the correct user from the list below to add them to your buddy list."
@@ -7996,7 +7839,7 @@ msgid "Notes Address Book group results"
 msgstr "?????"
 
 msgid "Notes Address Book group results"
-msgstr "Notes ??????"
+msgstr "Notes ??????"
 
 #, c-format
 msgid ""
@@ -8006,7 +7849,7 @@ msgid "Select Notes Address Book"
 msgstr ""
 
 msgid "Select Notes Address Book"
-msgstr "?? Notes ???"
+msgstr "?? Notes ???"
 
 msgid "Unable to add group: group not found"
 msgstr "??????:????"
@@ -8018,7 +7861,7 @@ msgid "Notes Address Book Group"
 msgstr ""
 
 msgid "Notes Address Book Group"
-msgstr "Notes ????"
+msgstr "Notes ????"
 
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
@@ -8067,7 +7910,7 @@ msgid "Add Notes Address Book Group..."
 msgstr "?? Sametime ??..."
 
 msgid "Add Notes Address Book Group..."
-msgstr "?? Notes ????..."
+msgstr "?? Notes ????..."
 
 msgid "User Search..."
 msgstr "????..."
@@ -8130,7 +7973,7 @@ msgid "IM With Password"
 msgstr "??????"
 
 msgid "IM With Password"
-msgstr "?????"
+msgstr "?????"
 
 msgid "Cannot set IM key"
 msgstr "????????"
@@ -8148,7 +7991,7 @@ msgid "Could not load public key"
 msgstr "????"
 
 msgid "Could not load public key"
-msgstr "??????"
+msgstr "??????"
 
 msgid "User Information"
 msgstr "????"
@@ -8268,10 +8111,10 @@ msgid "IM with Key Exchange"
 msgstr "??????"
 
 msgid "IM with Key Exchange"
-msgstr "???????"
+msgstr "???????"
 
 msgid "IM with Password"
-msgstr "?????"
+msgstr "?????"
 
 msgid "Get Public Key..."
 msgstr "????..."
@@ -8283,7 +8126,7 @@ msgid "_Passphrase:"
 msgstr "??????"
 
 msgid "_Passphrase:"
-msgstr "???(_P):"
+msgstr "??(_P):"
 
 #, c-format
 msgid "Channel %s does not exist in the network"
@@ -8309,7 +8152,7 @@ msgid "<br><b>Channel Cipher:</b> %s"
 
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
-msgstr "<br><b>?????:</b> %s"
+msgstr "<br><b>????:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
 #, c-format
@@ -8340,7 +8183,7 @@ msgid "Channel Passphrase"
 msgstr "????..."
 
 msgid "Channel Passphrase"
-msgstr "?????"
+msgstr "????"
 
 msgid "Channel Public Keys List"
 msgstr "??????"
@@ -8353,9 +8196,9 @@ msgstr ""
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
 msgstr ""
-"??????????????????????????????????????"
-"????????,???????????????????????,?????"
-"???????????????"
+"??????????????????????????????????????"
+"??????,??????????????????????,????????"
+"????????????"
 
 msgid "Channel Authentication"
 msgstr "????"
@@ -8367,11 +8210,11 @@ msgid "Passphrase"
 msgstr "???"
 
 msgid "Passphrase"
-msgstr "???"
+msgstr "??"
 
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
-msgstr "??? %s ?????????????"
+msgstr "??? %s ????????????"
 
 msgid "Add Channel Private Group"
 msgstr "???????"
@@ -8413,10 +8256,10 @@ msgid "Reset Secret Channel"
 msgstr "??????"
 
 msgid "Reset Secret Channel"
-msgstr "??????"
+msgstr "??????"
 
 msgid "Set Secret Channel"
-msgstr "??????"
+msgstr "??????"
 
 #, c-format
 msgid ""
@@ -8513,7 +8356,7 @@ msgid "Server signoff"
 msgstr "? %s (%s) ??"
 
 msgid "Server signoff"
-msgstr "?????"
+msgstr "?????"
 
 msgid "Personal Information"
 msgstr "????"
@@ -8522,7 +8365,7 @@ msgid "Job Role"
 msgstr "??"
 
 msgid "Job Role"
-msgstr "??"
+msgstr "??"
 
 msgid "Organization"
 msgstr "??"
@@ -8569,10 +8412,10 @@ msgid "Roomlist"
 msgstr "??????"
 
 msgid "Roomlist"
-msgstr "????"
+msgstr "?????"
 
 msgid "Cannot get room list"
-msgstr "????????"
+msgstr "?????????"
 
 msgid "Network is empty"
 msgstr "????"
@@ -8657,7 +8500,7 @@ msgid "Passphrase required"
 msgstr "???????"
 
 msgid "Passphrase required"
-msgstr "?????"
+msgstr "????"
 
 #, c-format
 msgid ""
@@ -8693,7 +8536,6 @@ msgstr "???????"
 msgid "Disconnected by server"
 msgstr "???????"
 
-#, fuzzy
 msgid "Error connecting to SILC Server"
 msgstr "??? SILC ??????"
 
@@ -8707,34 +8549,28 @@ 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 ??"
 
 msgid "Error loading SILC key pair"
-msgstr "?? SILC ?????"
+msgstr "?? SILC ?????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Download %s: %s"
-msgstr "%s ?????: %s"
+msgstr "?? %s:%s"
 
 msgid "Your Current Mood"
-msgstr "??????"
+msgstr "??????"
 
 #, c-format
 msgid "Normal"
@@ -8772,7 +8608,7 @@ msgid "Your VCard File"
 msgstr "????????????????"
 
 msgid "Your VCard File"
-msgstr "?? VCard ??"
+msgstr "?? vCard ??"
 
 msgid "Timezone (UTC)"
 msgstr "??(UTC)"
@@ -8801,7 +8637,7 @@ msgid "Passphrases do not match"
 msgstr "???? SILC ???"
 
 msgid "Passphrases do not match"
-msgstr "??????"
+msgstr "?????"
 
 msgid "Key Pair Generation failed"
 msgstr "???????"
@@ -8816,7 +8652,7 @@ msgid "Passphrase (retype)"
 msgstr "????"
 
 msgid "Passphrase (retype)"
-msgstr "???(??)"
+msgstr "??(??)"
 
 msgid "Generate Key Pair"
 msgstr "?????"
@@ -8861,16 +8697,16 @@ msgid "part [channel]:  Leave the chat"
 msgstr "????: %s,(?????? bug)"
 
 msgid "part [channel]:  Leave the chat"
-msgstr "part [??]: ????"
+msgstr "part [??]: ????"
 
 msgid "leave [channel]:  Leave the chat"
-msgstr "leave [??]: ????"
+msgstr "leave [??]: ????"
 
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;???&gt;]: ???????"
 
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr "join: &lt;??&gt; [&lt;???&gt;]: ??????????"
+msgstr "join: &lt;???&gt; [&lt;???&gt;]: ??????????"
 
 msgid "list:  List channels on this network"
 msgstr "list: ?????????"
@@ -8920,7 +8756,7 @@ msgid "oper &lt;nick&gt; [-pubkey]:  Get
 msgstr "umode &lt;????&gt;: ??????????"
 
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
-msgstr "oper &lt;??&gt; [-pubkey]: ??????????"
+msgstr "oper &lt;??&gt; [-pubkey]:??????????"
 
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
@@ -8938,7 +8774,7 @@ msgid "getkey &lt;nick|server&gt;:  Retr
 msgstr "ban [&lt;??&gt; +|-&lt;??&gt;]: ????????"
 
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr "getkey &lt;??|???&gt;: ???????????"
+msgstr "getkey &lt;??|???&gt;:???????????"
 
 msgid "stats:  View server and network statistics"
 msgstr "stat: ??????????"
@@ -9008,9 +8844,8 @@ msgstr "?? SILC ???..."
 msgid "Creating SILC key pair..."
 msgstr "?? SILC ???..."
 
-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "?? SILC ???..."
+msgstr "???? SILC ???"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9047,9 +8882,9 @@ msgstr "????:\t%d ?\n"
 msgid "Key Length: \t%d bits\n"
 msgstr "????:\t%d ?\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Version: \t%s\n"
-msgstr "??: %s"
+msgstr "??:\t%s\n"
 
 #, c-format
 msgid ""
@@ -9146,33 +8981,28 @@ msgstr "??: ??????"
 msgid "Failure: Authentication failed"
 msgstr "??: ??????"
 
-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
 msgstr "????? SILC ????"
 
 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 "?????????"
 
-#, fuzzy
 msgid "Unable to create listen socket"
 msgstr "???????"
 
-#, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP ?????????? @ ??"
 
-#, fuzzy
 msgid "SIP connect server not specified"
 msgstr "?????"
 
@@ -9210,17 +9040,16 @@ msgid "join &lt;room&gt;:  Join a chat r
 msgstr "???"
 
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;??&gt;: ?? Yahoo ???????"
+msgstr "join: &lt;???&gt;: ?? Yahoo ???????"
 
 msgid "list: List rooms on the Yahoo network"
-msgstr "list: ?? Yahoo ??????"
+msgstr "list: ?? Yahoo ???????"
 
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
-#, fuzzy
 msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
+msgstr "Yahoo ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -9232,7 +9061,6 @@ msgstr "Yahoo! ID"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo ????"
 
@@ -9249,13 +9077,16 @@ msgid "Chat room locale"
 msgstr "??????"
 
 msgid "Chat room locale"
-msgstr "??????"
+msgstr "???????"
 
 msgid "Ignore conference and chatroom invitations"
 msgstr "??????????"
 
+msgid "Use account proxy for SSL connections"
+msgstr ""
+
 msgid "Chat room list URL"
-msgstr "?????? URL"
+msgstr "??????? URL"
 
 msgid "Yahoo Chat server"
 msgstr "Yahoo ?????"
@@ -9263,9 +9094,8 @@ msgstr "Yahoo ????"
 msgid "Yahoo Chat port"
 msgstr "Yahoo ????"
 
-#, fuzzy
 msgid "Yahoo JAPAN ID..."
-msgstr "Yahoo! ID"
+msgstr "Yahoo ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -9277,12 +9107,15 @@ msgstr "Yahoo! ID"
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
 msgstr "Yahoo ????"
 
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s ???????????,??????"
+
 msgid "Your SMS was not delivered"
-msgstr ""
+msgstr "?? SMS ????"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "????? Yahoo! ???"
@@ -9305,26 +9138,22 @@ 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! ???????"
 
 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
 msgstr "????? %d???? Yahoo! ???????"
 
 #. username or password missing
-#, fuzzy
 msgid "Username or password missing"
 msgstr "???????"
 
@@ -9334,7 +9163,7 @@ msgstr ""
 "method.  You will probably not be able to successfully sign on to Yahoo.  "
 "Check %s for updates."
 msgstr ""
-"Yahoo ????????????????????????? Yahoo???? %s ?"
+"Yahoo ????????????????????????? Yahoo???? %s ?"
 "????"
 
 msgid "Failed Yahoo! Authentication"
@@ -9350,18 +9179,33 @@ msgstr "?????"
 msgid "Ignore buddy?"
 msgstr "?????"
 
-msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "???????,???? Yahoo! ???"
+#, fuzzy
+msgid "Invalid username or password"
+msgstr "????????"
 
+#, fuzzy
+msgid ""
+"Your account has been locked due to too many failed login attempts.  Please "
+"try logging into the Yahoo! website."
+msgstr "????? %d???? Yahoo! ???????"
+
 #, c-format
+msgid "Unknown error 52.  Reconnecting should fix this."
+msgstr ""
+
+msgid ""
+"Error 1013: The username you have entered is invalid.  The most common cause "
+"of this error is entering your email address instead of your Yahoo! ID."
+msgstr ""
+
+#, 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 "????? %s ????? %s ?????????? %s?"
 
-#, fuzzy
 msgid "Unable to add buddy to server list"
 msgstr "?????????????"
 
@@ -9369,17 +9213,16 @@ msgstr ""
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-#, fuzzy
 msgid "Received unexpected HTTP response from server"
 msgstr "?????????? HTTP ???"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with %s: %s"
 msgstr ""
 "??? %s ???:\n"
 "%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
 msgstr "??????????"
 
@@ -9407,15 +9250,14 @@ msgstr "???????"
 msgid "Appear Permanently Offline"
 msgstr "???????"
 
-#, fuzzy
 msgid "Presence"
-msgstr "???"
+msgstr ""
 
 msgid "Appear Offline"
 msgstr "?????"
 
 msgid "Don't Appear Permanently Offline"
-msgstr "???????"
+msgstr "???????"
 
 msgid "Join in Chat"
 msgstr "????"
@@ -9423,7 +9265,6 @@ msgstr "????"
 msgid "Initiate Conference"
 msgstr "????"
 
-#, fuzzy
 msgid "Presence Settings"
 msgstr "??????"
 
@@ -9431,7 +9272,7 @@ msgid "Select the ID you want to activat
 msgstr ""
 
 msgid "Select the ID you want to activate"
-msgstr ""
+msgstr "??????? ID"
 
 msgid "Join whom in chat?"
 msgstr "???????"
@@ -9457,15 +9298,15 @@ msgstr "??????????"
 msgid "Unable to establish file descriptor."
 msgstr "??????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s is trying to send you a group of %d files.\n"
-msgstr "%s ?????? %s"
+msgstr "%s ?????? %s\n"
 
 msgid "Write Error"
 msgstr "???"
 
 msgid "Yahoo! Japan Profile"
-msgstr "Yahoo ????"
+msgstr "Yahoo! ????"
 
 msgid "Yahoo! Profile"
 msgstr "Yahoo! ??"
@@ -9473,7 +9314,7 @@ msgid ""
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
-msgstr "??,????????????????????"
+msgstr "???,????????????????????"
 
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
@@ -9504,10 +9345,9 @@ msgstr "????"
 msgid "Last Update"
 msgstr "????"
 
-#, fuzzy
 msgid ""
 "This profile is in a language or format that is not supported at this time."
-msgstr "??,?????????????????????"
+msgstr "???,?????????????????????"
 
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
@@ -9526,22 +9366,19 @@ 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 "??????"
 
 #. -6
 msgid "Unknown room"
-msgstr "????"
+msgstr "?????"
 
 #. -15
 msgid "Maybe the room is full"
-msgstr "??????"
+msgstr "???????"
 
 #. -35
 msgid "Not available"
@@ -9563,7 +9400,7 @@ msgid "Fetching the room list failed."
 msgstr "??????????"
 
 msgid "Fetching the room list failed."
-msgstr "?????????"
+msgstr "??????????"
 
 msgid "Voices"
 msgstr "??"
@@ -9575,12 +9412,11 @@ msgid "Unable to fetch room list."
 msgstr "????"
 
 msgid "Unable to fetch room list."
-msgstr "?????????"
+msgstr "??????????"
 
 msgid "User Rooms"
-msgstr "????"
+msgstr "?????"
 
-#, fuzzy
 msgid "Connection problem with the YCHT server"
 msgstr "YCHT ??????????"
 
@@ -9594,7 +9430,7 @@ msgid "Hidden or not logged-in"
 msgstr "??????? %s,%s,%s"
 
 msgid "Hidden or not logged-in"
-msgstr "??????"
+msgstr "??????"
 
 #, c-format
 msgid "<br>At %s since %s"
@@ -9704,15 +9540,15 @@ 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
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "?????: HTTP ????????? %d ???"
 
@@ -9772,18 +9608,15 @@ msgstr "????????"
 msgstr "????????"
 
 #. Shortcut
-#, fuzzy
 msgid "Shortcut"
-msgstr "??"
+msgstr "????"
 
-#, fuzzy
 msgid "The text-shortcut for the smiley"
-msgstr "GTK+ ????????"
+msgstr "?????????"
 
 #. Stored Image
-#, fuzzy
 msgid "Stored Image"
-msgstr "????"
+msgstr "?????"
 
 msgid "Stored Image. (that'll have to do for now)"
 msgstr ""
@@ -9810,11 +9643,11 @@ msgid "Listening to music"
 msgstr "????"
 
 msgid "Listening to music"
-msgstr ""
+msgstr "?????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s) changed status from %s to %s"
-msgstr "%s ???? %s ??? %s"
+msgstr "%s (%s) ???? %s ??? %s"
 
 #, c-format
 msgid "%s (%s) is now %s"
@@ -9856,41 +9689,35 @@ msgstr "???"
 msgid "Unknown."
 msgstr "???"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] "%d ?"
-msgstr[1] "%d ?"
+msgstr[0] "???"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] "%d ?"
-msgstr[1] "%d ?"
+msgstr[0] "???"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
-msgstr[0] "%s %d ??"
-msgstr[1] "%s %d ??"
+msgstr[0] "???"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] "%d ??"
-msgstr[1] "%d ??"
+msgstr[0] "???"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
-msgstr[0] "%s %d ?"
-msgstr[1] "%s %d ?"
+msgstr[0] "???"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] "%d ?"
-msgstr[1] "%d ?"
+msgstr[0] "???"
 
 #, c-format
 msgid "Could not open %s: Redirected too many times"
@@ -9900,7 +9727,7 @@ msgstr "????? %s"
 msgid "Unable to connect to %s"
 msgstr "????? %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
 msgstr "??????????"
 
@@ -9910,9 +9737,9 @@ msgstr ""
 "server may be trying something malicious."
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from %s: %s"
-msgstr "??????????"
+msgstr "? %s ????:%s"
 
 #, c-format
 msgid "Error writing to %s: %s"
@@ -9926,44 +9753,44 @@ msgstr ""
 msgid " - %s"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid " (%s)"
-msgstr "%s(%s)"
+msgstr " (%s)"
 
 #. 10053
 #, c-format
 msgid "Connection interrupted by other software on your computer."
-msgstr ""
+msgstr "????????????????"
 
 #. 10054
-#, fuzzy, c-format
+#, c-format
 msgid "Remote host closed connection."
-msgstr "??????????"
+msgstr "??????????"
 
 #. 10060
-#, fuzzy, c-format
+#, c-format
 msgid "Connection timed out."
-msgstr "????"
+msgstr "?????"
 
 #. 10061
-#, fuzzy, c-format
+#, c-format
 msgid "Connection refused."
-msgstr "????"
+msgstr "??????"
 
 #. 10048
-#, fuzzy, c-format
+#, c-format
 msgid "Address already in use."
-msgstr "??????????"
+msgstr "????????"
 
 #, c-format
 msgid "Error Reading %s"
 msgstr "?? %s ??"
 
-#, fuzzy, c-format
+#, 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~."
-msgstr "???? %s ?????????????,??????? %s~ ???"
+msgstr "???? %s ?????????????,??????? %s~ ???"
 
 msgid "Internet Messenger"
 msgstr "???????"
@@ -9982,7 +9809,7 @@ msgid "Login Options"
 
 #. Build the login options frame.
 msgid "Login Options"
-msgstr "????"
+msgstr "????"
 
 msgid "Pro_tocol:"
 msgstr "??(_T):"
@@ -10007,7 +9834,7 @@ msgstr "????????(_I):"
 msgid "Use this buddy _icon for this account:"
 msgstr "????????(_I):"
 
-msgid "_Advanced"
+msgid "Ad_vanced"
 msgstr "??(_A)"
 
 msgid "Use GNOME Proxy Settings"
@@ -10067,12 +9894,10 @@ msgstr "??(_B)"
 msgid "_Basic"
 msgstr "??(_B)"
 
-#, fuzzy
 msgid "Create _this new account on the server"
-msgstr "???????????"
+msgstr "???????????(_T)"
 
-#, fuzzy
-msgid "_Proxy"
+msgid "P_roxy"
 msgstr "??"
 
 msgid "Enabled"
@@ -10081,7 +9906,7 @@ msgstr "??"
 msgid "Protocol"
 msgstr "??"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
@@ -10102,12 +9927,130 @@ msgstr ""
 "??????????????????????,?????????????<b>?"
 "?->??/??</b>"
 
-#, fuzzy, c-format
+#. Buddy List
+msgid "Background Color"
+msgstr "????"
+
+msgid "The background color for the buddy list"
+msgstr "?????????"
+
+msgid "Layout"
+msgstr "??"
+
+msgid "The layout of icons, name, and status of the buddy list"
+msgstr ""
+
+#. Group
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Background Color"
+msgstr "????"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Text"
+msgstr "????"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Background Color"
+msgstr "??????"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Text"
+msgstr "????(_C)"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list contact or chat room
+msgid "Contact/Chat Background Color"
+msgstr "???/??????"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list contact when in its expanded state
+msgid "Contact Text"
+msgstr "?????"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is online
+#, fuzzy
+msgid "Online Text"
+msgstr "????"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is away
+msgid "Away Text"
+msgstr "????"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is offline
+#, fuzzy
+msgid "Offline Text"
+msgstr "????"
+
+#, fuzzy
+msgid "The text information for when a buddy is offline"
+msgstr "?? %s ?????"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is idle
+msgid "Idle Text"
+msgstr "????"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message Text"
+msgstr "????"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nickname"
+msgstr ""
+
+msgid "The text information for a buddy's status"
+msgstr "?? %s ?????"
+
+#, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
 "You currently have %d contacts named %s. Would you like to merge them?"
-msgstr[0] "?????? %2$s ? %1$d ?????????????"
-msgstr[1] "?????? %2$s ? %1$d ?????????????"
+msgstr[0] "?? %s ?????"
 
 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
@@ -10128,9 +10071,8 @@ msgstr "??????????? "join.\n"
 msgstr "?????????????????\n"
 
-#, fuzzy
 msgid "Room _List"
-msgstr "????"
+msgstr "?????(_L)"
 
 msgid "_Block"
 msgstr "??(_B)"
@@ -10142,21 +10084,19 @@ msgid "Get _Info"
 msgstr "??"
 
 msgid "Get _Info"
-msgstr "??(_I)"
+msgstr "????(_I)"
 
 msgid "I_M"
-msgstr "??(_M)"
+msgstr "??(_M)"
 
-#, fuzzy
 msgid "_Audio Call"
-msgstr "????(_A)"
+msgstr "????(_A)"
 
 msgid "Audio/_Video Call"
-msgstr ""
+msgstr "??/?? ??(_V)"
 
-#, fuzzy
 msgid "_Video Call"
-msgstr "????"
+msgstr "????(_V)"
 
 msgid "_Send File..."
 msgstr "????(_S)..."
@@ -10165,13 +10105,11 @@ msgid "View _Log"
 msgstr "???????(_P)..."
 
 msgid "View _Log"
-msgstr "????(_L)"
+msgstr "??????(_L)"
 
-#, fuzzy
 msgid "Hide When Offline"
 msgstr "?????"
 
-#, fuzzy
 msgid "Show When Offline"
 msgstr "?????"
 
@@ -10181,9 +10119,8 @@ msgstr "??(_R)"
 msgid "_Remove"
 msgstr "??(_R)"
 
-#, fuzzy
 msgid "Set Custom Icon"
-msgstr "???????..."
+msgstr "???????"
 
 msgid "Remove Custom Icon"
 msgstr "???????"
@@ -10210,9 +10147,8 @@ msgstr "??"
 msgid "Persistent"
 msgstr "??"
 
-#, fuzzy
 msgid "_Edit Settings..."
-msgstr "????"
+msgstr "????(_E)..."
 
 msgid "_Collapse"
 msgstr "??(_C)"
@@ -10221,16 +10157,15 @@ msgid "/Tools/Mute Sounds"
 msgstr "??(_E)"
 
 msgid "/Tools/Mute Sounds"
-msgstr "/??(T)/??(S)"
+msgstr "/??/??"
 
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
-msgstr "?????????????????????"
+msgstr "?????????????????????"
 
 #. I don't believe this can happen currently, I think
 #. * everything that calls this function checks for one of the
 #. * above node types first.
-#, fuzzy
 msgid "Unknown node type"
 msgstr "??????? %d"
 
@@ -10248,7 +10183,7 @@ msgid "/Buddies/View User _Log..."
 msgstr "/??(B)/??????(_I)..."
 
 msgid "/Buddies/View User _Log..."
-msgstr "/??(B)/??????(_L)..."
+msgstr "/??(B)/????????(_L)..."
 
 msgid "/Buddies/Sh_ow"
 msgstr "/??(B)/??(_O)"
@@ -10287,89 +10222,84 @@ msgstr "/??(_A)"
 msgid "/_Accounts"
 msgstr "/??(_A)"
 
-#, fuzzy
 msgid "/Accounts/Manage Accounts"
-msgstr "/??(A)/??"
+msgstr "/??/????"
 
 #. Tools
 msgid "/_Tools"
 msgstr "/??(_T)"
 
 msgid "/Tools/Buddy _Pounces"
-msgstr "/??(T)/?????(_P)"
+msgstr "/??/?????(_P)"
 
 msgid "/Tools/_Certificates"
-msgstr "/??(T)/??(_C)"
+msgstr "/??/??(_C)"
 
-#, fuzzy
 msgid "/Tools/Custom Smile_ys"
-msgstr "/??(T)/??(I)"
+msgstr "/??/?????(_Y)"
 
 msgid "/Tools/Plu_gins"
-msgstr "/??(T)/??(_G)"
+msgstr "/??/??(_G)"
 
 msgid "/Tools/Pr_eferences"
-msgstr "/??(T)/???(_E)"
+msgstr "/??/???(_E)"
 
 msgid "/Tools/Pr_ivacy"
-msgstr "/??(T)/??(_I)"
+msgstr "/??/??(_I)"
 
 msgid "/Tools/_File Transfers"
-msgstr "/??(T)/????(_F)"
+msgstr "/??/????(_F)"
 
 msgid "/Tools/R_oom List"
-msgstr "/??(T)/????(_O)"
+msgstr "/??/?????(_O)"
 
 msgid "/Tools/System _Log"
-msgstr "/??(T)/????(_L)"
+msgstr "/??/????(_L)"
 
 msgid "/Tools/Mute _Sounds"
-msgstr "/??(T)/??(_S)"
+msgstr "/??/??(_S)"
 
 #. Help
 msgid "/_Help"
 msgstr "/??(_H)"
 
 msgid "/Help/Online _Help"
-msgstr "/??(H)/????(_H)"
+msgstr "/??/????(_H)"
 
 msgid "/Help/_Debug Window"
-msgstr "/??(H)/????(_D)"
+msgstr "/??/????(_D)"
 
 msgid "/Help/_About"
-msgstr "/??(H)/??(_A)"
+msgstr "/??/??(_A)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Account:</b> %s"
-msgstr ""
-"\n"
-"<b>??:</b>%s"
+msgstr "<b>??:</b>%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Occupants:</b> %d"
 msgstr ""
 "\n"
-"<b>??:</b>%s"
+"<b>??:</b>%d"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Topic:</b> %s"
 msgstr ""
 "\n"
-"<b>??:</b>%s"
+"<b>??:</b>%s"
 
-#, fuzzy
 msgid "(no topic set)"
-msgstr "?????"
+msgstr "(?????)"
 
 msgid "Buddy Alias"
 msgstr "????"
 
 msgid "Logged In"
-msgstr "???"
+msgstr "???"
 
 msgid "Last Seen"
 msgstr "????"
@@ -10383,9 +10313,8 @@ msgstr ""
 msgid "Rockin'"
 msgstr ""
 
-#, fuzzy
 msgid "Total Buddies"
-msgstr "??"
+msgstr "????"
 
 #, c-format
 msgid "Idle %dd %dh %02dm"
@@ -10400,34 +10329,33 @@ msgid "/Buddies/New Instant Message..."
 msgstr "?? %d?"
 
 msgid "/Buddies/New Instant Message..."
-msgstr "/??(B)/?????(M)..."
+msgstr "/??/?????..."
 
 msgid "/Buddies/Join a Chat..."
-msgstr "/??(B)/????(C)..."
+msgstr "/??/????..."
 
 msgid "/Buddies/Get User Info..."
-msgstr "/??(B)/??????(I)..."
+msgstr "/??/??????..."
 
 msgid "/Buddies/Add Buddy..."
-msgstr "/??(B)/????(A)..."
+msgstr "/??/????..."
 
 msgid "/Buddies/Add Chat..."
-msgstr "/??(B)/????(H)..."
+msgstr "/??/????..."
 
 msgid "/Buddies/Add Group..."
-msgstr "/??(B)/???(G)..."
+msgstr "/??/???..."
 
 msgid "/Tools/Privacy"
-msgstr "/??(T)/??(I)"
+msgstr "/??/??"
 
 msgid "/Tools/Room List"
-msgstr "/??(T)/????(O)"
+msgstr "/??/?????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
-msgstr[0] "?? %2$s ? %1$d ?????\n"
-msgstr[1] "?? %2$s ? %1$d ?????\n"
+msgstr[0] "/??/?????\n"
 
 msgid "Manually"
 msgstr "??"
@@ -10436,35 +10364,33 @@ msgid "By recent log activity"
 msgstr "???"
 
 msgid "By recent log activity"
-msgstr ""
+msgstr "??????"
 
 #, c-format
 msgid "%s disconnected"
 msgstr "%s ?????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s disabled"
-msgstr "?????"
+msgstr "%s ???"
 
-#, fuzzy
 msgid "Reconnect"
-msgstr "??"
+msgstr "????"
 
-#, fuzzy
 msgid "Re-enable"
-msgstr "??????"
+msgstr "????"
 
 msgid "SSL FAQs"
-msgstr ""
+msgstr "SSL ????"
 
 msgid "Welcome back!"
-msgstr ""
+msgstr "????!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d account was disabled because you signed on from another location:"
 msgid_plural ""
 "%d accounts were disabled because you signed on from another location:"
-msgstr[0] "???????????????"
+msgstr[0] "????!"
 
 msgid "<b>Username:</b>"
 msgstr "<b>???:</b>"
@@ -10479,7 +10405,7 @@ msgstr "/??(A)"
 msgstr "/??(A)"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
@@ -10496,35 +10422,31 @@ msgid "/Buddies/Show/Offline Buddies"
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/??(B)/??(O)//????(O)"
+msgstr "/??/??/????"
 
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/??(B)/??(O)//??(E)"
+msgstr "/??/??/??"
 
 msgid "/Buddies/Show/Buddy Details"
-msgstr "/??(B)/??(O)//??????(D)"
+msgstr "/??/??/??????"
 
 msgid "/Buddies/Show/Idle Times"
-msgstr "/??(B)/??(O)/????(T)"
+msgstr "/??/??/????"
 
 msgid "/Buddies/Show/Protocol Icons"
-msgstr "/??(B)/??(O)/????(P)"
+msgstr "/??/??/????"
 
-#, fuzzy
 msgid "Add a buddy.\n"
-msgstr "????"
+msgstr "?????\n"
 
-#, fuzzy
 msgid "Buddy's _username:"
-msgstr "????:"
+msgstr "????(_U):"
 
-#, fuzzy
 msgid "(Optional) A_lias:"
-msgstr "????:"
+msgstr "??(??):"
 
-#, fuzzy
 msgid "Add buddy to _group:"
-msgstr "?????????"
+msgstr "???????:"
 
 msgid "This protocol does not support chat rooms."
 msgstr "??????????"
@@ -10532,7 +10454,7 @@ msgid ""
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
-msgstr "???????????????????"
+msgstr "???????????????????"
 
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
@@ -10546,10 +10468,9 @@ msgstr "?(_G):"
 msgstr "?(_G):"
 
 #, fuzzy
-msgid "Auto_join when account becomes online."
+msgid "Auto_join when account connects."
 msgstr "??????????"
 
-#, fuzzy
 msgid "_Remain in chat after window is closed."
 msgstr "??????????"
 
@@ -10560,10 +10481,10 @@ msgid "<PurpleMain>/Accounts/Enable Acco
 msgstr "????"
 
 msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr "<PurpleMain>/??(A)/????"
+msgstr "<PurpleMain>/??/????"
 
 msgid "<PurpleMain>/Accounts/"
-msgstr "<PurpleMain>/??(A)/"
+msgstr "<PurpleMain>/??/"
 
 msgid "_Edit Account"
 msgstr "????(_E)"
@@ -10575,118 +10496,11 @@ msgid "/Tools"
 msgstr "??(_D)"
 
 msgid "/Tools"
-msgstr "/??(T)"
+msgstr "/??"
 
 msgid "/Buddies/Sort Buddies"
-msgstr "/??(B)/????(S)"
+msgstr "/??/????"
 
-#. Buddy List
-msgid "Background Color"
-msgstr "????"
-
-#, fuzzy
-msgid "The background color for the buddy list"
-msgstr "???????????"
-
-#, fuzzy
-msgid "Layout"
-msgstr "???"
-
-msgid "The layout of icons, name, and status of the blist"
-msgstr ""
-
-#. Group
-#, fuzzy
-msgid "Expanded Background Color"
-msgstr "????"
-
-msgid "The background color of an expanded group"
-msgstr ""
-
-#, fuzzy
-msgid "Expanded Text"
-msgstr "??(_E)"
-
-msgid "The text information for when a group is expanded"
-msgstr ""
-
-#, fuzzy
-msgid "Collapsed Background Color"
-msgstr "??????"
-
-msgid "The background color of a collapsed group"
-msgstr ""
-
-#, fuzzy
-msgid "Collapsed Text"
-msgstr "??(_C)"
-
-msgid "The text information for when a group is collapsed"
-msgstr ""
-
-#. Buddy
-#, fuzzy
-msgid "Contact/Chat Background Color"
-msgstr "??????"
-
-msgid "The background color of a contact or chat"
-msgstr ""
-
-#, fuzzy
-msgid "Contact Text"
-msgstr "??"
-
-msgid "The text information for when a contact is expanded"
-msgstr ""
-
-#, fuzzy
-msgid "On-line Text"
-msgstr "??"
-
-msgid "The text information for when a buddy is online"
-msgstr ""
-
-#, fuzzy
-msgid "Away Text"
-msgstr "??"
-
-msgid "The text information for when a buddy is away"
-msgstr ""
-
-#, fuzzy
-msgid "Off-line Text"
-msgstr "??"
-
-msgid "The text information for when a buddy is off-line"
-msgstr ""
-
-#, fuzzy
-msgid "Idle Text"
-msgstr "??"
-
-msgid "The text information for when a buddy is idle"
-msgstr ""
-
-#, fuzzy
-msgid "Message Text"
-msgstr "?????"
-
-msgid "The text information for when a buddy has an unread message"
-msgstr ""
-
-msgid "Message (Nick Said) Text"
-msgstr ""
-
-msgid ""
-"The text information for when a chat has an unread message that mentions "
-"your nick"
-msgstr ""
-
-#, fuzzy
-msgid "The text information for a buddy's status"
-msgstr "?? %s ?????"
-
-#, fuzzy
 msgid "Type the host name for this certificate."
 msgstr "?????????????"
 
@@ -10702,7 +10516,7 @@ msgid ""
 
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
-msgstr "?????????????????????"
+msgstr "?????????????????????"
 
 msgid "Invite Buddy Into Chat Room"
 msgstr "?????????"
@@ -10715,7 +10529,7 @@ msgid "<h1>Conversation with %s</h1>\n"
 
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
-msgstr "<h1>? %s ???</h1>\n"
+msgstr "<h1>? %s ???</h1>\n"
 
 msgid "Save Conversation"
 msgstr "????"
@@ -10735,7 +10549,6 @@ msgstr "??????"
 msgid "Get Away Message"
 msgstr "??????"
 
-#, fuzzy
 msgid "Last Said"
 msgstr "????"
 
@@ -10757,9 +10570,8 @@ msgstr "???????..."
 msgid "Set Custom Icon..."
 msgstr "???????..."
 
-#, fuzzy
 msgid "Change Size"
-msgstr "????"
+msgstr "????"
 
 msgid "Show All"
 msgstr "????"
@@ -10769,96 +10581,96 @@ msgid "/Conversation/New Instant _Messag
 msgstr "/??(_C)"
 
 msgid "/Conversation/New Instant _Message..."
-msgstr "/??(C)/?????(_M)..."
+msgstr "/??/?????(_M)..."
 
+#, fuzzy
+msgid "/Conversation/Join a _Chat..."
+msgstr "/??/??(_V)..."
+
 msgid "/Conversation/_Find..."
-msgstr "/??(C)/??(_F)..."
+msgstr "/??/??(_F)..."
 
 msgid "/Conversation/View _Log"
-msgstr "/??(C)/????(_L)"
+msgstr "/??/??????(_L)"
 
 msgid "/Conversation/_Save As..."
-msgstr "/??(C)/???(_S)..."
+msgstr "/??/???(_S)..."
 
 msgid "/Conversation/Clea_r Scrollback"
-msgstr "/??(C)/????(_R)"
+msgstr "/??/????(_R)"
 
-#, fuzzy
 msgid "/Conversation/M_edia"
-msgstr "/??(C)/??(_O)"
+msgstr "/??/??(_E)"
 
-#, fuzzy
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/??(C)/??(_O)"
+msgstr "/??/??/????(_A)"
 
-#, fuzzy
 msgid "/Conversation/Media/_Video Call"
-msgstr "/??(C)/??(_O)"
+msgstr "/??/??/????(_V)"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/??(C)/????(_L)"
+msgstr "/??/??/??\\/????(_C)"
 
 msgid "/Conversation/Se_nd File..."
-msgstr "/??(C)/????(_N)..."
+msgstr "/??/????(_N)..."
 
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/??(C)/???????(_P)..."
+msgstr "/??/???????(_P)..."
 
 msgid "/Conversation/_Get Info"
-msgstr "/??(C)/????(_G)"
+msgstr "/??/????(_G)"
 
 msgid "/Conversation/In_vite..."
-msgstr "/??(C)/??(_V)..."
+msgstr "/??/??(_V)..."
 
 msgid "/Conversation/M_ore"
-msgstr "/??(C)/??(_O)"
+msgstr "/??/??(_O)"
 
 msgid "/Conversation/Al_ias..."
-msgstr "/??(C)/??(_L)..."
+msgstr "/??/??(_L)..."
 
 msgid "/Conversation/_Block..."
-msgstr "/??(C)/??(_B)..."
+msgstr "/??/??(_B)..."
 
 msgid "/Conversation/_Unblock..."
-msgstr "/??(C)/????(_U)..."
+msgstr "/??/????(_U)..."
 
 msgid "/Conversation/_Add..."
-msgstr "/??(C)/??(_A)..."
+msgstr "/??/??(_A)..."
 
 msgid "/Conversation/_Remove..."
-msgstr "/??(C)/??(_R)..."
+msgstr "/??/??(_R)..."
 
 msgid "/Conversation/Insert Lin_k..."
-msgstr "/??(C)/????(_K)..."
+msgstr "/??/????(_K)..."
 
 msgid "/Conversation/Insert Imag_e..."
-msgstr "/??(C)/????(_E)..."
+msgstr "/??/????(_E)..."
 
 msgid "/Conversation/_Close"
-msgstr "/??(C)/??(_C)"
+msgstr "/??/??(_C)"
 
 #. Options
 msgid "/_Options"
 msgstr "/??(_O)"
 
 msgid "/Options/Enable _Logging"
-msgstr "/??(O)/??????(_L)"
+msgstr "/??/??????(_L)"
 
 msgid "/Options/Enable _Sounds"
-msgstr "/??(O)/????(_S)"
+msgstr "/??/????(_S)"
 
 msgid "/Options/Show Formatting _Toolbars"
-msgstr "/??(O)/???????(_T)"
+msgstr "/??/???????(_T)"
 
 msgid "/Options/Show Ti_mestamps"
-msgstr "/??(O)/?????(_I)"
+msgstr "/??/?????(_M)"
 
 msgid "/Conversation/More"
-msgstr "/??(C)/??(O)"
+msgstr "/??/??"
 
 msgid "/Options"
-msgstr "/??(O)"
+msgstr "/??"
 
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
@@ -10866,76 +10678,75 @@ msgid "/Conversation"
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
 msgid "/Conversation"
-msgstr "/??(C)"
+msgstr "/??"
 
 msgid "/Conversation/View Log"
-msgstr "/??(C)/????(L)"
+msgstr "/??/??????"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio Call"
-msgstr "/??(C)/??(O)"
+msgstr "/??/??/????"
 
-#, fuzzy
 msgid "/Conversation/Media/Video Call"
-msgstr "/??(C)/????(L)"
+msgstr "/??/??/????"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/??(C)/??(O)"
+msgstr "/??/??/??\\/????"
 
 msgid "/Conversation/Send File..."
-msgstr "/??(C)/????(N)..."
+msgstr "/??/????..."
 
 msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/??(C)/???????(P)..."
+msgstr "/??/???????..."
 
 msgid "/Conversation/Get Info"
-msgstr "/??(C)/????(G)"
+msgstr "/??/????"
 
 msgid "/Conversation/Invite..."
-msgstr "/??(C)/??(V)..."
+msgstr "/??/??..."
 
 msgid "/Conversation/Alias..."
-msgstr "/??(C)/??(L)..."
+msgstr "/??/??..."
 
 msgid "/Conversation/Block..."
-msgstr "/??(C)/??(B)..."
+msgstr "/??/??..."
 
 msgid "/Conversation/Unblock..."
-msgstr "/??(C)/????(U)..."
+msgstr "/??/????..."
 
 msgid "/Conversation/Add..."
-msgstr "/??(C)/??(A)..."
+msgstr "/??/??..."
 
 msgid "/Conversation/Remove..."
-msgstr "/??(C)/??(R)..."
+msgstr "/??/??..."
 
 msgid "/Conversation/Insert Link..."
-msgstr "/??(C)/????(K)..."
+msgstr "/??/????..."
 
 msgid "/Conversation/Insert Image..."
-msgstr "/??(C)/????(E)..."
+msgstr "/??/????..."
 
 msgid "/Options/Enable Logging"
-msgstr "/??(O)/????(L)"
+msgstr "/??/??????"
 
 msgid "/Options/Enable Sounds"
-msgstr "/??(O)/????(S)"
+msgstr "/??/????"
 
 msgid "/Options/Show Formatting Toolbars"
-msgstr "/??(O)/???????(T)"
+msgstr "/??/???????"
 
 msgid "/Options/Show Timestamps"
-msgstr "/??(O)/?????(I)"
+msgstr "/??/?????"
 
 msgid "User is typing..."
 msgstr "??????..."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "%s has stopped typing"
-msgstr "%s ???????(%s)"
+msgstr ""
+"\n"
+"%s ?????(%s)"
 
 #. Build the Send To menu
 msgid "S_end To"
@@ -10948,17 +10759,16 @@ msgstr "???????"
 msgid "0 people in room"
 msgstr "???????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
-msgstr[0] "????? %d ??"
-msgstr[1] "????? %d ??"
+msgstr[0] "???????"
 
 msgid "Typing"
-msgstr "???"
+msgstr "????"
 
 msgid "Stopped Typing"
-msgstr "????"
+msgstr "?????"
 
 msgid "Nick Said"
 msgstr "???"
@@ -11009,19 +10819,19 @@ msgid "Save Debug Log"
 msgstr "???"
 
 msgid "Save Debug Log"
-msgstr "??????"
+msgstr "????????"
 
 msgid "Invert"
-msgstr "??"
+msgstr "??"
 
 msgid "Highlight matches"
 msgstr "???????"
 
 msgid "_Icon Only"
-msgstr "????(_I)"
+msgstr "???(_I)"
 
 msgid "_Text Only"
-msgstr "????(_T)"
+msgstr "???(_T)"
 
 msgid "_Both Icon & Text"
 msgstr "?????(_B)"
@@ -11042,7 +10852,7 @@ msgid "Misc"
 msgstr "??"
 
 msgid "Misc"
-msgstr "??"
+msgstr "??"
 
 msgid "Warning"
 msgstr "??"
@@ -11051,12 +10861,11 @@ msgid "Fatal Error"
 msgstr "?? "
 
 msgid "Fatal Error"
-msgstr "????"
+msgstr "????"
 
 msgid "bug master"
-msgstr ""
+msgstr "Bug ??"
 
-#, fuzzy
 msgid "artist"
 msgstr "??"
 
@@ -11065,17 +10874,16 @@ msgid "voice and video"
 msgstr "???"
 
 msgid "voice and video"
-msgstr ""
+msgstr "?????"
 
 msgid "support"
 msgstr "??"
 
-#, fuzzy
 msgid "webmaster"
-msgstr "??????"
+msgstr "?????"
 
 msgid "Senior Contributor/QA"
-msgstr ""
+msgstr "?????/????"
 
 msgid "win32 port"
 msgstr "Win32 ??"
@@ -11094,22 +10902,22 @@ msgid "XMPP"
 msgstr "??/??"
 
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 msgid "original author"
 msgstr "???"
 
 msgid "lead developer"
-msgstr "?????"
+msgstr "?????"
 
 msgid "Afrikaans"
-msgstr ""
+msgstr "?????"
 
 msgid "Arabic"
 msgstr "????"
 
 msgid "Belarusian Latin"
-msgstr ""
+msgstr "???????"
 
 msgid "Bulgarian"
 msgstr "?????"
@@ -11156,11 +10964,10 @@ msgstr "????"
 msgid "Spanish"
 msgstr "????"
 
-#, fuzzy
 msgid "Estonian"
-msgstr "?????"
+msgstr "?????"
 
-msgid "Euskera(Basque)"
+msgid "Basque"
 msgstr ""
 
 msgid "Persian"
@@ -11172,9 +10979,8 @@ msgstr "??"
 msgid "French"
 msgstr "??"
 
-#, fuzzy
 msgid "Irish"
-msgstr "???"
+msgstr "????"
 
 msgid "Galician"
 msgstr "?????"
@@ -11183,7 +10989,7 @@ msgid "Gujarati Language Team"
 msgstr "?????"
 
 msgid "Gujarati Language Team"
-msgstr "???????"
+msgstr "???????"
 
 msgid "Hebrew"
 msgstr "????"
@@ -11194,9 +11000,8 @@ msgstr "????"
 msgid "Hungarian"
 msgstr "????"
 
-#, fuzzy
 msgid "Armenian"
-msgstr "?????"
+msgstr "?????"
 
 msgid "Indonesian"
 msgstr "??????"
@@ -11211,17 +11016,16 @@ msgid "Ubuntu Georgian Translators"
 msgstr "????"
 
 msgid "Ubuntu Georgian Translators"
-msgstr "Ubuntu ???????"
+msgstr "Ubuntu ???????"
 
-#, fuzzy
 msgid "Khmer"
-msgstr "??"
+msgstr "???"
 
 msgid "Kannada"
-msgstr ""
+msgstr "????"
 
 msgid "Kannada Translation team"
-msgstr ""
+msgstr "????????"
 
 msgid "Korean"
 msgstr "???"
@@ -11229,9 +11033,8 @@ msgstr "???"
 msgid "Kurdish"
 msgstr "???"
 
-#, fuzzy
 msgid "Lao"
-msgstr "???"
+msgstr "???"
 
 msgid "Lithuanian"
 msgstr "????"
@@ -11239,30 +11042,26 @@ msgstr "????"
 msgid "Macedonian"
 msgstr "????"
 
-#, fuzzy
 msgid "Mongolian"
-msgstr "????"
+msgstr "???"
 
-#, fuzzy
 msgid "Bokm?l Norwegian"
-msgstr "???"
+msgstr "?????"
 
 msgid "Nepali"
 msgstr "????"
 
-#, fuzzy
 msgid "Dutch, Flemish"
-msgstr "???"
+msgstr "??????"
 
-#, fuzzy
 msgid "Norwegian Nynorsk"
-msgstr "???"
+msgstr "???????"
 
 msgid "Occitan"
-msgstr ""
+msgstr "?????"
 
 msgid "Punjabi"
-msgstr ""
+msgstr "????"
 
 msgid "Polish"
 msgstr "???"
@@ -11273,9 +11072,8 @@ msgstr "??????"
 msgid "Portuguese-Brazil"
 msgstr "??????"
 
-#, fuzzy
 msgid "Pashto"
-msgstr "??"
+msgstr "????"
 
 msgid "Romanian"
 msgstr "?????"
@@ -11295,15 +11093,14 @@ msgstr "?????"
 msgid "Serbian"
 msgstr "?????"
 
-#, fuzzy
 msgid "Sinhala"
-msgstr "??"
+msgstr "????"
 
 msgid "Swedish"
 msgstr "???"
 
 msgid "Swahili"
-msgstr ""
+msgstr "?????"
 
 msgid "Tamil"
 msgstr "????"
@@ -11318,22 +11115,22 @@ msgid "Urdu"
 msgstr "????"
 
 msgid "Urdu"
-msgstr ""
+msgstr "????"
 
 msgid "Vietnamese"
 msgstr "???"
 
 msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr "T.M.Thanh ? Gnome ?????"
+msgstr "T.M.Thanh ?Gnome ?????"
 
 msgid "Simplified Chinese"
-msgstr "????"
+msgstr "??(??)"
 
 msgid "Hong Kong Chinese"
-msgstr "??????"
+msgstr "??(??)"
 
 msgid "Traditional Chinese"
-msgstr "????"
+msgstr "??(??)"
 
 msgid "Amharic"
 msgstr "?????"
@@ -11354,27 +11151,40 @@ msgstr ""
 "complete list of contributors.  We provide no warranty for this program."
 "<BR><BR>"
 msgstr ""
+"%s ????? libpurple ???????????,??????? AIM,MSN,"
+"Yahoo!,XMPP,ICQ, IRC,SILC,SIP/SIMPLE,Novell GroupWise,Lotus Sametime,"
+"Bonjour,Zephyr,MySpaceIM,Gadu-Gadu ?? QQ???? GTK+ ???<BR><BR>??"
+"?? GNU ??????????????????????????????????"
+"?? %s ????? 'COPYING' ???? GPL ???%s ??????????,? "
+"'COPYING'????????????????????????????<BR><BR>"
 
 #, c-format
 msgid ""
 "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
 "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 msgstr ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 
 #, c-format
 msgid ""
-"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support at pidgin.im"
-"\">support at pidgin.im</A><BR/><BR/>"
+"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
+"support at pidgin.im\">support at pidgin.im</a><br/>This is a <b>public</b> "
+"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
+"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
+"primary language is <b>English</b>.  You are welcome to post in another "
+"language, but the responses may be less helpful.<br/><br/>"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 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>"
+msgstr ""
+"<FONT SIZE=\"4\">IRC ???:</FONT> irc.freenode.net ?? #pidgin<BR><BR>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel at conference.pidgin.im<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net ?? #pidgin<BR><BR>"
+msgstr "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel at conference.pidgin.im<BR><BR>"
 
 msgid "Current Developers"
 msgstr "?????"
@@ -11406,14 +11216,13 @@ msgstr "??????"
 msgid "Get User Info"
 msgstr "??????"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person whose info you would like "
 "to view."
 msgstr "??????????????/?????????"
 
 msgid "View User Log"
-msgstr "??????"
+msgstr "????????"
 
 msgid "Alias Contact"
 msgstr "??????"
@@ -11434,19 +11243,14 @@ msgstr "??????????"
 msgid "Enter an alias for this chat."
 msgstr "??????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
 "your buddy list.  Do you want to continue?"
 msgid_plural ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
-msgstr[0] ""
-"??????????????? %s ? %d ?????????????????"
-"??"
-msgstr[1] ""
-"??????????????? %s ? %d ?????????????????"
-"??"
+msgstr[0] "??????????"
 
 msgid "Remove Contact"
 msgstr "?????"
@@ -11504,45 +11308,35 @@ msgstr "??????????? msgid "Right-click for more unread messages...\n"
 msgstr "????????????????...\n"
 
-#, fuzzy
 msgid "_Change Status"
-msgstr "????"
+msgstr "????(_C)"
 
-#, fuzzy
 msgid "Show Buddy _List"
-msgstr "??????"
+msgstr "??????(_L)"
 
-#, fuzzy
 msgid "_Unread Messages"
-msgstr "????"
+msgstr "????(_U)"
 
-#, fuzzy
 msgid "New _Message..."
-msgstr "???..."
+msgstr "???(_M)..."
 
-#, fuzzy
 msgid "_Accounts"
-msgstr "/??(_A)"
+msgstr "??(_A)"
 
-#, fuzzy
 msgid "Plu_gins"
-msgstr "??"
+msgstr "??(_G)"
 
-#, fuzzy
 msgid "Pr_eferences"
-msgstr "???"
+msgstr "???(_E)"
 
-#, fuzzy
 msgid "Mute _Sounds"
-msgstr "??"
+msgstr "??(_S)"
 
-#, fuzzy
 msgid "_Blink on New Message"
-msgstr "???????"
+msgstr "???????(_B)"
 
-#, fuzzy
 msgid "_Quit"
-msgstr "??"
+msgstr "??(_Q)"
 
 msgid "Not started"
 msgstr "???"
@@ -11596,20 +11390,12 @@ msgid "C_lear finished transfers"
 msgstr "????????????(_F)"
 
 msgid "C_lear finished transfers"
-msgstr "????????(_L)"
+msgstr "????????(_L)"
 
 #. "Download Details" arrow
 msgid "File transfer _details"
 msgstr "??????(_D)"
 
-#. Pause button
-msgid "_Pause"
-msgstr "??(_P)"
-
-#. Resume button
-msgid "_Resume"
-msgstr "??(_R)"
-
 msgid "Paste as Plain _Text"
 msgstr "??????(_T)"
 
@@ -11625,11 +11411,9 @@ msgstr "??????????"
 msgid "Color to draw hyperlinks."
 msgstr "??????????"
 
-#, fuzzy
 msgid "Hyperlink visited color"
-msgstr "??????"
+msgstr "??????????"
 
-#, fuzzy
 msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "?????????????"
 
@@ -11639,14 +11423,12 @@ msgstr "??????????? msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "?????????????"
 
-#, fuzzy
 msgid "Sent Message Name Color"
 msgstr "????"
 
 msgid "Color to draw the name of a message you sent."
 msgstr ""
 
-#, fuzzy
 msgid "Received Message Name Color"
 msgstr "?????"
 
@@ -11677,24 +11459,20 @@ msgstr ""
 msgid "Color to draw the name of a whispered message."
 msgstr ""
 
-#, fuzzy
 msgid "Typing notification color"
-msgstr "????"
+msgstr "??????"
 
-#, fuzzy
 msgid "The color to use for the typing notification"
-msgstr "?????"
+msgstr "?????????"
 
-#, fuzzy
 msgid "Typing notification font"
-msgstr "????"
+msgstr "??????"
 
 msgid "The font to use for the typing notification"
 msgstr ""
 
-#, fuzzy
 msgid "Enable typing notification"
-msgstr "?????"
+msgstr "??????"
 
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
@@ -11740,9 +11518,8 @@ msgstr "????(_S)..."
 msgid "_Save Image..."
 msgstr "????(_S)..."
 
-#, fuzzy
 msgid "_Add Custom Smiley..."
-msgstr "???????:"
+msgstr "???????(_A)..."
 
 msgid "Select Font"
 msgstr "????"
@@ -11789,9 +11566,8 @@ msgstr "??"
 msgid "Smile!"
 msgstr "??"
 
-#, fuzzy
 msgid "_Manage custom smileys"
-msgstr "???????:"
+msgstr "???????(_M)"
 
 msgid "This theme has no available smileys."
 msgstr "???????????"
@@ -11883,24 +11659,23 @@ msgstr "??(_S)"
 msgid "_Smile!"
 msgstr "??(_S)"
 
-#, fuzzy
 msgid "Log Deletion Failed"
-msgstr "SSL ????"
+msgstr "??????"
 
 msgid "Check permissions and try again."
-msgstr ""
+msgstr "????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
-msgstr "?????????? %2$s ?? %1$s ???????"
+msgstr "?????????? %2$s ?? %1$s ???????"
 
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
-msgstr "?????????? %2$s ?? %1$s ???????"
+msgstr "?????????? %2$s ?? %1$s ?????????"
 
 #, c-format
 msgid ""
@@ -11908,13 +11683,11 @@ msgstr "?????????? %
 "s?"
 msgstr "?????????? %s ????????"
 
-#, fuzzy
 msgid "Delete Log?"
-msgstr "??"
+msgstr "???????"
 
-#, fuzzy
 msgid "Delete Log..."
-msgstr "??"
+msgstr "????..."
 
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
@@ -11926,65 +11699,50 @@ msgid "_Browse logs folder"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
 msgid "_Browse logs folder"
-msgstr "???????(_B)"
+msgstr "?????????(_B)"
 
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s???"%s -h"?????\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -f, --force-online  force online, regardless of network status\n"
-"  -h, --help          display this help and exit\n"
-"  -m, --multiple      do not ensure single instance\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
-"                      specifies account(s) to use, separated by commas.\n"
-"                      Without this only the first account will be enabled).\n"
-"  --display=DISPLAY   X display to use\n"
-"  -v, --version       display the current version and exit\n"
 msgstr ""
-"%s %s\n"
-"??: %s [??]...\n"
-"\n"
-"  -c, --config=??   ??"??"??????\n"
-"  -d, --debug         ????????????\n"
-"  -h, --help          ???????\n"
-"  -n, --nologin       ?????\n"
-"  -l, --login[=??]  ????(??"??"????????,?????)\n"
-"  -v, --version       ?????????\n"
 
-#, fuzzy, c-format
+msgid "use DIR for config files"
+msgstr ""
+
+msgid "print debugging messages to stdout"
+msgstr ""
+
+msgid "force online, regardless of network status"
+msgstr ""
+
+msgid "display this help and exit"
+msgstr ""
+
+msgid "allow multiple instances"
+msgstr ""
+
+msgid "don't automatically login"
+msgstr ""
+
 msgid ""
-"%s %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -f, --force-online  force online, regardless of network status\n"
-"  -h, --help          display this help and exit\n"
-"  -m, --multiple      do not ensure single instance\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
-"                      specifies account(s) to use, separated by commas.\n"
-"                      Without this only the first account will be enabled).\n"
-"  -v, --version       display the current version and exit\n"
+"enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas."
 msgstr ""
-"%s %s\n"
-"??: %s [??]...\n"
-"\n"
-"  -c, --config=??   ??"??"??????\n"
-"  -d, --debug         ????????????\n"
-"  -h, --help          ???????\n"
-"  -n, --nologin       ?????\n"
-"  -l, --login[=??]  ????(??"??"????????,?????)\n"
-"  -v, --version       ?????????\n"
 
+msgid "Without this only the first account will be enabled)."
+msgstr ""
+
+msgid "X display to use"
+msgstr ""
+
+msgid "display the current version and exit"
+msgstr ""
+
 #, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
@@ -12008,37 +11766,37 @@ msgid "Exiting because another libpurple
 
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
-msgstr ""
+msgstr "??,????? libpurple ???????\n"
 
 msgid "/_Media"
-msgstr ""
+msgstr "/??(_M)"
 
 msgid "/Media/_Hangup"
-msgstr ""
+msgstr "/??/??(_H)"
 
-#, fuzzy
-msgid "Calling..."
-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 "%s ???????????"
+
+msgid "Incoming Call"
 msgstr ""
 
-#, fuzzy, c-format
+msgid "_Pause"
+msgstr "??(_P)"
+
+#, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
-msgstr[0] "%s ? %d ?????"
-msgstr[1] "%s ? %d ?????"
+msgstr[0] "??(_P)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
-msgstr[0] "<b>%d ?????</b>"
-msgstr[1] "<b>%d ?????</b>"
+msgstr[0] "??(_P)"
 
 #, c-format
 msgid "The browser command \"%s\" is invalid."
@@ -12055,9 +11813,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 "??????"
@@ -12065,14 +11822,12 @@ msgstr "<span weight=\"bold\" size=\"lar
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">??????!</span>"
 
-#, fuzzy
 msgid "New Pounces"
 msgstr "???????"
 
 msgid "Dismiss"
-msgstr ""
+msgstr "??"
 
-#, fuzzy
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">??????!</span>"
 
@@ -12085,39 +11840,33 @@ msgstr "????"
 msgid "Unload Plugins"
 msgstr "????"
 
-#, fuzzy
 msgid "Could not unload plugin"
-msgstr "??????"
+msgstr "??????"
 
 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
-msgstr ""
+msgstr "????????,?????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<span foreground=\"red\" weight=\"bold\">Error: %s\n"
 "Check the plugin website for an update.</span>"
 msgstr ""
-"%s\n"
 "<span foreground=\"#ff0000\" weight=\"bold\">??:%s\n"
 "????????????</span>"
 
-#, fuzzy
 msgid "Author"
-msgstr "??"
+msgstr "??"
 
-#, fuzzy
 msgid "<b>Written by:</b>"
-msgstr "<b>???:</b>"
+msgstr "<b>??:</b>"
 
-#, fuzzy
 msgid "<b>Web site:</b>"
-msgstr "<b>???:</b>"
+msgstr "<b>??:</b>"
 
-#, fuzzy
 msgid "<b>Filename:</b>"
-msgstr "<b>???:</b>"
+msgstr "<b>???:</b>"
 
 msgid "Configure Pl_ugin"
 msgstr "????(_U)"
@@ -12128,7 +11877,6 @@ msgstr "????"
 msgid "Select a file"
 msgstr "????"
 
-#, fuzzy
 msgid "Modify Buddy Pounce"
 msgstr "???????"
 
@@ -12143,10 +11891,10 @@ msgid "Si_gns on"
 msgstr "????(_B):"
 
 msgid "Si_gns on"
-msgstr "??(_G)"
+msgstr "??(_G)"
 
 msgid "Signs o_ff"
-msgstr "??(_F)"
+msgstr "??(_F)"
 
 msgid "Goes a_way"
 msgstr "??(_W)"
@@ -12164,7 +11912,7 @@ msgid "P_auses while typing"
 msgstr "????(_T)"
 
 msgid "P_auses while typing"
-msgstr "?????(_A)"
+msgstr "????(_A)"
 
 msgid "Stops t_yping"
 msgstr "????(_Y)"
@@ -12205,61 +11953,58 @@ msgstr "????"
 msgid "Pounce Target"
 msgstr "????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Started typing"
 msgstr "????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Paused while typing"
-msgstr "?????"
+msgstr "????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Signed on"
-msgstr "??"
+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 "??"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Stopped typing"
 msgstr "????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Signed off"
-msgstr "??"
+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 "?????????????!"
 
-#, fuzzy
 msgid "Theme failed to unpack."
-msgstr "?????????"
+msgstr "???????"
 
-#, fuzzy
 msgid "Theme failed to load."
-msgstr "?????????"
+msgstr "???????"
 
-#, fuzzy
 msgid "Theme failed to copy."
-msgstr "?????????"
+msgstr "???????"
 
 msgid "Install Theme"
 msgstr "????"
@@ -12273,16 +12018,14 @@ msgid "Keyboard Shortcuts"
 msgstr "??"
 
 msgid "Keyboard Shortcuts"
-msgstr ""
+msgstr "?????"
 
-#, fuzzy
 msgid "Cl_ose conversations with the Escape key"
-msgstr "? %s ???"
+msgstr "?? ESC ?????(_O)"
 
 #. Buddy List Themes
-#, fuzzy
 msgid "Buddy List Theme"
-msgstr "????"
+msgstr "??????"
 
 #. System Tray
 msgid "System Tray Icon"
@@ -12294,7 +12037,6 @@ msgstr "??????"
 msgid "On unread messages"
 msgstr "??????"
 
-#, fuzzy
 msgid "Conversation Window"
 msgstr "????????"
 
@@ -12366,7 +12108,7 @@ msgid "Minimum input area height in line
 msgstr "?????????(_L)"
 
 msgid "Minimum input area height in lines:"
-msgstr ""
+msgstr "???????:"
 
 msgid "Font"
 msgstr "??"
@@ -12389,18 +12131,17 @@ msgid "Cannot start proxy configuration 
 msgstr "????????????,??????????????"
 
 msgid "Cannot start proxy configuration program."
-msgstr ""
+msgstr "???????????"
 
-#, fuzzy
 msgid "Cannot start browser configuration program."
-msgstr "????????"
+msgstr "????????????"
 
 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:"
@@ -12409,7 +12150,7 @@ msgid "_Enable automatic router port for
 msgstr "??"
 
 msgid "_Enable automatic router port forwarding"
-msgstr ""
+msgstr "???????????(_E)"
 
 msgid "_Manually specify range of ports to listen on"
 msgstr "????????????(_M)"
@@ -12422,30 +12163,27 @@ msgid "Relay Server (TURN)"
 
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr ""
+msgstr "?????(?)"
 
-#, fuzzy
 msgid "Proxy Server &amp; Browser"
-msgstr "?????"
+msgstr "????? &amp; ???"
 
 msgid "<b>Proxy configuration program was not found.</b>"
-msgstr ""
+msgstr "<b>??????????</b>"
 
 msgid "<b>Browser configuration program was not found.</b>"
-msgstr ""
+msgstr "<b>???????????</b>"
 
 msgid ""
 "Proxy & Browser preferences are configured\n"
 "in GNOME Preferences"
 msgstr ""
 
-#, fuzzy
 msgid "Configure _Proxy"
-msgstr "????(_C)"
+msgstr "???????(_P)"
 
-#, fuzzy
 msgid "Configure _Browser"
-msgstr "????(_C)"
+msgstr "?????(_B)"
 
 msgid "Proxy Server"
 msgstr "?????"
@@ -12455,7 +12193,7 @@ msgid "Use remote DNS with SOCKS4 proxie
 
 #. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
 msgid "Use remote DNS with SOCKS4 proxies"
-msgstr ""
+msgstr "?? SOCKS4 ?????? DNS"
 
 msgid "_User:"
 msgstr "??(_U):"
@@ -12475,9 +12213,8 @@ msgstr "Konqueror"
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#, fuzzy
 msgid "Desktop Default"
-msgstr "?????(_A)"
+msgstr "?????"
 
 msgid "GNOME Default"
 msgstr "GNOME ??"
@@ -12495,7 +12232,7 @@ msgid "Manual"
 msgstr "Epiphany"
 
 msgid "Manual"
-msgstr "??"
+msgstr "????"
 
 msgid "Browser Selection"
 msgstr "?????"
@@ -12524,7 +12261,7 @@ msgid "Log _format:"
 "(%s ?? URL)"
 
 msgid "Log _format:"
-msgstr "????(_F):"
+msgstr "??????(_F):"
 
 msgid "Log all _instant messages"
 msgstr "????????(_I)"
@@ -12576,7 +12313,7 @@ msgstr ""
 "Sound c_ommand:\n"
 "(%s for filename)"
 msgstr ""
-"????(_O):\n"
+"????(_O):\n"
 "(%s ?????)"
 
 msgid "M_ute sounds"
@@ -12777,9 +12514,8 @@ msgstr "?????"
 msgid "Custom Smiley"
 msgstr "?????"
 
-#, fuzzy
 msgid "Duplicate Shortcut"
-msgstr "????"
+msgstr "???????"
 
 msgid "Edit Smiley"
 msgstr "????"
@@ -12791,24 +12527,20 @@ msgstr "??(_I):"
 msgstr "??(_I):"
 
 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "??"
+msgstr "??????:"
 
-#, fuzzy
 msgid "Smiley"
 msgstr "??"
 
-#, fuzzy
 msgid "Shortcut Text"
-msgstr "??"
+msgstr "??????"
 
 msgid "Custom Smiley Manager"
-msgstr ""
+msgstr "????????"
 
-#, fuzzy
 msgid "Select Buddy Icon"
-msgstr "????"
+msgstr "??????"
 
 msgid "Click to change your buddyicon for this account."
 msgstr "?????????????"
@@ -12823,21 +12555,20 @@ msgid "Saved statuses..."
 msgstr "???..."
 
 msgid "Saved statuses..."
-msgstr "????"
+msgstr "????..."
 
-#, fuzzy
 msgid "Status Selector"
-msgstr "????"
+msgstr "?????"
 
 msgid "Google Talk"
 msgstr "Google Talk"
 
 #, c-format
 msgid "The following error has occurred loading %s: %s"
-msgstr "?? %s ????????: %s?"
+msgstr "?? %s ????????: %s?"
 
 msgid "Failed to load image"
-msgstr "??????"
+msgstr "??????"
 
 #, c-format
 msgid "Cannot send folder %s."
@@ -12888,7 +12619,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."
@@ -12923,11 +12653,10 @@ msgid ""
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr "????"%s"??:????,??????????"
+msgstr "????"%s"??:????,??????????"
 
-#, fuzzy
 msgid "_Open Link"
-msgstr "????(_O):"
+msgstr "????(_O)"
 
 msgid "_Copy Link Location"
 msgstr "??????(_C)"
@@ -12935,9 +12664,21 @@ msgstr "????????(_C)"
 msgid "_Copy Email Address"
 msgstr "????????(_C)"
 
+msgid "_Open File"
+msgstr "????..."
+
+msgid "Open _Containing Directory"
+msgstr "??????"
+
 msgid "Save File"
 msgstr "????"
 
+msgid "_Play Sound"
+msgstr "????"
+
+msgid "_Save File"
+msgstr "????"
+
 msgid "Select color"
 msgstr "????"
 
@@ -13025,77 +12766,6 @@ msgstr ""
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
-#, fuzzy
-msgid "Server name request"
-msgstr "?????"
-
-#, fuzzy
-msgid "Enter an XMPP Server"
-msgstr "???????"
-
-#, fuzzy
-msgid "Select an XMPP server to query"
-msgstr "???????????"
-
-#, fuzzy
-msgid "Find Services"
-msgstr "????"
-
-#, fuzzy
-msgid "Add to Buddy List"
-msgstr "??????"
-
-#, fuzzy
-msgid "Gateway"
-msgstr "??"
-
-#, fuzzy
-msgid "Directory"
-msgstr "????"
-
-#, fuzzy
-msgid "PubSub Collection"
-msgstr "????"
-
-msgid "PubSub Leaf"
-msgstr ""
-
-#, fuzzy
-msgid ""
-"\n"
-"<b>Description:</b> "
-msgstr "??"
-
-#. Create the window.
-#, fuzzy
-msgid "Service Discovery"
-msgstr "??????"
-
-#, fuzzy
-msgid "_Browse"
-msgstr "???(_B):"
-
-#, fuzzy
-msgid "Server does not exist"
-msgstr "?????"
-
-#, fuzzy
-msgid "Server does not support service discovery"
-msgstr "?????????????????"
-
-#, fuzzy
-msgid "XMPP Service Discovery"
-msgstr "??????"
-
-msgid "Allows browsing and registering services."
-msgstr ""
-
-#, fuzzy
-msgid ""
-"This plugin is useful for registering with legacy transports or other XMPP "
-"services."
-msgstr "??????? XMPP ????????"
-
 msgid "Buddy is idle"
 msgstr "?????"
 
@@ -13182,6 +12852,67 @@ msgstr "??????"
 msgid "Apply in IMs"
 msgstr "??????"
 
+# ## Forward to here.
+#. Note to translators: The string "Enter an XMPP Server" is asking the
+#. user to type the name of an XMPP server which will then be queried
+msgid "Server name request"
+msgstr "?????"
+
+msgid "Enter an XMPP Server"
+msgstr "???????"
+
+msgid "Select an XMPP server to query"
+msgstr "???????????"
+
+msgid "Find Services"
+msgstr "????"
+
+msgid "Add to Buddy List"
+msgstr "??????"
+
+msgid "Gateway"
+msgstr "??"
+
+msgid "Directory"
+msgstr "??????"
+
+msgid "PubSub Collection"
+msgstr "????"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"??"
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "??????"
+
+msgid "_Browse"
+msgstr "???(_B):"
+
+msgid "Server does not exist"
+msgstr "?????"
+
+msgid "Server does not support service discovery"
+msgstr "?????????????????"
+
+msgid "XMPP Service Discovery"
+msgstr "??????"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "??????? XMPP ????????"
+
 msgid "By conversation count"
 msgstr "?????"
 
@@ -13270,7 +13001,7 @@ msgid "Select a person from your address
 
 #. Add the label.
 msgid "Select a person from your address book below, or add a new person."
-msgstr "????????,????????,??????????"
+msgstr "????????,????????,??????????"
 
 msgid "Group:"
 msgstr "?:"
@@ -13287,7 +13018,7 @@ msgid ""
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
-msgstr "???????????????????,?????????????"
+msgstr "???????????????????,?????????????"
 
 #. Add the expander
 msgid "User _details"
@@ -13307,7 +13038,7 @@ msgid "Add to Address Book"
 msgstr "?????????????"
 
 msgid "Add to Address Book"
-msgstr "??????"
+msgstr "??????"
 
 msgid "Send Email"
 msgstr "??????"
@@ -13470,7 +13201,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."
@@ -13579,9 +13309,9 @@ msgstr ""
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 "???????,?????????:\n"
-"- ???????????????\n"
+"- ???????????????\n"
 "- ?????????\n"
-"- ?????????????????"
+"- ?????????????????"
 
 msgid "Hyperlink Color"
 msgstr "??????"
@@ -13589,11 +13319,9 @@ msgstr "??????????"
 msgid "Visited Hyperlink Color"
 msgstr "??????????"
 
-#, fuzzy
 msgid "Highlighted Message Name Color"
 msgstr "???????"
 
-#, fuzzy
 msgid "Typing Notification Color"
 msgstr "????"
 
@@ -13626,15 +13354,12 @@ msgstr "GTK+ ????????"
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ ????????"
 
-#, fuzzy
 msgid "Disable Typing Notification Text"
 msgstr "?????"
 
-#, fuzzy
 msgid "GTK+ Theme Control Settings"
 msgstr "Pidgin GTK+ ????"
 
-#, fuzzy
 msgid "Colors"
 msgstr "??"
 
@@ -13675,7 +13400,7 @@ msgid "You can upgrade to %s %s today."
 
 #, c-format
 msgid "You can upgrade to %s %s today."
-msgstr ""
+msgstr "???????? %s %s ?"
 
 msgid "New Version Available"
 msgstr "?????"
@@ -13724,7 +13449,6 @@ msgstr "?????????"
 msgstr "?????????"
 
 #. *< summary
-#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for use when no physical keyboard is present."
@@ -13779,94 +13503,79 @@ 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 ""
 
-#, fuzzy
 msgid "Icon for Chat"
 msgstr "????"
 
-#, fuzzy
 msgid "Ignored"
 msgstr "??"
 
-#, fuzzy
 msgid "Founder"
 msgstr "??"
 
-#, fuzzy
+#. A user in a chat room who has special privileges.
 msgid "Operator"
 msgstr "Opera"
 
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
 msgid "Half Operator"
 msgstr ""
 
-#, fuzzy
 msgid "Authorization dialog"
 msgstr "?????"
 
-#, fuzzy
 msgid "Error dialog"
 msgstr "?? "
 
-#, fuzzy
 msgid "Information dialog"
 msgstr "??"
 
 msgid "Mail dialog"
 msgstr ""
 
-#, fuzzy
 msgid "Question dialog"
 msgstr "?????"
 
-#, fuzzy
 msgid "Warning dialog"
 msgstr "????"
 
 msgid "What kind of dialog is this?"
 msgstr ""
 
-#, fuzzy
 msgid "Status Icons"
-msgstr "%s ???"
+msgstr "????"
 
-#, fuzzy
 msgid "Chatroom Emblems"
-msgstr "??????"
+msgstr "???????"
 
-#, fuzzy
 msgid "Dialog Icons"
 msgstr "????"
 
-#, fuzzy
 msgid "Pidgin Icon Theme Editor"
 msgstr "Pidgin GTK+ ????"
 
-#, fuzzy
 msgid "Contact"
 msgstr "????"
 
-#, fuzzy
 msgid "Pidgin Buddylist Theme Editor"
 msgstr "????"
 
-#, fuzzy
 msgid "Edit Buddylist Theme"
 msgstr "????"
 
 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "??????"
 
 #. *< type
 #. *< ui_requirement
@@ -13875,14 +13584,12 @@ msgstr ""
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
 msgstr "Pidgin GTK+ ????"
 
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
 msgstr "Pidgin GTK+ ????"
 
@@ -13944,7 +13651,7 @@ msgid "_Message Logs:"
 msgstr "?????????"
 
 msgid "_Message Logs:"
-msgstr "????(_M):"
+msgstr "??????(_M):"
 
 #. *< type
 #. *< ui_requirement
@@ -13965,8 +13672,60 @@ msgid ""
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
-msgstr "????????????????????????"
+msgstr "??????????????????????????"
 
+#, fuzzy
+msgid "Audio"
+msgstr "??"
+
+#, fuzzy
+msgid "Video"
+msgstr "??"
+
+msgid "Output"
+msgstr ""
+
+#, fuzzy
+msgid "_Plugin"
+msgstr "??"
+
+#, fuzzy
+msgid "_Device"
+msgstr "??"
+
+msgid "Input"
+msgstr ""
+
+#, fuzzy
+msgid "P_lugin"
+msgstr "??"
+
+#, fuzzy
+msgid "D_evice"
+msgstr "??"
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#, fuzzy
+msgid "Voice/Video Settings"
+msgstr "????"
+
+#. *< name
+#. *< version
+msgid "Configure your microphone and webcam."
+msgstr ""
+
+#. *< summary
+msgid "Configure microphone and webcam settings for voice/video calls."
+msgstr ""
+
 msgid "Opacity:"
 msgstr "????:"
 
@@ -14050,7 +13809,6 @@ msgstr "Pidgin for Windows ?????msgid "Options specific to Pidgin for Windows."
 msgstr "Pidgin for Windows ??????"
 
-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "?? Pidgin for Windows ?????,?????????"
@@ -14092,6 +13850,89 @@ msgstr "??????? XMPP ?? msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "??????? XMPP ????????"
 
+#~ msgid "Calling ... "
+#~ msgstr "????..."
+
+#~ msgid "Invalid certificate chain"
+#~ msgstr "?????"
+
+#~ msgid "Join/Part Hiding Configuration"
+#~ msgstr "??/??????"
+
+#~ msgid "User Inactivity Timeout (in minutes)"
+#~ msgstr "???????(????)"
+
+#~ msgid "Your account is locked, please log in to the Yahoo! website."
+#~ msgstr "???????,???? Yahoo! ???"
+
+#~ msgid ""
+#~ "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support at pidgin."
+#~ "im\">support at pidgin.im</A><BR/><BR/>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support at pidgin."
+#~ "im\">support at pidgin.im</A><BR/><BR/>"
+
+#~ msgid ""
+#~ "%s %s\n"
+#~ "Usage: %s [OPTION]...\n"
+#~ "\n"
+#~ "  -c, --config=DIR    use DIR for config files\n"
+#~ "  -d, --debug         print debugging messages to stdout\n"
+#~ "  -f, --force-online  force online, regardless of network status\n"
+#~ "  -h, --help          display this help and exit\n"
+#~ "  -m, --multiple      do not ensure single instance\n"
+#~ "  -n, --nologin       don't automatically login\n"
+#~ "  -l, --login[=NAME]  enable specified account(s) (optional argument "
+#~ "NAME\n"
+#~ "                      specifies account(s) to use, separated by commas.\n"
+#~ "                      Without this only the first account will be "
+#~ "enabled).\n"
+#~ "  --display=DISPLAY   X display to use\n"
+#~ "  -v, --version       display the current version and exit\n"
+#~ msgstr ""
+#~ "%s %s\n"
+#~ "??: %s [??]...\n"
+#~ "\n"
+#~ "  -c, --config=??\t????????????\n"
+#~ "  -d, --debug\t\t????????????\n"
+#~ "  -f, --force-online\t??????????????\n"
+#~ "  -h, --help\t\t???????\n"
+#~ "  -m, --multiple\t???????\n"
+#~ "  -n, --nologin\t?????\n"
+#~ "  -l, --login[=??]\t????(??"??"????????,?????)\n"
+#~ "  --display=DISPLAY\t???? X ??\n"
+#~ "  -v, --version\t?????????\n"
+
+#~ msgid ""
+#~ "%s %s\n"
+#~ "Usage: %s [OPTION]...\n"
+#~ "\n"
+#~ "  -c, --config=DIR    use DIR for config files\n"
+#~ "  -d, --debug         print debugging messages to stdout\n"
+#~ "  -f, --force-online  force online, regardless of network status\n"
+#~ "  -h, --help          display this help and exit\n"
+#~ "  -m, --multiple      do not ensure single instance\n"
+#~ "  -n, --nologin       don't automatically login\n"
+#~ "  -l, --login[=NAME]  enable specified account(s) (optional argument "
+#~ "NAME\n"
+#~ "                      specifies account(s) to use, separated by commas.\n"
+#~ "                      Without this only the first account will be "
+#~ "enabled).\n"
+#~ "  -v, --version       display the current version and exit\n"
+#~ msgstr ""
+#~ "%s %s\n"
+#~ "??: %s [??]...\n"
+#~ "\n"
+#~ "  -c, --config=??\t????????????\n"
+#~ "  -d, --debug\t\t????????????\n"
+#~ "  -f, --force-online\t??????????????\n"
+#~ "  -h, --help\t\t???????\n"
+#~ "  -m, --multiple\t???????\n"
+#~ "  -n, --nologin\t?????\n"
+#~ "  -l, --login[=??]\t????(??"??"????????,?????)\n"
+#~ "  --display=DISPLAY\t???? X ??\n"
+#~ "  -v, --version\t?????????\n"
+
 #~ msgid "Cannot open socket"
 #~ msgstr "???????"
 
@@ -14187,41 +14028,35 @@ msgstr "??????? XMPP ?? 
 #, fuzzy
 #~ msgid "Roster Item Exchange"
-#~ msgstr "???????"
+#~ msgstr "???????"
 
-#, fuzzy
 #~ msgid "Reachability Address"
-#~ msgstr "??????"
+#~ msgstr "????"
 
 #~ msgid "User Profile"
 #~ msgstr "????"
 
-#, fuzzy
 #~ msgid "Jingle"
-#~ msgstr "??"
+#~ msgstr "Jingle"
 
 #~ msgid "User Nickname"
 #~ msgstr "????"
 
-#, fuzzy
 #~ msgid "Jingle Video"
-#~ msgstr "????"
+#~ msgstr "Jingle ??"
 
 #, fuzzy
 #~ msgid "Message Receipts"
 #~ msgstr "?????"
 
-#, fuzzy
 #~ msgid "Public Key Publishing"
-#~ msgstr "????"
+#~ msgstr "????"
 
-#, fuzzy
 #~ msgid "User Chatting"
-#~ msgstr "????"
+#~ msgstr "????"
 
-#, fuzzy
 #~ msgid "User Browsing"
-#~ msgstr "????"
+#~ msgstr "????"
 
 #, fuzzy
 #~ msgid "User Gaming"
@@ -14231,27 +14066,36 @@ msgstr "??????? XMPP ?? #~ msgid "User Viewing"
 #~ msgstr "????"
 
-#, fuzzy
 #~ msgid "Stanza Encryption"
-#~ msgstr "Trillian ??"
+#~ msgstr "Stanza ??"
 
+#~ msgid "Delayed Delivery"
+#~ msgstr "????"
+
+#~ msgid "Hop Check"
+#~ msgstr "????"
+
 #~ msgid "Read Error"
 #~ msgstr "????"
 
+#, fuzzy
+#~ msgid "Malformed BOSH Connect Server"
+#~ msgstr "?????????"
+
+#~ msgid "Failed to open the file"
+#~ msgstr "??????"
+
 #~ msgid "Failed to connect to server."
 #~ msgstr "?????????"
 
-#, fuzzy
 #~ msgid "Read buffer full (2)"
-#~ msgstr "???"
+#~ msgstr "??????? (2)"
 
-#, fuzzy
 #~ msgid "Unparseable message"
-#~ msgstr "??????"
+#~ msgstr "??????"
 
-#, fuzzy
 #~ msgid "Couldn't connect to host: %s (%d)"
-#~ msgstr "???????"
+#~ msgstr "???????:%s (%d)"
 
 #~ msgid "Login failed (%s)."
 #~ msgstr "????(%s)?"
@@ -14282,13 +14126,11 @@ msgstr "??????? XMPP ?? #~ msgid "Could Not Connect"
 #~ msgstr "????"
 
-#, fuzzy
 #~ msgid "Could not decrypt server reply"
-#~ msgstr "?????????"
+#~ msgstr "?????????"
 
-#, fuzzy
 #~ msgid "Invalid username."
-#~ msgstr "????"
+#~ msgstr "???????"
 
 #~ msgid "Connection lost"
 #~ msgstr "????"
@@ -14320,9 +14162,8 @@ msgstr "??????? XMPP ?? #~ msgid "Could not resolve hostname"
 #~ msgstr "???????"
 
-#, fuzzy
 #~ msgid "Incorrect Password"
-#~ msgstr "????"
+#~ msgstr "????"
 
 #, fuzzy
 #~ msgid ""
@@ -14342,6 +14183,13 @@ msgstr "??????? XMPP ?? #~ msgstr "?????????"
 
 #~ msgid ""
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ msgstr "%s ????????"%s"?????,???"%s"?"
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "?????"
+
+#~ msgid ""
 #~ "Lost connection with server\n"
 #~ "%s"
 #~ msgstr ""
@@ -14351,12 +14199,17 @@ msgstr "??????? XMPP ?? #~ 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 ???"
+#~ msgstr "????? %s:????? TLS/SSL ???????? TLS/SSL ???"
 
+#~ msgid "_Proxy"
+#~ msgstr "??(_P)"
+
+#~ msgid "_Resume"
+#~ msgstr "??(_R)"
+
 #~ msgid "Conversation Window Hiding"
 #~ msgstr "??????"
 
@@ -14390,7 +14243,7 @@ msgstr "??????? XMPP ?? 
 #, fuzzy
 #~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "?? Notes ???"
+#~ msgstr "?? Notes ???"
 
 #~ msgid ""
 #~ "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -14443,7 +14296,7 @@ msgstr "??????? XMPP ?? #~ msgstr "????,?? %s ??????"
 
 #~ msgid "%s not currently logged in."
-#~ msgstr "%s ??????"
+#~ msgstr "%s ??????"
 
 #~ msgid "Warning of %s not allowed."
 #~ msgstr "???? %s ?????"
@@ -14502,7 +14355,7 @@ 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 "
@@ -14512,9 +14365,6 @@ msgstr "??????? XMPP ?? #~ "????????????????,??????????????,?????"
 #~ "??????"
 
-#~ msgid "An unknown signon error has occurred: %s."
-#~ msgstr "?????????: %s?"
-
 #~ msgid "An unknown error, %d, has occurred.  Info: %s"
 #~ msgstr "??????? %d???: %s"
 
@@ -14574,7 +14424,7 @@ msgstr "??????? XMPP ?? #~ msgstr "????"
 
 #~ msgid "By log size"
-#~ msgstr "?????"
+#~ msgstr "???????"
 
 #~ msgid "_Open Link in Browser"
 #~ msgstr "?????????(_O)"
@@ -14625,7 +14475,7 @@ msgstr "??????? XMPP ?? 
 #, fuzzy
 #~ msgid "Add into %d's buddy list"
-#~ msgstr "????????"
+#~ msgstr "????????"
 
 #, fuzzy
 #~ msgid "QQ Number Error"
@@ -14899,7 +14749,7 @@ msgstr "??????? XMPP ?? #~ msgstr "??????:"
 
 #~ msgid "Unable to login, check debug log"
-#~ msgstr "????,???????"
+#~ msgstr "????,?????????"
 
 #~ msgid "TCP Address"
 #~ msgstr "TCP ??"


More information about the Commits mailing list