changeset 31331:c85924562c0c

Chinese (Simplified) translation updated (Aron Xu)
author Mark Doliner <mark@kingant.net>
date Thu, 10 Mar 2011 10:17:38 +0000 (2011-03-10)
parents 3eaf954631fa
children 886f6df50451
files po/ChangeLog po/zh_CN.po
diffstat 2 files changed, 251 insertions(+), 207 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Thu Mar 10 09:50:43 2011 +0000
+++ b/po/ChangeLog	Thu Mar 10 10:17:38 2011 +0000
@@ -4,6 +4,7 @@
 	* Bengali translation updated (Jamil Ahmed)
 	* Chinese (Hong Kong) translation updated (Ambrose C. Li, Paladin R.
 	  Liu)
+	* Chinese (Simplified) translation updated (Aron Xu)
 	* Chinese (Traditional) translation updated (Ambrose C. Li, Paladin R.
 	  Liu)
 	* Czech translation updated (David Vachulka)
--- a/po/zh_CN.po	Thu Mar 10 09:50:43 2011 +0000
+++ b/po/zh_CN.po	Thu Mar 10 10:17:38 2011 +0000
@@ -1,17 +1,18 @@
+# Chinese (China) translation of Pidgin.
 # Pidgin 莉�散����膊�篏�筝㊥��膺肢���
-# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the pidgin package.
 # Funda Wang <fundawang@linux.net.cn>, 2003, 2004.
-# Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.
 # fujianwzh <fujianwzh@gmail.com>, 2009.
 # liyuekui <liyuekui@gmail.com>, 2009.
+# Aron Xu <happyaron.xu@gmail.com>, 2009, 2010, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: pidgin HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-19 13:34-0500\n"
-"PO-Revision-Date: 2010-10-10 16:18+0800\n"
+"POT-Creation-Date: 2011-03-10 02:14-0800\n"
+"PO-Revision-Date: 2011-03-07 01:55+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
@@ -1697,7 +1698,7 @@
 #. Scheme name
 #. Pool name
 msgid "SSL Peers Cache"
-msgstr ""
+msgstr "SSL 腴��合�絖�"
 
 #. Make messages
 #, c-format
@@ -2124,7 +2125,7 @@
 msgstr "膾�����"
 
 msgid "Old flat format"
-msgstr ""
+msgstr "�у�綛恰�贋�弱�"
 
 msgid "Logging of this conversation failed."
 msgstr "莅医�罩ゅ�莚���紊沿乾��"
@@ -2269,8 +2270,10 @@
 "篆�絖���篁句��莊��\n"
 "(莚傑�箴�絎��頑君緇�)"
 
-msgid "Automatically reject from users not in buddy list"
-msgstr "������膸�筝���ソ����茵�賢�����欠��莚傑�"
+msgid ""
+"When a file-transfer request arrives from a user who is\n"
+"*not* on your buddy list:"
+msgstr "筝���ソ����茵�����篋阪��ユ��篁銀���莚傑��駈�"
 
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
@@ -2282,6 +2285,9 @@
 msgid "Create a new directory for each user"
 msgstr "筝堺�筝����桁��綮堺�亥���"
 
+msgid "Escape the filenames"
+msgstr "��羔���篁�"
+
 msgid "Notes"
 msgstr "紊�羈�"
 
@@ -2622,7 +2628,7 @@
 msgstr "胼紫鎖羔���─��"
 
 msgid "Save messages sent to an offline user as pounce."
-msgstr ""
+msgstr "絨�����膸�胼紫鎖絅遵���羔����臀�減絅遵������若��"
 
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
@@ -2648,10 +2654,10 @@
 msgstr "��"
 
 msgid "Save offline messages in pounce"
-msgstr ""
+msgstr "篆�絖�胼紫鎖筝阪ソ��������"
 
 msgid "Do not ask. Always save in pounce."
-msgstr ""
+msgstr "筝�荀�莚∫����紙���絖�筝阪ソ�������若��"
 
 msgid "One Time Password"
 msgstr "筝�罨≧�у���"
@@ -3095,9 +3101,7 @@
 msgstr "UIN"
 
 #. first name
-#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
 #. optional information
-#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "��"
 
