changeset 28190:214a9814e52c

Updated Chinese (Hong Kong & Traditional) translations. Closes #10202. committer: Elliott Sales de Andrade <qulogic@pidgin.im>
author ambrose.li@gmail.com
date Fri, 04 Sep 2009 02:27:21 +0000 (2009-09-04)
parents 8ca57377fbfe
children ac0e64c07ee4
files po/ChangeLog po/zh_HK.po po/zh_TW.po
diffstat 3 files changed, 1193 insertions(+), 762 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Fri Sep 04 02:23:11 2009 +0000
+++ b/po/ChangeLog	Fri Sep 04 02:27:21 2009 +0000
@@ -4,7 +4,9 @@
 	* 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)
--- a/po/zh_HK.po	Fri Sep 04 02:23:11 2009 +0000
+++ b/po/zh_HK.po	Fri Sep 04 02:27:21 2009 +0000
@@ -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 @@
 #
 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@gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
 "MIME-Version: 1.0\n"
@@ -136,7 +136,7 @@
 msgstr "��荐���絎�鐚�"
 
 msgid "Username:"
-msgstr "絽活��(_U)鐚�"
+msgstr "絽活��鐚�"
 
 msgid "Password:"
 msgstr "絲�腆種�"
@@ -924,7 +924,8 @@
 msgid "System Log"
 msgstr "膤紫輝�ヨ�"
 
-msgid "Calling ... "
+# XXX ��⑮ - acli 20090730
+msgid "Calling..."
 msgstr "�ユ��筝�..."
 
 # NOTE ��������筝���罔�膠�
@@ -1577,6 +1578,33 @@
 "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 ��篆���篋堺����絲�����阪��������肢���茲�茖緒��∴�膓峨���欠�㍼�茲�茖巡���荅俄������f��箙���
+# 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 @@
 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 ��篆���篋堺����絲�����阪��������肢���茲�茖緒��∴�膓峨���欠�㍼�茲�茖巡���荅俄������f��箙���
-# XXX ��⑮ - 20090729 acli
-msgid "When receiving a message with URL(s), TinyURL for easier copying"
-msgstr "�倶・�九�医����膓峨����荐�����鐚�篏睡�� TinyURL 膰��㊦恐��鐚�絅醇�剛梢��絲�"
-
 msgid "accounts"
 msgstr "絽活��羝���"
 
@@ -1719,6 +1720,39 @@
 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,73 +1798,24 @@
 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��鐚�篏��������順���g����巡����綽���賢絽���篏�"
-"����������"
-
-#. 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
+#, c-format
+msgid "The certificate for %s could not be validated."
+msgstr "�≧�薊�茘� %s ��茘��吾��"
+
 #. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "SSL 茘��檎���"
 
-msgid "Invalid certificate chain"
-msgstr "�≧����茘��檎�"
-
-#. The subject name is correct, but we weren't able to verify the
-#. * chain because there was no pool of root CAs found. Prompt the user
-#. * to validate it.
-#.
-#. vrq will be completed by user_auth
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
-"�≧��後���綣笈��醐����坂�羃����壕��御�罕�茘��� (root certificate) ��莖���綺���"
-
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr "��%s���榊ず��茘��御����綾��鐚��≧������画��後���"
-
-#. FIXME 2.6.1
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr "��%s���榊ず��茘��檎�����≧������"
-
-#. vrq will be completed by user_auth
-msgid ""
-"The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr "��綣笈��梧�牙┗�延��� Pidgin 筝�茯�茘����壕��御�罕�膂順�若��"
-
-#, 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 "茘��御�罕���膂順讐���≧����"
+msgid "Unable to validate certificate"
+msgstr "�≧�薊�茘�茘���"
+
+# FIXME 茘���筝�紊����� - acli 20070913
+# FIXME 茘���篁��倶���紊���
+#, c-format
+msgid ""
+"The certificate claims to be from \"%s\" instead. This could mean that you "
+"are not connecting to the service you believe you are."
+msgstr "��綣笈��梧�牙┗絎���荅峨卯�若��%s��鐚�篏��������巡研羃����g��遺�絽���篏睡����������"
 
 #. Make messages
 #, c-format
@@ -1868,7 +1853,6 @@
 msgstr "+++ %s �糸��"
 
 #. Unknown error
-#, c-format
 msgid "Unknown error"
 msgstr "���ラ���"
 
@@ -2070,18 +2054,18 @@
 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 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <������荀�>鐚�%s\n"
 
