Upstream release 0.2.6

∘ Updating sessions to make guest account marked when being
used (LP: #436030)
∘ String "Switch From" is miscapitalized (LP: #540265)
∘ Follow user switching lockdown key (LP: #504360)
∘ Use user avatar images in session menu (LP: #436028)
∘ Don't show suspend/hibernate if disabled in Policy Kit (LP: #432598)
∘ Lock screen when switching users (LP: #536801)
∘ Fix callback prototype (LP: #536990)
∘ Revert back to "Shut Down" instead of "Switch Off" (LP: #540056)
∘ Fix leaked GConf notifications
∘ Add GConf key for showing the "Log Out" item
∘ Adding the ability to specify a desktop file to have at the end
of the menu.
∘ Setting up restart required notification by changing panel icon
and icon in menus.
∘ Use the libindicator image helpers
∘ Set proper translation domain for loadable indicator
∘ Translation update

1 files changed, 58 insertions, 61 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 85f1204..b992874 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,57 +1,64 @@
-# Chinese translations for PACKAGE package.

-# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER

-# This file is distributed under the same license as the PACKAGE package.

-# Canonical OEM, 2010.

-# 

+# Chinese translations for PACKAGE package.
+# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Canonical OEM, 2010.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: indicator-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-10 17:38-0500\n"
-"PO-Revision-Date: 2010-03-03 10:21-0500\n"
-"Last-Translator: Canonical OEM\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"
 "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=INTEGER; plural=EXPRESSION;\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"
 
 #: ../data/indicator-session.schemas.in.h:1
+msgid "Makes it so that the logout button doesn't show in the session menu."
+msgstr ""
+
+#: ../data/indicator-session.schemas.in.h:2
+msgid "Remove the Log Out item from the session menu"
+msgstr ""
+
+#: ../data/indicator-session.schemas.in.h:3
 msgid "Suppress the dialog to confirm logout, restart and shutdown action"
 msgstr "禁止确认注销、重新启动和关机操作的对话出现"
 
-#: ../data/indicator-session.schemas.in.h:2
+#: ../data/indicator-session.schemas.in.h:4
 msgid ""
 "Whether or not to show confirmation dialogs for logout, restart and shutdown "
 "actions."
 msgstr "是否显示确认注销、重新启动和关机操作的对话。"
 
-#: ../src/gconf-helper.c:52 ../src/session-service.c:538
-#, fuzzy
+#: ../src/gconf-helper.c:63 ../src/session-service.c:613
 msgid "Log Out"
 msgstr "注销"
 
-#: ../src/gconf-helper.c:53 ../src/session-service.c:559
-#: ../src/session-service.c:625
-#, fuzzy
+#: ../src/gconf-helper.c:64 ../src/session-service.c:638
+#: ../src/session-service.c:722
 msgid "Restart"
-msgstr "重新启动"
+msgstr "重启"
 
-#: ../src/gconf-helper.c:54 ../src/session-service.c:568
+#: ../src/gconf-helper.c:65 ../src/session-service.c:647
 msgid "Switch Off"
 msgstr "关闭"
 
-#: ../src/gconf-helper.c:56 ../src/session-service.c:540
-#, fuzzy
+#: ../src/gconf-helper.c:67 ../src/session-service.c:615
 msgid "Log Out..."
 msgstr "注销"
 
-#: ../src/gconf-helper.c:57 ../src/session-service.c:561
-#: ../src/session-service.c:627
+#: ../src/gconf-helper.c:68 ../src/session-service.c:640
+#: ../src/session-service.c:724
 msgid "Restart..."
 msgstr "重新启动..."
 
-#: ../src/gconf-helper.c:58 ../src/session-service.c:570
+#: ../src/gconf-helper.c:69 ../src/session-service.c:649
 msgid "Switch Off..."
 msgstr "关闭..."
 
@@ -77,17 +84,17 @@ msgstr "关闭"
 #: ../src/dialog.c:41
 msgid ""
 "Are you sure you want to close all programs and log out of the computer?"
-msgstr ""
+msgstr "您确定要关闭所有程序并注销？"
 
 #. LOGOUT_DIALOG_RESTART,
 #: ../src/dialog.c:42
 msgid "Are you sure you want to close all programs and restart the computer?"
-msgstr ""
+msgstr "您确定要关闭所有程序并重新启动计算机？"
 
 #. LOGOUT_DIALOG_SHUTDOWN,
 #: ../src/dialog.c:43
 msgid "Are you sure you want to close all programs and shut down the computer?"
-msgstr ""
+msgstr "您确定要关闭所有程序并关闭计算机？"
 
 #. LOGOUT_DIALOG_LOGOUT,
 #: ../src/dialog.c:47
@@ -109,21 +116,18 @@ msgstr "关闭"
 
 #. LOGOUT_DIALOG_LOGOUT,
 #: ../src/dialog.c:55
-#, fuzzy
 msgctxt "button auth"
 msgid "Log Out"
 msgstr "注销"
 
 #. LOGOUT_DIALOG_RESTART,
 #: ../src/dialog.c:56
-#, fuzzy
 msgctxt "button auth"
 msgid "Restart..."
-msgstr "重新启动..."
+msgstr "重启"
 
 #. LOGOUT_DIALOG_SHUTDOWN,
 #: ../src/dialog.c:57
-#, fuzzy
 msgctxt "button auth"
 msgid "Switch Off..."
 msgstr "关闭..."
@@ -132,78 +136,71 @@ msgstr "关闭..."
 #. there are updates that require restart.  It will do a restart
 #. in place of a log out.
 #: ../src/dialog.c:63
-#, fuzzy
 msgid "Restart Instead"
-msgstr "重新启动"
+msgstr "改为重启"
 
 #: ../src/dialog.c:64
-#, fuzzy
 msgid "Restart Instead..."
-msgstr "重新启动..."
+msgstr "改为重启..."
 
 #: ../src/dialog.c:65
 msgid "Some software updates won't apply until the computer next restarts."
-msgstr ""
+msgstr "一些软件更新要在计算机下次重启后生效。"
 
 #: ../src/dialog.c:217 ../src/dialog.c:222
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
-#: ../src/indicator-session.c:203
+#: ../src/indicator-session.c:272
 msgid "Switch User..."
 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:232
+#: ../src/indicator-session.c:301
 #, c-format
-msgid "Switch from %s..."
+msgid "Switch From %s..."
 msgstr "从 %s 切换..."
 
-#: ../src/session-service.c:437
+#: ../src/session-service.c:512
 msgid "Lock Screen"
-msgstr ""
+msgstr "锁定屏幕"
 
-#: ../src/session-service.c:456
+#: ../src/session-service.c:535
 msgid "Guest Session"
-msgstr ""
+msgstr "客人会话"
 
-#: ../src/session-service.c:547
+#: ../src/session-service.c:623
 msgid "Sleep"
 msgstr "休眠"
 
-#: ../src/session-service.c:553
+#: ../src/session-service.c:630
 msgid "Hibernate"
-msgstr ""
+msgstr "休眠"
 
-#: ../src/session-service.c:618
-#, fuzzy
+#: ../src/session-service.c:712
 msgid "Restart Required"
-msgstr "重新启动"
+msgstr "需要重启"
 
-#: ../src/session-service.c:620
-#, fuzzy
+#: ../src/session-service.c:714
 msgid "Restart Required..."
-msgstr "重新启动..."
-
-#~ msgid ""
-#~ "You recently installed updates which will only take effect after a "
-#~ "restart.  Restart to apply software updates."
-#~ msgstr ""
-#~ "您最近安装了更新，这些更新只有在重新启动后才能生效。 重新启动以应用软件更"
-#~ "新。"
+msgstr "需要重启"
 
 #~ msgid "You will be logged out in %d second."
 #~ msgid_plural "You will be logged out in %d seconds."
 #~ msgstr[0] "您将在 %d 秒内注销。"
-#~ msgstr[1] "您将在 %d 秒内注销。"
 
 #~ msgid "The computer will restart in %d second."
 #~ msgid_plural "The computer will restart in %d seconds."
 #~ msgstr[0] "计算机将在 %d 秒内重新启动。"
-#~ msgstr[1] "计算机将在 %d 秒内重新启动。"
+
+#~ 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 秒内关闭。"
-#~ msgstr[1] "计算机将在 %d 秒内关闭。"