@@ -3673,7 +3677,10 @@
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "���≦����荀������絲�羌�筝�篏睡��痕�����莚�"
 
-#. This should never happen!
+#. This happens when the server sends back jibberish
+#. * in the "additional data with success" case.
+#. * Seen with Wildfire 3.0.1.
+#.
 msgid "Invalid response from server"
 msgstr "���≦������綺�������"
 
@@ -3751,9 +3758,8 @@
 msgid "Unable to canonicalize password"
 msgstr "��羈�絲劫���菴�茵�茹�����紊���"
 
-#, fuzzy
 msgid "Malicious challenge from server"
-msgstr "���≦������������"
+msgstr "�倶�������������"
 
 msgid "Unexpected response from server"
 msgstr "篁����≦���九�遺��鎀�����綺�"
@@ -3809,7 +3815,6 @@
 msgid "Postal Code"
 msgstr "���睡���"
 
-#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "�遵�"
 
@@ -4057,9 +4062,8 @@
 msgid "Invalid XMPP ID"
 msgstr "���� XMPP ID"
 
-#, fuzzy
 msgid "Invalid XMPP ID. Username portion must be set."
-msgstr "������ XMPP ID�����蕁肢�臀�������������"
+msgstr "������ XMPP ID�����蕁肢�臀������桁����"
 
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "������ XMPP ID�����蕁肢�臀�������������"
@@ -4834,7 +4838,6 @@
 msgid "Indignant"
 msgstr "�ゆ��"
 
-#, fuzzy
 msgid "Interested"
 msgstr "�頑僑"
 
@@ -5217,28 +5220,23 @@
 msgid "Set friendly name for %s."
 msgstr "筝� %s 莅丞舟��絅遵��腱違��"
 
-#, fuzzy
 msgid "Set Friendly Name"
-msgstr "莅丞舟��絅順����腱�..."
+msgstr "莅丞舟��絅順����腱�"
 
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "菴����銀��� MSN 絅遵����亥����絖���"
 
-#, fuzzy
 msgid "This Location"
-msgstr "���隙�臀�"
-
-#, fuzzy
+msgstr "菴�筝��臀�"
+
 msgid "This is the name that identifies this location"
-msgstr "菴����銀��� MSN 絅遵����亥����絖���"
-
-#, fuzzy
+msgstr "菴������④篏�臀�����腱�"
+
 msgid "Other Locations"
-msgstr "���隙�臀�"
-
-#, fuzzy
+msgstr "�銀�篏�臀�"
+
 msgid "You can sign out from other locations here"
-msgstr "�����九�篏�臀���④���桁���糸�篋���"
+msgstr "���札��������阪���銀�篏�臀����脂����"
 
 #. TODO: Due to limitations in our current request field API, the
 #. following string will show up with a trailing colon.  This should
@@ -5246,13 +5244,11 @@
 #. a separate purple_request_field_label_new_without_colon function,
 #. or by never automatically adding the colon and requiring that
 #. callers add the colon themselves.
-#, fuzzy
 msgid "You are not signed in from any other locations."
-msgstr "�����九�篏�臀���④���桁���糸�篋���"
-
-#, fuzzy
+msgstr "�����銀�篏�臀����脂����綏臥���冴��"
+
 msgid "Allow multiple logins?"
-msgstr "��莅梧�茵�紊�筝��箴�"
+msgstr "��莅後��合�脂��鐚�"
 
 msgid ""
 "Do you want to allow or disallow connecting from multiple locations "
@@ -5344,9 +5340,8 @@
 msgid "Set Friendly Name..."
 msgstr "莅丞舟��絅順����腱�..."
 
-#, fuzzy
 msgid "View Locations..."
-msgstr "�����臀�..."
+msgstr "�ョ��篏�臀�..."
 
 msgid "Set Home Phone Number..."
 msgstr "莅丞舟絎九梱�笈��欠��..."
@@ -5360,9 +5355,8 @@
 msgid "Enable/Disable Mobile Devices..."
 msgstr "����/胼���Щ���紊�..."
 
-#, fuzzy
 msgid "Allow/Disallow Multiple Logins..."
-msgstr "��莅�/胼�罩∝Щ�����..."
+msgstr "��莅�/胼�罩√��合�脂��..."
 
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "��莅�/胼�罩∝Щ�����..."
@@ -5577,7 +5571,7 @@
 msgstr "��莅悟�頑�"
 
 msgid "Allow connecting from multiple locations"