+# NOTE GStreamer 篌寂�羃���膺肢⑮��codec��筝�絖�
+# XXX 莉�腆弱���緇��茘��鐚�鐚�膩�⊆茹g⊆���茹g⊆���
+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���句�銀�茹c���顔����鐚�篏���篌寂��� 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 @@
 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 @@
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "篁ヤ失����昆篁醇謙荅�─腟�膤紫輝�� IPC ��呃��恰���莠�羝������ IPC ��篁ゃ��"
 
-#  XXX 筝�����
-msgid "Join/Part Hiding Configuration"
-msgstr "荐㊤�絋�篏��沿�������/������紊������荐���"
-
-msgid "Minimum Room Size"
-msgstr "��紊��紊у�筝���"
-
-msgid "User Inactivity Timeout (in minutes)"
-msgstr "��臀�����筝���鐚�����鐚�"
+msgid "Hide Joins/Parts"
+msgstr "篁ヤ���羈�筝��沿�������/������紊������荐���"
+
+#. Translators: Followed by an input request a number of people
+msgid "For rooms with more than this many people"
+msgstr "��紊���х��篋堺�後���"
+
+msgid "If user has not spoken in this many minutes"
+msgstr "篁ュ����荐�鐚�絨��号���茫�荅沿���"
 
 msgid "Apply hiding rules to buddies"
 msgstr "�沿�頳��鋋������弱ソ��"
@@ -4003,15 +4018,21 @@
 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 @@
 #  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."
-msgstr ""
-"role &lt;篏睡����&gt; &lt;moderator|participant|visitor|none&gt; [膓峨��1] [膓峨��"
-"2] ...: ��緇�����紊����荳�蚕��篏睡����鐚���荐㊤�篏睡����������紊���х��荳�蚕��"
+"users with a role or set users' role with the room."
+msgstr ""
+"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 @@
 msgid "Transfer was closed."
 msgstr "�活叱綏画←筝㊥②��"
 
-msgid "Failed to open the file"
-msgstr "�≧�����罟�罅�"
-
 msgid "Failed to open in-band bytestream"
 msgstr "�≧�����絽九�т���腟�羌�"
 
@@ -5144,8 +5162,7 @@
 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 @@
 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 ��茫�鐚�篏�������羃����������順����叵��"
+#, c-format
+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 @@
 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 "篌堺������荐���"
 
 # 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 @@
 "篏����g�鐚�埇���篏�紊����紫���茫�膈�緇�������緇���茵���荅���絋���篏�箴��句梗膾���荅��g�鐚�"
 "�i瑳篏���膈�緇�����絨����翫����綮狗�激��"
 
-# NOTE ��荀� http://pidgin.im/pipermail/translators/2009-July/000394.html
-#, c-format
-msgid "Error requesting "
-msgstr "荀�羆���筝㊦�主��篋����鐚�篌堺������� "
+# NOTE �����荀�羆� %s��絅遵���鋋��� - acli 20090902
+#. Note to translators: The first %s is a URL, the second is an
+#. error message.
+#, c-format
+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 @@
 msgid "C_onnect"
 msgstr "�g�(_O)"
 
+msgid "You closed the connection."
+msgstr "篏�����篋��g���"
+
 msgid "Get AIM Info"
 msgstr "��緇� AIM 莖�荐�"
 
@@ -7260,6 +7287,10 @@
 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 "�渇��罟�罅�"
 
 #, 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 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "綽順�ユ��茘医�����紊����茫�"
 
+msgid "Use account proxy for SSL connections"
+msgstr "篏睡�� SSL �g���鐚�篏睡��験����篁g��篌堺����"
+
 msgid "Chat room list URL"
 msgstr "��紊��羝�������恐��"
 
@@ -9708,6 +9742,11 @@
 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 @@
 "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 "�主��篋�篁g⊆ 52 ��筝������鐚����育�g�������ら���������"
+
+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 "���ョ�����篁g⊆ %d��綏牙��糸�ュ�� Yahoo!鐚�絎��合恐腴�筝����遵群膓�篆�③���������"
+msgstr "�主��篋�篁g⊆ %d �����ラ���鐚��糸�ュ�� Yahoo! 絎��合恐腴����遵�札羝��ら���������"
 
 #, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
@@ -10584,6 +10638,127 @@
 "篏�絋���絽����医���篆��号�����ゅ験��鐚����������羝��������絽活��->膊∞��絽活������篁わ�"
 "�喝�����������≪��"
 
