* New upstream release.

  * Fix convert file key naming (LP: #847807)
  * Use environment variable to get seat path (LP: #856455)
  * Fix abort when using ConsoleKit fallback (LP: #740382)
  * Update session icon instead of creating a new one (LP: #854292)
  * Update to latest Launchpad translations

1 files changed, 208 insertions, 84 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index b992874..eaf65dc 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,60 +7,90 @@ msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-17 10:48-0500\n"
-"PO-Revision-Date: 2010-03-15 12:41+0000\n"
-"Last-Translator: Sebastien Bacher <seb128@ubuntu.com>\n"
+"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"PO-Revision-Date: 2011-09-15 13:13+0000\n"
+"Last-Translator: Xhacker Liu <liu.dongyuan@gmail.com>\n"
 "Language-Team: Chinese (simplified)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-03-17 19:48+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-09-27 15:12+0000\n"
+"X-Generator: Launchpad (build 14041)\n"
 
-#: ../data/indicator-session.schemas.in.h:1
-msgid "Makes it so that the logout button doesn't show in the session menu."
-msgstr ""
+#: ../data/com.canonical.indicator.session.gschema.xml.in.h:1
+msgid "Makes it so that the logout button doesn’t show in the session menu."
+msgstr "用它来隐藏会话菜单中的注销按钮。"
+
+#: ../data/com.canonical.indicator.session.gschema.xml.in.h:2
+msgid "Makes it so that the restart button doesn’t show in the session menu."
+msgstr "用它来隐藏会话菜单中的重启按钮。"
+
+#: ../data/com.canonical.indicator.session.gschema.xml.in.h:3
+msgid ""
+"Makes it so that the shutdown button doesn’t show in the session menu."
+msgstr "用它来隐藏会话菜单中的关机按钮。"
 
-#: ../data/indicator-session.schemas.in.h:2
+#: ../data/com.canonical.indicator.session.gschema.xml.in.h:4
 msgid "Remove the Log Out item from the session menu"
-msgstr ""
+msgstr "移除会话菜单中的注销项"
+
+#: ../data/com.canonical.indicator.session.gschema.xml.in.h:5
+msgid "Remove the Restart item from the session menu"
+msgstr "移除会话菜单中的重启项"
+
+#: ../data/com.canonical.indicator.session.gschema.xml.in.h:6
+msgid "Remove the shutdown item from the session menu"
+msgstr "移除会话菜单中的关机项"
 
-#: ../data/indicator-session.schemas.in.h:3
+#: ../data/com.canonical.indicator.session.gschema.xml.in.h:7
 msgid "Suppress the dialog to confirm logout, restart and shutdown action"
-msgstr "禁止确认注销、重新启动和关机操作的对话出现"
+msgstr "禁止确认注销、重新启动和关机操作的对话框出现"
 
-#: ../data/indicator-session.schemas.in.h:4
+#: ../data/com.canonical.indicator.session.gschema.xml.in.h:8
 msgid ""
 "Whether or not to show confirmation dialogs for logout, restart and shutdown "
 "actions."
-msgstr "是否显示确认注销、重新启动和关机操作的对话。"
+msgstr "是否显示确认注销、重新启动和关机操作的对话框。"
 
-#: ../src/gconf-helper.c:63 ../src/session-service.c:613
+#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:1
+msgid "Classic Guest Session"
+msgstr "传统客人会话"
+
+#: ../data/extra-sessions/classic-desktop.desktop.in.in.h:2
+msgid "Start a guest session using the classic desktop"
+msgstr "以传统桌面环境启动客人会话"
+
+#: ../data/indicator-session-lock-screen.desktop.in.in.h:1
+#: ../src/device-menu-mgr.c:649
+msgid "Lock Screen"
+msgstr "锁定屏幕"
+
+#: ../data/indicator-session-shutdown.desktop.in.in.h:1
+#: ../src/settings-helper.c:86 ../src/device-menu-mgr.c:716
+msgid "Shut Down"
+msgstr "关机"
+
+#: ../data/indicator-session-logout.desktop.in.in.h:1
+#: ../src/settings-helper.c:84 ../src/device-menu-mgr.c:672
 msgid "Log Out"
 msgstr "注销"
 
-#: ../src/gconf-helper.c:64 ../src/session-service.c:638
-#: ../src/session-service.c:722
+#: ../data/indicator-session-restart.desktop.in.in.h:1
+#: ../src/settings-helper.c:85
 msgid "Restart"
 msgstr "重启"
 
-#: ../src/gconf-helper.c:65 ../src/session-service.c:647
-msgid "Switch Off"
-msgstr "关闭"
+#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
+msgid "Log Out…"
+msgstr "注销..."
 
-#: ../src/gconf-helper.c:67 ../src/session-service.c:615
-msgid "Log Out..."
-msgstr "注销"
+#: ../src/settings-helper.c:89
+msgid "Restart…"
+msgstr "重启..."
 
-#: ../src/gconf-helper.c:68 ../src/session-service.c:640
-#: ../src/session-service.c:724
-msgid "Restart..."
-msgstr "重新启动..."
-
-#: ../src/gconf-helper.c:69 ../src/session-service.c:649
-msgid "Switch Off..."
-msgstr "关闭..."
+#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
+msgid "Shut Down…"
+msgstr "关机..."
 
 #. LOGOUT_DIALOG_LOGOUT,
 #: ../src/dialog.c:35
@@ -77,8 +107,8 @@ msgstr "重新启动"
 #. LOGOUT_DIALOG_SHUTDOWN,
 #: ../src/dialog.c:37
 msgctxt "title"
-msgid "Switch Off"
-msgstr "关闭"
+msgid "Shut Down"
+msgstr "关机"
 
 #. LOGOUT_DIALOG_LOGOUT,
 #: ../src/dialog.c:41
@@ -93,7 +123,8 @@ msgstr "您确定要关闭所有程序并重新启动计算机？"
 
 #. LOGOUT_DIALOG_SHUTDOWN,
 #: ../src/dialog.c:43
-msgid "Are you sure you want to close all programs and shut down the computer?"
+msgid ""
+"Are you sure you want to close all programs and shut down the computer?"
 msgstr "您确定要关闭所有程序并关闭计算机？"
 
 #. LOGOUT_DIALOG_LOGOUT,
@@ -111,8 +142,8 @@ msgstr "重新启动"
 #. LOGOUT_DIALOG_SHUTDOWN,
 #: ../src/dialog.c:49
 msgctxt "button"
-msgid "Switch Off"
-msgstr "关闭"
+msgid "Shut Down"
+msgstr "关机"
 
 #. LOGOUT_DIALOG_LOGOUT,
 #: ../src/dialog.c:55
@@ -123,14 +154,14 @@ msgstr "注销"
 #. LOGOUT_DIALOG_RESTART,
 #: ../src/dialog.c:56
 msgctxt "button auth"
-msgid "Restart..."
-msgstr "重启"
+msgid "Restart…"
+msgstr "重启..."
 
 #. LOGOUT_DIALOG_SHUTDOWN,
 #: ../src/dialog.c:57
 msgctxt "button auth"
-msgid "Switch Off..."
-msgstr "关闭..."
+msgid "Shut Down…"
+msgstr "关机..."
 
 #. TRANSLATORS: This button appears on the logout dialog when
 #. there are updates that require restart.  It will do a restart
@@ -140,67 +171,160 @@ msgid "Restart Instead"
 msgstr "改为重启"
 
 #: ../src/dialog.c:64
-msgid "Restart Instead..."
-msgstr "改为重启..."
+msgid "Restart Instead…"
+msgstr "转为重启..."
 
 #: ../src/dialog.c:65
-msgid "Some software updates won't apply until the computer next restarts."
-msgstr "一些软件更新要在计算机下次重启后生效。"
+msgid "Some software updates won’t apply until the computer next restarts."
+msgstr "某些软件更新将在计算机下次重启时应用"
 
-#: ../src/dialog.c:217 ../src/dialog.c:222
+#: ../src/dialog.c:219 ../src/dialog.c:224
 msgid "Cancel"
 msgstr "取消"
 
-#: ../src/indicator-session.c:272
-msgid "Switch User..."
+#: ../src/indicator-session.c:538
+msgctxt "session_menu:switchfrom"
+msgid "1"
 msgstr "切换用户..."
 
-#. TODO: We need some way to remove the elipsis from appearing
-#. twice in the label.  Not sure how to do that yet.
-#: ../src/indicator-session.c:301
+#: ../src/indicator-session.c:551
+msgid "Switch User Account…"
+msgstr "切换用户帐号..."
+
+#: ../src/indicator-session.c:578
 #, c-format
-msgid "Switch From %s..."
-msgstr "从 %s 切换..."
+msgid "Switch From %s…"
+msgstr "切换自 %s..."
 
-#: ../src/session-service.c:512
-msgid "Lock Screen"
-msgstr "锁定屏幕"
+#: ../src/apt-watcher.c:280 ../src/apt-watcher.c:340 ../src/apt-watcher.c:392
+#: ../src/device-menu-mgr.c:548
+msgid "Software Up to Date"
+msgstr "软件更新"
 
-#: ../src/session-service.c:535
-msgid "Guest Session"
-msgstr "客人会话"
+#: ../src/apt-watcher.c:286 ../src/apt-watcher.c:352
+msgid "Updates Available…"
+msgstr "有可用更新…"
 
-#: ../src/session-service.c:623
-msgid "Sleep"
-msgstr "休眠"
+#: ../src/apt-watcher.c:292 ../src/apt-watcher.c:357
+msgid "Updates Installing…"
+msgstr "正在安装更新…"
+
+#: ../src/apt-watcher.c:401 ../src/apt-watcher.c:464
+msgid "Restart to Complete Updates…"
+msgstr "重启以完成更新..."
+
+#: ../src/device-menu-mgr.c:516
+msgid "System Settings…"
+msgstr "系统设置…"
+
+#: ../src/device-menu-mgr.c:527
+msgid "Displays…"
+msgstr "显示…"
+
+#: ../src/device-menu-mgr.c:537
+msgid "Startup Applications…"
+msgstr "启动应用程序…"
 
-#: ../src/session-service.c:630
+#: ../src/device-menu-mgr.c:566
+msgid "Attached Devices"
+msgstr "已连接的设备"
+
+#: ../src/device-menu-mgr.c:577
+msgid "Printers"
+msgstr "打印机"
+
+#: ../src/device-menu-mgr.c:588
+msgid "Scanners"
+msgstr "扫描仪"
+
+#: ../src/device-menu-mgr.c:603 ../src/udev-mgr.c:243 ../src/udev-mgr.c:255
+msgid "Webcam"
+msgstr "摄像头"
+
+#: ../src/device-menu-mgr.c:692
+msgid "Suspend"
+msgstr "待机"
+
+#: ../src/device-menu-mgr.c:704
 msgid "Hibernate"
 msgstr "休眠"
 
-#: ../src/session-service.c:712
-msgid "Restart Required"
-msgstr "需要重启"
+#: ../src/user-menu-mgr.c:175
+msgid "Guest Session"
+msgstr "客人会话"
+
+#: ../src/user-menu-mgr.c:189
+msgid "Guest"
+msgstr "访客"
+
+#: ../src/user-menu-mgr.c:270
+msgid "Online Accounts…"
+msgstr "在线账户…"
 
-#: ../src/session-service.c:714
-msgid "Restart Required..."
-msgstr "需要重启"
+#: ../src/user-menu-mgr.c:285
+msgid "User Accounts…"
+msgstr "用户账户…"
+
+#: ../src/udev-mgr.c:255
+#, c-format
+msgid "%s Webcam"
+msgstr "%s 网络摄像头"
+
+#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:387 ../src/udev-mgr.c:400
+#: ../src/udev-mgr.c:454 ../src/udev-mgr.c:466
+msgid "Scanner"
+msgstr "扫描仪"
+
+#: ../src/udev-mgr.c:335 ../src/udev-mgr.c:400 ../src/udev-mgr.c:466
+#, c-format
+msgid "%s Scanner"
+msgstr "%s 扫描仪"
 
-#~ msgid "You will be logged out in %d second."
-#~ msgid_plural "You will be logged out in %d seconds."
-#~ msgstr[0] "您将在 %d 秒内注销。"
+#~ msgid "Log Out..."
+#~ msgstr "注销..."
 
-#~ msgid "The computer will restart in %d second."
-#~ msgid_plural "The computer will restart in %d seconds."
-#~ msgstr[0] "计算机将在 %d 秒内重新启动。"
+#~ msgid "Shut Down..."
+#~ msgstr "关机..."
+
+#~ msgid "Switch User..."
+#~ msgstr "切换用户..."
+
+#~ msgid "Restart..."
+#~ msgstr "重新启动..."
+
+#~ msgid "Restart Instead..."
+#~ msgstr "改为重启..."
+
+#, c-format
+#~ msgid "Switch From %s..."
+#~ msgstr "从 %s 切换..."
+
+#~ msgid "Some software updates won't apply until the computer next restarts."
+#~ msgstr "一些软件更新要在计算机重启后生效。"
+
+#~ msgctxt "button auth"
+#~ msgid "Restart..."
+#~ msgstr "重启..."
+
+#~ msgid "Makes it so that the logout button doesn't show in the session menu."
+#~ msgstr "使注销按钮不在会话菜单中显示。"
+
+#~ msgctxt "button auth"
+#~ msgid "Shut Down..."
+#~ msgstr "关机..."
+
+#~ msgid "Makes it so that the restart button doesn't show in the session menu."
+#~ msgstr "使重启按钮不在会话菜单中显示。"
 
 #~ msgid ""
-#~ "You recently installed updates which will only take effect after a "
-#~ "restart.  Restart to apply software updates."
-#~ msgstr ""
-#~ "您最近安装了更新，这些更新只有在重新启动后才能生效。 重新启动以应用软件更"
-#~ "新。"
-
-#~ msgid "The computer will switch off in %d second."
-#~ msgid_plural "The computer will switch off in %d seconds."
-#~ msgstr[0] "计算机将在 %d 秒内关闭。"
+#~ "Makes it so that the shutdown button doesn't show in the session menu."
+#~ msgstr "使关机按钮不在会话菜单中显示。"
+
+#~ msgid "Restart to Complete Update"
+#~ msgstr "重启以完成更新"
+
+#~ msgid "Session"
+#~ msgstr "会话"
+
+#~ msgid "Restart to Complete Update…"
+#~ msgstr "重启以完成更新..."