pidgin: 0ce6e164: Updated Simplified Translation from Aron...

darkrain42 at pidgin.im darkrain42 at pidgin.im
Sat Jul 4 18:31:22 EDT 2009


-----------------------------------------------------------------
Revision: 0ce6e164761ad4833f620020df5a0194cfea51e0
Ancestor: 9d0a6d5fe743780536a1a2a9e82e1c5bc3eeef40
Author: darkrain42 at pidgin.im
Date: 2009-07-04T22:23:30
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0ce6e164761ad4833f620020df5a0194cfea51e0

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

ChangeLog: 

Updated Simplified Translation from Aron Xu, new translator. Closes #9243.

-------------- next part --------------
============================================================
--- pidgin/gtkdialogs.c	7accd6f6705171a17f0712851f50d92bb93e1900
+++ pidgin/gtkdialogs.c	b489c9c98329699633caaddae1e8e3967e415e5c
@@ -231,7 +231,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", "Funda Wang", "fundawang at linux.net.cn"},
+	{N_("Simplified Chinese"),  "zh_CN", "Aron Xu", "aronmalache at 163.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"},
@@ -294,6 +294,7 @@ static const struct translator past_tran
 	{N_("Swedish"),             "sv", "Christian Rose", NULL},
 	{N_("Turkish"),             "tr", "Ahmet Alp BALKAN", NULL},
 	{N_("Simplified Chinese"),  "zh_CN", "Hashao, Rocky S. Lee", NULL},
+	{N_("Simplified Chinese"),  "zh_CN", "Funda Wang", "fundawang at linux.net.cn"},
 	{N_("Traditional Chinese"), "zh_TW", "Hashao, Rocky S. Lee", NULL},
 	{NULL, NULL, NULL, NULL}
 };
============================================================
--- po/ChangeLog	c647e8e2d92e3e88160f7a1a3dddbac4c5616829
+++ po/ChangeLog	cd438b140aaec809074efa37085f3b3a7179e019
@@ -5,6 +5,7 @@ version 2.6.0
 	* Lao translation updated (Anousak Souphavah)
 	* Slovenian translation updated (Martin Srebotnjak)
 	* Swahili translation added (Paul Msegeya)
+	* Simplified Chinese translation updated under new translator (Aron Xu)
 
 version 2.5.8
 	* No changes
============================================================
--- po/zh_CN.po	f585bac473bb970062ce3f8b03762b1c411084e7
+++ po/zh_CN.po	0145107d9aaa2dfce0e1bf243e51c455beb5f479
@@ -1,20 +1,21 @@
-# pidgin ???????????
-# Copyright (C) 2003 pidgin team.
+# Pidgin ???????????
+# Copyright (C) 2009 pidgin team.
 # This file is distributed under the same license as the pidgin package.
 # Funda Wang <fundawang at linux.net.cn>, 2003, 2004.
+# liyuekui <liyuekui at gmail.com>, 2009.
+# Aron Xu <aronmalache at 163.com>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: pidgin HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
-"PO-Revision-Date: 2007-05-20 20:22+0800\n"
-"Last-Translator: Funda Wang <fundawang at linux.net.cn>\n"
-"Language-Team: zh_CN <i18n-translation at lists.linux.net.cn>\n"
+"POT-Creation-Date: 2009-07-04 15:17-0700\n"
+"PO-Revision-Date: 2009-04-23 00:32+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.
@@ -25,7 +26,7 @@ msgstr "%s???"%s -h"????msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s???"%s -h"?????\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
@@ -60,7 +61,6 @@ msgstr "?????"
 msgid "Account was not added"
 msgstr "?????"
 
-#, fuzzy
 msgid "Username of an account must be non-empty."
 msgstr "???????????"
 
@@ -70,7 +70,6 @@ msgstr "????"
 msgid "Remember password"
 msgstr "????"
 
-#, fuzzy
 msgid "There are no protocol plugins installed."
 msgstr "????????"
 
@@ -86,9 +85,8 @@ msgstr "??:"
 msgid "Protocol:"
 msgstr "??:"
 
-#, fuzzy
 msgid "Username:"
-msgstr "???(_U):"
+msgstr "???:"
 
 msgid "Password:"
 msgstr "??:"
@@ -97,7 +95,6 @@ msgstr "??:"
 msgstr "??:"
 
 #. Register checkbox
-#, fuzzy
 msgid "Create this account on the server"
 msgstr "???????????"
 
@@ -179,7 +176,6 @@ msgstr "??"
 msgid "Default"
 msgstr "??"
 
-#, fuzzy
 msgid "You must provide a username for the buddy."
 msgstr "????????????"
 
@@ -198,13 +194,11 @@ msgstr "???"
 msgid "Username"
 msgstr "???"
 
-#, fuzzy
 msgid "Alias (optional)"
-msgstr "??????"
+msgstr "?????(??)"
 
-#, fuzzy
 msgid "Add in group"
-msgstr "???"
+msgstr "????"
 
 msgid "Account"
 msgstr "??"
@@ -346,9 +340,8 @@ msgstr "??"
 msgid "Plugins"
 msgstr "??"
 
-#, fuzzy
 msgid "Block/Unblock"
-msgstr "????"
+msgstr "??/????"
 
 msgid "Block"
 msgstr "??"
@@ -356,11 +349,10 @@ msgstr "????"
 msgid "Unblock"
 msgstr "????"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
-msgstr "???????????/?????????"
+msgstr "????????/????????????"
 
 #. Not multiline
 #. Not masked?
@@ -371,7 +363,6 @@ msgstr "?????"
 msgid "New Instant Message"
 msgstr "?????"
 