-msgstr ""
+msgstr "��莅娯�紊�筝��臀��脂��"
 
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge鐚������桁�����������篁ヤ梢綣�莎隙���羈���"
@@ -5854,6 +5848,9 @@
 msgid "Connecting..."
 msgstr "罩e�����..."
 
+msgid "The Display Name you entered is too short."
+msgstr "����ョ���丞ず��腱医お�㏍��"
+
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "����ョ�� PIN �水墾���� [7-10]��"
 
@@ -5924,33 +5921,6 @@
 msgid "Retrieving User Information..."
 msgstr "罩e���膣∝���隙拭��..."
 
-msgid "Loading menu..."
-msgstr "罩e��十�ヨ���..."
-
-msgid "Status Message"
-msgstr "�倶��羔���"
-
-msgid "Rejection Message"
-msgstr "��膸�羔���"
-
-#. hidden number
-msgid "Hidden Number"
-msgstr "����埇��"
-
-msgid "Your MXit ID..."
-msgstr "���� MXit ID..."
-
-#. Configuration options
-#. WAP server (reference: "libpurple/accountopt.h")
-msgid "WAP Server"
-msgstr "WAP ���≦��"
-
-msgid "Connect via HTTP"
-msgstr "��菴� HTTP 菴���"
-
-msgid "Enable splash-screen popup"
-msgstr "�����羣�絮鎶�"
-
 #. you were kicked
 msgid "You have been kicked from this MultiMX."
 msgstr "��群茴�権�堺④ MultiMX��"
@@ -5965,6 +5935,44 @@
 msgid "You have invited"
 msgstr "��群��莚�"
 
+msgid "Loading menu..."
+msgstr "罩e��十�ヨ���..."
+
+msgid "Status Message"
+msgstr "�倶��羔���"
+
+msgid "Rejection Message"
+msgstr "��膸�羔���"
+
+#. hidden number
+msgid "Hidden Number"
+msgstr "����埇��"
+
+msgid "No profile available"
+msgstr "��������臀���篁�"
+
+#, fuzzy
+msgid "This contact does not have a profile."
+msgstr "罩ゅ��傑押�������球���散��"
+
+msgid "Your MXit ID..."
+msgstr "���� MXit ID..."
+
+#. contact is in Deleted, Rejected or None state
+msgid "Re-Invite"
+msgstr "���育��莚�"
+
+#. Configuration options
+#. WAP server (reference: "libpurple/accountopt.h")
+msgid "WAP Server"
+msgstr "WAP ���≦��"
+
+msgid "Connect via HTTP"
+msgstr "��菴� HTTP 菴���"
+
+msgid "Enable splash-screen popup"
+msgstr "�����羣�絮鎶�"
+
 msgid "Last Online"
 msgstr "������鎖"
 
@@ -6358,15 +6366,15 @@
 
 #. Slap means "to hit someone with an open/flat hand"
 msgid "Slap"
-msgstr ""
+msgstr "����"
 
 #, c-format
 msgid "%s has slapped you!"
-msgstr ""
+msgstr "%s ��篋�篏�筝�筝�鐚�"
 
 #, c-format
 msgid "Slapping %s..."
-msgstr ""
+msgstr "��筝�筝� %s..."
 
 #. Goose means "to pinch someone on their butt"
 msgid "Goose"
@@ -6697,7 +6705,7 @@
 msgid ""
 "You required encryption in your account settings, but one of the servers "
 "doesn't support it."
-msgstr ""
+msgstr "������決�臀�賢荀�羆���絲�鐚�篏���菴��ョ�����≦��賢��筝�筝��������絲���"
 
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
@@ -6705,9 +6713,8 @@
 msgid "Error requesting %s: %s"
 msgstr "莚傑� %s �九�咲��鐚�%s"
 
-#, fuzzy
 msgid "The server returned an empty response"
-msgstr "��羈�菴��ワ����≦�����腥阪��綺���"
+msgstr "���≦�����腥阪��綺�"
 
 msgid ""
 "Server requested that you fill out a CAPTCHA in order to sign in, but this "
