Complete Simplified Chinese translation.

1 files changed, 212 insertions, 147 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7419bb64..b7e668a6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: gnome-bluetooth master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "bluetooth&component=general\n"
-"POT-Creation-Date: 2009-12-01 20:04+0000\n"
-"PO-Revision-Date: 2009-12-09 15:18+0800\n"
+"POT-Creation-Date: 2010-06-17 17:04+0000\n"
+"PO-Revision-Date: 2010-07-14 00:05+0800\n"
 "Last-Translator: Tao Wei <weitao1979@gmail.com>\n"
 "Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -19,95 +19,99 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../lib/bluetooth-client.c:115
+#: ../lib/bluetooth-client.c:127
 msgid "All types"
 msgstr "所有类型"
 
-#: ../lib/bluetooth-client.c:117
+#: ../lib/bluetooth-client.c:129
 msgid "Phone"
 msgstr "电话"
 
-#: ../lib/bluetooth-client.c:119
+#: ../lib/bluetooth-client.c:131
 msgid "Modem"
 msgstr "调制解调器"
 
-#: ../lib/bluetooth-client.c:121
+#: ../lib/bluetooth-client.c:133
 msgid "Computer"
 msgstr "计算机"
 
-#: ../lib/bluetooth-client.c:123
+#: ../lib/bluetooth-client.c:135
 msgid "Network"
 msgstr "网络"
 
 #. translators: a hands-free headset, a combination of a single speaker with a microphone
-#: ../lib/bluetooth-client.c:126
+#: ../lib/bluetooth-client.c:138
 msgid "Headset"
 msgstr "耳机"
 
-#: ../lib/bluetooth-client.c:128
+#: ../lib/bluetooth-client.c:140
 msgid "Headphones"
 msgstr "听筒"
 
-#: ../lib/bluetooth-client.c:130
+#: ../lib/bluetooth-client.c:142
 msgid "Audio device"
 msgstr "音频设备"
 
-#: ../lib/bluetooth-client.c:132
+#: ../lib/bluetooth-client.c:144
 msgid "Keyboard"
 msgstr "键盘"
 
-#: ../lib/bluetooth-client.c:134
+#: ../lib/bluetooth-client.c:146
 msgid "Mouse"
 msgstr "鼠标"
 
-#: ../lib/bluetooth-client.c:136
+#: ../lib/bluetooth-client.c:148
 msgid "Camera"
 msgstr "相机"
 
-#: ../lib/bluetooth-client.c:138
+#: ../lib/bluetooth-client.c:150
 msgid "Printer"
 msgstr "打印机"
 
-#: ../lib/bluetooth-client.c:140
+#: ../lib/bluetooth-client.c:152
 msgid "Joypad"
 msgstr "游戏手柄"
 
-#: ../lib/bluetooth-client.c:142
+#: ../lib/bluetooth-client.c:154
 msgid "Tablet"
 msgstr "触摸板"
 
-#: ../lib/bluetooth-client.c:144 ../lib/bluetooth-chooser.c:120
+#: ../lib/bluetooth-client.c:156
+msgid "Video device"
+msgstr "视频设备"
+
+#: ../lib/bluetooth-client.c:158 ../lib/bluetooth-chooser.c:129
 #: ../lib/bluetooth-filter-widget.c:85
 msgid "Unknown"
 msgstr "未知"
 
-#: ../lib/bluetooth-chooser-button.c:65 ../lib/bluetooth-chooser-button.c:359
+#: ../lib/bluetooth-chooser-button.c:75 ../lib/bluetooth-chooser-button.c:369
 msgid "Click to select device..."
 msgstr "点击选择设备..."
 
-#: ../lib/bluetooth-chooser.c:161
+#: ../lib/bluetooth-chooser.c:170
 msgid "No adapters available"
 msgstr "无可用的适配器"
 
-#: ../lib/bluetooth-chooser.c:165 ../lib/bluetooth-chooser.c:839
+#: ../lib/bluetooth-chooser.c:174 ../lib/bluetooth-chooser.c:868
 msgid "Searching for devices..."
 msgstr "正在查找设备..."
 