+#. 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 "絮�����臂g����������"
+
+msgid "The background color of an expanded group"
+msgstr "臂g�絮�������臂g���腮援���������"
+
+# 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 "絮�����臂g�����腮�"
+
+msgid "The text information for when a group is expanded"
+msgstr "臂g�絮�����臂g���腮援��絖�蕭�����絖�蕁��"
+
+#. 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 "�嚷儀��臂g����������"
+
+msgid "The background color of a collapsed group"
+msgstr "臂g��区儀��臂g���腮援���������"
+
+#. 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 "�区儀��臂g�����腮�"
+
+msgid "The text information for when a group is collapsed"
+msgstr "臂g��区儀��臂g���腮援��絖�蕭�����絖�蕁��"
+
+#. 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��茹i��鐚���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 @@
 msgid "_Group:"
 msgstr "靸g�(_G)鐚�"
 
-msgid "Auto_join when account becomes online."
-msgstr "絽活��筝�膩�緇����活��������(_J)��"
+msgid "Auto_join when account connects."
+msgstr "絽活���g�緇����活��������(_J)��"
 
 msgid "_Remain in chat after window is closed."
 msgstr "����荀�腦��������紊��沿��(_R)��"
@@ -11057,103 +11232,6 @@
 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 "絮�����臂g����������"
-
-msgid "The background color of an expanded group"
-msgstr "臂g�絮�������臂g���腮援���������"
-
-# NOTE �号��gtkblist-theme-loader����紮�腆種���������絖����檎����荅俄���PidginThemeFont鐚�絖�蕭���腮宴��絖�蕭�蕁�兂����鐚�鐚�筝���
-msgid "Expanded Text"
-msgstr "絮�����臂g�����腮�"
-
-msgid "The text information for when a group is expanded"
-msgstr "臂g�絮�����臂g���腮援��絖�蕭�����絖�蕁��"
-
-msgid "Collapsed Background Color"
-msgstr "�嚷儀��臂g����������"
-
-msgid "The background color of a collapsed group"
-msgstr "臂g��区儀��臂g���腮援���������"
-
-msgid "Collapsed Text"
-msgstr "�区儀��臂g�����腮�"
-
-msgid "The text information for when a group is collapsed"
-msgstr "臂g��区儀��臂g���腮援��絖�蕭�����絖�蕁��"
-
-#. 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��茹i��鐚���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 @@
 msgid "/Conversation/New Instant _Message..."
 msgstr "/絅遵�/�医�恰��荐���(_M)..."
 
+msgid "/Conversation/Join a _Chat..."
+msgstr "/篋よ�/���ヨ��紊��(_C)..."
+
 msgid "/Conversation/_Find..."
 msgstr "/篋よ�/��絨�(_F)..."
 
@@ -11649,7 +11730,7 @@
 msgid "Estonian"
 msgstr "��羃�絨寂���"
 
-msgid "Euskera(Basque)"
+msgid "Basque"
 msgstr "綏贋������"
 
 msgid "Persian"
@@ -11886,11 +11967,13 @@
 
 #, c-format
 msgid ""
-"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
-"\">support@pidgin.im</A><BR/><BR/>"
-msgstr ""
-"<FONT SIZE=\"4\">�脂�究��呃�</FONT> <A HREF=\"mailto:support@pidgin.im"
-"\">support@pidgin.im</A><BR/><BR/>"
+"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@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 ""
 
 #, c-format
 msgid ""
@@ -12466,70 +12549,47 @@
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s���決���%s -h��篁ョ�峨��顔�俄�罩ョ��莖�荐���\n"
 
-#  FIXME
-#  NOTE hard-code 篋�筝�����Pidgin����⑮��茖��篏��������藥��育�o�篁ゆ���ラ�f���鐚�������篆���鐚�緇��喝�井��┌�����膊�
-#, c-format
-msgid ""
-"%s %s\n"
+#, c-format
+msgid ""
 "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"
+msgstr ""
 "篏睡���号�鐚� %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����⑮��茖��篏��������藥��育�o�篁ゆ���ラ�f���鐚�������篆���鐚�緇��喝�井��┌�����膊�
-#, 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"
-"  -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 "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 ""
+"enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas."
+msgstr ""
+"������絎���絽活�� (��� 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 ""
@@ -12565,10 +12625,6 @@
 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 @@
 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 @@
 msgid "_Open Mail"
 msgstr "�����灸散(_O)"
 
-msgid "_Pause"
-msgstr "����(_P)"
-
 # TODO 荀�荀��� - 20080826
 msgid "_Edit"
 msgstr "篆���(_E)"
