pidgin: b885791d: Updated Chinese (Hong Kong & Traditional..

qulogic at pidgin.im qulogic at pidgin.im
Thu Sep 3 22:36:39 EDT 2009


-----------------------------------------------------------------
Revision: b885791dbd21de13d4a52215b977f4f1c3f80298
Ancestor: 608fcebd65f66e5ebd77d2e36ed7cdf473505562
Author: ambrose.li at gmail.com
Date: 2009-09-04T02:27:21
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b885791dbd21de13d4a52215b977f4f1c3f80298

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

ChangeLog: 

Updated Chinese (Hong Kong & Traditional) translations.

Closes #10202.

-------------- next part --------------
============================================================
--- po/ChangeLog	8c077e3934725abffa2cdec68d1fec57383f5505
+++ po/ChangeLog	a6d7b4bec6611ae30216b7b92e699167193467e7
@@ -4,7 +4,9 @@ version 2.6.2
 	* Afrikaans translation updated (Friedel Wolff)
 	* Albanian translation updated (Besnik Bleta)
 	* Basque translation updated (Mikel Pascual Aldabaldetreku)
+	* Chinese (Hong Kong) translation updated (Ambrose C. Li)
 	* Chinese (Simplified) translation updated (Aron Xu)
+	* Chinese (Traditional) translation updated (Ambrose C. Li)
 	* Finnish translation updated (Timo Jyrinki)
 	* French translation updated (?ric Boumaour)
 	* German translation updated (Jochen Kemnade)
============================================================
--- po/zh_HK.po	be210c21ff7e91b80e329019accfb06b2f871841
+++ po/zh_HK.po	4b743e46002a79d44c3d8e480d60c8a56cc90ff9
@@ -8,7 +8,7 @@
 # LINE NUMBERS (LINES BEGINNING WITH #:) IN THIS FILE.
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.594 2009/08/06 05:26:27 acli Exp $
+# $InternalId: zh_TW.po,v 1.600 2009/09/03 13:49:05 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -52,10 +52,10 @@ msgstr ""
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.6.0\n"
+"Project-Id-Version: Pidgin 2.6.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-05 23:59-0700\n"
-"PO-Revision-Date: 2009-07-30 01:53-0500\n"
+"POT-Creation-Date: 2009-09-01 09:57-0400\n"
+"PO-Revision-Date: 2009-09-03 06:04-0400\n"
 "Last-Translator: Ambrose Li <ambrose.li at gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <community at linuxhall.org>\n"
 "MIME-Version: 1.0\n"
@@ -136,7 +136,7 @@ msgid "Username:"
 msgstr "????:"
 
 msgid "Username:"
-msgstr "??(_U):"
+msgstr "??:"
 
 msgid "Password:"
 msgstr "??:"
@@ -924,7 +924,8 @@ msgstr "????"
 msgid "System Log"
 msgstr "????"
 
-msgid "Calling ... "
+# XXX ?? - acli 20090730
+msgid "Calling..."
 msgstr "???..."
 
 # NOTE ????????
@@ -1577,6 +1578,33 @@ msgstr "????????,?? "conversation into the current conversation."
 msgstr "????????,????????????????????"
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"?? TinyURL ?..."
+
+# XXX ?? - 20090729 acli
+msgid "Only create TinyURL for URLs of this length or greater"
+msgstr "?????????????????? TinyURL"
+
+# XXX ?? - 20090729 acli
+msgid "TinyURL (or other) address prefix"
+msgstr "TinyURL(????)????"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "TinyURL ??"
+
+# NOTE ?? copying ???????,???????????,??????,????????????
+# XXX ?? - 20090729 acli
+msgid "When receiving a message with URL(s), use TinyURL for easier copying"
+msgstr "????????????,?? TinyURL ????,?????"
+
 msgid "Online"
 msgstr "??"
 
@@ -1623,33 +1651,6 @@ msgstr "Lastlog ???"
 msgid "Lastlog plugin."
 msgstr "Lastlog ???"
 
-#, c-format
-msgid ""
-"\n"
-"Fetching TinyURL..."
-msgstr ""
-"\n"
-"?? TinyURL ?..."
-
-# XXX ?? - 20090729 acli
-msgid "Only create TinyURL for urls of this length or greater"
-msgstr "?????????????????? TinyURL"
-
-# XXX ?? - 20090729 acli
-msgid "TinyURL (or other) address prefix"
-msgstr "TinyURL(????)????"
-
-msgid "TinyURL"
-msgstr "TinyURL"
-
-msgid "TinyURL plugin"
-msgstr "TinyURL ??"
-
-# NOTE ?? copying ???????,???????????,??????,????????????
-# XXX ?? - 20090729 acli
-msgid "When receiving a message with URL(s), TinyURL for easier copying"
-msgstr "????????????,?? TinyURL ????,?????"
-
 msgid "accounts"
 msgstr "????"
 
@@ -1719,6 +1720,39 @@ msgstr "????"
 msgid "buddy list"
 msgstr "????"
 
+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 "????????? Pidgin ????????????"
+
+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 ""
+"????????,???????????? (root certificate) ?????"
+
+msgid "The certificate chain presented is invalid."
+msgstr "????????????????"
+
+# NOTE: ? http://grca.nat.gov.tw/qanda1.htm
+msgid "The certificate has been revoked."
+msgstr "?????????"
+
+msgid "An unknown certificate error occurred."
+msgstr "?????????????"
+
 msgid "(DOES NOT MATCH)"
 msgstr "(????)"
 
@@ -1764,74 +1798,25 @@ msgstr "????(_V)"
 msgid "_View Certificate..."
 msgstr "????(_V)"
 
-# FIXME ?????? - acli 20070913
 #, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"?%s??????????????%s?,???????????????????"
-"?????"
+msgid "The certificate for %s could not be validated."
+msgstr "???? %s ????"
 
-#. Had no CA pool, so couldn't verify the chain *and*
-#. * the subject name isn't valid.
-#. * I think this is bad enough to warrant a fatal error. It's
-#. * not likely anyway...
-#.
 #. TODO: Probably wrong.
-#. TODO: Make this error either block the ensuing SSL
-#. connection error until the user dismisses this one, or
-#. stifle it.
-#. TODO: Probably wrong.
-#. TODO: Probably wrong
-#. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "SSL ????"
 
-msgid "Invalid certificate chain"
-msgstr "??????"
+msgid "Unable to validate certificate"
+msgstr "??????"
 
-#. The subject name is correct, but we weren't able to verify the
-#. * chain because there was no pool of root CAs found. Prompt the user
-#. * to validate it.
-#.
-#. vrq will be completed by user_auth
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
-"????????,???????????? (root certificate) ?????"
-
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
+# FIXME ?????? - acli 20070913
+# FIXME ????????
 #, c-format
 msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr "?%s??????????,?????????"
+"The certificate claims to be from \"%s\" instead. This could mean that you "
+"are not connecting to the service you believe you are."
+msgstr "????????????%s?,????????????????????"
 
-#. FIXME 2.6.1
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr "?%s????????????"
-
-#. vrq will be completed by user_auth
-msgid ""
-"The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr "????????? Pidgin ????????????"
-
-#, 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."
-msgstr ""
-"?%s???????????????????,????????????????"
-"??"
-
-msgid "Invalid certificate authority signature"
-msgstr "???????????"
-
 #. Make messages
 #, c-format
 msgid ""
@@ -1868,7 +1853,6 @@ msgstr "+++ %s ??"
 msgstr "+++ %s ??"
 
 #. Unknown error
-#, c-format
 msgid "Unknown error"
 msgstr "????"
 
@@ -2070,18 +2054,18 @@ msgstr "??????"
 msgstr "??????"
 
 #, c-format
-msgid "You canceled the transfer of %s"
+msgid "You cancelled the transfer of %s"
 msgstr "???? %s ???"
 
 msgid "File transfer cancelled"
 msgstr "???????"
 
 #, c-format
-msgid "%s canceled the transfer of %s"
+msgid "%s cancelled the transfer of %s"
 msgstr "%s ??? %s ???"
 
 #, c-format
-msgid "%s canceled the file transfer"
+msgid "%s cancelled the file transfer"
 msgstr "%s ???????"
 
 #, c-format
@@ -2259,6 +2243,36 @@ msgstr "(%s) %s <????>:%s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <????>:%s\n"
 
+# NOTE GStreamer ???????codec???
+# XXX ???(????)???????????
+msgid ""
+"No codecs found. Install some GStreamer codecs found in GStreamer plugins "
+"packages."
+msgstr "???????????????????? GStreamer ???"
+
+msgid ""
+"No codecs left. Your codec preferences in fs-codecs.conf are too strict."
+msgstr ""
+"??? fs-codecs.conf ?????????????,?????????????"
+
+# NOTE?non-recoverable?????????,????? glibc ???
+msgid "A non-recoverable Farsight2 error has occurred."
+msgstr "???????? Farsight2 ???"
+
+msgid "Conference error."
+msgstr "??????"
+
+msgid "Error with your microphone."
+msgstr "??????????"
+
+msgid "Error with your webcam."
+msgstr "?? webcam ?????"
+
+# FIXME ?????? - acli 20090902
+#, c-format
+msgid "Error creating session: %s"
+msgstr "??????????:%s"
+
 # FIXME ?????? - acli 20090731
 msgid "Error creating conference."
 msgstr "???????"
@@ -2270,6 +2284,7 @@ msgstr "?????????? I
 msgid "This plugin has not defined an ID."
 msgstr "?????????? ID?"
 
+# FIXME ?????? - acli 20090902
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "???? %d (?? %d)"
@@ -2537,15 +2552,15 @@ msgstr "??????????? msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "????????????? IPC ??,???????? IPC ???"
 
-#  XXX ???
-msgid "Join/Part Hiding Configuration"
-msgstr "?????????/?????????"
+msgid "Hide Joins/Parts"
+msgstr "??????????/?????????"
 
-msgid "Minimum Room Size"
-msgstr "???????"
+#. 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)"
-msgstr "??????(??)"
+msgid "If user has not spoken in this many minutes"
+msgstr "????,????????"
 
 msgid "Apply hiding rules to buddies"
 msgstr "??????????"
@@ -4003,15 +4018,21 @@ msgstr "??"
 msgid "Logo"
 msgstr "??"
 
+#, 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 "?????"
 
-msgid "Cancel Presence Notification"
-msgstr "????????"
-
 msgid "(Re-)Request authorization"
 msgstr "?????????"
 
@@ -4713,10 +4734,10 @@ msgid ""
 #  NOTE ???? by ambrose
 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;???&gt; &lt;moderator|participant|visitor|none&gt; [??1] [??"
-"2] ...: ?????????????,????????????????"
+"role &lt;moderator|participant|visitor|none&gt; [??1] [??2] ...: ????"
+"?????????,????????????????"
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;???&gt; [??]:??????????"
@@ -4857,9 +4878,6 @@ msgstr "???????"
 msgid "Transfer was closed."
 msgstr "???????"
 
-msgid "Failed to open the file"
-msgstr "??????"
-
 msgid "Failed to open in-band bytestream"
 msgstr "??????????"
 
@@ -5144,8 +5162,7 @@ msgstr "?????????"
 msgid "Not expected"
 msgstr "?????????"
 
-#, c-format
-msgid "Friendly name changes too rapidly"
+msgid "Friendly name is changing too rapidly"
 msgstr "?????????"
 
 #, c-format
@@ -5719,10 +5736,9 @@ msgstr "%s ????? webcam,??msgid "%s requests to view your webcam, but this request is not yet supported."
 msgstr "%s ????? webcam,??????????????"
 
-# FIXME ???????? - acli 20090803
 #, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s ????? webcam ??,??????????????"
+msgid "%s invited you to view his/her webcam, but this is not yet supported."
+msgstr "%s ?????(?)? webcam,??????????????"
 
 msgid "Away From Computer"
 msgstr "?????"
@@ -5772,6 +5788,10 @@ msgstr "??????????"
 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??????????"
 
@@ -6460,8 +6480,10 @@ msgstr "??????"
 msgstr "??????"
 
 # NOTE ?? http://pidgin.im/pipermail/translators/2009-July/000394.html
-msgid "Received unexpected response from "
-msgstr "???????????,????? "
+#. Note to translators: %s in this string is a URL
+#, c-format
+msgid "Received unexpected response from %s"
+msgstr "%s ????????"
 
 #. username connecting too frequently
 msgid ""
@@ -6471,10 +6493,12 @@ msgstr ""
 "????/????????????????????????????????,"
 "????????????????"
 
-# NOTE ?? http://pidgin.im/pipermail/translators/2009-July/000394.html
+# NOTE ????? %s?????? - acli 20090902
+#. Note to translators: The first %s is a URL, the second is an
+#. error message.
 #, c-format
-msgid "Error requesting "
-msgstr "?????????,????? "
+msgid "Error requesting %s: %s"
+msgstr "???? %s ???????:%s"
 
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL ????????????"
@@ -7250,6 +7274,9 @@ msgstr "??(_O)"
 msgid "C_onnect"
 msgstr "??(_O)"
 
+msgid "You closed the connection."
+msgstr "???????"
+
 msgid "Get AIM Info"
 msgstr "?? AIM ??"
 
@@ -7260,6 +7287,10 @@ msgstr "??????"
 msgid "Get Status Msg"
 msgstr "??????"
 
+# XXX ????????????,??? cnscode.org.tw ????????????
+msgid "End Direct IM Session"
+msgstr "??????????"
+
 # NOTE ????????????????
 msgid "Direct IM"
 msgstr "????"
@@ -8145,7 +8176,7 @@ msgstr "????"
 msgstr "????"
 
 #, c-format
-msgid "%d canceled the transfer of %s"
+msgid "%d cancelled the transfer of %s"
 msgstr "%d ????%s????"
 
 #, c-format
@@ -9683,6 +9714,9 @@ msgstr "??????????? msgid "Ignore conference and chatroom invitations"
 msgstr "???????????"
 
+msgid "Use account proxy for SSL connections"
+msgstr "?? SSL ???,??????????"
+
 msgid "Chat room list URL"
 msgstr "?????????"
 
@@ -9708,6 +9742,11 @@ msgstr "Yahoo JAPAN ????"
 msgid "Yahoo! JAPAN Protocol Plugin"
 msgstr "Yahoo JAPAN ????"
 
+# FIXME ???????? - acli 20090803
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s ????? webcam ??,??????????????"
+
 msgid "Your SMS was not delivered"
 msgstr "????????"
 
@@ -9772,19 +9811,34 @@ msgstr ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
-"?????????????? %s????????(?)??????????,?"
+"?????????????? %s????????(?)??????????,?"
 "?????(?),????????"
 
 msgid "Ignore buddy?"
 msgstr "??????"
 
-# NOTE???????????????? - acli 20090730
-msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "??????????????? Yahoo! ???"
+msgid "Invalid username or password"
+msgstr "????????"
 
+msgid ""
+"Your account has been locked due to too many failed login attempts.  Please "
+"try logging into the Yahoo! website."
+msgstr "??????????,?????????????? Yahoo! ?????"
+
 #, c-format
+msgid "Unknown error 52.  Reconnecting should fix this."
+msgstr "????? 52 ?????,?????????????"
+
+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 ""
+"?? 1013:?????????????????????????????????"
+"?????? Yahoo ???"
+
+#, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr "??????? %d?????? Yahoo!,????????????????"
+msgstr "????? %d ?????,??? Yahoo! ???????????????"
 
 #, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
@@ -10584,6 +10638,127 @@ msgstr ""
 "???????????????,?????????????->???????,"
 "?????????"
 
+#. 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 ??gtkblist-theme-loader????,????????????PidginThemeFont(???????????),??
+#. 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 "????????"
+
+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 "???????"
+
+# NOTE "the text font and color to be used for expanded contacts" (blist-theme.h)
+# NOTE ??deryni???,?contact???,??????priority buddy
+# NOTE ??contact???,????????contact???????contact????buddy
+# NOTE ???,???text information for when a contact is expanded?????contact???
+msgid "The text information for when a contact is expanded"
+msgstr "????????????????????"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is online
+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
+msgid "Offline Text"
+msgstr "???????"
+
+msgid "The text information for when a buddy is offline"
+msgstr "?????????????????"
+
+#. 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 "????????????"
+
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
@@ -11019,8 +11194,8 @@ msgstr "??(_G):"
 msgid "_Group:"
 msgstr "??(_G):"
 
-msgid "Auto_join when account becomes online."
-msgstr "???????????(_J)?"
+msgid "Auto_join when account connects."
+msgstr "???????????(_J)?"
 
 msgid "_Remain in chat after window is closed."
 msgstr "???????????(_R)?"
@@ -11057,103 +11232,6 @@ msgstr "/??/??????"
 msgid "/Buddies/Sort Buddies"
 msgstr "/??/??????"
 
-#. 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 blist"
-msgstr "????????????????"
-
-#. Group
-msgid "Expanded Background Color"
-msgstr "??????????"
-
-msgid "The background color of an expanded group"
-msgstr "???????????????"
-
-# NOTE ??gtkblist-theme-loader????,????????????PidginThemeFont(???????????),??
-msgid "Expanded Text"
-msgstr "????????"
-
-msgid "The text information for when a group is expanded"
-msgstr "?????????????????"
-
-msgid "Collapsed Background Color"
-msgstr "??????????"
-
-msgid "The background color of a collapsed group"
-msgstr "??????????????"
-
-msgid "Collapsed Text"
-msgstr "????????"
-
-msgid "The text information for when a group is collapsed"
-msgstr "?????????????????"
-
-#. Buddy
-msgid "Contact/Chat Background Color"
-msgstr "??/????????"
-
-msgid "The background color of a contact or chat"
-msgstr "?????????????"
-
-msgid "Contact Text"
-msgstr "???????"
-
-# NOTE "the text font and color to be used for expanded contacts" (blist-theme.h)
-# NOTE ??deryni???,?contact???,??????priority buddy
-# NOTE ??contact???,????????contact???????contact????buddy
-# NOTE ???,???text information for when a contact is expanded?????contact???
-msgid "The text information for when a contact is expanded"
-msgstr "????????????????????"
-
-msgid "On-line Text"
-msgstr "???????"
-
-msgid "The text information for when a buddy is online"
-msgstr "?????????????????"
-
-msgid "Away Text"
-msgstr "???????"
-
-msgid "The text information for when a buddy is away"
-msgstr "?????????????????"
-
-msgid "Off-line Text"
-msgstr "???????"
-
-msgid "The text information for when a buddy is off-line"
-msgstr "?????????????????"
-
-msgid "Idle Text"
-msgstr "???????"
-
-msgid "The text information for when a buddy is idle"
-msgstr "?????????????????"
-
-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 "????????????????????????"
-
-msgid "The text information for a buddy's status"
-msgstr "????????????"
-
 # XXX ?????? - acli 20070913
 msgid "Type the host name for this certificate."
 msgstr "???????????????"
@@ -11242,6 +11320,9 @@ msgstr "/??/?????(_M)..."
 msgid "/Conversation/New Instant _Message..."
 msgstr "/??/?????(_M)..."
 
+msgid "/Conversation/Join a _Chat..."
+msgstr "/??/?????(_C)..."
+
 msgid "/Conversation/_Find..."
 msgstr "/??/??(_F)..."
 
@@ -11649,7 +11730,7 @@ msgstr "?????"
 msgid "Estonian"
 msgstr "?????"
 
-msgid "Euskera(Basque)"
+msgid "Basque"
 msgstr "????"
 
 msgid "Persian"
@@ -11886,11 +11967,13 @@ msgid ""
 
 #, 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 ""
-"<FONT SIZE=\"4\">????:</FONT> <A HREF=\"mailto:support at pidgin.im"
-"\">support at pidgin.im</A><BR/><BR/>"
 
 #, c-format
 msgid ""
@@ -12466,71 +12549,48 @@ msgstr "%s %s????%s -h????msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s????%s -h????????????\n"
 
-#  FIXME
-#  NOTE hard-code ????Pidgin?????,????????(?????),?????,?????????
 #, 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=DIR    ???????\n"
-"  -d, --debug         ????????????\n"
-"  -f, --force-online  ????????,?????????\n"
-"  -h, --help          ?????????\n"
-"  -m, --multiple      ????????Pidgin??\n"
-"  -n, --nologin       ?????\n"
-"  -l, --login[=NAME]  ??????? (?? NAME ????????\n"
-"                      ??,???????) \n"
-"  --display=DISPLAY   ????? X display\n"
-"  -v, --version       ?????????\n"
 
-#  FIXME
-#  NOTE hard-code ????Pidgin?????,????????(?????),?????,?????????
-#, 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=DIR    ???????\n"
-"  -d, --debug         ????????????\n"
-"  -f, --force-online  ????????,?????????\n"
-"  -h, --help          ?????????\n"
-"  -m, --multiple      ????????Pidgin??\n"
-"  -n, --nologin       ?????\n"
-"  -l, --login[=NAME]  ???????(NAME????????,???????"
-"?\n"
-"                      ?????,????????????????)\n"
-"  -v, --version       ?????????\n"
+"??????? (?? NAME ????????\n"
+"                      ??,???????;"
 
+msgid "Without this only the first account will be enabled)."
+msgstr "???????,??????????)"
+
+msgid "X display to use"
+msgstr "????? X display"
+
+msgid "display the current version and exit"
+msgstr "?????????"
+
 #, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
@@ -12565,10 +12625,6 @@ msgstr "/??/??(_H)"
 msgid "/Media/_Hangup"
 msgstr "/??/??(_H)"
 
-# XXX ?? - acli 20090730
-msgid "Calling..."
-msgstr "???..."
-
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
 msgstr "%s ????????/?????"
@@ -12577,6 +12633,13 @@ msgstr "%s ?????????? msgid "%s wishes to start a video session with you."
 msgstr "%s ???????????"
 
+# FIXME ?????????,?????/????,???????????????? - acli 20090902
+msgid "Incoming Call"
+msgstr "????"
+
+msgid "_Pause"
+msgstr "??(_P)"
+
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -13518,9 +13581,6 @@ msgstr "????(_O)"
 msgid "_Open Mail"
 msgstr "????(_O)"
 
-msgid "_Pause"
-msgstr "??(_P)"
-
 # TODO ??? - 20080826
 msgid "_Edit"
 msgstr "??(_E)"
@@ -13592,74 +13652,6 @@ msgstr "??????????? msgid "Displays statistical information about your buddies' availability"
 msgstr "????????????????"
 
-#  NOTE ???Select an XMPP server to query????????
-msgid "Server name request"
-msgstr "???????"
-
-#  XXX ?????,?????????,?????????? - acli 20090803
-msgid "Enter an XMPP Server"
-msgstr "??? XMPP ?????"
-
-msgid "Select an XMPP server to query"
-msgstr "????? XMPP ???"
-
-#  NOTE ????
-#  FIXME ?????? - acli 20090730
-msgid "Find Services"
-msgstr "????"
-
-msgid "Add to Buddy List"
-msgstr "???????"
-
-# NOTE ?? http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=gateway&qrytype=en&x=27&y=7
-msgid "Gateway"
-msgstr "???"
-
-msgid "Directory"
-msgstr "??"
-
-# NOTE ?? http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=collection&qrytype=en&x=30&y=9
-# NOTE ?? http://wiki.jabbercn.org/index.php?title=XEP-0060&variant=zh-hant
-msgid "PubSub Collection"
-msgstr "PubSub ????"
-
-# NOTE ?? http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=leaf&qrytype=en&x=37&y=11
-# NOTE ?? http://wiki.jabbercn.org/index.php?title=XEP-0060&variant=zh-hant
-msgid "PubSub Leaf"
-msgstr "PubSub ????"
-
-msgid ""
-"\n"
-"<b>Description:</b> "
-msgstr ""
-"\n"
-"<b>??:</b>"
-
-#. 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 "XMPP ????"
-
-#  FIXME ?????? - acli 20090730
-msgid "Allows browsing and registering services."
-msgstr "??????????"
-
-msgid ""
-"This plugin is useful for registering with legacy transports or other XMPP "
-"services."
-msgstr "????????????? XMPP ??????"
-
 msgid "Buddy is idle"
 msgstr "????"
 
@@ -13755,6 +13747,76 @@ msgstr "???????"
 msgid "Apply in IMs"
 msgstr "???????"
 
+#  NOTE ???Select an XMPP server to query????????
+#. 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 "???????"
+
+#  XXX ?????,?????????,?????????? - acli 20090803
+msgid "Enter an XMPP Server"
+msgstr "??? XMPP ?????"
+
+msgid "Select an XMPP server to query"
+msgstr "????? XMPP ???"
+
+#  NOTE ????
+#  FIXME ?????? - acli 20090730
+msgid "Find Services"
+msgstr "????"
+
+msgid "Add to Buddy List"
+msgstr "???????"
+
+# NOTE ?? http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=gateway&qrytype=en&x=27&y=7
+msgid "Gateway"
+msgstr "???"
+
+msgid "Directory"
+msgstr "??"
+
+# NOTE ?? http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=collection&qrytype=en&x=30&y=9
+# NOTE ?? http://wiki.jabbercn.org/index.php?title=XEP-0060&variant=zh-hant
+msgid "PubSub Collection"
+msgstr "PubSub ????"
+
+# NOTE ?? http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=leaf&qrytype=en&x=37&y=11
+# NOTE ?? http://wiki.jabbercn.org/index.php?title=XEP-0060&variant=zh-hant
+msgid "PubSub Leaf"
+msgstr "PubSub ????"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>??:</b>"
+
+#. 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 "XMPP ????"
+
+#  FIXME ?????? - acli 20090730
+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 "??????"
 
@@ -14567,8 +14629,53 @@ msgstr "??????????? "timestamp formats."
 msgstr "????????????????????????????"
 
+msgid "Audio"
+msgstr "??"
+
+msgid "Video"
+msgstr "??"
+
+msgid "Output"
+msgstr "??"
+
+msgid "_Plugin"
+msgstr "??(_P)"
+
+msgid "_Device"
+msgstr "??(_D)"
+
+msgid "Input"
+msgstr "??"
+
+msgid "P_lugin"
+msgstr "??(_L)"
+
+msgid "D_evice"
+msgstr "??(_E)"
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Voice/Video Settings"
+msgstr "??/????"
+
+#. *< name
+#. *< version
+msgid "Configure your microphone and webcam."
+msgstr "?????? webcam?"
+
+#. *< summary
+msgid "Configure microphone and webcam settings for voice/video calls."
+msgstr "???/?????????? webcam?"
+
 msgid "Opacity:"
-msgstr "????:"
+msgstr "???:"
 
 #. IM Convo trans options
 msgid "IM Conversation Windows"
@@ -14695,6 +14802,117 @@ msgstr "??? XMPP ?????? msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "??? XMPP ????????????"
 
+#~ msgid "Calling ... "
+#~ msgstr "???..."
+
+#~ msgid "Invalid certificate chain"
+#~ msgstr "??????"
+
+#~ 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."
+#~ msgstr ""
+#~ "?%s???????????????????,???????????????"
+#~ "???"
+
+#~ msgid "Invalid certificate authority signature"
+#~ msgstr "???????????"
+
+#  XXX ???
+#~ msgid "Join/Part Hiding Configuration"
+#~ msgstr "?????????/?????????"
+
+#~ msgid "Minimum Room Size"
+#~ msgstr "???????"
+
+#~ msgid "User Inactivity Timeout (in minutes)"
+#~ msgstr "??????(??)"
+
+#~ msgid "Failed to open the file"
+#~ msgstr "??????"
+
+# NOTE???????????????? - acli 20090730
+#~ msgid "Your account is locked, please log in to the Yahoo! website."
+#~ msgstr "??????????????? Yahoo! ???"
+
+#~ msgid "Euskera(Basque)"
+#~ msgstr "????"
+
+#~ 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\">????:</FONT> <A HREF=\"mailto:support at pidgin.im"
+#~ "\">support at pidgin.im</A><BR/><BR/>"
+
+#  FIXME
+#  NOTE hard-code ????Pidgin?????,????????(?????),?????,?????????
+#~ 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=DIR    ???????\n"
+#~ "  -d, --debug         ????????????\n"
+#~ "  -f, --force-online  ????????,?????????\n"
+#~ "  -h, --help          ?????????\n"
+#~ "  -m, --multiple      ????????Pidgin??\n"
+#~ "  -n, --nologin       ?????\n"
+#~ "  -l, --login[=NAME]  ??????? (?? NAME ????????\n"
+#~ "                      ??,???????) \n"
+#~ "  --display=DISPLAY   ????? X display\n"
+#~ "  -v, --version       ?????????\n"
+
+#  FIXME
+#  NOTE hard-code ????Pidgin?????,????????(?????),?????,?????????
+#~ 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=DIR    ???????\n"
+#~ "  -d, --debug         ????????????\n"
+#~ "  -f, --force-online  ????????,?????????\n"
+#~ "  -h, --help          ?????????\n"
+#~ "  -m, --multiple      ????????Pidgin??\n"
+#~ "  -n, --nologin       ?????\n"
+#~ "  -l, --login[=NAME]  ???????(NAME????????,???????"
+#~ "?\n"
+#~ "                      ?????,????????????????)\n"
+#~ "  -v, --version       ?????????\n"
+
 #~ msgid "_Resume"
 #~ msgstr "??(_R)"
 
@@ -15050,9 +15268,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"
 
============================================================
--- po/zh_TW.po	7a95fffdbfdada273d060c0e6c962159c55fe3a9
+++ po/zh_TW.po	9da9876569231bbdcc7e146710c730c2b8ae6808
@@ -6,7 +6,7 @@
 # LINE NUMBERS (LINES BEGINNING WITH #:) IN THIS FILE.
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.594 2009/08/06 05:26:27 acli Exp $
+# $InternalId: zh_TW.po,v 1.600 2009/09/03 13:49:05 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -50,10 +50,10 @@ msgstr ""
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.6.0\n"
+"Project-Id-Version: Pidgin 2.6.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-05 23:59-0700\n"
-"PO-Revision-Date: 2009-07-30 01:53-0500\n"
+"POT-Creation-Date: 2009-09-01 09:57-0400\n"
+"PO-Revision-Date: 2009-09-03 06:04-0400\n"
 "Last-Translator: Ambrose Li <ambrose.li at gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n at linux.org.tw>\n"
 "MIME-Version: 1.0\n"
@@ -134,7 +134,7 @@ msgid "Username:"
 msgstr "????:"
 
 msgid "Username:"
-msgstr "??(_U):"
+msgstr "??:"
 
 msgid "Password:"
 msgstr "??:"
@@ -922,7 +922,8 @@ msgstr "????"
 msgid "System Log"
 msgstr "????"
 
-msgid "Calling ... "
+# XXX ?? - acli 20090730
+msgid "Calling..."
 msgstr "???..."
 
 # NOTE ????????
@@ -1575,6 +1576,33 @@ msgstr "????????,?? "conversation into the current conversation."
 msgstr "????????,????????????????????"
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"?? TinyURL ?..."
+
+# XXX ?? - 20090729 acli
+msgid "Only create TinyURL for URLs of this length or greater"
+msgstr "?????????????????? TinyURL"
+
+# XXX ?? - 20090729 acli
+msgid "TinyURL (or other) address prefix"
+msgstr "TinyURL(????)????"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "TinyURL ??"
+
+# NOTE ?? copying ???????,???????????,??????,????????????
+# XXX ?? - 20090729 acli
+msgid "When receiving a message with URL(s), use TinyURL for easier copying"
+msgstr "????????????,?? TinyURL ????,?????"
+
 msgid "Online"
 msgstr "??"
 
@@ -1621,33 +1649,6 @@ msgstr "Lastlog ???"
 msgid "Lastlog plugin."
 msgstr "Lastlog ???"
 
-#, c-format
-msgid ""
-"\n"
-"Fetching TinyURL..."
-msgstr ""
-"\n"
-"?? TinyURL ?..."
-
-# XXX ?? - 20090729 acli
-msgid "Only create TinyURL for urls of this length or greater"
-msgstr "?????????????????? TinyURL"
-
-# XXX ?? - 20090729 acli
-msgid "TinyURL (or other) address prefix"
-msgstr "TinyURL(????)????"
-
-msgid "TinyURL"
-msgstr "TinyURL"
-
-msgid "TinyURL plugin"
-msgstr "TinyURL ??"
-
-# NOTE ?? copying ???????,???????????,??????,????????????
-# XXX ?? - 20090729 acli
-msgid "When receiving a message with URL(s), TinyURL for easier copying"
-msgstr "????????????,?? TinyURL ????,?????"
-
 msgid "accounts"
 msgstr "????"
 
@@ -1717,6 +1718,39 @@ msgstr "????"
 msgid "buddy list"
 msgstr "????"
 
+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 "????????? Pidgin ????????????"
+
+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 ""
+"????????,???????????? (root certificate) ?????"
+
+msgid "The certificate chain presented is invalid."
+msgstr "????????????????"
+
+# NOTE: ? http://grca.nat.gov.tw/qanda1.htm
+msgid "The certificate has been revoked."
+msgstr "?????????"
+
+msgid "An unknown certificate error occurred."
+msgstr "?????????????"
+
 msgid "(DOES NOT MATCH)"
 msgstr "(????)"
 
@@ -1762,74 +1796,27 @@ msgstr "????(_V)"
 msgid "_View Certificate..."
 msgstr "????(_V)"
 
-# FIXME ?????? - acli 20070913
 #, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"?%s??????????????%s?,???????????????????"
-"?????"
+msgid "The certificate for %s could not be validated."
+msgstr "???? %s ????"
 
-#. Had no CA pool, so couldn't verify the chain *and*
-#. * the subject name isn't valid.
-#. * I think this is bad enough to warrant a fatal error. It's
-#. * not likely anyway...
-#.
 #. TODO: Probably wrong.
-#. TODO: Make this error either block the ensuing SSL
-#. connection error until the user dismisses this one, or
-#. stifle it.
-#. TODO: Probably wrong.
-#. TODO: Probably wrong
-#. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "SSL ????"
 
-msgid "Invalid certificate chain"
-msgstr "??????"
+msgid "Unable to validate certificate"
+msgstr "??????"
 
-#. The subject name is correct, but we weren't able to verify the
-#. * chain because there was no pool of root CAs found. Prompt the user
-#. * to validate it.
-#.
-#. vrq will be completed by user_auth
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
-"????????,???????????? (root certificate) ?????"
-
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
+# FIXME ?????? - acli 20070913
+# FIXME ????????
 #, c-format
 msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr "?%s??????????,?????????"
-
-#. FIXME 2.6.1
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr "?%s????????????"
-
-#. vrq will be completed by user_auth
-msgid ""
-"The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr "????????? Pidgin ????????????"
-
-#, 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 ""
-"?%s???????????????????,????????????????"
-"??"
+"????????????%s?,???????????????"
+"?????"
 
-msgid "Invalid certificate authority signature"
-msgstr "???????????"
-
 #. Make messages
 #, c-format
 msgid ""
@@ -1866,7 +1853,6 @@ msgstr "+++ %s ??"
 msgstr "+++ %s ??"
 
 #. Unknown error
-#, c-format
 msgid "Unknown error"
 msgstr "????"
 
@@ -2068,18 +2054,18 @@ msgstr "??????"
 msgstr "??????"
 
 #, c-format
-msgid "You canceled the transfer of %s"
-msgstr "???? %s ???"
+msgid "You cancelled the transfer of %s"
+msgstr "???? %s ???"
 
 msgid "File transfer cancelled"
 msgstr "???????"
 
 #, c-format
-msgid "%s canceled the transfer of %s"
+msgid "%s cancelled the transfer of %s"
 msgstr "%s ??? %s ???"
 
 #, c-format
-msgid "%s canceled the file transfer"
+msgid "%s cancelled the file transfer"
 msgstr "%s ???????"
 
 #, c-format
@@ -2257,6 +2243,35 @@ msgstr "(%s) %s <????>:%s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <????>:%s\n"
 
+# NOTE GStreamer ???????codec???
+# XXX ???(????)???????????
+msgid ""
+"No codecs found. Install some GStreamer codecs found in GStreamer plugins "
+"packages."
+msgstr "???????????????????? GStreamer ???"
+
+msgid ""
+"No codecs left. Your codec preferences in fs-codecs.conf are too strict."
+msgstr "??? fs-codecs.conf ?????????????,?????????????"
+
+# NOTE?non-recoverable?????????,????? glibc ???
+msgid "A non-recoverable Farsight2 error has occurred."
+msgstr "???????? Farsight2 ???"
+
+msgid "Conference error."
+msgstr "??????"
+
+msgid "Error with your microphone."
+msgstr "??????????"
+
+msgid "Error with your webcam."
+msgstr "?? webcam ?????"
+
+# FIXME ?????? - acli 20090902
+#, c-format
+msgid "Error creating session: %s"
+msgstr "??????????:%s"
+
 # FIXME ?????? - acli 20090731
 msgid "Error creating conference."
 msgstr "???????"
@@ -2268,6 +2283,7 @@ msgstr "?????????? I
 msgid "This plugin has not defined an ID."
 msgstr "?????????? ID?"
 
+# FIXME ?????? - acli 20090902
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "???? %d (?? %d)"
@@ -2535,15 +2551,15 @@ msgstr "??????????? msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "????????????? IPC ??,???????? IPC ???"
 
-#  XXX ???
-msgid "Join/Part Hiding Configuration"
-msgstr "?????????/?????????"
+msgid "Hide Joins/Parts"
+msgstr "??????????/?????????"
 
-msgid "Minimum Room Size"
-msgstr "???????"
+#. 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)"
-msgstr "??????(??)"
+msgid "If user has not spoken in this many minutes"
+msgstr "????,????????"
 
 msgid "Apply hiding rules to buddies"
 msgstr "??????????"
@@ -4001,15 +4017,21 @@ msgstr "??"
 msgid "Logo"
 msgstr "??"
 
+#, 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 "?????"
 
-msgid "Cancel Presence Notification"
-msgstr "????????"
-
 msgid "(Re-)Request authorization"
 msgstr "?????????"
 
@@ -4711,9 +4733,9 @@ msgid ""
 #  NOTE ???? by ambrose
 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;???&gt; &lt;moderator|participant|visitor|none&gt; [??1] [??"
+"role &lt;moderator|participant|visitor|none&gt; [??1] [??"
 "2] ...: ?????????????,????????????????"
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -4855,9 +4877,6 @@ msgstr "???????"
 msgid "Transfer was closed."
 msgstr "???????"
 
-msgid "Failed to open the file"
-msgstr "??????"
-
 msgid "Failed to open in-band bytestream"
 msgstr "??????????"
 
@@ -5142,8 +5161,7 @@ msgstr "?????????"
 msgid "Not expected"
 msgstr "?????????"
 
-#, c-format
-msgid "Friendly name changes too rapidly"
+msgid "Friendly name is changing too rapidly"
 msgstr "?????????"
 
 #, c-format
@@ -5717,10 +5735,9 @@ msgstr "%s ????? webcam,??msgid "%s requests to view your webcam, but this request is not yet supported."
 msgstr "%s ????? webcam,??????????????"
 
-# FIXME ???????? - acli 20090803
 #, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s ????? webcam ??,??????????????"
+msgid "%s invited you to view his/her webcam, but this is not yet supported."
+msgstr "%s ?????(?)? webcam,??????????????"
 
 msgid "Away From Computer"
 msgstr "?????"
@@ -5770,6 +5787,10 @@ msgstr "??????????"
 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??????????"
 
@@ -6458,8 +6479,10 @@ msgstr "??????"
 msgstr "??????"
 
 # NOTE ?? http://pidgin.im/pipermail/translators/2009-July/000394.html
-msgid "Received unexpected response from "
-msgstr "???????????,????? "
+#. Note to translators: %s in this string is a URL
+#, c-format
+msgid "Received unexpected response from %s"
+msgstr "%s ????????"
 
 #. username connecting too frequently
 msgid ""
@@ -6469,10 +6492,12 @@ msgstr ""
 "????/????????????????????????????????"
 "?,????????????????"
 
-# NOTE ?? http://pidgin.im/pipermail/translators/2009-July/000394.html
+# NOTE ????? %s?????? - acli 20090902
+#. Note to translators: The first %s is a URL, the second is an
+#. error message.
 #, c-format
-msgid "Error requesting "
-msgstr "?????????,????? "
+msgid "Error requesting %s: %s"
+msgstr "???? %s ???????:%s"
 
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL ????????????"
@@ -7248,6 +7273,9 @@ msgstr "??(_O)"
 msgid "C_onnect"
 msgstr "??(_O)"
 
+msgid "You closed the connection."
+msgstr "???????"
+
 msgid "Get AIM Info"
 msgstr "?? AIM ??"
 
@@ -7258,6 +7286,10 @@ msgstr "??????"
 msgid "Get Status Msg"
 msgstr "??????"
 
+# XXX ????????????,??? cnscode.org.tw ????????????
+msgid "End Direct IM Session"
+msgstr "??????????"
+
 # NOTE ????????????????
 msgid "Direct IM"
 msgstr "????"
@@ -8143,7 +8175,7 @@ msgstr "????"
 msgstr "????"
 
 #, c-format
-msgid "%d canceled the transfer of %s"
+msgid "%d cancelled the transfer of %s"
 msgstr "%d ????%s????"
 
 #, c-format
@@ -9677,6 +9709,9 @@ msgstr "??????????? msgid "Ignore conference and chatroom invitations"
 msgstr "???????????"
 
+msgid "Use account proxy for SSL connections"
+msgstr "?? SSL ???,??????????"
+
 msgid "Chat room list URL"
 msgstr "?????????"
 
@@ -9702,6 +9737,11 @@ msgstr "Yahoo JAPAN ????"
 msgid "Yahoo! JAPAN Protocol Plugin"
 msgstr "Yahoo JAPAN ????"
 
+# FIXME ???????? - acli 20090803
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s ????? webcam ??,??????????????"
+
 msgid "Your SMS was not delivered"
 msgstr "????????"
 
@@ -9766,19 +9806,32 @@ msgstr ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
-"?????????????? %s????????(?)??????????,?"
+"?????????????? %s????????(?)??????????,?"
 "?????(?),????????"
 
 msgid "Ignore buddy?"
 msgstr "??????"
 
-# NOTE???????????????? - acli 20090730
-msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "??????????????? Yahoo! ???"
+msgid "Invalid username or password"
+msgstr "????????"
 
+msgid ""
+"Your account has been locked due to too many failed login attempts.  Please "
+"try logging into the Yahoo! website."
+msgstr "??????????,?????????????? Yahoo! ?????"
+
 #, c-format
+msgid "Unknown error 52.  Reconnecting should fix this."
+msgstr "????? 52 ?????,?????????????"
+
+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 "?? 1013:??????????????????????????????????????? Yahoo ???"
+
+#, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr "??????? %d?????? Yahoo!,????????????????"
+msgstr "????? %d ?????,??? Yahoo! ???????????????"
 
 #, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
@@ -10578,6 +10631,127 @@ msgstr ""
 "???????????????,?????????????->???????,"
 "?????????"
 
+#. 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 ??gtkblist-theme-loader????,????????????PidginThemeFont(???????????),??
+#. 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 "????????"
+
+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 "???????"
+
+# NOTE "the text font and color to be used for expanded contacts" (blist-theme.h)
+# NOTE ??deryni???,?contact???,??????priority buddy
+# NOTE ??contact???,????????contact???????contact????buddy
+# NOTE ???,???text information for when a contact is expanded?????contact???
+msgid "The text information for when a contact is expanded"
+msgstr "????????????????????"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is online
+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
+msgid "Offline Text"
+msgstr "???????"
+
+msgid "The text information for when a buddy is offline"
+msgstr "?????????????????"
+
+#. 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 "????????????"
+
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
@@ -11013,8 +11187,8 @@ msgstr "??(_G):"
 msgid "_Group:"
 msgstr "??(_G):"
 
-msgid "Auto_join when account becomes online."
-msgstr "???????????(_J)?"
+msgid "Auto_join when account connects."
+msgstr "???????????(_J)?"
 
 msgid "_Remain in chat after window is closed."
 msgstr "???????????(_R)?"
@@ -11051,103 +11225,6 @@ msgstr "/??/??????"
 msgid "/Buddies/Sort Buddies"
 msgstr "/??/??????"
 
-#. 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 blist"
-msgstr "????????????????"
-
-#. Group
-msgid "Expanded Background Color"
-msgstr "??????????"
-
-msgid "The background color of an expanded group"
-msgstr "???????????????"
-
-# NOTE ??gtkblist-theme-loader????,????????????PidginThemeFont(???????????),??
-msgid "Expanded Text"
-msgstr "????????"
-
-msgid "The text information for when a group is expanded"
-msgstr "?????????????????"
-
-msgid "Collapsed Background Color"
-msgstr "??????????"
-
-msgid "The background color of a collapsed group"
-msgstr "??????????????"
-
-msgid "Collapsed Text"
-msgstr "????????"
-
-msgid "The text information for when a group is collapsed"
-msgstr "?????????????????"
-
-#. Buddy
-msgid "Contact/Chat Background Color"
-msgstr "??/????????"
-
-msgid "The background color of a contact or chat"
-msgstr "?????????????"
-
-msgid "Contact Text"
-msgstr "???????"
-
-# NOTE "the text font and color to be used for expanded contacts" (blist-theme.h)
-# NOTE ??deryni???,?contact???,??????priority buddy
-# NOTE ??contact???,????????contact???????contact????buddy
-# NOTE ???,???text information for when a contact is expanded?????contact???
-msgid "The text information for when a contact is expanded"
-msgstr "????????????????????"
-
-msgid "On-line Text"
-msgstr "???????"
-
-msgid "The text information for when a buddy is online"
-msgstr "?????????????????"
-
-msgid "Away Text"
-msgstr "???????"
-
-msgid "The text information for when a buddy is away"
-msgstr "?????????????????"
-
-msgid "Off-line Text"
-msgstr "???????"
-
-msgid "The text information for when a buddy is off-line"
-msgstr "?????????????????"
-
-msgid "Idle Text"
-msgstr "???????"
-
-msgid "The text information for when a buddy is idle"
-msgstr "?????????????????"
-
-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 "????????????????????????"
-
-msgid "The text information for a buddy's status"
-msgstr "????????????"
-
 # XXX ?????? - acli 20070913
 msgid "Type the host name for this certificate."
 msgstr "???????????????"
@@ -11236,6 +11313,9 @@ msgstr "/??/?????(_M)..."
 msgid "/Conversation/New Instant _Message..."
 msgstr "/??/?????(_M)..."
 
+msgid "/Conversation/Join a _Chat..."
+msgstr "/??/?????(_C)..."
+
 msgid "/Conversation/_Find..."
 msgstr "/??/??(_F)..."
 
@@ -11643,7 +11723,7 @@ msgstr "?????"
 msgid "Estonian"
 msgstr "?????"
 
-msgid "Euskera(Basque)"
+msgid "Basque"
 msgstr "????"
 
 msgid "Persian"
@@ -11880,11 +11960,13 @@ msgid ""
 
 #, 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 ""
-"<FONT SIZE=\"4\">????:</FONT> <A HREF=\"mailto:support at pidgin.im"
-"\">support at pidgin.im</A><BR/><BR/>"
 
 #, c-format
 msgid ""
@@ -12460,71 +12542,48 @@ msgstr "%s %s????%s -h????msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s????%s -h????????????\n"
 
-#  FIXME
-#  NOTE hard-code ????Pidgin?????,????????(?????),?????,?????????
 #, 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=DIR    ???????\n"
-"  -d, --debug         ????????????\n"
-"  -f, --force-online  ????????,?????????\n"
-"  -h, --help          ?????????\n"
-"  -m, --multiple      ????????Pidgin??\n"
-"  -n, --nologin       ?????\n"
-"  -l, --login[=NAME]  ??????? (?? NAME ????????\n"
-"                      ??,???????) \n"
-"  --display=DISPLAY   ????? X display\n"
-"  -v, --version       ?????????\n"
 
-#  FIXME
-#  NOTE hard-code ????Pidgin?????,????????(?????),?????,?????????
-#, 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=DIR    ???????\n"
-"  -d, --debug         ????????????\n"
-"  -f, --force-online  ????????,?????????\n"
-"  -h, --help          ?????????\n"
-"  -m, --multiple      ????????Pidgin??\n"
-"  -n, --nologin       ?????\n"
-"  -l, --login[=NAME]  ???????(NAME????????,???????"
-"?\n"
-"                      ?????,????????????????)\n"
-"  -v, --version       ?????????\n"
+"??????? (?? NAME ????????\n"
+"                      ??,???????;"
 
+msgid "Without this only the first account will be enabled)."
+msgstr "???????,??????????)"
+
+msgid "X display to use"
+msgstr "????? X display"
+
+msgid "display the current version and exit"
+msgstr "?????????"
+
 #, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
@@ -12559,10 +12618,6 @@ msgstr "/??/??(_H)"
 msgid "/Media/_Hangup"
 msgstr "/??/??(_H)"
 
-# XXX ?? - acli 20090730
-msgid "Calling..."
-msgstr "???..."
-
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
 msgstr "%s ????????/?????"
@@ -12571,6 +12626,13 @@ msgstr "%s ?????????? msgid "%s wishes to start a video session with you."
 msgstr "%s ???????????"
 
+# FIXME ?????????,?????/????,???????????????? - acli 20090902
+msgid "Incoming Call"
+msgstr "????"
+
+msgid "_Pause"
+msgstr "??(_P)"
+
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -13512,9 +13574,6 @@ msgstr "????(_O)"
 msgid "_Open Mail"
 msgstr "????(_O)"
 
-msgid "_Pause"
-msgstr "??(_P)"
-
 # TODO ??? - 20080826
 msgid "_Edit"
 msgstr "??(_E)"
@@ -13586,74 +13645,6 @@ msgstr "??????????? msgid "Displays statistical information about your buddies' availability"
 msgstr "????????????????"
 
-#  NOTE ???Select an XMPP server to query????????
-msgid "Server name request"
-msgstr "???????"
-
-#  XXX ?????,?????????,?????????? - acli 20090803
-msgid "Enter an XMPP Server"
-msgstr "??? XMPP ?????"
-
-msgid "Select an XMPP server to query"
-msgstr "????? XMPP ???"
-
-#  NOTE ????
-#  FIXME ?????? - acli 20090730
-msgid "Find Services"
-msgstr "????"
-
-msgid "Add to Buddy List"
-msgstr "???????"
-
-# NOTE ?? http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=gateway&qrytype=en&x=27&y=7
-msgid "Gateway"
-msgstr "???"
-
-msgid "Directory"
-msgstr "??"
-
-# NOTE ?? http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=collection&qrytype=en&x=30&y=9
-# NOTE ?? http://wiki.jabbercn.org/index.php?title=XEP-0060&variant=zh-hant
-msgid "PubSub Collection"
-msgstr "PubSub ????"
-
-# NOTE ?? http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=leaf&qrytype=en&x=37&y=11
-# NOTE ?? http://wiki.jabbercn.org/index.php?title=XEP-0060&variant=zh-hant
-msgid "PubSub Leaf"
-msgstr "PubSub ????"
-
-msgid ""
-"\n"
-"<b>Description:</b> "
-msgstr ""
-"\n"
-"<b>??:</b>"
-
-#. 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 "XMPP ????"
-
-#  FIXME ?????? - acli 20090730
-msgid "Allows browsing and registering services."
-msgstr "??????????"
-
-msgid ""
-"This plugin is useful for registering with legacy transports or other XMPP "
-"services."
-msgstr "????????????? XMPP ??????"
-
 msgid "Buddy is idle"
 msgstr "????"
 
@@ -13749,6 +13740,76 @@ msgstr "???????"
 msgid "Apply in IMs"
 msgstr "???????"
 
+#  NOTE ???Select an XMPP server to query????????
+#. 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 "???????"
+
+#  XXX ?????,?????????,?????????? - acli 20090803
+msgid "Enter an XMPP Server"
+msgstr "??? XMPP ?????"
+
+msgid "Select an XMPP server to query"
+msgstr "????? XMPP ???"
+
+#  NOTE ????
+#  FIXME ?????? - acli 20090730
+msgid "Find Services"
+msgstr "????"
+
+msgid "Add to Buddy List"
+msgstr "???????"
+
+# NOTE ?? http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=gateway&qrytype=en&x=27&y=7
+msgid "Gateway"
+msgstr "???"
+
+msgid "Directory"
+msgstr "??"
+
+# NOTE ?? http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=collection&qrytype=en&x=30&y=9
+# NOTE ?? http://wiki.jabbercn.org/index.php?title=XEP-0060&variant=zh-hant
+msgid "PubSub Collection"
+msgstr "PubSub ????"
+
+# NOTE ?? http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=leaf&qrytype=en&x=37&y=11
+# NOTE ?? http://wiki.jabbercn.org/index.php?title=XEP-0060&variant=zh-hant
+msgid "PubSub Leaf"
+msgstr "PubSub ????"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>??:</b>"
+
+#. 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 "XMPP ????"
+
+#  FIXME ?????? - acli 20090730
+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 "?????"
 
@@ -14561,8 +14622,53 @@ msgstr "??????????? "timestamp formats."
 msgstr "????????????????????????????"
 
+msgid "Audio"
+msgstr "??"
+
+msgid "Video"
+msgstr "??"
+
+msgid "Output"
+msgstr "??"
+
+msgid "_Plugin"
+msgstr "??(_P)"
+
+msgid "_Device"
+msgstr "??(_D)"
+
+msgid "Input"
+msgstr "??"
+
+msgid "P_lugin"
+msgstr "??(_L)"
+
+msgid "D_evice"
+msgstr "??(_E)"
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Voice/Video Settings"
+msgstr "??/????"
+
+#. *< name
+#. *< version
+msgid "Configure your microphone and webcam."
+msgstr "?????? webcam?"
+
+#. *< summary
+msgid "Configure microphone and webcam settings for voice/video calls."
+msgstr "???/?????????? webcam?"
+
 msgid "Opacity:"
-msgstr "????:"
+msgstr "???:"
 
 #. IM Convo trans options
 msgid "IM Conversation Windows"
@@ -14689,6 +14795,117 @@ msgstr "??? XMPP ?????? msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "??? XMPP ????????????"
 
+#~ msgid "Calling ... "
+#~ msgstr "???..."
+
+#~ msgid "Invalid certificate chain"
+#~ msgstr "??????"
+
+#~ 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."
+#~ msgstr ""
+#~ "?%s???????????????????,???????????????"
+#~ "???"
+
+#~ msgid "Invalid certificate authority signature"
+#~ msgstr "???????????"
+
+#  XXX ???
+#~ msgid "Join/Part Hiding Configuration"
+#~ msgstr "?????????/?????????"
+
+#~ msgid "Minimum Room Size"
+#~ msgstr "???????"
+
+#~ msgid "User Inactivity Timeout (in minutes)"
+#~ msgstr "??????(??)"
+
+#~ msgid "Failed to open the file"
+#~ msgstr "??????"
+
+# NOTE???????????????? - acli 20090730
+#~ msgid "Your account is locked, please log in to the Yahoo! website."
+#~ msgstr "??????????????? Yahoo! ???"
+
+#~ msgid "Euskera(Basque)"
+#~ msgstr "????"
+
+#~ 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\">????:</FONT> <A HREF=\"mailto:support at pidgin.im"
+#~ "\">support at pidgin.im</A><BR/><BR/>"
+
+#  FIXME
+#  NOTE hard-code ????Pidgin?????,????????(?????),?????,?????????
+#~ 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=DIR    ???????\n"
+#~ "  -d, --debug         ????????????\n"
+#~ "  -f, --force-online  ????????,?????????\n"
+#~ "  -h, --help          ?????????\n"
+#~ "  -m, --multiple      ????????Pidgin??\n"
+#~ "  -n, --nologin       ?????\n"
+#~ "  -l, --login[=NAME]  ??????? (?? NAME ????????\n"
+#~ "                      ??,???????) \n"
+#~ "  --display=DISPLAY   ????? X display\n"
+#~ "  -v, --version       ?????????\n"
+
+#  FIXME
+#  NOTE hard-code ????Pidgin?????,????????(?????),?????,?????????
+#~ 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=DIR    ???????\n"
+#~ "  -d, --debug         ????????????\n"
+#~ "  -f, --force-online  ????????,?????????\n"
+#~ "  -h, --help          ?????????\n"
+#~ "  -m, --multiple      ????????Pidgin??\n"
+#~ "  -n, --nologin       ?????\n"
+#~ "  -l, --login[=NAME]  ???????(NAME????????,???????"
+#~ "?\n"
+#~ "                      ?????,????????????????)\n"
+#~ "  -v, --version       ?????????\n"
+
 #~ msgid "_Resume"
 #~ msgstr "??(_R)"
 
@@ -15044,9 +15261,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"
 


More information about the Commits mailing list