-#: ../lib/bluetooth-chooser.c:351
+#: ../lib/bluetooth-chooser.c:372
 #, c-format
 msgid "Remove '%s' from the list of devices?"
 msgstr "从设备列表中移除 '%s'？"
 
-#: ../lib/bluetooth-chooser.c:353
+#: ../lib/bluetooth-chooser.c:374
 msgid ""
 "If you remove the device, you will have to set it up again before next use."
-msgstr "如果你移除此设备，下次使用时需要重新进行设置。"
+msgstr "如果您移除此设备，下次使用时需要重新进行设置。"
 
-#: ../lib/bluetooth-chooser.c:717
+#: ../lib/bluetooth-chooser.c:746
 msgid "Device"
 msgstr "设备"
 
-#: ../lib/bluetooth-chooser.c:754
+#: ../lib/bluetooth-chooser.c:783
 msgid "Type"
 msgstr "类型"
 
@@ -132,9 +136,8 @@ msgid "Paired or trusted"
 msgstr "已配对或已信任"
 
 #: ../lib/bluetooth-filter-widget.c:238
-#, fuzzy
 msgid "<b>Show Only Bluetooth Devices With...</b>"
-msgstr "<b>只显示蓝牙设备有...</b>"
+msgstr "<b>只显示蓝牙设备带有...</b>"
 
 #. The device category filter
 #: ../lib/bluetooth-filter-widget.c:254
@@ -171,90 +174,94 @@ msgstr "为 Geolocation 服务使用该 GPS 设备"
 #. * or leave untranslated
 #: ../lib/plugins/test.c:53
 msgid "Access the Internet using your cell phone (test)"
-msgstr "通过你的移动电话访问互联网 (测试)"
+msgstr "通过您的移动电话访问互联网 (测试)"
 
-#: ../applet/main.c:113
+#: ../applet/main.c:146
 msgid "Select Device to Browse"
 msgstr "选择要浏览的设备"
 
-#: ../applet/main.c:117
+#: ../applet/main.c:150
 msgid "_Browse"
 msgstr "浏览(_B)"
 
-#: ../applet/main.c:125
+#: ../applet/main.c:159
 msgid "Select device to browse"
 msgstr "选择要浏览的设备"
 
-#: ../applet/main.c:294 ../properties/properties-adapter-off.ui.h:1
+#: ../applet/main.c:338 ../properties/properties-adapter-off.ui.h:1
 msgid "Turn On Bluetooth"
 msgstr "打开蓝牙"
 
-#: ../applet/main.c:295
+#: ../applet/main.c:339
 msgid "Bluetooth: Off"
 msgstr "蓝牙：关"
 
-#: ../applet/main.c:298
+#: ../applet/main.c:342
 msgid "Turn Off Bluetooth"
 msgstr "关闭蓝牙"
 
-#: ../applet/main.c:299
+#: ../applet/main.c:343
 msgid "Bluetooth: On"
 msgstr "蓝牙：开"
 
-#: ../applet/main.c:304 ../applet/notify.c:148
+#: ../applet/main.c:348 ../applet/notify.c:155
 msgid "Bluetooth: Disabled"
 msgstr "蓝牙：已停用"
 
-#: ../applet/main.c:450
+#: ../applet/main.c:499
 msgid "Disconnecting..."
 msgstr "正在断开连接..."
 
-#: ../applet/main.c:453 ../sendto/main.c:213
+#: ../applet/main.c:502 ../sendto/main.c:217 ../sendto/main.c:314
 msgid "Connecting..."
 msgstr "正在连接..."
 
-#: ../applet/main.c:456 ../applet/main.c:797
+#: ../applet/main.c:505 ../applet/main.c:846
 msgid "Connected"
 msgstr "已连接"
 
-#: ../applet/main.c:459 ../applet/main.c:797
+#: ../applet/main.c:508 ../applet/main.c:846
 msgid "Disconnected"
 msgstr "已断开"
 
-#: ../applet/main.c:815 ../applet/main.c:869 ../properties/adapter.c:371
+#: ../applet/main.c:864 ../applet/main.c:928 ../properties/adapter.c:371
 msgid "Disconnect"
 msgstr "断开"
 
-#: ../applet/main.c:815 ../applet/main.c:869
+#: ../applet/main.c:864 ../applet/main.c:928
 msgid "Connect"
 msgstr "连接"
 