-#, fuzzy
 msgid "Please enter the username or alias of the person you would like to IM."
 msgstr "???????????/?????????"
 
@@ -387,11 +378,10 @@ msgstr "??"
 msgid "Join"
 msgstr "??"
 
-#, fuzzy
 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"
@@ -400,20 +390,17 @@ msgstr "????..."
 msgid "Send IM..."
 msgstr "????..."
 
-#, fuzzy
 msgid "Block/Unblock..."
-msgstr "????"
+msgstr "??/????..."
 
 msgid "Join Chat..."
 msgstr "????..."
 
-#, fuzzy
 msgid "View Log..."
-msgstr "????"
+msgstr "????..."
 
-#, fuzzy
 msgid "View All Logs"
-msgstr "????"
+msgstr "??????"
 
 msgid "Show"
 msgstr "??"
@@ -436,19 +423,17 @@ msgstr "?????"
 msgid "By Log Size"
 msgstr "?????"
 
-#, fuzzy
 msgid "Buddy"
-msgstr "??(_B):"
+msgstr "??"
 
 msgid "Chat"
 msgstr "??"
 
-#, fuzzy
 msgid "Grouping"
-msgstr "?"
+msgstr "??"
 
 msgid "Certificate Import"
-msgstr "????"
+msgstr "????"
 
 msgid "Specify a hostname"
 msgstr "?????"
@@ -503,17 +488,17 @@ msgid "SSL Host Certificate"
 msgstr ""
 
 msgid "SSL Host Certificate"
-msgstr ""
+msgstr "SSL ????"
 
 #, c-format
 msgid "Really delete certificate for %s?"
-msgstr ""
+msgstr "????? %s ?????"
 
 msgid "Confirm certificate delete"
-msgstr ""
+msgstr "??????"
 
 msgid "Certificate Manager"
-msgstr ""
+msgstr "?????"
 
 #. Creating the user splits
 msgid "Hostname"
@@ -615,7 +600,6 @@ msgstr "???????..."
 msgid "Add Buddy Pounce..."
 msgstr "???????..."
 
-#, fuzzy
 msgid "Invite..."
 msgstr "??"
 
@@ -631,7 +615,8 @@ msgid_plural "List of %d users:\n"
 #, fuzzy, c-format
 msgid "List of %d user:\n"
 msgid_plural "List of %d users:\n"
-msgstr[0] "????:\n"
+msgstr[0] "%d ??????:\n"
+msgstr[1] "%d ??????:\n"
 
 msgid "Supported debug options are:  version"
 msgstr "????????: version"
@@ -650,7 +635,7 @@ msgid ""
 msgid ""
 "%s is not a valid message class. See '/help msgcolor' for valid message "
 "classes."
-msgstr ""
+msgstr "%s ????????????'/help msgcolor' ????????"
 
 #, c-format
 msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
@@ -727,6 +712,7 @@ msgstr[0] "???? - ??? %d%%
 msgid "File Transfers - %d%% of %d file"
 msgid_plural "File Transfers - %d%% of %d files"
 msgstr[0] "???? - ??? %d%%,? %d ???"
+msgstr[1] "???? - ??? %d%%,? %d ???"
 
 #. Create the window.
 msgid "File Transfers"
@@ -773,13 +759,11 @@ msgstr "%.2f KB/?"
 msgid "%.2f KiB/s"
 msgstr "%.2f KB/?"
 
-#, fuzzy
 msgid "Sent"
-msgstr "??(_S)"
+msgstr "???"
 
-#, fuzzy
 msgid "Received"
-msgstr "?????"
+msgstr "???"
 
 msgid "Finished"
 msgstr "???"
@@ -788,21 +772,20 @@ msgstr "?????? %s?"
 msgid "The file was saved as %s."
 msgstr "?????? %s?"
 
-#, fuzzy
 msgid "Sending"
-msgstr "??"
+msgstr "????"
 
-#, fuzzy
 msgid "Receiving"
-msgstr "??"
+msgstr "????"
 
-#, fuzzy, c-format
+# c-format
+#, c-format
 msgid "Conversation in %s on %s"
-msgstr "? %s ???"
+msgstr "? %s ?? %s ???"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Conversation with %s on %s"
-msgstr "? %s ???"
+msgstr "? %s ? %s ???"
 
 msgid "%B %Y"
 msgstr "%Y?%m?"
@@ -839,16 +822,14 @@ msgstr "? %s ???"
 msgid "Conversations with %s"
 msgstr "? %s ???"
 
-#, fuzzy
 msgid "All Conversations"
-msgstr "??"
+msgstr "????"
 
 msgid "System Log"
 msgstr "????"
 
-#, fuzzy
 msgid "Calling ... "
-msgstr "????..."
+msgstr "????..."
 
 msgid "Hangup"
 msgstr ""
@@ -874,12 +855,11 @@ msgstr ""
 msgid "%s is trying to start an unsupported media session type with you."
 msgstr ""
 
-#, fuzzy
 msgid "You have rejected the call."
-msgstr "????????%s%s"
+msgstr "???????"
 
 msgid "call: Make an audio call."
-msgstr ""
+msgstr "??:?????"
 
 msgid "Emails"
 msgstr "????"
@@ -893,10 +873,11 @@ msgstr "??"
 msgid "Subject"
 msgstr "??"
 
-#, c-format
+#, fuzzy, 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 ?????"
 
 msgid "New Mail"
 msgstr "???"
@@ -920,16 +901,14 @@ msgstr "(?)"
 msgid "(none)"
 msgstr "(?)"
 
