Update Simplifid Chinese translation.

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4823c90045a7db20e94edb54d97bd029d40e97a9..9d700bf4c514ed7be6096f27d16d85fe92dbb49d 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,15 +13,16 @@
 # Richard Ma <richard.ma.19850509@gmail.com>, 2009.
 # Tao Wei <weitao1979@gmail.com>, 2009.
 # Tao Wang <dancefire@gmail.com>, 2010.
 # Richard Ma <richard.ma.19850509@gmail.com>, 2009.
 # Tao Wei <weitao1979@gmail.com>, 2009.
 # Tao Wang <dancefire@gmail.com>, 2010.

-# Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.

 # Dean Lee <xslidian@gmail.com>, 2010.
 # Dean Lee <xslidian@gmail.com>, 2010.

+# Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.

 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"

-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-16 23:16+0800\n"
-"PO-Revision-Date: 2010-09-16 23:18+0800\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&component=general\n"
+"POT-Creation-Date: 2010-09-24 07:49+0000\n"
+"PO-Revision-Date: 2010-09-23 14:48+0800\n"

 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"


@@ -622,8 +623,7 @@ msgstr "证书已被吊销"
 #: ../libempathy/empathy-utils.c:377
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 #: ../libempathy/empathy-utils.c:377
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"

-msgstr ""
-"证书使用不安全的加密算法或者是弱加密的"
+msgstr "证书使用不安全的加密算法或者是弱加密的"

 
 #: ../libempathy/empathy-utils.c:380
 msgid ""
 
 #: ../libempathy/empathy-utils.c:380
 msgid ""


@@ -632,6 +632,7 @@ msgid ""
 msgstr "服务器证书的长度——或服务器证书链的深度——超出了加密库的硬性限制"
 
 #: ../libempathy/empathy-utils.c:544
 msgstr "服务器证书的长度——或服务器证书链的深度——超出了加密库的硬性限制"
 
 #: ../libempathy/empathy-utils.c:544

+#: ../libempathy-gtk/empathy-contact-list-store.h:73

 msgid "People Nearby"
 msgstr "附近的人"
 
 msgid "People Nearby"
 msgstr "附近的人"
 


@@ -1438,6 +1439,14 @@ msgstr "以后再决定(_L)"
 msgid "Subscription Request"
 msgstr "订阅请求"
 
 msgid "Subscription Request"
 msgstr "订阅请求"
 

+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "未分组"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "收藏夹"
+

 #: ../libempathy-gtk/empathy-contact-list-view.c:2004
 #: ../libempathy-gtk/empathy-individual-view.c:2232
 #, c-format
 #: ../libempathy-gtk/empathy-contact-list-view.c:2004
 #: ../libempathy-gtk/empathy-individual-view.c:2232
 #, c-format


@@ -1509,11 +1518,11 @@ msgid "Share My Desktop"
 msgstr "共享我的桌面"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:415
 msgstr "共享我的桌面"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:415

-#: ../libempathy-gtk/empathy-contact-widget.c:1541
+#: ../libempathy-gtk/empathy-contact-widget.c:1539

 #: ../libempathy-gtk/empathy-individual-menu.c:759
 #: ../libempathy-gtk/empathy-individual-widget.c:1292
 msgid "Favorite"
 #: ../libempathy-gtk/empathy-individual-menu.c:759
 #: ../libempathy-gtk/empathy-individual-widget.c:1292
 msgid "Favorite"

-msgstr "收藏夹"
+msgstr "收藏"

 
 #: ../libempathy-gtk/empathy-contact-menu.c:444
 #: ../libempathy-gtk/empathy-individual-menu.c:786
 
 #: ../libempathy-gtk/empathy-contact-menu.c:444
 #: ../libempathy-gtk/empathy-individual-menu.c:786


@@ -1565,128 +1574,128 @@ msgstr "网站："
 msgid "Birthday:"
 msgstr "生日："
 
 msgid "Birthday:"
 msgstr "生日："
 

-#: ../libempathy-gtk/empathy-contact-widget.c:579
+#: ../libempathy-gtk/empathy-contact-widget.c:578

 #: ../libempathy-gtk/empathy-individual-widget.c:454
 msgid "Country ISO Code:"
 msgstr "包括 ISO 编码："
 
 #: ../libempathy-gtk/empathy-individual-widget.c:454
 msgid "Country ISO Code:"
 msgstr "包括 ISO 编码："
 

-#: ../libempathy-gtk/empathy-contact-widget.c:581
+#: ../libempathy-gtk/empathy-contact-widget.c:580

 #: ../libempathy-gtk/empathy-individual-widget.c:456
 msgid "Country:"
 msgstr "国家："
 
 #: ../libempathy-gtk/empathy-individual-widget.c:456
 msgid "Country:"
 msgstr "国家："
 

-#: ../libempathy-gtk/empathy-contact-widget.c:583
+#: ../libempathy-gtk/empathy-contact-widget.c:582

 #: ../libempathy-gtk/empathy-individual-widget.c:458
 msgid "State:"
 msgstr "省："
 
 #: ../libempathy-gtk/empathy-individual-widget.c:458
 msgid "State:"
 msgstr "省："
 