-#: ../applet/main.c:828
+#: ../applet/main.c:877
 msgid "Send files..."
 msgstr "发送文件..."
 
-#: ../applet/main.c:838
+#: ../applet/main.c:887
 msgid "Browse files..."
 msgstr "浏览文件..."
 
-#: ../applet/main.c:849
+#: ../applet/main.c:898
 msgid "Open Keyboard Preferences..."
 msgstr "打开键盘参数选择..."
 
-#: ../applet/main.c:857
+#: ../applet/main.c:906
 msgid "Open Mouse Preferences..."
 msgstr "打开鼠标首选项..."
 
-#: ../applet/main.c:984
+#: ../applet/main.c:916
+msgid "Open Sound Preferences..."
+msgstr "开放声音系统首选项..."
+
+#: ../applet/main.c:1036
 msgid "Debug"
 msgstr "调试"
 
 #. Parse command-line options
-#: ../applet/main.c:1004
+#: ../applet/main.c:1055
 msgid "- Bluetooth applet"
 msgstr "- 蓝牙小程序"
 
-#: ../applet/main.c:1009
+#: ../applet/main.c:1060
 #, c-format
 msgid ""
 "%s\n"
@@ -263,11 +270,20 @@ msgstr ""
 "%s\n"
 "运行 '%s --help' 查看命令行可用选项的完整列表。\n"
 
-#: ../applet/main.c:1026
+#: ../applet/main.c:1077
 msgid "Bluetooth Applet"
 msgstr "蓝牙小程序"
 
-#: ../applet/notify.c:148
+#. Power switch
+#. Translators: This string appears next to a toggle switch which controls
+#. * enabling/disabling Bluetooth radio's on the device. Akin to the power
+#. * switches in the Network UI of Moblin
+#: ../applet/notify.c:122 ../properties/bluetooth-properties.desktop.in.in.h:1
+#: ../moblin/main.c:141 ../moblin/moblin-panel.c:1595
+msgid "Bluetooth"
+msgstr "蓝牙"
+
+#: ../applet/notify.c:155
 msgid "Bluetooth: Enabled"
 msgstr "蓝牙：已启用"
 
@@ -350,7 +366,7 @@ msgid "Browse files on device..."
 msgstr "浏览设备上的文件..."
 
 #: ../applet/popup-menu.ui.h:3 ../properties/adapter.c:330
-#: ../moblin/moblin-panel.c:1182 ../moblin/moblin-panel.c:1270
+#: ../moblin/moblin-panel.c:1396 ../moblin/moblin-panel.c:1506
 msgid "Devices"
 msgstr "设备"
 
@@ -398,37 +414,33 @@ msgstr "匹配(_M)"
 msgid "_Show input"
 msgstr "显示输入(_S)"
 
-#. translators:
-#. * This is the name of the preferences dialogue for gnome-user-share
-#: ../properties/main.c:87
+#: ../properties/main.c:90
 msgid "Cannot start \"Personal File Sharing\" Preferences"
 msgstr "不能启动“个人文件共享”首选项"
 
-#. translators:
-#. * This is the name of the preferences dialogue for gnome-user-share
-#: ../properties/main.c:98
+#: ../properties/main.c:95
 msgid ""
 "Please verify that the \"Personal File Sharing\" program is correctly "
 "installed."
 msgstr "请验证“个人文件共享”程序已经正确安装了。"
 
-#: ../properties/main.c:135
+#: ../properties/main.c:124
 msgid "Bluetooth Preferences"
 msgstr "蓝牙首选项"
 
-#: ../properties/main.c:150
+#: ../properties/main.c:139
 msgid "_Show Bluetooth icon"
 msgstr "显示蓝牙图标(_S)"
 
-#: ../properties/main.c:174
+#: ../properties/main.c:163
 msgid "Receive Files"
 msgstr "接收文件"
 
-#: ../properties/main.c:222
+#: ../properties/main.c:211
 msgid "Output a list of currently known devices"
 msgstr "输出当前已知设备的列表"
 
-#: ../properties/main.c:260
+#: ../properties/main.c:249
 msgid "Bluetooth Properties"
 msgstr "蓝牙属性"
 