-#, fuzzy
 msgid "URI"
-msgstr "UIN"
+msgstr "URI"
 
 msgid "ERROR"
-msgstr ""
+msgstr "??"
 
-#, fuzzy
 msgid "loading plugin failed"
-msgstr "Ping ??"
+msgstr "??????"
 
 msgid "unloading plugin failed"
 msgstr ""
@@ -966,9 +945,8 @@ msgstr ""
 "Please open the debug window and try again to see the exact error message."
 msgstr ""
 
-#, fuzzy
 msgid "Select plugin to install"
-msgstr "????"
+msgstr "???????"
 
 msgid "You can (un)load plugins from the following list."
 msgstr "??????????????"
@@ -1059,16 +1037,14 @@ msgstr "????"
 msgid "Play a sound"
 msgstr "????"
 
-#, fuzzy
 msgid "Pounce only when my status is not Available"
-msgstr "?????????????(_O)"
+msgstr "?????????????"
 
 msgid "Recurring"
 msgstr "??"
 
-#, fuzzy
 msgid "Cannot create pounce"
-msgstr "??????"
+msgstr "??????"
 
 msgid "You do not have any accounts."
 msgstr "??????"
@@ -1174,13 +1150,11 @@ msgstr "??"
 msgid "Logging"
 msgstr "??"
 
-#, fuzzy
 msgid "You must fill all the required fields."
-msgstr "???????"
+msgstr "??????????"
 
-#, fuzzy
 msgid "The required fields are underlined."
-msgstr "???? %s ?????"
+msgstr "????????????"
 
 msgid "Not implemented yet."
 msgstr "????"
@@ -1191,16 +1165,14 @@ msgstr "????..."
 msgid "Open File..."
 msgstr "????..."
 
-#, fuzzy
 msgid "Choose Location..."
-msgstr "??"
+msgstr "????..."
 
 msgid "Hit 'Enter' to find more rooms of this category."
-msgstr ""
+msgstr "?'Enter'??????????????"
 
-#, fuzzy
 msgid "Get"
-msgstr "??(_S)"
+msgstr "??"
 
 #. Create the window.
 msgid "Room List"
@@ -1233,9 +1205,8 @@ msgstr "????????"
 msgid "Others talk in chat"
 msgstr "????????"
 
-#, fuzzy
 msgid "Someone says your username in chat"
-msgstr "????????????"
+msgstr "????????????"
 
 msgid "GStreamer Failure"
 msgstr "GStreamer ??"
@@ -1273,7 +1244,7 @@ msgstr "??:"
 msgid "Method: "
 msgstr "??:"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Sound Command\n"
 "(%s for filename)"
@@ -1297,9 +1268,8 @@ msgstr "??????"
 msgid "Only when not available"
 msgstr "??????"
 
-#, fuzzy
 msgid "Volume(0-100):"
-msgstr "??:"
+msgstr "??(0-100):"
 
 #. Sound events
 msgid "Sound Events"
@@ -1492,24 +1462,20 @@ msgstr "??"
 msgid "Offline"
 msgstr "??"
 
-#, fuzzy
 msgid "Online Buddies"
-msgstr "????"
+msgstr "????"
 
-#, fuzzy
 msgid "Offline Buddies"
 msgstr "????"
 
-#, fuzzy
 msgid "Online/Offline"
-msgstr "????"
+msgstr "??/??"
 
 msgid "Meebo"
 msgstr ""
 
-#, fuzzy
 msgid "No Grouping"
-msgstr "???"
+msgstr "???"
 
 msgid "Nested Subgroup"
 msgstr ""
@@ -1517,12 +1483,11 @@ msgstr ""
 msgid "Nested Grouping (experimental)"
 msgstr ""
 
-#, fuzzy
 msgid "Provides alternate buddylist grouping options."
-msgstr "??? Evolution ????"
+msgstr "?????????"
 
 msgid "Lastlog"
-msgstr "Lastlog"
+msgstr "????"
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
 msgid "lastlog: Searches for a substring in the backlog."
@@ -1547,12 +1512,11 @@ msgstr ""
 msgid "TinyURL (or other) address prefix"
 msgstr ""
 
-#, fuzzy
 msgid "TinyURL"
-msgstr "URL"
+msgstr "TinyURL"
 
 msgid "TinyURL plugin"
-msgstr ""
+msgstr "TinyURL ??"
 
 msgid "When receiving a message with URL(s), TinyURL for easier copying"
 msgstr ""
@@ -1647,13 +1611,13 @@ msgstr ""
 msgstr ""
 
 #. Make messages
-#, fuzzy, c-format
+#, c-format
 msgid "Accept certificate for %s?"
-msgstr "????????"
+msgstr "?? %s ???????"
 
 #. TODO: Find what the handle ought to be
 msgid "SSL Certificate Verification"
-msgstr ""
+msgstr "SSL ????"
 
 msgid "_View Certificate..."
 msgstr "????(_V)..."
@@ -1725,16 +1689,14 @@ msgstr ""
 msgstr ""
 
 #. TODO: Find what the handle ought to be
-#, fuzzy
 msgid "Certificate Information"
-msgstr "?????"
+msgstr "????"
 
 msgid "Registration Error"
 msgstr "????"
 
-#, fuzzy
 msgid "Unregistration Error"
-msgstr "????"
+msgstr "??????"
 
 #, c-format
 msgid "+++ %s signed on"
@@ -1792,7 +1754,6 @@ msgstr "%s ??????(%s)?"
 msgid "%s left the room (%s)."
 msgstr "%s ??????(%s)?"
 
-#, fuzzy
 msgid "Invite to chat"
 msgstr "????"
 
