* 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, 201 insertions, 58 deletions

diff --git a/po/zh_HK.po b/po/zh_HK.po
index 9b6f87f..fecc69b 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,59 +7,89 @@ 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-11 11:10+0000\n"
+"POT-Creation-Date: 2011-09-15 08:37+0000\n"
+"PO-Revision-Date: 2011-09-16 07:56+0000\n"
 "Last-Translator: Roy Chan <roy.chan@linux.org.hk>\n"
 "Language-Team: Chinese (Hong Kong) <zh_HK@li.org>\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 "停止確定登出、重新啟動和關機的對話框"
 
-#: ../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 "是否要顯示確定登出、重新啟動和關機的對話框。"
 
-#: ../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/gconf-helper.c:67 ../src/session-service.c:615
-msgid "Log Out..."
+#: ../src/settings-helper.c:88 ../src/device-menu-mgr.c:677
+msgid "Log Out…"
 msgstr "登出..."
 
-#: ../src/gconf-helper.c:68 ../src/session-service.c:640
-#: ../src/session-service.c:724
-msgid "Restart..."
+#: ../src/settings-helper.c:89
+msgid "Restart…"
 msgstr "重新啟動..."
 
-#: ../src/gconf-helper.c:69 ../src/session-service.c:649
-msgid "Switch Off..."
+#: ../src/settings-helper.c:90 ../src/device-menu-mgr.c:721
+msgid "Shut Down…"
 msgstr "關機..."
 
 #. LOGOUT_DIALOG_LOGOUT,
@@ -77,7 +107,7 @@ msgstr "重新啟動"
 #. LOGOUT_DIALOG_SHUTDOWN,
 #: ../src/dialog.c:37
 msgctxt "title"
-msgid "Switch Off"
+msgid "Shut Down"
 msgstr "關機"
 
 #. LOGOUT_DIALOG_LOGOUT,
@@ -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,7 +142,7 @@ msgstr "重新啟動"
 #. LOGOUT_DIALOG_SHUTDOWN,
 #: ../src/dialog.c:49
 msgctxt "button"
-msgid "Switch Off"
+msgid "Shut Down"
 msgstr "關機"
 
 #. LOGOUT_DIALOG_LOGOUT,
@@ -123,13 +154,13 @@ msgstr "登出"
 #. LOGOUT_DIALOG_RESTART,
 #: ../src/dialog.c:56
 msgctxt "button auth"
-msgid "Restart..."
+msgid "Restart…"
 msgstr "重新啟動..."
 
 #. LOGOUT_DIALOG_SHUTDOWN,
 #: ../src/dialog.c:57
 msgctxt "button auth"
-msgid "Switch Off..."
+msgid "Shut Down…"
 msgstr "關機..."
 
 #. TRANSLATORS: This button appears on the logout dialog when
@@ -140,48 +171,160 @@ msgid "Restart Instead"
 msgstr "建議重新啟動"
 
 #: ../src/dialog.c:64
-msgid "Restart Instead..."
+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 "0"
+
+#: ../src/indicator-session.c:551
+msgid "Switch User Account…"
 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: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/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/device-menu-mgr.c:566
+msgid "Attached Devices"
+msgstr "已連接裝置"
 
-#: ../src/session-service.c:623
-msgid "Sleep"
-msgstr "睡眠"
+#: ../src/device-menu-mgr.c:577
+msgid "Printers"
+msgstr "打印機"
 
-#: ../src/session-service.c:630
+#: ../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/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 "Restart..."
+#~ msgstr "重新啟動..."
+
+#~ msgid "Log Out..."
+#~ msgstr "登出..."
+
+#~ msgctxt "button auth"
+#~ msgid "Restart..."
+#~ msgstr "重新啟動..."
+
+#~ msgid "Switch User..."
+#~ msgstr "切換使用者..."
+
+#~ msgid "Some software updates won't apply until the computer next restarts."
+#~ msgstr "有些軟件更新在電腦下次重新啟動前未能套用。"
+
+#~ msgid "Restart Instead..."
+#~ msgstr "建議重新啟動..."
+
+#, c-format
+#~ msgid "Switch From %s..."
+#~ msgstr "從 %s 切換..."
+
+#~ msgid "Makes it so that the logout button doesn't show in the session menu."
+#~ msgstr "也讓登出按鈕不要在作業階段選單內顯示。"
+
+#~ msgid "Shut Down..."
+#~ 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 ""
+#~ "Makes it so that the shutdown button doesn't show in the session menu."
+#~ msgstr "讓關機按鈕不要顯示在作業階段選單內。"
+
+#~ msgid "Restart to Complete Update"
+#~ msgstr "重新啟動以完成更新"
+
+#~ msgid "Restart to Complete Update…"
+#~ msgstr "重新啟動以完成更新..."
 
-#: ../src/session-service.c:714
-msgid "Restart Required..."
-msgstr "需要重新啟動..."
+#~ msgid "Session"
+#~ msgstr "作業階段"