@@ -13592,74 +13652,6 @@
 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 @@
 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 @@
 "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 @@
 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@pidgin."
+#~ "im\">support@pidgin.im</A><BR/><BR/>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">�脂�究��呃�</FONT> <A HREF=\"mailto:support@pidgin.im"
+#~ "\">support@pidgin.im</A><BR/><BR/>"
+
+#  FIXME
+#  NOTE hard-code 篋�筝�����Pidgin����⑮��茖��篏��������藥��育�o�篁ゆ���ラ�f���鐚�������篆���鐚�緇��喝�井��┌�����膊�
+#~ 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����⑮��茖��篏��������藥��育�o�篁ゆ���ラ�f���鐚�������篆���鐚�緇��喝�井��┌�����膊�
+#~ 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 @@
 #~ "�����g�鐚�埇���篏�紊����紫���茫�膈�緇�������緇���茵���荅���絋�������句梗膾���荅�����"
 #~ "膩�鐚��i瑳����膈�緇�����絨����翫����綮狗�激��"
 
-#~ msgid "An unknown signon error has occurred: %s."
-#~ msgstr "�主��篋�筝������ョ���糸�ラ���鐚�%s��"
-
 #~ msgid "An unknown error, %d, has occurred.  Info: %s"
 #~ msgstr "筝������ョ����� %d �主����莖�荐�鐚�%s"
 
--- a/po/zh_TW.po	Fri Sep 04 02:23:11 2009 +0000
+++ b/po/zh_TW.po	Fri Sep 04 02:27:21 2009 +0000
@@ -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 @@
 #
 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@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
@@ -134,7 +134,7 @@
 msgstr "��荐���絎�鐚�"
 
 msgid "Username:"
-msgstr "絽活��(_U)鐚�"
+msgstr "絽活��鐚�"
 
 msgid "Password:"
 msgstr "絲�腆種�"
@@ -922,7 +922,8 @@
 msgid "System Log"
 msgstr "膤紫輝�ヨ�"
 
-msgid "Calling ... "
+# XXX ��⑮ - acli 20090730
+msgid "Calling..."
 msgstr "�ユ��筝�..."
 
 # NOTE ��������筝���罔�膠�
@@ -1575,6 +1576,33 @@
 "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 ��篆���篋堺����絲�����阪��������肢���茲�茖緒��∴�膓峨���欠�㍼�茲�茖巡���荅俄������f��箙���
+# 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 @@
 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 ��篆���篋堺����絲�����阪��������肢���茲�茖緒��∴�膓峨���欠�㍼�茲�茖巡���荅俄������f��箙���
-# XXX ��⑮ - 20090729 acli
-msgid "When receiving a message with URL(s), TinyURL for easier copying"
-msgstr "�倶・�九�医����膓峨����荐�����鐚�篏睡�� TinyURL 膰��㊦恐��鐚�絅醇�剛梢��絲�"
-
 msgid "accounts"
 msgstr "絽活��羝���"
 
@@ -1717,6 +1718,39 @@
 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,73 +1796,26 @@
 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��鐚����������順���g����巡��������賢絽���篏�"
-"����������"
-
-#. 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
+#, c-format
+msgid "The certificate for %s could not be validated."
+msgstr "�≧�薊�茘� %s ����茘���"
+
 #. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "SSL ��茘����"
 
-msgid "Invalid certificate chain"
-msgstr "�≧������茘���"
-
-#. The subject name is correct, but we weren't able to verify the
-#. * chain because there was no pool of root CAs found. Prompt the user
-#. * to validate it.
-#.
-#. vrq will be completed by user_auth
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
-"�≧��後���綣究��茘�鐚����堺������号��茘�罘�罕���茘� (root certificate) ��莖���綺���"
-
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr "��%s���榊ず����茘�����綾��鐚��≧������画��後���"
-
-#. FIXME 2.6.1
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr "��%s���榊ず����茘������≧������"
-
-#. vrq will be completed by user_auth
-msgid ""
-"The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr "��綣究��茘��牙┗�延��� Pidgin 筝�茯�茘����号��茘�罘�罕�膂順�若��"
-
-#, 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 "��茘�罘�罕���膂順����≧����"
+msgid "Unable to validate certificate"
+msgstr "�≧�薊�茘���茘�"
+
+# FIXME 茘���筝�紊����� - acli 20070913
+# FIXME 茘���篁��倶���紊���
+#, c-format
+msgid ""
+"The certificate claims to be from \"%s\" instead. This could mean that you "
+"are not connecting to the service you believe you are."
+msgstr ""
+"��綣究��茘��牙┗絎���荅峨卯�若��%s��鐚����������巡研羃����g��井�����篏�"
+"����������"
 
 #. Make messages
 #, c-format