@@ -2166,9 +2127,9 @@ msgstr "?????????"
 msgid "Unable to load your plugin."
 msgstr "?????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s requires %s, but it failed to unload."
-msgstr "????? %s ?????"
+msgstr "%s ????? %s ?????"
 
 msgid "Autoaccept"
 msgstr "????"
@@ -2224,9 +2185,8 @@ msgstr ""
 "(only when there's no conversation with the sender)"
 msgstr ""
 
-#, fuzzy
 msgid "Create a new directory for each user"
-msgstr "??????????"
+msgstr "??????????"
 
 msgid "Notes"
 msgstr "??"
@@ -2516,9 +2476,10 @@ msgstr "??????????? msgstr "?????????????????????"
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2571,7 +2532,7 @@ msgid ""
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2856,9 +2817,8 @@ msgstr "Purple ???"
 msgstr "Purple ???"
 
 #. Creating the options for the protocol
-#, fuzzy
 msgid "Local Port"
-msgstr "??"
+msgstr "????"
 
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -2879,9 +2839,8 @@ msgstr "?????????"
 msgid "Could not listen on socket"
 msgstr "?????????"
 
-#, fuzzy
 msgid "Error communicating with local mDNSResponder."
-msgstr "????????"
+msgstr "??? DNS ??????"
 
 msgid "Invalid proxy settings"
 msgstr "???????"
@@ -2906,9 +2865,9 @@ msgstr "????????!"
 msgid "Buddylist saved successfully!"
 msgstr "????????!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't write buddy list for %s to %s"
-msgstr "????????"
+msgstr "??? %s ?? %s ????"
 
 msgid "Couldn't load buddylist"
 msgstr "????????"
@@ -3246,13 +3205,12 @@ msgstr ""
 msgid "Ban on %s by %s, set %s ago"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Ban on %s"
-msgstr "??: %s"
+msgstr "??: %s"
 
-#, fuzzy
 msgid "End of ban list"
-msgstr "???"
+msgstr "??????"
 
 #, c-format
 msgid "You are banned from %s."
@@ -3373,13 +3331,12 @@ msgstr "??????????? #. We only want to do the following dance if the connection
 #. has not been successfully completed.  If it has, just
 #. notify the user that their /nick command didn't go.
-#, fuzzy, c-format
+#, c-format
 msgid "The nickname \"%s\" is already being used."
-msgstr "??????????"
+msgstr "?? \"%s\" ?????"
 
-#, fuzzy
 msgid "Nickname in use"
-msgstr "??"
+msgstr "??????"
 
 msgid "Cannot change nick"
 msgstr "??????"
@@ -3398,9 +3355,9 @@ msgstr "PING ?? -- ??: %lu ?"
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING ?? -- ??: %lu ?"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot join %s: Registration is required."
-msgstr "????"
+msgstr "???? %s:????"
 
 msgid "Cannot join channel"
 msgstr "??????"
@@ -3597,9 +3554,8 @@ msgstr "????? TLS/SSL ??? msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "????? TLS/SSL ????????? TLS/SSL ???"
 
-#, fuzzy
 msgid "You require encryption, but no TLS/SSL support found."
-msgstr "????? TLS/SSL ????????? TLS/SSL ???"
+msgstr "??? TLS/SSL ??,????? TLS/SSL ???"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "??????????????????"
@@ -3631,19 +3587,14 @@ msgstr ""
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
 
-#, fuzzy
 msgid "No session ID given"
-msgstr "???????"
+msgstr "?????? ID"
 
-#, fuzzy
 msgid "Unsupported version of BOSH protocol"
-msgstr "??????"
+msgstr "??? BOSH ?????"
 
-#, fuzzy
 msgid "Unable to establish a connection with the server"
-msgstr ""
-"????????:\n"
-"%s"
+msgstr "??????????"
 
 #, c-format
 msgid ""
@@ -3653,9 +3604,8 @@ msgstr ""
 "????????:\n"
 "%s"
 
-#, fuzzy
 msgid "Unable to establish SSL connection"
-msgstr "???????"
+msgstr "???? SSL ??"
 
 msgid "Unable to create socket"
 msgstr "???????"
@@ -3727,12 +3677,11 @@ msgstr "????"
 msgid "Operating System"
 msgstr "????"
 
-#, fuzzy
 msgid "Local Time"
-msgstr "????:"
+msgstr "????"
 
 msgid "Last Activity"
-msgstr ""
+msgstr "????"
 
 msgid "Service Discovery Info"
 msgstr "??????"
@@ -3744,9 +3693,8 @@ msgstr "????"
 msgid "Extended Stanza Addressing"
 msgstr "????"
 
-#, fuzzy
 msgid "Multi-User Chat"
-msgstr "?????"
+msgstr "?????"
 
 #, fuzzy
 msgid "Multi-User Chat Extended Presence Information"
@@ -3775,17 +3723,15 @@ msgstr "????"
 msgid "In-Band Registration"
 msgstr "????"
 
-#, fuzzy
 msgid "User Location"
-msgstr "??"
+msgstr "????"
 
 #, fuzzy
 msgid "User Avatar"
 msgstr "????"
 
-#, fuzzy
 msgid "Chat State Notifications"
-msgstr "??????"
+msgstr "??????"
 
 msgid "Software Version"
 msgstr "????"
@@ -3822,9 +3768,8 @@ msgstr "??????"
 msgid "Reachability Address"
 msgstr "??????"
 
-#, fuzzy
 msgid "User Profile"
-msgstr "????"
+msgstr "????"
 
 #, fuzzy
 msgid "Jingle"