@@ -459,38 +471,12 @@ msgstr "未出现蓝牙适配器"
 
 #: ../properties/properties-no-adapter.ui.h:1
 msgid "Your computer does not have any Bluetooth adapters plugged in."
-msgstr "你的计算机未插入任何蓝牙适配器。"
-
-#. Power switch
-#. Translators: This string appears next to a toggle switch which controls
-#. * enabling/disabling Bluetooth radio's on the device. Akin to the power
-#. * switches in the Network UI of Moblin
-#: ../properties/bluetooth-properties.desktop.in.in.h:1
-#: ../moblin/moblin-panel.c:1340
-msgid "Bluetooth"
-msgstr "蓝牙"
+msgstr "您的计算机未插入任何蓝牙适配器。"
 
 #: ../properties/bluetooth-properties.desktop.in.in.h:2
 msgid "Configure Bluetooth settings"
 msgstr "配置蓝牙设定"
 
-#: ../properties/bluetooth-manager.schemas.in.h:1
-msgid "Whether to show the notification icon"
-msgstr "是否显示通知图标"
-
-#: ../properties/bluetooth-manager.schemas.in.h:2
-msgid "Whether to show the notification icon."
-msgstr "是否显示通知图标。"
-
-#: ../properties/gconf-bridge.c:1223
-#, c-format
-msgid "GConf error: %s"
-msgstr "GConf 错误： %s"
-
-#: ../properties/gconf-bridge.c:1228
-msgid "All further errors shown only on terminal."
-msgstr "全部的更多错误只显示在终端。"
-
 #. translators:
 #. * The '%s' is the device name, for example:
 #. * Pairing with 'Sony Bluetooth Headset' cancelled
@@ -500,12 +486,12 @@ msgstr "全部的更多错误只显示在终端。"
 msgid "Pairing with '%s' cancelled"
 msgstr "已取消和 '%s' 配对"
 
-#: ../wizard/main.c:245 ../moblin/moblin-panel.c:975
+#: ../wizard/main.c:245 ../moblin/moblin-panel.c:1139
 #, c-format
 msgid "Please confirm that the PIN displayed on '%s' matches this one."
 msgstr "请确认显示于 '%s' 的 PIN 与此匹配。 "
 
-#: ../wizard/main.c:299 ../moblin/moblin-panel.c:1026
+#: ../wizard/main.c:299 ../moblin/moblin-panel.c:1190
 msgid "Please enter the following PIN:"
 msgstr "请输入如下的 PIN："
 
@@ -527,13 +513,13 @@ msgstr "设置 '%s' 失败"
 msgid "Connecting to '%s'..."
 msgstr "正在连接到 '%s' ..."
 
-#: ../wizard/main.c:549 ../moblin/moblin-panel.c:633
+#: ../wizard/main.c:549 ../moblin/moblin-panel.c:750
 #, c-format
 msgid ""
 "Please enter the following PIN on '%s' and press “Enter” on the keyboard:"
 msgstr "请在 '%s' 输入如下 PIN 并按下键盘上的 “Enter” 键："
 
-#: ../wizard/main.c:551 ../moblin/moblin-panel.c:635
+#: ../wizard/main.c:551 ../moblin/moblin-panel.c:752
 #, c-format
 msgid "Please enter the following PIN on '%s':"
 msgstr "请在 '%s' 输入如下的 PIN ："
@@ -547,7 +533,7 @@ msgstr "请在 '%s' 输入如下的 PIN ："
 msgid "Please wait while finishing setup on device '%s'..."
 msgstr "即将完成 '%s' 设备的设置，请稍候..."
 
-#: ../wizard/main.c:588
+#: ../wizard/main.c:588 ../moblin/moblin-panel.c:777
 #, c-format
 msgid "Successfully set up new device '%s'"
 msgstr "成功设置新设备 '%s'"
@@ -585,7 +571,7 @@ msgid "Device search"
 msgstr "设备搜索"
 
 #. This is a button to answer: Does the PIN matches the one on the device?
-#: ../wizard/wizard.ui.h:10 ../moblin/moblin-panel.c:1138
+#: ../wizard/wizard.ui.h:10 ../moblin/moblin-panel.c:1343
 msgid "Does not match"
 msgstr "不匹配"
 