-#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-contact-widget.c:584

 #: ../libempathy-gtk/empathy-individual-widget.c:460
 msgid "City:"
 msgstr "城市："
 
 #: ../libempathy-gtk/empathy-individual-widget.c:460
 msgid "City:"
 msgstr "城市："
 

-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:586

 #: ../libempathy-gtk/empathy-individual-widget.c:462
 msgid "Area:"
 msgstr "地区："
 
 #: ../libempathy-gtk/empathy-individual-widget.c:462
 msgid "Area:"
 msgstr "地区："
 

-#: ../libempathy-gtk/empathy-contact-widget.c:589
+#: ../libempathy-gtk/empathy-contact-widget.c:588

 #: ../libempathy-gtk/empathy-individual-widget.c:464
 msgid "Postal Code:"
 msgstr "邮政编码："
 
 #: ../libempathy-gtk/empathy-individual-widget.c:464
 msgid "Postal Code:"
 msgstr "邮政编码："
 

-#: ../libempathy-gtk/empathy-contact-widget.c:591
+#: ../libempathy-gtk/empathy-contact-widget.c:590

 #: ../libempathy-gtk/empathy-individual-widget.c:466
 msgid "Street:"
 msgstr "街道："
 
 #: ../libempathy-gtk/empathy-individual-widget.c:466
 msgid "Street:"
 msgstr "街道："
 

-#: ../libempathy-gtk/empathy-contact-widget.c:593
+#: ../libempathy-gtk/empathy-contact-widget.c:592

 #: ../libempathy-gtk/empathy-individual-widget.c:468
 msgid "Building:"
 msgstr "建筑物："
 
 #: ../libempathy-gtk/empathy-individual-widget.c:468
 msgid "Building:"
 msgstr "建筑物："
 

-#: ../libempathy-gtk/empathy-contact-widget.c:595
+#: ../libempathy-gtk/empathy-contact-widget.c:594

 #: ../libempathy-gtk/empathy-individual-widget.c:470
 msgid "Floor:"
 msgstr "楼层："
 
 #: ../libempathy-gtk/empathy-individual-widget.c:470
 msgid "Floor:"
 msgstr "楼层："
 

-#: ../libempathy-gtk/empathy-contact-widget.c:597
+#: ../libempathy-gtk/empathy-contact-widget.c:596

 #: ../libempathy-gtk/empathy-individual-widget.c:472
 msgid "Room:"
 msgstr "房间："
 
 #: ../libempathy-gtk/empathy-individual-widget.c:472
 msgid "Room:"
 msgstr "房间："
 

-#: ../libempathy-gtk/empathy-contact-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:598

 #: ../libempathy-gtk/empathy-individual-widget.c:474
 msgid "Text:"
 msgstr "文本："
 
 #: ../libempathy-gtk/empathy-individual-widget.c:474
 msgid "Text:"
 msgstr "文本："
 

-#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:600

 #: ../libempathy-gtk/empathy-individual-widget.c:476
 msgid "Description:"
 msgstr "描述："
 
 #: ../libempathy-gtk/empathy-individual-widget.c:476
 msgid "Description:"
 msgstr "描述："
 

-#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-contact-widget.c:602

 #: ../libempathy-gtk/empathy-individual-widget.c:478
 msgid "URI:"
 msgstr "URI："
 
 #: ../libempathy-gtk/empathy-individual-widget.c:478
 msgid "URI:"
 msgstr "URI："
 

-#: ../libempathy-gtk/empathy-contact-widget.c:605
+#: ../libempathy-gtk/empathy-contact-widget.c:604

 #: ../libempathy-gtk/empathy-individual-widget.c:480
 msgid "Accuracy Level:"
 msgstr "准确程度："
 
 #: ../libempathy-gtk/empathy-individual-widget.c:480
 msgid "Accuracy Level:"
 msgstr "准确程度："
 

-#: ../libempathy-gtk/empathy-contact-widget.c:607
+#: ../libempathy-gtk/empathy-contact-widget.c:606

 #: ../libempathy-gtk/empathy-individual-widget.c:482
 msgid "Error:"
 msgstr "错误："
 
 #: ../libempathy-gtk/empathy-individual-widget.c:482
 msgid "Error:"
 msgstr "错误："
 

-#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-contact-widget.c:608

 #: ../libempathy-gtk/empathy-individual-widget.c:484
 msgid "Vertical Error (meters):"
 msgstr "垂直误差(米)："
 
 #: ../libempathy-gtk/empathy-individual-widget.c:484
 msgid "Vertical Error (meters):"
 msgstr "垂直误差(米)："
 

-#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-contact-widget.c:610

 #: ../libempathy-gtk/empathy-individual-widget.c:486
 msgid "Horizontal Error (meters):"
 msgstr "水平误差(米)："
 
 #: ../libempathy-gtk/empathy-individual-widget.c:486
 msgid "Horizontal Error (meters):"
 msgstr "水平误差(米)："
 