@@ -3833,9 +3778,8 @@ msgstr ""
 msgid "Jingle Audio"
 msgstr ""
 
-#, fuzzy
 msgid "User Nickname"
-msgstr "???"
+msgstr "????"
 
 msgid "Jingle ICE UDP"
 msgstr ""
@@ -3956,13 +3900,11 @@ msgstr "??"
 msgid "Unsubscribe"
 msgstr "??"
 
-#, fuzzy
 msgid "Log In"
-msgstr "???"
+msgstr "??"
 
-#, fuzzy
 msgid "Log Out"
-msgstr "????"
+msgstr "??"
 
 msgid "Chatty"
 msgstr "??"
@@ -4009,9 +3951,8 @@ msgstr "??????"
 msgid "Email Address"
 msgstr "??????"
 
-#, fuzzy
 msgid "Search for XMPP users"
-msgstr "????"
+msgstr "?? XMPP ??"
 
 #. "Search"
 msgid "Search"
@@ -4096,17 +4037,14 @@ msgstr "??:"
 msgid "Affiliations:"
 msgstr "??:"
 
-#, fuzzy
 msgid "No users found"
 msgstr "????????"
 
-#, fuzzy
 msgid "Roles:"
-msgstr "??"
+msgstr "??:"
 
-#, fuzzy
 msgid "Ping timeout"
-msgstr "???"
+msgstr "Ping ??"
 
 msgid "Read Error"
 msgstr "????"
@@ -4131,9 +4069,9 @@ msgstr "%s@%s ????"
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s ????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Registration to %s successful"
-msgstr "%s@%s ????"
+msgstr "%s ????"
 
 msgid "Registration Successful"
 msgstr "????"
@@ -4141,17 +4079,15 @@ msgstr "????"
 msgid "Registration Failed"
 msgstr "????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Registration from %s successfully removed"
-msgstr "%s@%s ????"
+msgstr "%s ??????"
 
-#, fuzzy
 msgid "Unregistration Successful"
-msgstr "????"
+msgstr "??????"
 
-#, fuzzy
 msgid "Unregistration Failed"
-msgstr "????"
+msgstr "??????"
 
 msgid "State"
 msgstr "?/?"
@@ -4171,7 +4107,6 @@ msgstr "????"
 msgid "Unregister"
 msgstr "????"
 
-#, fuzzy
 msgid ""
 "Please fill out the information below to change your account registration."
 msgstr "?????????????????"
@@ -4179,24 +4114,22 @@ msgstr "??????????? msgid "Please fill out the information below to register your new account."
 msgstr "?????????????????"
 
-#, fuzzy
 msgid "Register New XMPP Account"
-msgstr "???? Jabber ??"
+msgstr "???? XMPP ??"
 
 msgid "Register"
 msgstr "??"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Change Account Registration at %s"
-msgstr "?? %s ?????"
+msgstr "??? %s ?????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Register New Account at %s"
-msgstr "???? Jabber ??"
+msgstr "? %s ?????"
 
-#, fuzzy
 msgid "Change Registration"
-msgstr "????"
+msgstr "????"
 
 #, fuzzy
 msgid "Malformed BOSH Connect Server"
@@ -4206,16 +4139,14 @@ msgstr "????????"
 msgid "Error unregistering account"
 msgstr "????????"
 
-#, fuzzy
 msgid "Account successfully unregistered"
-msgstr "?????????"
+msgstr "????????"
 
 msgid "Initializing Stream"
 msgstr "????"
 
-#, fuzzy
 msgid "Initializing SSL/TLS"
-msgstr "????"
+msgstr "??? SSL/TLS"
 
 msgid "Authenticating"
 msgstr "????"
@@ -4306,9 +4237,8 @@ msgstr "???????"
 msgid "Password (again)"
 msgstr "???????"
 
-#, fuzzy
 msgid "Change XMPP Password"
-msgstr "????"
+msgstr "?? XMPP ??"
 
 msgid "Please enter your new password"
 msgstr "????????"
@@ -4496,9 +4426,9 @@ msgstr "?????? %s"
 msgid "Unable to kick user %s"
 msgstr "?????? %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to ping user %s"
-msgstr "?????? %s"
+msgstr "?? ping ?? %s"
 
 #, fuzzy, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
@@ -4620,14 +4550,12 @@ msgstr "buzz: ????????? #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "XMPP Protocol Plugin"
-msgstr "MSN ????"
+msgstr "XMPP ????"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#, fuzzy
 msgid "Domain"
-msgstr "?????"
+msgstr "?"
 
 msgid "Require SSL/TLS"
 msgstr ""
@@ -4647,22 +4575,20 @@ msgstr "?????"
 msgid "Connect server"
 msgstr "?????"
 
-#, fuzzy
 msgid "File transfer proxies"
-msgstr "??????"
+msgstr "??????"
 
 msgid "BOSH URL"
 msgstr ""
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
-#, fuzzy
 msgid "Show Custom Smileys"
-msgstr "???????:"
+msgstr "???????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has left the conversation."
-msgstr "%s ????????"
+msgstr "%s ????????"
 
 #, c-format
 msgid "Message from %s"
@@ -4680,11 +4606,10 @@ msgstr "??? %s ?????: %s
 msgid "Message delivery to %s failed: %s"
 msgstr "??? %s ?????: %s"
 
-#, fuzzy
 msgid "XMPP Message Error"
-msgstr "Jabber ????"
+msgstr "XMPP ????"
 
-#, fuzzy, c-format
+#, c-format
 msgid "(Code %s)"
 msgstr " (?? %s)"
 