@@ -603,7 +589,7 @@ msgid "Introduction"
 msgstr "介绍"
 
 #. This is a button to answer: Does the PIN matches the one on the device?
-#: ../wizard/wizard.ui.h:16 ../moblin/moblin-panel.c:1134
+#: ../wizard/wizard.ui.h:16 ../moblin/moblin-panel.c:1339
 msgid "Matches"
 msgstr "匹配"
 
@@ -615,13 +601,13 @@ msgstr "PIN 码选项"
 msgid "PIN _options..."
 msgstr "PIN 选项(_O)..."
 
-#: ../wizard/wizard.ui.h:19
+#: ../wizard/wizard.ui.h:19 ../moblin/moblin-panel.c:1253
 msgid "Select the additional services you want to use with your device:"
-msgstr "为你的设备选择要用的附加服务："
+msgstr "为您的设备选择要用的附加服务："
 
 #: ../wizard/wizard.ui.h:20
 msgid "Select the device you want to setup"
-msgstr "选择你要设置的设备"
+msgstr "选择您要设置的设备"
 
 #: ../wizard/wizard.ui.h:21
 msgid "Setup Completed"
@@ -635,12 +621,12 @@ msgstr "本设备安装向导将帮助您在这台电脑上配置带有蓝牙功
 
 #: ../wizard/wizard.ui.h:23
 msgid ""
-"The device will need to be within 10 meters of your computer, and be “"
-"visible” (sometimes called “discoverable”). Check the "
-"device's manual if in doubt."
+"The device will need to be within 10 meters of your computer, and be "
+"“visible” (sometimes called “discoverable”). Check the device's manual if in "
+"doubt."
 msgstr ""
-"该设备必须位于你的计算机10米范围内，并 “可被发现#8221;(有时称为 “"
-"可见的”)。如有疑问请检查设备手册。"
+"该设备必须位于您的计算机10米范围内，并 “可被发现#8221;(有时称为 “可见的”)。如"
+"有疑问请检查设备手册。"
 
 #: ../wizard/wizard.ui.h:24
 msgid "Welcome to the Bluetooth new device setup"
@@ -654,94 +640,98 @@ msgstr "自动选择 PIN(_A)"
 msgid "_Restart Setup"
 msgstr "重新启动安装程序(_R)"
 
-#: ../sendto/main.c:98
+#: ../sendto/main.c:162
 #, c-format
 msgid "%'d second"
 msgid_plural "%'d seconds"
 msgstr[0] "%'d 秒"
 
-#: ../sendto/main.c:103 ../sendto/main.c:116
+#: ../sendto/main.c:167 ../sendto/main.c:180
 #, c-format
 msgid "%'d minute"
 msgid_plural "%'d minutes"
 msgstr[0] "%'d 分钟"
 
-#: ../sendto/main.c:114
+#: ../sendto/main.c:178
 #, c-format
 msgid "%'d hour"
 msgid_plural "%'d hours"
 msgstr[0] "%'d 小时"
 
-#: ../sendto/main.c:124
+#: ../sendto/main.c:188
 #, c-format
 msgid "approximately %'d hour"
 msgid_plural "approximately %'d hours"
 msgstr[0] "大约 %'d 小时"
 
-#: ../sendto/main.c:150
+#: ../sendto/main.c:249
 msgid "File Transfer"
 msgstr "文件传输"
 
+#: ../sendto/main.c:253
+msgid "_Retry"
+msgstr "重试(_R)"
+
 #. translators: This is the heading for the progress dialogue
-#: ../sendto/main.c:169
+#: ../sendto/main.c:273
 msgid "Sending files via Bluetooth"
 msgstr "通过蓝牙传输文件"
 
-#: ../sendto/main.c:181
+#: ../sendto/main.c:285
 msgid "From:"
 msgstr "从："
 
-#: ../sendto/main.c:197
+#: ../sendto/main.c:298
 msgid "To:"
 msgstr "到："
 
-#: ../sendto/main.c:243
+#: ../sendto/main.c:343 ../sendto/main.c:359
 msgid "An unknown error occurred"
 msgstr "发生了未知错误"
 