@@ -7180,6 +7187,12 @@
 msgid "You have been disconnected from chat room %s."
 msgstr "��群膸���筝���紊�� %s ��菴��ャ��"
 
+msgid "The new formatting is invalid."
+msgstr "�井�弱���������"
+
+msgid "Username formatting can change only capitalization and whitespace."
+msgstr "���桁���弱������贋�劫ぇ����腥堺�若��"
+
 msgid "Pop-Up Message"
 msgstr "綣劫�堺���"
 
@@ -7415,12 +7428,6 @@
 msgid "ICQ Privacy Options"
 msgstr "ICQ ��腱���蕁�"
 
-msgid "The new formatting is invalid."
-msgstr "�井�弱���������"
-
-msgid "Username formatting can change only capitalization and whitespace."
-msgstr "���桁���弱������贋�劫ぇ����腥堺�若��"
-
 msgid "Change Address To:"
 msgstr "絨��医���贋�剛減鐚�"
 
@@ -7463,13 +7470,11 @@
 msgid "Set Privacy Options..."
 msgstr "莅丞舟��腱���蕁�..."
 
-#, fuzzy
 msgid "Show Visible List"
-msgstr "�丞ず絅遵���茵�(_L)"
-
-#, fuzzy
+msgstr "�丞ず�����茵�"
+
 msgid "Show Invisible List"
-msgstr "��莚桁��茵�"
+msgstr "�丞ず�����茵�"
 
 #. AIM actions
 msgid "Confirm Account"
@@ -7487,9 +7492,8 @@
 msgid "Search for Buddy by Email Address..."
 msgstr "���球���散��膣√ソ��..."
 
-#, fuzzy
 msgid "Don't use encryption"
-msgstr "��荀���絲�"
+msgstr "筝�篏睡����絲�"
 
 msgid "Use clientLogin"
 msgstr "篏睡����欠��糸�"
@@ -7529,75 +7533,6 @@
 "�医����荀���犬�域�膊��坂��翫産腴��贋・菴��ワ�菴�絲剛��恰�銀����上����荀�����篏����絨���"
 "�我���� IP �医��鐚���篁ュ��初����羹�������腱�蕋�����"
 
-msgid "Invalid SNAC"
-msgstr "���� SNAC"
-
-msgid "Server rate limit exceeded"
-msgstr ""
-
-msgid "Client rate limit exceeded"
-msgstr ""
-
-msgid "Service unavailable"
-msgstr "���>�����"
-
-msgid "Service not defined"
-msgstr "���≧���箙�"
-
-msgid "Obsolete SNAC"
-msgstr "綺��� SNAC"
-
-msgid "Not supported by host"
-msgstr "筝紙�坂�����"
-
-msgid "Not supported by client"
-msgstr "絎∽�隙�����"
-
-msgid "Refused by client"
-msgstr "絎∽�傑��膸�"
-
-msgid "Reply too big"
-msgstr "��紊�紊�ぇ"
-
-msgid "Responses lost"
-msgstr "��綺�筝√け"
-
-msgid "Request denied"
-msgstr "莚傑�茴��罩�"
-
-msgid "Busted SNAC payload"
-msgstr "SNAC ����茣�莉醇�紜�"
-
-msgid "Insufficient rights"
-msgstr "����筝�紊�"
-
-msgid "In local permit/deny"
-msgstr "���域���/胼�罩�"
-
-msgid "Warning level too high (sender)"
-msgstr "������茘���膾у���蕭�"
-
-msgid "Warning level too high (receiver)"
-msgstr "�ユ�区��茘���膾у���蕭�"
-
-msgid "User temporarily unavailable"
-msgstr "���隙鹸�銀�����"
-
-msgid "No match"
-msgstr "���拷��"
-
-msgid "List overflow"
-msgstr "��茵�頃��"
-
-msgid "Request ambiguous"
-msgstr "莚傑����"
-
-msgid "Queue full"
-msgstr "����羯�"
-
-msgid "Not while on AOL"
-msgstr "筝�篏�篋� AOL 筝�"
-
 #. Label
 msgid "Buddy Icon"
 msgstr "���桁ご��"
@@ -7716,36 +7651,102 @@
 msgid "Capabilities"
 msgstr "絎拷��"
 