-#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-contact-widget.c:612

 #: ../libempathy-gtk/empathy-individual-widget.c:488
 msgid "Speed:"
 msgstr "速度："
 
 #: ../libempathy-gtk/empathy-individual-widget.c:488
 msgid "Speed:"
 msgstr "速度："
 

-#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-contact-widget.c:614

 #: ../libempathy-gtk/empathy-individual-widget.c:490
 msgid "Bearing:"
 msgstr "方位朝向："
 
 #: ../libempathy-gtk/empathy-individual-widget.c:490
 msgid "Bearing:"
 msgstr "方位朝向："
 

-#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-contact-widget.c:616

 #: ../libempathy-gtk/empathy-individual-widget.c:492
 msgid "Climb Speed:"
 msgstr "爬升速度："
 
 #: ../libempathy-gtk/empathy-individual-widget.c:492
 msgid "Climb Speed:"
 msgstr "爬升速度："
 

-#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-contact-widget.c:618

 #: ../libempathy-gtk/empathy-individual-widget.c:494
 msgid "Last Updated on:"
 msgstr "最近更新于："
 
 #: ../libempathy-gtk/empathy-individual-widget.c:494
 msgid "Last Updated on:"
 msgstr "最近更新于："
 

-#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-contact-widget.c:620

 #: ../libempathy-gtk/empathy-individual-widget.c:496
 msgid "Longitude:"
 msgstr "经度："
 
 #: ../libempathy-gtk/empathy-individual-widget.c:496
 msgid "Longitude:"
 msgstr "经度："
 

-#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-contact-widget.c:622

 #: ../libempathy-gtk/empathy-individual-widget.c:498
 msgid "Latitude:"
 msgstr "纬度："
 
 #: ../libempathy-gtk/empathy-individual-widget.c:498
 msgid "Latitude:"
 msgstr "纬度："
 

-#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-contact-widget.c:624

 #: ../libempathy-gtk/empathy-individual-widget.c:500
 msgid "Altitude:"
 msgstr "海拔："
 
 #: ../libempathy-gtk/empathy-individual-widget.c:500
 msgid "Altitude:"
 msgstr "海拔："
 

-#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-contact-widget.c:705
+#: ../libempathy-gtk/empathy-contact-widget.c:687
+#: ../libempathy-gtk/empathy-contact-widget.c:704

 #: ../libempathy-gtk/empathy-individual-widget.c:582
 #: ../libempathy-gtk/empathy-individual-widget.c:599
 #: ../src/empathy-preferences.ui.h:12
 #: ../libempathy-gtk/empathy-individual-widget.c:582
 #: ../libempathy-gtk/empathy-individual-widget.c:599
 #: ../src/empathy-preferences.ui.h:12


@@ -1694,23 +1703,23 @@ msgid "Location"
 msgstr "位置"
 
 #. translators: format is "Location, $date"
 msgstr "位置"
 
 #. translators: format is "Location, $date"

-#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-contact-widget.c:706

 #: ../libempathy-gtk/empathy-individual-widget.c:601
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
 #: ../libempathy-gtk/empathy-individual-widget.c:601
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 

-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:758

 #: ../libempathy-gtk/empathy-individual-widget.c:650
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e,%Y 于 %R UTC 时间"
 
 #: ../libempathy-gtk/empathy-individual-widget.c:650
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e,%Y 于 %R UTC 时间"
 

-#: ../libempathy-gtk/empathy-contact-widget.c:842
+#: ../libempathy-gtk/empathy-contact-widget.c:841

 #: ../libempathy-gtk/empathy-individual-widget.c:841
 msgid "Save Avatar"
 msgstr "保存头像"
 
 #: ../libempathy-gtk/empathy-individual-widget.c:841
 msgid "Save Avatar"
 msgstr "保存头像"
 

-#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:897

 #: ../libempathy-gtk/empathy-individual-widget.c:899
 msgid "Unable to save avatar"
 msgstr "无法保存头像"
 #: ../libempathy-gtk/empathy-individual-widget.c:899
 msgid "Unable to save avatar"
 msgstr "无法保存头像"


@@ -1896,10 +1905,12 @@ msgid "Conversations"
 msgstr "对话"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgstr "对话"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3

+#: ../libempathy-gtk/empathy-search-bar.ui.h:1

 msgid "Find Next"
 msgstr "向下查找"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Find Next"
 msgstr "向下查找"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4

+#: ../libempathy-gtk/empathy-search-bar.ui.h:2

 msgid "Find Previous"
 msgstr "向上查找"
 
 msgid "Find Previous"
 msgstr "向上查找"
 


@@ -1983,15 +1994,15 @@ msgstr "设置你的状态信息和现在的状态"
 msgid "Custom messages…"
 msgstr "自定义消息..."
 
 msgid "Custom messages…"
 msgstr "自定义消息..."
 

-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3

 msgid "Find:"
 msgstr "查找："
 
 msgid "Find:"
 msgstr "查找："
 

-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4

 msgid "Match case"
 msgstr "区分大小写"
 
 msgid "Match case"
 msgstr "区分大小写"
 

-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5

 msgid "Phrase not found"
 msgstr "未找到短语"
 
 msgid "Phrase not found"
 msgstr "未找到短语"