-#: ../sendto/main.c:253
+#: ../sendto/main.c:352
 msgid ""
 "Make sure that remote device is switched on and that it accepts Bluetooth "
 "connections"
 msgstr "请确认远程设备已开启并接受蓝牙连接"
 
-#: ../sendto/main.c:337
+#: ../sendto/main.c:450
 #, c-format
 msgid "Sending %s"
 msgstr "发送 %s"
 
-#: ../sendto/main.c:344 ../sendto/main.c:406
+#: ../sendto/main.c:457 ../sendto/main.c:523
 #, c-format
 msgid "Sending file %d of %d"
 msgstr "发送中 %d / %d"
 
-#: ../sendto/main.c:402
+#: ../sendto/main.c:519
 #, c-format
 msgid "%d KB/s"
 msgstr "%d KB/s"
 
-#: ../sendto/main.c:404
+#: ../sendto/main.c:521
 #, c-format
 msgid "%d B/s"
 msgstr "%d B/s"
 
-#: ../sendto/main.c:498
+#: ../sendto/main.c:641
 msgid "Select Device to Send To"
 msgstr "选择要发送到的设备"
 
-#: ../sendto/main.c:502
+#: ../sendto/main.c:645
 msgid "Send _To"
 msgstr "发送到(_T)"
 
-#: ../sendto/main.c:543
+#: ../sendto/main.c:687
 msgid "Choose files to send"
 msgstr "选择要发送的文件"
 
-#: ../sendto/main.c:572
+#: ../sendto/main.c:716
 msgid "Remote device to use"
 msgstr "使用远程设备"
 
-#: ../sendto/main.c:574
+#: ../sendto/main.c:718
 msgid "Remote device's name"
 msgstr "远程设备名称"
 
@@ -752,83 +742,158 @@ msgstr "程序错误，不能在列表上找到设备"
 #: ../sendto/nautilus-sendto-plugin.c:247
 #, c-format
 msgid "Obex Push file transfer unsupported"
-msgstr ""
+msgstr "不支持 Obex 文件推送传输"
 
 #: ../sendto/nautilus-sendto-plugin.c:266
 msgid "Bluetooth (OBEX Push)"
-msgstr ""
+msgstr "蓝牙(OBEX 推送)"
 
-#: ../moblin/main.c:88
+#: ../moblin/main.c:93
 msgid "Run in standalone mode"
 msgstr "使用独立模式运行"
 
-#: ../moblin/main.c:96 ../moblin/bluetooth-panel.desktop.in.in.h:2
+#: ../moblin/main.c:101 ../moblin/bluetooth-panel.desktop.in.in.h:2
 msgid "Moblin Bluetooth Panel"
 msgstr "Moblin 蓝牙面板"
 
-#: ../moblin/main.c:97
+#: ../moblin/main.c:102
 msgid "- Moblin Bluetooth Panel"
 msgstr "- 蓝牙控制面板"
 
-#: ../moblin/main.c:124
+#: ../moblin/main.c:129
 msgid "bluetooth"
 msgstr "蓝牙"
 
-#: ../moblin/moblin-panel.c:525
+#: ../moblin/moblin-panel.c:177
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d 时"
+
+#: ../moblin/moblin-panel.c:179
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d 分"
+
+#: ../moblin/moblin-panel.c:182
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d 秒"
+
+#. hour:minutes:seconds
+#: ../moblin/moblin-panel.c:188
+#, c-format
+msgid "%s %s %s"
+msgstr "%s %s %s"
+
+#. minutes:seconds
+#: ../moblin/moblin-panel.c:192
+#, c-format
+msgid "%s %s"
+msgstr "%s %s"
+
+#. minutes
+#. seconds
+#: ../moblin/moblin-panel.c:195 ../moblin/moblin-panel.c:199
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#. 0 seconds
+#: ../moblin/moblin-panel.c:202
+msgid "0 seconds"
+msgstr "0 秒"
+
+#: ../moblin/moblin-panel.c:224
+#, c-format
+msgid ""
+"Your computer is visible on\n"
+"Bluetooth for %s."
+msgstr ""
+"您的计算机为 %s 而在\n"
+"蓝牙网络上可见。"
+
+#: ../moblin/moblin-panel.c:625
 #, c-format
 msgid "Pairing with %s failed."