+msgid "Invalid SNAC"
+msgstr "���� SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "���>�����"
+
+msgid "Service not defined"
+msgstr "���≧���箙�"
+
+msgid "Obsolete SNAC"
+msgstr "綺��� SNAC"
+
+msgid "Not supported by host"
+msgstr "筝紙�坂�����"
+
+msgid "Not supported by client"
+msgstr "絎∽�隙�����"
+
+msgid "Refused by client"
+msgstr "絎∽�傑��膸�"
+
+msgid "Reply too big"
+msgstr "��紊�紊�ぇ"
+
+msgid "Responses lost"
+msgstr "��綺�筝√け"
+
+msgid "Request denied"
+msgstr "莚傑�茴��罩�"
+
+msgid "Busted SNAC payload"
+msgstr "SNAC ����茣�莉醇�紜�"
+
+msgid "Insufficient rights"
+msgstr "����筝�紊�"
+
+msgid "In local permit/deny"
+msgstr "���域���/胼�罩�"
+
+msgid "Warning level too high (sender)"
+msgstr "������茘���膾у���蕭�"
+
+msgid "Warning level too high (receiver)"
+msgstr "�ユ�区��茘���膾у���蕭�"
+
+msgid "User temporarily unavailable"
+msgstr "���隙鹸�銀�����"
+
+msgid "No match"
+msgstr "���拷��"
+
+msgid "List overflow"
+msgstr "��茵�頃��"
+
+msgid "Request ambiguous"
+msgstr "莚傑����"
+
+msgid "Queue full"
+msgstr "����綏我察"
+
+msgid "Not while on AOL"
+msgstr "筝�篏�篋� AOL 筝�"
+
 #. Translators: This string is a menu option that, if selected, will cause
 #. you to appear online to the chosen user even when your status is set to
 #. Invisible.
 msgid "Appear Online"
-msgstr "�丞ず筝阪��鎖"
+msgstr "絲劫�狗��荳���"
 
 #. Translators: This string is a menu option that, if selected, will cause
 #. you to appear offline to the chosen user when your status is set to
 #. Invisible (this is the default).
-#, fuzzy
 msgid "Don't Appear Online"
-msgstr "�丞ず筝阪��鎖"
+msgstr "絲劫�九��鎖筝����"
 
 #. Translators: This string is a menu option that, if selected, will cause
 #. you to always appear offline to the chosen user (even when your status
 #. isn't Invisible).
 msgid "Appear Offline"
-msgstr "�丞ず筝榊�膾�"
+msgstr "絲劫�狗��荳�"
 
 #. Translators: This string is a menu option that, if selected, will cause
 #. you to appear offline to the chosen user if you are invisible, and
 #. appear online to the chosen user if you are not invisible (this is the
 #. default).
-#, fuzzy
 msgid "Don't Appear Offline"
-msgstr "�丞ず筝榊�膾�"
-
-#, fuzzy
+msgstr "絲劫�九��鎖���"
+
 msgid "you have no buddies on this list"
-msgstr "��群茴�権�堺④ MultiMX��"
+msgstr "罩ゅ��茵�賢羃≧��絅遵�"
 
 #, fuzzy, c-format
 msgid ""
@@ -7755,16 +7756,14 @@
 "絋������活���菴�篋�絅遵����域�羆�莅よ�鐚�����������渇�����肢�篋�絅遵�鐚��九�����獅�����域�"
 "羆�莅よ�����"
 
-#, fuzzy
 msgid "Visible List"
-msgstr "���"
+msgstr "��荳�����茵�"
 
 msgid "These buddies will see your status when you switch to \"Invisible\""
 msgstr ""
 
-#, fuzzy
 msgid "Invisible List"
-msgstr "��莚桁��茵�"
+msgstr "��荳���茵�"
 
 msgid "These buddies will always see you as offline"
 msgstr ""
@@ -8312,14 +8311,14 @@
 msgid "Select Server"
 msgstr "�������≦��"
 
-msgid "QQ2005"
-msgstr "QQ2005"
+msgid "QQ2008"
+msgstr "QQ2008"
 
 msgid "QQ2007"
 msgstr "QQ2007"
 
-msgid "QQ2008"
-msgstr "QQ2008"
+msgid "QQ2005"
+msgstr "QQ2005"
 
 msgid "Connect by TCP"
 msgstr "��菴� TCP 菴���"