@@ -1866,7 +1853,6 @@
 msgstr "+++ %s �糸��"
 
 #. Unknown error
-#, c-format
 msgid "Unknown error"
 msgstr "���ラ���"
 
@@ -2068,18 +2054,18 @@
 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 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <������荀�>鐚�%s\n"
 
+# NOTE GStreamer 篌寂�羃���膺肢⑮��codec��筝�絖�
+# XXX 莉�腆弱���緇��茘��鐚�鐚�膩�⊆茹g⊆���茹g⊆���
+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���句�銀�茹c���顔����鐚�篏���篌寂��� 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 @@
 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 @@
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "篁ヤ失����昆篁醇謙荅�─腟�膤紫輝�� IPC ��呃��恰���莠�羝������ IPC ��篁ゃ��"
 
-#  XXX 筝�����
-msgid "Join/Part Hiding Configuration"
-msgstr "荐㊤�絋�篏��沿�������/������紊������荐���"
-
-msgid "Minimum Room Size"
-msgstr "��紊��紊у�筝���"
-
-msgid "User Inactivity Timeout (in minutes)"
-msgstr "��臀�����筝���鐚�����鐚�"
+msgid "Hide Joins/Parts"
+msgstr "篁ヤ���羈�筝��沿�������/������紊������荐���"
+
+#. Translators: Followed by an input request a number of people
+msgid "For rooms with more than this many people"
+msgstr "��紊���х��篋堺�後���"
+
+msgid "If user has not spoken in this many minutes"
+msgstr "篁ュ����荐�鐚�絨��号���茫�荅沿���"
 
 msgid "Apply hiding rules to buddies"
 msgstr "�沿�頳��鋋������弱ソ��"
@@ -4001,15 +4017,21 @@
 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 @@
 #  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."
-msgstr ""
-"role &lt;篏睡����&gt; &lt;moderator|participant|visitor|none&gt; [�援┗1] [�援┗"
+"users with a role or set users' role with the room."
+msgstr ""
+"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 @@
 msgid "Transfer was closed."
 msgstr "�活叱綏画←筝㊥②��"
 
-msgid "Failed to open the file"
-msgstr "�≧�����罟�罅�"
-
 msgid "Failed to open in-band bytestream"
 msgstr "�≧�����絽九�т���腟�羌�"
 
@@ -5142,8 +5161,7 @@
 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 @@
 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 ��茫�鐚�篏�������羃����������順����叵��"
+#, c-format
+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 @@
 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 "篌堺������荐���"
 
 # 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 @@
 "�����g�鐚�埇���篏�紊����紫���茫�膈�緇�������緇���茵���荅���絋�������句梗膾���荅�����"
 "膩�鐚��i瑳����膈�緇�����絨����翫����綮狗�激��"
 
-# NOTE ��荀� http://pidgin.im/pipermail/translators/2009-July/000394.html
-#, c-format
-msgid "Error requesting "
-msgstr "荀�羆���筝㊦�主��篋����鐚�篌堺������� "
+# NOTE �����荀�羆� %s��絅遵���鋋��� - acli 20090902
+#. Note to translators: The first %s is a URL, the second is an
+#. error message.
+#, c-format
+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 @@
 msgid "C_onnect"
 msgstr "�g�(_O)"
 
+msgid "You closed the connection."
+msgstr "������篋��g���"
+
 msgid "Get AIM Info"
 msgstr "��緇� AIM 莖�荐�"
 
@@ -7258,6 +7286,10 @@
 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 "�渇��罟�罅�"
 
 #, 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 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "綽順�ユ��茘医�����紊����茫�"
 
+msgid "Use account proxy for SSL connections"
+msgstr "篏睡�� SSL �g���鐚�篏睡��験����篁g��篌堺����"
+
 msgid "Chat room list URL"
 msgstr "��紊��羝�������恐��"
 
@@ -9702,6 +9737,11 @@
 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 @@
 "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 "�主��篋�篁g⊆ 52 ��筝������鐚����育�g�������ら���������"
+
+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 "���ョ�����篁g⊆ %d��綏牙��糸�ュ�� Yahoo!鐚�絎��合恐腴�筝����遵群膓�篆�③���������"
+msgstr "�主��篋�篁g⊆ %d �����ラ���鐚��糸�ュ�� Yahoo! 絎��合恐腴����遵�札羝��ら���������"
 
 #, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