-msgstr "和 '%s' 配对失败"
+msgstr "和 %s 配对失败。"
 
-#: ../moblin/moblin-panel.c:821
+#: ../moblin/moblin-panel.c:985
 msgid "<u>Pair</u>"
 msgstr "配对"
 
-#: ../moblin/moblin-panel.c:835
+#: ../moblin/moblin-panel.c:999
 msgid "<u>Connect</u>"
 msgstr "<u>连接</u>"
 
-#: ../moblin/moblin-panel.c:854
+#: ../moblin/moblin-panel.c:1018
 msgid "<u>Browse</u>"
 msgstr "<u>浏览</u>"
 
-#: ../moblin/moblin-panel.c:1048
+#: ../moblin/moblin-panel.c:1212
 msgid "Device setup failed"
 msgstr "设备设置失败"
 
 #. Back button
-#: ../moblin/moblin-panel.c:1060 ../moblin/moblin-panel.c:1097
-#: ../moblin/moblin-panel.c:1146 ../moblin/moblin-panel.c:1208
-#: ../moblin/moblin-panel.c:1425
+#: ../moblin/moblin-panel.c:1226 ../moblin/moblin-panel.c:1302
+#: ../moblin/moblin-panel.c:1351 ../moblin/moblin-panel.c:1429
+#: ../moblin/moblin-panel.c:1661
 msgid "Back to devices"
 msgstr "返回设备"
 
-#: ../moblin/moblin-panel.c:1081 ../moblin/moblin-panel.c:1118
+#: ../moblin/moblin-panel.c:1265
+msgid "Done"
+msgstr "完成"
+
+#: ../moblin/moblin-panel.c:1286 ../moblin/moblin-panel.c:1323
 msgid "Device setup"
 msgstr "设备设置"
 
-#: ../moblin/moblin-panel.c:1229
+#: ../moblin/moblin-panel.c:1446 ../moblin/moblin-panel.c:1577
+msgid "Settings"
+msgstr "设置"
+
+#: ../moblin/moblin-panel.c:1462
 msgid "Only show:"
 msgstr "只显示："
 
 #. Button for PIN options file
-#: ../moblin/moblin-panel.c:1235
+#: ../moblin/moblin-panel.c:1468
 msgid "PIN options"
 msgstr "PIN 码选项"
 
 #. Add new button
-#: ../moblin/moblin-panel.c:1318
+#: ../moblin/moblin-panel.c:1512
 msgid "Add a new device"
 msgstr "添加新设备"
 
+#: ../moblin/moblin-panel.c:1613
+msgid "Make visible on Bluetooth"
+msgstr "在蓝牙网络上可见"
+
 #. Button for Send file
-#: ../moblin/moblin-panel.c:1385
+#: ../moblin/moblin-panel.c:1619
 msgid "Send file from your computer"
-msgstr "从你的计算机上发送文件"
+msgstr "从您的计算机上发送文件"
 
 #: ../moblin/bluetooth-panel.desktop.in.in.h:1
 msgid "Bluetooth Manager Panel"
 msgstr "蓝牙管理器控制面板"
 
+#~ msgid "Whether to show the notification icon"
+#~ msgstr "是否显示通知图标"
+
+#~ msgid "Whether to show the notification icon."
+#~ msgstr "是否显示通知图标。"
+
+#~ msgid "GConf error: %s"
+#~ msgstr "GConf 错误： %s"
+
+#~ msgid "All further errors shown only on terminal."
+#~ msgstr "全部的更多错误只显示在终端。"
+
 #~ msgid "A Bluetooth manager for the GNOME desktop"
 #~ msgstr "适用于 GNOME 桌面的蓝牙管理器"
 
@@ -1074,10 +1139,10 @@ msgstr "蓝牙管理器控制面板"
 #~ "点击此处以打开确认窗口"
 
 #~ msgid "Select type of device you wanna setup"
-#~ msgstr "选择你想要设置的设备类型"
+#~ msgstr "选择您想要设置的设备类型"
 
 #~ msgid "Select device you wanna setup"
-#~ msgstr "选择你想设置的设备"
+#~ msgstr "选择您想设置的设备"
 
 #~ msgid "Bluetooth device wizard"
 #~ msgstr "蓝牙设备向导"