@@ -8333,6 +8332,9 @@
 msgid "Show chat room when msg comes"
 msgstr "綵�羔����井�ユ�倶�丞ず��紊��"
 
+msgid "Use default font"
+msgstr "篏睡���莅ゅ�篏�"
+
 msgid "Keep alive interval (seconds)"
 msgstr "篆�����鎖�顔��(腱�)"
 
@@ -9322,7 +9324,7 @@
 msgstr "��羈���罩紫����"
 
 msgid "WATCH"
-msgstr ""
+msgstr "��茹�"
 
 msgid "Cannot watch user"
 msgstr "��羈���茹�����訓"
@@ -9880,7 +9882,7 @@
 msgstr "list鐚� ���� Yahoo 臀�膸�筝�����紊��"
 
 msgid "doodle: Request user to start a Doodle session"
-msgstr ""
+msgstr "doodle: 莚傑����桁�紮�筝�筝� Doodle 篌�莚�"
 
 msgid "Yahoo ID..."
 msgstr "Yahoo ID..."
@@ -9914,7 +9916,7 @@
 msgstr "綽順�ヤ�莅�����紊����莚�"
 
 msgid "Use account proxy for HTTP and HTTPS connections"
-msgstr ""
+msgstr "筝� HTTP �� HTTPS 菴��ヤ戎����隙撮��"
 
 msgid "Chat room list URL"
 msgstr "��紊���紊����茵� URL"
@@ -10021,12 +10023,14 @@
 
 #, c-format
 msgid "Unknown error 52.  Reconnecting should fix this."
-msgstr ""
+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! ID��"
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
@@ -10062,7 +10066,7 @@
 msgid ""
 "Unable to connect: The server's response did not contain the necessary "
 "information"
-msgstr ""
+msgstr "��羈�菴��ワ����≦����綺�筝㊦失絨�綽�荀�篆≧��"
 
 msgid "Not at Home"
 msgstr "筝����"
@@ -10228,7 +10232,7 @@
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
-msgstr ""
+msgstr "���ラ��莚�������初��荀����阪��桁攻膈�緇�篋����������医���ヨ��紊��"
 
 #, c-format
 msgid "You are now chatting in %s."
@@ -10494,7 +10498,7 @@
 msgstr "菴�菴�胼糸�"
 
 msgid "Feeling"
-msgstr ""
+msgstr "����筝医�"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10587,6 +10591,7 @@
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr ""
+"��羈�筝堺�ヨ�� %s ����絎劫����莇喝�����絖���臀�蕁究���≦������醇③���ц���罩e幻��篏���"
 
 #, c-format
 msgid "Error reading from %s: %s"
@@ -10640,7 +10645,7 @@
 
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
-msgstr ""
+msgstr "篋���臀���莅��綺�� ���� AIM��Google Talk��Jabber/XMPP��MSN��Yahoo ���翫�"
 
 msgid "Internet Messenger"
 msgstr "篋���臀���莅��綺�"
@@ -10783,7 +10788,7 @@
 msgstr "�桁�"
 
 msgid "The layout of icons, name, and status of the buddy list"
-msgstr ""
+msgstr "�丈������腱医��絅遵���茵��倶�����桁�"
 
 #. Group
 #. Note to translators: These two strings refer to the background color
@@ -10792,7 +10797,7 @@
 msgstr "�������"
 
 msgid "The background color of an expanded group"
-msgstr ""
+msgstr "���膸����������"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its expanded state
@@ -10838,26 +10843,26 @@
 #. 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 "��鎖��絖�"
+msgstr "��鎖����"
 
 msgid "The text information for when a buddy is online"
-msgstr "綵�筝�篏�絅遵�筝�膾炊�倶�丞ず����絖�篆≧��"
+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 "胼糸���絖�"
+msgstr "胼糸�����"
 
 msgid "The text information for when a buddy is away"
-msgstr ""
+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 "胼紫鎖��絖�"
+msgstr "胼紫鎖����"
 
 msgid "The text information for when a buddy is offline"
-msgstr ""
+msgstr "綵�絅遵�胼紫鎖�倶�丞ず������拭��"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is idle
@@ -10865,7 +10870,7 @@
 msgstr "������絖�"
 
 msgid "The text information for when a buddy is idle"