@@ -4717,7 +4642,7 @@ msgstr "?? %s ??"
 msgstr "?? %s ??"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "???????????"
 
 #, fuzzy
@@ -5437,7 +5362,7 @@ msgstr "?????,????? msgid "Mobile message was not sent because it was too long."
 msgstr "?????,????????"
 
-#, c-format
+#, fuzzy, 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 "
@@ -5457,6 +5382,11 @@ msgstr[0] ""
 "?????????\n"
 "\n"
 "?????,?????????"
+msgstr[1] ""
+"MSN ?????? %d ?????????????,??????????????"
+"?????????\n"
+"\n"
+"?????,?????????"
 
 msgid ""
 "Message was not sent because the system is unavailable. This normally "
@@ -6260,9 +6190,10 @@ 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 you wish "
-"to connect to."
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr "?????????????????????????"
 
 msgid "Error. SSL support is not installed."
@@ -6482,7 +6413,7 @@ msgid "Buddy Icon"
 
 #. Label
 msgid "Buddy Icon"
-msgstr "????"
+msgstr "????"
 
 msgid "Voice"
 msgstr "??"
@@ -6629,10 +6560,10 @@ msgstr "?????"
 msgstr "?????"
 
 #. Unregistered username
-#. uid is not exist
+#. the username does not exist
 #, fuzzy
-msgid "Invalid username."
-msgstr "????"
+msgid "Username does not exist"
+msgstr "?????"
 
 #. Suspended account
 msgid "Your account is currently suspended."
@@ -6757,40 +6688,46 @@ msgstr "??(_D)"
 msgid "_Decline"
 msgstr "??(_D)"
 
-#, c-format
+#, fuzzy, 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 ???,??????????"
 
-#, c-format
+#, fuzzy, 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 ???,??????????"
 
-#, c-format
+#, fuzzy, 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 ???,???????????"
 
 #, fuzzy, 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[0] "???? %2$s ? %1$hu ???,????/?????????"
+msgstr[1] "???? %2$s ? %1$hu ???,????/?????????"
 
 #, fuzzy, 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[0] "???? %2$s ? %1$hu ???,????????????"
+msgstr[1] "???? %2$s ? %1$hu ???,????????????"
 
-#, c-format
+#, fuzzy, 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 ???,?????"
 
 #. Data is assumed to be the destination bn
 #, c-format
@@ -6945,7 +6882,7 @@ msgstr ""
 "?????????????????????????????;????????"
 "?????"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
 "truncated for you."
@@ -6953,11 +6890,12 @@ msgstr[0] "?????????? "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] "?????????????? %d ?????????????"
+msgstr[1] "?????????????? %d ?????????????"
 
 msgid "Profile too long."
 msgstr "???????"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
 "truncated for you."
@@ -6965,6 +6903,7 @@ msgstr[0] "?????????? "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] "?????????????? %d ???????????????"
+msgstr[1] "?????????????? %d ???????????????"
 
 msgid "Away message too long."
 msgstr "???????"
@@ -7904,6 +7843,11 @@ msgstr "??????"
 msgid "Enter the text from the image"
 msgstr "??????"
 
+#. uid is not exist
+#, fuzzy
+msgid "Invalid username."
+msgstr "????"
+
 #, c-format
 msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
@@ -9489,7 +9433,6 @@ msgstr "??????????? msgid "Received invalid data"
 msgstr "??????????????????"
 
-#. Password incorrect
 #, fuzzy
 msgid "Incorrect Password"
 msgstr "????"
@@ -9501,11 +9444,6 @@ msgstr "????? %d???? Y
 "Logging into the Yahoo! website may fix this."
 msgstr "????? %d???? Yahoo! ???????"
 
-#. the username does not exist
-#, fuzzy
-msgid "Username does not exist"
-msgstr "?????"
-
 #. indicates a lock of some description
 #, fuzzy
 msgid ""
@@ -10124,35 +10062,41 @@ msgstr "???"
 msgid "Unknown."
 msgstr "???"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d ?"
+msgstr[1] "%d ?"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d ?"
+msgstr[1] "%d ?"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d ??"
+msgstr[1] "%s %d ??"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ??"
+msgstr[1] "%d ??"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s %d ?"
+msgstr[1] "%s %d ?"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d ?"
+msgstr[1] "%d ?"
 
 #, c-format
 msgid "Could not open %s: Redirected too many times"
@@ -10273,7 +10217,7 @@ msgid "Use this buddy _icon for this acc
 
 #. Buddy icon
 msgid "Use this buddy _icon for this account:"
-msgstr "??????????(_I):"
+msgstr "????????(_I):"
 
 msgid "_Advanced"
 msgstr "??(_A)"
@@ -10370,11 +10314,12 @@ msgstr ""
 "??????????????????????,?????????????<b>?"
 "?->??/??</b>"
 
-#, c-format
+#, fuzzy, 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 ?????????????"
 
 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
@@ -10384,11 +10329,9 @@ msgstr ""
 "????????????????????????????,?????????"
 "?????????????????,??????????????"??""
 
-#, fuzzy
 msgid "Please update the necessary fields."
 msgstr "?????????"
 
-#, fuzzy
 msgid "A_ccount"
 msgstr "??(_C):"
 
@@ -10687,10 +10630,11 @@ msgstr "/??(T)/????(O)"
 msgid "/Tools/Room List"
 msgstr "/??(T)/????(O)"
 
-#, c-format
+#, fuzzy, 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"
 
 msgid "Manually"
 msgstr "??"
@@ -10949,6 +10893,10 @@ msgstr "?? %s ?????"
 msgid "The text information for a buddy's status"
 msgstr "?? %s ?????"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "?????????????"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL ???"