@@ -10578,6 +10631,127 @@
 "�����絽����医���篆��号�����ゅ験��鐚����������羝��������絽活��->膊∞��絽活������篁わ�"
 "�喝�����������≪��"
 
+#. 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��茹i��鐚���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 @@
 msgid "_Group:"
 msgstr "靸ょ�(_G)鐚�"
 
-msgid "Auto_join when account becomes online."
-msgstr "絽活��筝�膩�緇����活��������(_J)��"
+msgid "Auto_join when account connects."
+msgstr "絽活���g�緇����活��������(_J)��"
 
 msgid "_Remain in chat after window is closed."
 msgstr "����荀�腦��������紊��沿��(_R)��"
@@ -11051,103 +11225,6 @@
 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��茹i��鐚���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 @@
 msgid "/Conversation/New Instant _Message..."
 msgstr "/絅遵�/�医�恰��荐���(_M)..."
 
+msgid "/Conversation/Join a _Chat..."
+msgstr "/篋よ�/���ヨ��紊��(_C)..."
+
 msgid "/Conversation/_Find..."
 msgstr "/篋よ�/��絨�(_F)..."
 
@@ -11643,7 +11723,7 @@
 msgid "Estonian"
 msgstr "��羃�絨寂���"
 
-msgid "Euskera(Basque)"
+msgid "Basque"
 msgstr "綏贋������"
 
 msgid "Persian"
@@ -11880,11 +11960,13 @@
 
 #, c-format
 msgid ""
-"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
-"\">support@pidgin.im</A><BR/><BR/>"
-msgstr ""
-"<FONT SIZE=\"4\">�脂�究��呃�</FONT> <A HREF=\"mailto:support@pidgin.im"
-"\">support@pidgin.im</A><BR/><BR/>"
+"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@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 ""
 
 #, c-format
 msgid ""
@@ -12460,70 +12542,47 @@
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s���決���%s -h��篁ョ�峨��顔�俄�罩ョ��莖�荐���\n"
 
-#  FIXME
-#  NOTE hard-code 篋�筝�����Pidgin����⑮��茖��篏��������藥��育�o�篁ゆ���ラ�f���鐚�������篆���鐚�緇��喝�井��┌�����膊�
-#, c-format
-msgid ""
-"%s %s\n"
+#, c-format
+msgid ""
 "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"
+msgstr ""
 "篏睡���号�鐚� %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����⑮��茖��篏��������藥��育�o�篁ゆ���ラ�f���鐚�������篆���鐚�緇��喝�井��┌�����膊�
-#, 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"
-"  -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 "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 ""
+"enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas."
+msgstr ""
+"������絎���絽活�� (��� 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 ""
@@ -12559,10 +12618,6 @@
 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 @@
 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 @@
 msgid "_Open Mail"
 msgstr "�����灸散(_O)"
 
-msgid "_Pause"
-msgstr "����(_P)"
-
 # TODO 荀�荀��� - 20080826
 msgid "_Edit"
 msgstr "篆���(_E)"
@@ -13586,74 +13645,6 @@
 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 @@
 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 @@
 "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 @@
 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@pidgin."
+#~ "im\">support@pidgin.im</A><BR/><BR/>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">�脂�究��呃�</FONT> <A HREF=\"mailto:support@pidgin.im"
+#~ "\">support@pidgin.im</A><BR/><BR/>"
+
+#  FIXME
+#  NOTE hard-code 篋�筝�����Pidgin����⑮��茖��篏��������藥��育�o�篁ゆ���ラ�f���鐚�������篆���鐚�緇��喝�井��┌�����膊�
+#~ 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����⑮��茖��篏��������藥��育�o�篁ゆ���ラ�f���鐚�������篆���鐚�緇��喝�井��┌�����膊�
+#~ 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 @@
 #~ "�����g�鐚�埇���篏�紊����紫���茫�膈�緇�������緇���茵���荅���絋�������句梗膾���荅�����"
 #~ "膩�鐚��i瑳����膈�緇�����絨����翫����綮狗�激��"
 
-#~ msgid "An unknown signon error has occurred: %s."
-#~ msgstr "�主��篋�筝������ョ���糸�ラ���鐚�%s��"
-
 #~ msgid "An unknown error, %d, has occurred.  Info: %s"
 #~ msgstr "筝������ョ����� %d �主����莖�荐�鐚�%s"