-msgstr ""
+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
@@ -11183,7 +11188,7 @@
 
 #, c-format
 msgid "Idle %dd %dh %02dm"
-msgstr "����筝� (%d紊�%d絨��%02d��)"
+msgstr "����(%d鎀�%d絨��%02d��)"
 
 #, c-format
 msgid "Idle %dh %02dm"
@@ -11738,9 +11743,6 @@
 msgid "Fatal Error"
 msgstr "�吓�初��莚�"
 
-msgid "bug master"
-msgstr "Bug 筝紫�"
-
 msgid "artist"
 msgstr "臂�轡"
 
@@ -11921,6 +11923,10 @@
 msgid "Maithili"
 msgstr "�������莚�"
 
+#, fuzzy
+msgid "Meadow Mari"
+msgstr "�育��散"
+
 msgid "Macedonian"
 msgstr "薊��狗/莚�"
 
@@ -12056,6 +12062,9 @@
 "Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
 "im<BR><BR>"
 msgstr ""
+"<FONT SIZE=\"4\"><B>������莎�羣�</B></FONT><BR>\t<A HREF=\"%s\">臀�腴�</A><BR>"
+"\t<A HREF=\"%s\">絽梧����</A><BR>\tIRC 蘂���鐚�#pidgin (irc.freenode.net)<BR>"
+"\tXMPP MUC: devel@conference.pidgin.im<BR><BR>"
 
 #, c-format
 msgid ""
@@ -12605,10 +12614,10 @@
 "\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "���"
 
 msgid "use DIR for config files"
-msgstr ""
+msgstr "篏睡����絎����篏�筝咲��臀���篁句���"
 
 msgid "print debugging messages to stdout"
 msgstr "���域�莚�篆≧���井����莨���"
@@ -12626,7 +12635,7 @@
 msgstr "筝������糸�"
 
 msgid "NAME"
-msgstr ""
+msgstr "��腱�"
 
 msgid ""
 "enable specified account(s) (optional argument NAME\n"
@@ -12655,6 +12664,16 @@
 "how to get the backtrace, please read the instructions at\n"
 "%swiki/GetABacktrace\n"
 msgstr ""
+"%s %s ����篋�罧級��莚�攻綏峨�莚�菴�茵��後�莉����井��篁吟��\n"
+"菴���蒐篁句失�傑��絲取�雁�����鐚�筝�������紊沿����眼��\n"
+"\n"
+"絋������醇�上�育���医刊羣����隙�罩ラ�鐚�莚傑����菴�篁ヤ��医����篋ょ失�傑�ュ��鐚�\n"
+"篁ヤ梢綣���篋阪�����九�藹�菴�茵�篆��鐚�\n"
+"%ssimpleticket/\n"
+"\n"
+"莚決�膸�莚贋����倶��③���ц�����篏�鐚�綛九���倶�箴�莉������後���篁句����羣�拭����\n"
+"絋�������ラ��絋�篏��桁���羣�拭���莚桁���鐚�\n"
+"%swiki/GetABacktrace\n"
 
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
@@ -12717,6 +12736,13 @@
 msgid "New Pounces"
 msgstr "絅遵������惹�腓�"
 
+#. Translators: Make sure you translate "Dismiss" differently than
+#. "close"!  This string is used in the "You have pounced" dialog
+#. that appears when one of your Buddy Pounces is triggered.  In
+#. this context "Dismiss" means "I acknowledge that I've seen that
+#. this pounce was triggered--remove it from this list."  Translating
+#. it as "Remove" is acceptable if you can't think of a more precise
+#. word.
 msgid "Dismiss"
 msgstr "綽順��"
 
@@ -13099,7 +13125,7 @@
 msgstr "Konqueror"
 
 msgid "Google Chrome"
-msgstr ""
+msgstr "Google Chrome"
 
 #. Do not move the line below.  Code below expects gnome-open to be in
 #. * this list immediately after xdg-open!
@@ -13123,11 +13149,11 @@
 
 #. Translators: please do not translate "chromium-browser" here!
 msgid "Chromium (chromium-browser)"
-msgstr ""
+msgstr "Chromium (chromium-browser)"
 
 #. Translators: please do not translate "chrome" here!
 msgid "Chromium (chrome)"