@@ -11206,10 +11154,11 @@ msgstr "???????"
 msgid "0 people in room"
 msgstr "???????"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "????? %d ??"
+msgstr[1] "????? %d ??"
 
 msgid "Typing"
 msgstr "???"
@@ -11691,7 +11640,7 @@ msgstr "??????????"
 msgid "Enter an alias for this chat."
 msgstr "??????????"
 
-#, c-format
+#, fuzzy, 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?"
@@ -11701,6 +11650,9 @@ msgstr[0] ""
 msgstr[0] ""
 "??????????????? %s ? %d ?????????????????"
 "??"
+msgstr[1] ""
+"??????????????? %s ? %d ?????????????????"
+"??"
 
 msgid "Remove Contact"
 msgstr "?????"
@@ -11884,7 +11836,7 @@ msgstr "??????"
 msgstr "??????"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "?????????????"
 
 msgid "Hyperlink prelight color"
@@ -11922,15 +11874,22 @@ msgstr ""
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "????"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "?????"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12275,15 +12234,17 @@ msgstr ""
 msgid "%s wishes to start a video session with you."
 msgstr ""
 
-#, c-format
+#, fuzzy, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s ? %d ?????"
+msgstr[1] "%s ? %d ?????"
 
-#, c-format
+#, fuzzy, 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>"
 
 #, c-format
 msgid "The browser command \"%s\" is invalid."
@@ -12300,6 +12261,10 @@ msgstr "???"??"???? "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "???"??"?????,???????"
 
+#, fuzzy
+msgid "No message"
+msgstr "????"
+
 msgid "Open All Messages"
 msgstr "??????"
 
@@ -12317,10 +12282,6 @@ msgstr "<span weight=\"bold\" size=\"lar
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">??????!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "????"
-
 msgid "The following plugins will be unloaded."
 msgstr "??????????"
 
@@ -12642,7 +12603,8 @@ msgstr "<span style=\"italic\">?:stu
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">?:stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "???? IP ??(_A)"
 
 msgid "Public _IP:"
@@ -12822,31 +12784,26 @@ msgstr ""
 "????(_O):\n"
 "(%s ?????)"
 
-#, fuzzy
 msgid "M_ute sounds"
-msgstr "??"
+msgstr "??(_U)"
 
 msgid "Sounds when conversation has _focus"
 msgstr "?????????(_F)"
 
-#, fuzzy
 msgid "_Enable sounds:"
-msgstr "????:"
+msgstr "????(_E):"
 
-#, fuzzy
 msgid "V_olume:"
-msgstr "??:"
+msgstr "??(_O):"
 
 msgid "Play"
 msgstr "??"
 
-#, fuzzy
 msgid "_Browse..."
-msgstr "??(_E)..."
+msgstr "??(_B)..."
 
-#, fuzzy
 msgid "_Reset"
-msgstr "??"
+msgstr "??(_R)"
 
 msgid "_Report idle time:"
 msgstr "??????(_R):"
@@ -12920,9 +12877,8 @@ msgstr "???????:"
 msgstr "???????:"
 
 #. Remove All button
-#, fuzzy
 msgid "Remove Al_l"
-msgstr "??"
+msgstr "????(_L)"
 
 msgid "Permit User"
 msgstr "????"
@@ -13018,46 +12974,26 @@ msgstr "%s ???"
 msgid "Status for %s"
 msgstr "%s ???"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "????"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
+msgid "Custom Smiley"
+msgstr "?????"
+
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "????"
 
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "??? %s ????"
-
-#, fuzzy
 msgid "Edit Smiley"
-msgstr "????"
+msgstr "????"
 
-#, fuzzy
 msgid "Add Smiley"
-msgstr "??"
+msgstr "????"
 
-#, fuzzy
 msgid "_Image:"
-msgstr "??(_I)"
+msgstr "??(_I):"
 
 #. Shortcut text
 #, fuzzy
@@ -13079,22 +13015,18 @@ msgstr "????"
 msgid "Select Buddy Icon"
 msgstr "????"
 
-#, fuzzy
 msgid "Click to change your buddyicon for this account."
-msgstr "??????????(_I):"
+msgstr "?????????????"
 
-#, fuzzy
 msgid "Click to change your buddyicon for all accounts."
-msgstr "??????????(_I):"
+msgstr "?????????????"
 
 msgid "Waiting for network connection"
 msgstr "????????"
 
-#, fuzzy
 msgid "New status..."
-msgstr "???..."
+msgstr "???..."
 
-#, fuzzy
 msgid "Saved statuses..."
 msgstr "????"
 
@@ -13132,7 +13064,7 @@ msgid "Set as buddy icon"
 "??????????????,?????????,?????????????"
 
 msgid "Set as buddy icon"
-msgstr "???????"
+msgstr "???????"
 
 msgid "Send image file"
 msgstr "??????"
@@ -13146,12 +13078,12 @@ msgid ""
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
-msgstr "??????????????,?????????????"
+msgstr "??????????????,?????????????"
 
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
-msgstr "??????????????,?????????????"
+msgstr "????????????,?????????????"
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
 #. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
@@ -13161,9 +13093,10 @@ msgstr "???????"
 msgid "Cannot send launcher"
 msgstr "???????"
 
+#, fuzzy
 msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "??????????????????,?????????????????,?"
 "???????"
@@ -13199,7 +13132,7 @@ msgid "_Open Link"
 
 #, fuzzy
 msgid "_Open Link"
-msgstr "???????(_O):"
+msgstr "????(_O):"
 
 msgid "_Copy Link Location"
 msgstr "??????(_C)"