-msgstr ""
+msgstr "Chromium (chrome)"
 
 msgid "Manual"
 msgstr "��綏ヨ�臀�"
@@ -13438,7 +13464,7 @@
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
-msgstr ""
+msgstr "���箙�茵��� %s 綏峨����莚隙戎���銀�綽��傑�劫���"
 
 msgid "Custom Smiley"
 msgstr "���箙�茵���"
@@ -13493,7 +13519,7 @@
 msgstr "Google Talk"
 
 msgid "Facebook (XMPP)"
-msgstr ""
+msgstr "Facebook (XMPP)"
 
 #, c-format
 msgid "The following error has occurred loading %s: %s"
@@ -14447,6 +14473,8 @@
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
+"��膤私査�丈��/\n"
+"����篋阪�丈��"
 
 msgid "Icon for Chat"
 msgstr "��紊��丈��"
@@ -14809,7 +14837,7 @@
 
 #. Installer Subsection Text
 msgid "Debug Symbols (for reporting crashes)"
-msgstr ""
+msgstr "莪�莚�膃��(����ュ��經����莚�)"
 
 #. Installer Subsection Text
 msgid "Desktop"
@@ -14821,12 +14849,16 @@
 "function; if retrying fails, you may need to use the 'Offline Installer' "
 "from http://pidgin.im/download/windows/ ."
 msgstr ""
+"筝�莉� GTK+ 菴�茵���($R2)�咲����$\\rPidgin ��荀�絎��劫�轡篏�鐚�絋�����莚�篁��九け茣ワ�����"
+"���初��荀�篏睡���膾水�茖�腮�綺� http://pidgin.im/download/windows/"
 
 #. $R2 will display the URL that the Debug Symbols failed to download from
 msgid ""
 "Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
 "use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
 msgstr ""
+"絎�茖�莪�莚�膃��($R2)�尌����$\\r絋�����莚�篁��九け茣ワ�������初��荀�篏睡���膾水�茖�腮�綺� "
+"http://pidgin.im/download/windows/"
 
 #. $R3 will display the URL that the Dictionary failed to download from
 #, no-c-format
@@ -14835,6 +14867,9 @@
 "installation instructions are at: http://developer.pidgin.im/wiki/Installing"
 "%20Pidgin#manual_win32_spellcheck_installation"
 msgstr ""
+"絎�茖��弱��罍��ュ����($R3)紊沿乾��$\\r絋�����莚�篁��九け茣ワ����札������綏ュ�茖� http://"
+"developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
 
 #. Installer Subsection Text
 msgid "GTK+ Runtime (required if not present)"
@@ -14857,6 +14892,8 @@
 "already present).$\\rAre you sure you want to skip installing the GTK+ "
 "Runtime?"
 msgstr ""
+"Pidgin ��荀�筝�筝��弱��� GTK+ 菴�茵���(����膤紫�筝�羃≧��絎�茖�)��$\\r��`絎�筝�絎�茖� GTK+ "
+"菴�茵��九��鐚�"
 
 #. Installer Subsection Text
 msgid "Shortcuts"
@@ -14894,15 +14931,21 @@
 msgid ""
 "Unable to uninstall the currently installed version of Pidgin. The new "
 "version will be installed without removing the currently installed version."
-msgstr ""
+msgstr "��羈��梧十綏峨�茖������� Pidgin鐚��亥��絨�筝����ゅ群����篁区���贋・絎�茖���"
 
 #. Text displayed on Installer Finish Page
 msgid "Visit the Pidgin Web Page"
-msgstr "羌頵� Pidgin 臀�蕁�"
+msgstr "莅翠�� Pidgin 臀�腴�"
 
 msgid "You do not have permission to uninstall this application."
 msgstr "��押�������梧十罩ょ�綺��"
 
+#~ msgid "Automatically reject from users not in buddy list"
+#~ msgstr "�Û����膸�筝���ソ����茵�賢�����欠��莚傑�"
+
+#~ msgid "bug master"
+#~ msgstr "Bug 筝紫�"
+
 #~ msgid "An error occurred on the in-band bytestream transfer\n"
 #~ msgstr "��綣���篁倶�九���篋���莚���\n"