@@ -13225,24 +13158,20 @@ msgstr "??(_I)"
 msgid "_Invite"
 msgstr "??(_I)"
 
-#, fuzzy
 msgid "_Modify..."
-msgstr "??(_M)"
+msgstr "??(_M)..."
 
-#, fuzzy
 msgid "_Add..."
-msgstr "??(_A)"
+msgstr "??(_A)..."
 
 msgid "_Open Mail"
 msgstr "????(_O)"
 
-#, fuzzy
 msgid "_Edit"
-msgstr "??"
+msgstr "??(_E)"
 
-#, fuzzy
 msgid "Pidgin Tooltip"
-msgstr "Pidgin"
+msgstr "Pidgin ????"
 
 msgid "Pidgin smileys"
 msgstr "Pidgin ??"
@@ -13256,9 +13185,8 @@ msgstr "?"
 msgid "none"
 msgstr "?"
 
-#, fuzzy
 msgid "Small"
-msgstr "????"
+msgstr "?"
 
 msgid "Smaller versions of the default smilies"
 msgstr ""
@@ -13528,7 +13456,6 @@ msgstr "?????????"
 msgstr "?????????"
 
 #. *  description
-#, fuzzy
 msgid ""
 "Allows support for mouse gestures in conversation windows. Drag the middle "
 "mouse button to perform certain actions:\n"
@@ -13539,9 +13466,9 @@ msgstr ""
 "???????????????\n"
 "?????????????:\n"
 "\n"
-"???????????\n"
-"??????????????\n"
-"??????????????"
+"????????????\n"
+"???????????????\n"
+"???????????????"
 
 msgid "Instant Messaging"
 msgstr "????"
@@ -13617,7 +13544,6 @@ msgstr "??????????? msgid "Please enter the person's information below."
 msgstr "?????????????"
 
-#, fuzzy
 msgid "Please enter the buddy's username and account type below."
 msgstr "??????????????????"
 
@@ -13653,11 +13579,13 @@ msgstr "??????? UI ???msgid "Test to see that all ui signals are working properly."
 msgstr "??????? UI ??????????"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Buddy Note</b>: %s"
-msgstr "????"
+msgstr ""
+"\n"
+"<b>????</b>: %s"
 
 msgid "History"
 msgstr "??"
@@ -13687,20 +13615,17 @@ msgstr "??????????? msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr "?????????????,??????????"
 
-#, fuzzy
 msgid "Markerline"
-msgstr "???"
+msgstr "???"
 
-#, fuzzy
 msgid "Draw a line to indicate new messages in a conversation."
-msgstr "?????????"
+msgstr "????????????????"
 
-#, fuzzy
 msgid "Jump to markerline"
-msgstr "???"
+msgstr "?????"
 
 msgid "Draw Markerline in "
-msgstr ""
+msgstr "??????"
 
 msgid "_IM windows"
 msgstr "??????(_I)"
@@ -13750,18 +13675,18 @@ msgstr "??????????? msgstr "????????????"
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr "????????????????????????"
 
 #. ---------- "Notify For" ----------
 msgid "Notify For"
 msgstr "??"
 
-#, fuzzy
 msgid "\t_Only when someone says your username"
-msgstr "\t??????????????(_O)"
+msgstr "\t???????????(_O)"
 
 msgid "_Focused windows"
 msgstr "????(_F)"
@@ -13785,18 +13710,16 @@ msgstr "???????"??? msgid "Set window manager \"_URGENT\" hint"
 msgstr "???????"??"??(_U)"
 
-#, fuzzy
 msgid "_Flash window"
-msgstr "????(_H)"
+msgstr "????(_F)"
 
 #. Raise window method button
 msgid "R_aise conversation window"
 msgstr "??????(_A)"
 
 #. Present conversation method button
-#, fuzzy
 msgid "_Present conversation window"
-msgstr "??????(_A)"
+msgstr "??????(_P)"
 
 #. ---------- "Notification Removals" ----------
 msgid "Notification Removal"
@@ -13868,9 +13791,8 @@ msgstr "??????"
 msgid "Hyperlink Color"
 msgstr "??????"
 
-#, fuzzy
 msgid "Visited Hyperlink Color"
-msgstr "??????"
+msgstr "??????????"
 
 #, fuzzy
 msgid "Highlighted Message Name Color"
@@ -13963,13 +13885,11 @@ msgstr "?????"
 msgid "New Version Available"
 msgstr "?????"
 
-#, fuzzy
 msgid "Later"
-msgstr "??"
+msgstr "??"
 
-#, fuzzy
 msgid "Download Now"
-msgstr "%s ?????: %s"
+msgstr "????"
 
 #. *< type
 #. *< ui_requirement
@@ -14000,21 +13920,20 @@ msgstr "??????????? #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Send Button"
-msgstr "???"
+msgstr "????"
 
 #. *< name
 #. *< version
-#, fuzzy
 msgid "Conversation Window Send Button."
-msgstr "??????"
+msgstr "?????????"
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
-msgstr ""
+"for use when no physical keyboard is present."
+msgstr "?????????????????,?????????"
 
 msgid "Duplicate Correction"
 msgstr "????"
@@ -14336,8 +14255,9 @@ 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."
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "?? Pidgin for Windows ?????,?????????"
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14380,6 +14300,9 @@ msgstr "??????? XMPP ?? #~ msgid "Activate which ID?"
 #~ msgstr "???? ID?"
 
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "????????????"
+
 #~ msgid "Cursor Color"
 #~ msgstr "????"
 


More information about the Commits mailing list