diff --git a/po/zh_HK.po b/po/zh_HK.po
index 9f04787db..325b119c7 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-shell 2.91.4\n"
+"Project-Id-Version: gnome-shell 2.91.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-07 09:43+0800\n"
-"PO-Revision-Date: 2011-01-07 09:44+0800\n"
+"POT-Creation-Date: 2011-02-04 13:12+0800\n"
+"PO-Revision-Date: 2011-02-04 13:12+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
 "Language: \n"
@@ -55,18 +55,12 @@ msgid "History for command (Alt-F2) dialog"
 msgstr "指令 (Alt-F2) 對話盒歷史紀錄"
 
 #: ../data/org.gnome.shell.gschema.xml.in.h:7
-#, fuzzy
-#| msgid ""
-#| "If true and format is either \"12-hour\" or \"24-hour\", display date in "
-#| "the clock, in addition to time."
 msgid "If true, display date in the clock, in addition to time."
-msgstr "如果設為 true 且格式為「12-小時」或「24-小時」，在時鐘裏顯示日期，加在時刻後面。"
+msgstr "如設定為「true」，除了在時鐘內顯示日期外還顯示時刻。"
 
 #: ../data/org.gnome.shell.gschema.xml.in.h:8
-#, fuzzy
-#| msgid "If true, display the ISO week date in the calendar."
 msgid "If true, display seconds in time."
-msgstr "如果設為 true，在日曆中顯示 ISO 週數。"
+msgstr "如設定為「true」，在時刻中顯示秒數。"
 
 #: ../data/org.gnome.shell.gschema.xml.in.h:9
 msgid "If true, display the ISO week date in the calendar."
@@ -76,7 +70,8 @@ msgstr "如果設為 true，在日曆中顯示 ISO 週數。"
 msgid "List of desktop file IDs for favorite applications"
 msgstr "喜好的應用程式桌面檔案 ID 清單"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:11
+#: ../data/org.gnome.shell.gschema.xml.in.h:12
+#, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
 "used for gst-launch. The pipeline should have an unconnected sink pad where "
@@ -85,45 +80,47 @@ msgid ""
 "pipeline can also take care of its own output - this might be used to send "
 "the output to an icecast server via shout2send or similar. When unset or set "
 "to an empty value, the default pipeline will be used. This is currently "
-"'videorate ! theoraenc ! oggmux' and records to Ogg Theora."
-msgstr ""
+"'videorate ! vp8enc quality=10 speed=2 threads=%T ! queue ! webmmux' and "
+"records to WEBM using the VP8 codec. %T is used as a placeholder for a guess "
+"at the optimal thread count on the system."
+msgstr "設定用來錄製的 GStreamer 管線。它根據據 gst-launch 使用的語法。管線應該要有未連接的出口(sink pad)，提供錄製視像之用。它通常會有未連接的入口(source pad)；從出口輸出的資訊就寫入輸出檔案。然而管線本身也會處理它本身的輸出 - 習慣上是透過 shout2send 之類將輸出傳送到 icecast 伺服器。當取消設定或設定為空值時，就會使用預設的管線。這個值目前為 'videorate ! vp8enc quality=10 speed=2 threads=%T ! queue ! webmmux' 即使用 VP8 codec 錄製 WEBM。%T 是在系統的最佳化執行緒計數猜測時使用的佔位符。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:12
+#: ../data/org.gnome.shell.gschema.xml.in.h:13
 msgid "Show date in clock"
 msgstr "在時鐘內顯示日期"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:13
+#: ../data/org.gnome.shell.gschema.xml.in.h:14
 msgid "Show the week date in the calendar"
 msgstr "在日曆中顯示週數"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.h:15
 msgid "Show time with seconds"
 msgstr "在時刻中顯示秒數"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.h:16
 msgid ""
 "The applications corresponding to these identifiers will be displayed in the "
 "favorites area."
 msgstr "對應這些辨別碼的應用程式會顯示在喜好區域。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.h:17
 msgid ""
 "The filename for recorded screencasts will be a unique filename based on the "
 "current date, and use this extension. It should be changed when recording to "
 "a different container format."
 msgstr "錄製好的畫面廣播檔案名稱會以目前的時刻作為獨特的檔名，並使用這個延伸檔名。當錄製為不同的容器格式時應該做適當更改。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.h:18
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
 msgstr "由 GNOME Shell 的畫面廣播錄製程式所錄製成果的框架率，以 frames-per-second 計。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.h:19
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "用來編碼畫面廣播的 gstreamer 管線"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.h:20
 msgid ""
 "The shell normally monitors active applications in order to present the most "
 "used ones (e.g. in launchers). While this data will be kept private, you may "
@@ -131,17 +128,21 @@ msgid ""
 "remove already saved data."
 msgstr "這個 shell 通常會監控使用中的應用程式以便能顯示出最常使用的（例如，在程式執行器中）。雖然這個資料會保持隱密，但是你可能會基於私隱的理由想要停用這個功能。請注意這麼做並不會移除已儲存的資料。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.h:21
 msgid "Uuids of extensions to disable"
 msgstr "要停用的延伸檔名 Uuid"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.h:22
 msgid "Whether to collect stats about applications usage"
 msgstr "是否收集關於應用程式使用率的狀態"
 
+#: ../data/org.gnome.shell.gschema.xml.in.h:23
+msgid "disabled OpenSearch providers"
+msgstr "已停用 OpenSearch 提供者"
+
 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:1
 msgid "Clip the crosshairs at the center"
-msgstr ""
+msgstr "點選中央的十字準星"
 
 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:2
 msgid "Color of the crosshairs"
@@ -164,7 +165,7 @@ msgid ""
 "proportionally the same as the position of the system mouse on screen; - "
 "push: when the magnified mouse intersects a boundary of the zoom region, the "
 "contents are scrolled into view."
-msgstr ""
+msgstr "決定放大的滑鼠圖片在放大鏡檢 視中的位置以及它如何反應系統滑鼠的移動。數值有 - none: 不追蹤滑鼠；- centered: 滑鼠圖片顯示於放大區域的中央（也代表系統滑鼠下方的點）而放大的內容也會隨系統滑鼠移動而捲動；- proportional: 放大的滑鼠在縮放區域中的位置和系統滑鼠在螢幕中的位置是成比例的；- push: 當放大的滑鼠與縮放區域邊界交錯時，內容會捲動到檢視中。"
 
 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:5
 msgid ""
@@ -180,10 +181,8 @@ msgid ""
 msgstr ""
 
 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:7
-#, fuzzy
-#| msgid "Enabled"
 msgid "Enable lens mode"
-msgstr "啟用觸控螢幕模式"
+msgstr "啟用鏡頭模式"
 
 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:8
 msgid ""
@@ -266,28 +265,47 @@ msgstr "放大的檢視是否應以系統滑鼠的位置為中心點並隨滑鼠
 msgid "Width of the vertical and horizontal lines that make up the crosshairs."
 msgstr "組成十字準星的垂直和水平線條的闊度。"
 
+#: ../js/misc/util.js:86
+msgid "Command not found"
+msgstr "找不到指令"
+
+#. Replace "Error invoking GLib.shell_parse_argv: " with
+#. something nicer
+#: ../js/misc/util.js:113
+msgid "Could not parse command:"
+msgstr "無法分析指令："
+
+#: ../js/misc/util.js:135
+msgid "No such application"
+msgstr "沒有這個應用程式"
+
+#: ../js/misc/util.js:148
+#, c-format
+msgid "Execution of '%s' failed:"
+msgstr "執行「%s」失敗："
+
 #. Translators: Filter to display all applications
-#: ../js/ui/appDisplay.js:155
+#: ../js/ui/appDisplay.js:164
 msgid "All"
 msgstr "全部"
 
-#: ../js/ui/appDisplay.js:236
+#: ../js/ui/appDisplay.js:245
 msgid "APPLICATIONS"
 msgstr "程式集"
 
-#: ../js/ui/appDisplay.js:266
+#: ../js/ui/appDisplay.js:275
 msgid "PREFERENCES"
 msgstr "偏好設定"
 
-#: ../js/ui/appDisplay.js:563
+#: ../js/ui/appDisplay.js:572
 msgid "New Window"
 msgstr "新視窗"
 
-#: ../js/ui/appDisplay.js:567
+#: ../js/ui/appDisplay.js:576
 msgid "Remove from Favorites"
 msgstr "自喜好中移除"
 
-#: ../js/ui/appDisplay.js:568
+#: ../js/ui/appDisplay.js:577
 msgid "Add to Favorites"
 msgstr "加入喜好"
 
@@ -301,122 +319,392 @@ msgstr "%s 已加入你的喜好中。"
 msgid "%s has been removed from your favorites."
 msgstr "%s 已經從你的喜好中移除。"
 
+#. Translators: Shown in calendar event list for all day events
+#. * Keep it short, best if you can use less then 10 characters
+#.
+#: ../js/ui/calendar.js:65
+#, fuzzy
+#| msgid "All Day"
+msgctxt "event list time"
+msgid "All Day"
+msgstr "整天"
+
+#. Translators: Shown in calendar event list, if 24h format
+#: ../js/ui/calendar.js:70
+msgctxt "event list time"
+msgid "%H:%M"
+msgstr ""
+
+#. Transators: Shown in calendar event list, if 12h format
+#: ../js/ui/calendar.js:77
+#, fuzzy
+#| msgid "%a %l:%M %p"
+msgctxt "event list time"
+msgid "%l:%M %p"
+msgstr "%a %p %l:%M"
+
+#. Translators: Calendar grid abbreviation for Sunday.
+#. *
+#. * NOTE: These grid abbreviations are always shown together
+#. * and in order, e.g. "S M T W T F S".
+#.
+#: ../js/ui/calendar.js:117
+#, fuzzy
+#| msgid "S"
+msgctxt "grid sunday"
+msgid "S"
+msgstr "日"
+
+#. Translators: Calendar grid abbreviation for Monday
+#: ../js/ui/calendar.js:119
+#, fuzzy
+#| msgid "M"
+msgctxt "grid monday"
+msgid "M"
+msgstr "一"
+
+#. Translators: Calendar grid abbreviation for Tuesday
+#: ../js/ui/calendar.js:121
+#, fuzzy
+#| msgid "T"
+msgctxt "grid tuesday"
+msgid "T"
+msgstr "二"
+
+#. Translators: Calendar grid abbreviation for Wednesday
+#: ../js/ui/calendar.js:123
+#, fuzzy
+#| msgid "W"
+msgctxt "grid wednesday"
+msgid "W"
+msgstr "三"
+
+#. Translators: Calendar grid abbreviation for Thursday
+#: ../js/ui/calendar.js:125
+#, fuzzy
+#| msgid "T"
+msgctxt "grid thursday"
+msgid "T"
+msgstr "二"
+
+#. Translators: Calendar grid abbreviation for Friday
+#: ../js/ui/calendar.js:127
+#, fuzzy
+#| msgid "F"
+msgctxt "grid friday"
+msgid "F"
+msgstr "五"
+
+#. Translators: Calendar grid abbreviation for Saturday
+#: ../js/ui/calendar.js:129
+#, fuzzy
+#| msgid "S"
+msgctxt "grid saturday"
+msgid "S"
+msgstr "日"
+
+#. Translators: Event list abbreviation for Sunday.
+#. *
+#. * NOTE: These list abbreviations are normally not shown together
+#. * so they need to be unique (e.g. Tuesday and Thursday cannot
+#. * both be 'T').
+#.
+#: ../js/ui/calendar.js:142
+#, fuzzy
+#| msgid "Su"
+msgctxt "list sunday"
+msgid "Su"
+msgstr "日"
+
+#. Translators: Event list abbreviation for Monday
+#: ../js/ui/calendar.js:144
+#, fuzzy
+#| msgid "M"
+msgctxt "list monday"
+msgid "M"
+msgstr "一"
+
+#. Translators: Event list abbreviation for Tuesday
+#: ../js/ui/calendar.js:146
+#, fuzzy
+#| msgid "T"
+msgctxt "list tuesday"
+msgid "T"
+msgstr "二"
+
+#. Translators: Event list abbreviation for Wednesday
+#: ../js/ui/calendar.js:148
+#, fuzzy
+#| msgid "W"
+msgctxt "list wednesday"
+msgid "W"
+msgstr "三"
+
+#. Translators: Event list abbreviation for Thursday
+#: ../js/ui/calendar.js:150
+#, fuzzy
+#| msgid "Th"
+msgctxt "list thursday"
+msgid "Th"
+msgstr "四"
+
+#. Translators: Event list abbreviation for Friday
+#: ../js/ui/calendar.js:152
+#, fuzzy
+#| msgid "F"
+msgctxt "list friday"
+msgid "F"
+msgstr "五"
+
+#. Translators: Event list abbreviation for Saturday
+#: ../js/ui/calendar.js:154
+#, fuzzy
+#| msgid "S"
+msgctxt "list saturday"
+msgid "S"
+msgstr "日"
+
+#. Translators: Text to show if there are no events
+#: ../js/ui/calendar.js:701
+msgid "Nothing Scheduled"
+msgstr "沒有預訂行程"
+
+#. Translators: Shown on calendar heading when selected day occurs on current year
+#: ../js/ui/calendar.js:717
+#, fuzzy
+#| msgid "%A %B %e, %Y"
+msgctxt "calendar heading"
+msgid "%A, %B %d"
+msgstr "%Y %B %e %A"
+
+#. Translators: Shown on calendar heading when selected day occurs on different year
+#: ../js/ui/calendar.js:720
+#, fuzzy
+#| msgid "%A %B %e, %Y"
+msgctxt "calendar heading"
+msgid "%A, %B %d, %Y"
+msgstr "%Y %B %e %A"
+
+#: ../js/ui/calendar.js:730
+msgid "Today"
+msgstr "今天"
+
+#: ../js/ui/calendar.js:734
+msgid "Tomorrow"
+msgstr "明天"
+
+#: ../js/ui/calendar.js:743
+msgid "This week"
+msgstr "本週"
+
+#: ../js/ui/calendar.js:751
+msgid "Next week"
+msgstr "下週"
+
 #: ../js/ui/dash.js:27
 msgid "Remove"
 msgstr "移除"
 
-#: ../js/ui/docDisplay.js:494
-msgid "RECENT ITEMS"
-msgstr "最近使用項目"
+#: ../js/ui/dateMenu.js:91
+msgid "Date and Time Settings"
+msgstr "日期與時刻設定值"
 
-#: ../js/ui/lookingGlass.js:552
-msgid "No extensions installed"
-msgstr "沒有安裝擴充功能"
-
-#: ../js/ui/lookingGlass.js:589
-msgid "Enabled"
-msgstr "已啟用"
-
-#. translators:
-#. * The device has been disabled
-#: ../js/ui/lookingGlass.js:591 ../src/gvc/gvc-mixer-control.c:1087
-msgid "Disabled"
-msgstr "已停用"
-
-#: ../js/ui/lookingGlass.js:593
-msgid "Error"
-msgstr "錯誤"
-
-#: ../js/ui/lookingGlass.js:595
-msgid "Out of date"
-msgstr "過期"
-
-#: ../js/ui/lookingGlass.js:620
-msgid "View Source"
-msgstr "檢示來源"
-
-#: ../js/ui/lookingGlass.js:626
-msgid "Web Page"
-msgstr "網頁"
-
-#: ../js/ui/overview.js:101
-msgid "Undo"
-msgstr "復原"
-
-#: ../js/ui/overview.js:166
-msgid "Windows"
-msgstr "視窗"
-
-#: ../js/ui/overview.js:169
-msgid "Applications"
-msgstr "應用程式"
-
-#. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:478
-#, c-format
-msgid "Quit %s"
-msgstr "結束 %s"
+#: ../js/ui/dateMenu.js:110
+msgid "Open Calendar"
+msgstr "開啟行事曆"
 
 #. Translators: This is the time format with date used
 #. in 24-hour mode.
-#: ../js/ui/panel.js:563
+#: ../js/ui/dateMenu.js:149
 msgid "%a %b %e, %R:%S"
 msgstr "%b %e %a, %R:%S"
 
-#: ../js/ui/panel.js:564
+#: ../js/ui/dateMenu.js:150
 msgid "%a %b %e, %R"
 msgstr "%b %e %a, %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
-#: ../js/ui/panel.js:568
+#: ../js/ui/dateMenu.js:154
 msgid "%a %R:%S"
 msgstr "%a %R:%S"
 
-#: ../js/ui/panel.js:569
+#: ../js/ui/dateMenu.js:155
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is a time format with date used
 #. for AM/PM.
-#: ../js/ui/panel.js:576
+#: ../js/ui/dateMenu.js:162
 msgid "%a %b %e, %l:%M:%S %p"
 msgstr "%b %e %a, %p %l:%M:%S"
 
-#: ../js/ui/panel.js:577
+#: ../js/ui/dateMenu.js:163
 msgid "%a %b %e, %l:%M %p"
 msgstr "%b %e %a, %p %l:%M"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../js/ui/panel.js:581
+#: ../js/ui/dateMenu.js:167
 msgid "%a %l:%M:%S %p"
 msgstr "%a %p %l:%M:%S"
 
-#: ../js/ui/panel.js:582
+#: ../js/ui/dateMenu.js:168
 msgid "%a %l:%M %p"
 msgstr "%a %p %l:%M"
 
+#. Translators: This is the date format to use when the calendar popup is
+#. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
+#.
+#: ../js/ui/dateMenu.js:194
+msgid "%A %B %e, %Y"
+msgstr "%Y %B %e %A"
+
+#: ../js/ui/docDisplay.js:18
+msgid "RECENT ITEMS"
+msgstr "最近使用項目"
+
+#: ../js/ui/endSessionDialog.js:63
+#, c-format
+msgid "Log Out %s"
+msgstr "登出 %s"
+
+#: ../js/ui/endSessionDialog.js:64 ../js/ui/endSessionDialog.js:69
+msgid "Log Out"
+msgstr "登出"
+
+#: ../js/ui/endSessionDialog.js:65
+msgid "Click Log Out to quit these applications and log out of the system."
+msgstr "點選登出以結束這些應用程式並登出系統。"
+
+#: ../js/ui/endSessionDialog.js:66
+#, c-format
+msgid "%s will be logged out automatically in %d seconds."
+msgstr "%s 會在 %d 秒後自動登出。"
+
+#: ../js/ui/endSessionDialog.js:67
+#, c-format
+msgid "You will be logged out automatically in %d seconds."
+msgstr "你會在 %d 秒後自動登出。"
+
+#: ../js/ui/endSessionDialog.js:68
+msgid "Logging out of the system."
+msgstr "登出系統。"
+
+#: ../js/ui/endSessionDialog.js:74 ../js/ui/endSessionDialog.js:78
+msgid "Shut Down"
+msgstr "關機"
+
+#: ../js/ui/endSessionDialog.js:75
+msgid "Click Shut Down to quit these applications and shut down the system."
+msgstr "點選關機以結束這些應用程式並將系統關機。"
+
+#: ../js/ui/endSessionDialog.js:76
+#, c-format
+msgid "The system will shut down automatically in %d seconds."
+msgstr "本系統會在 %d 秒後自動關閉。"
+
+#: ../js/ui/endSessionDialog.js:77
+msgid "Shutting down the system."
+msgstr "正在關閉系統。"
+
+#: ../js/ui/endSessionDialog.js:84 ../js/ui/endSessionDialog.js:88
+msgid "Restart"
+msgstr "重新啟動"
+
+#: ../js/ui/endSessionDialog.js:85
+msgid "Click Restart to quit these applications and restart the system."
+msgstr "點選重新啟動以結束這些應用程式並將系統重新啟動。"
+
+#: ../js/ui/endSessionDialog.js:86
+#, c-format
+msgid "The system will restart automatically in %d seconds."
+msgstr "系統會在 %d 秒內自動重新啟動。"
+
+#: ../js/ui/endSessionDialog.js:87
+msgid "Restarting the system."
+msgstr "重新啟動系統。"
+
+#: ../js/ui/endSessionDialog.js:395
+msgid "Confirm"
+msgstr "確認"
+
+#: ../js/ui/endSessionDialog.js:400 ../js/ui/status/bluetooth.js:470
+msgid "Cancel"
+msgstr "取消"
+
+#: ../js/ui/lookingGlass.js:556
+msgid "No extensions installed"
+msgstr "沒有安裝擴充功能"
+
+#: ../js/ui/lookingGlass.js:593
+msgid "Enabled"
+msgstr "已啟用"
+
+#. translators:
+#. * The device has been disabled
+#: ../js/ui/lookingGlass.js:595 ../src/gvc/gvc-mixer-control.c:1087
+msgid "Disabled"
+msgstr "已停用"
+
+#: ../js/ui/lookingGlass.js:597
+msgid "Error"
+msgstr "錯誤"
+
+#: ../js/ui/lookingGlass.js:599
+msgid "Out of date"
+msgstr "過期"
+
+#: ../js/ui/lookingGlass.js:624
+msgid "View Source"
+msgstr "檢示來源"
+
+#: ../js/ui/lookingGlass.js:630
+msgid "Web Page"
+msgstr "網頁"
+
+#: ../js/ui/messageTray.js:1809
+msgid "System Information"
+msgstr "系統資訊"
+
+#: ../js/ui/overview.js:88
+msgid "Undo"
+msgstr "復原"
+
+#: ../js/ui/overview.js:159
+msgid "Windows"
+msgstr "視窗"
+
+#: ../js/ui/overview.js:162
+msgid "Applications"
+msgstr "應用程式"
+
+#. TODO - _quit() doesn't really work on apps in state STARTING yet
+#: ../js/ui/panel.js:480
+#, c-format
+msgid "Quit %s"
+msgstr "結束 %s"
+
 #. Button on the left side of the panel.
 #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:727
+#: ../js/ui/panel.js:614
 msgid "Activities"
 msgstr "概覽 "
 
-#: ../js/ui/placeDisplay.js:111
+#: ../js/ui/placeDisplay.js:106
 #, c-format
 msgid "Failed to unmount '%s'"
 msgstr "無法卸載「%s」"
 
-#: ../js/ui/placeDisplay.js:114
+#: ../js/ui/placeDisplay.js:109
 msgid "Retry"
 msgstr "重試"
 
-#: ../js/ui/placeDisplay.js:159
+#: ../js/ui/placeDisplay.js:150
 msgid "Connect to..."
 msgstr "連接到…"
 
-#: ../js/ui/placeDisplay.js:558
+#: ../js/ui/placeDisplay.js:386
 msgid "PLACES & DEVICES"
 msgstr "位置 & 裝置"
 
@@ -426,88 +714,82 @@ msgstr "位置 & 裝置"
 #. switches containing "◯" and "|"). Other values will
 #. simply result in invisible toggle switches.
 #: ../js/ui/popupMenu.js:33
-#, fuzzy
 msgid "toggle-switch-us"
-msgstr "美式 84 鍵鍵盤"
+msgstr "toggle-switch-us"
 
-#: ../js/ui/runDialog.js:233
+#: ../js/ui/runDialog.js:209
 msgid "Please enter a command:"
 msgstr "請輸入指令："
 
-#: ../js/ui/runDialog.js:378
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "執行「%s」失敗："
-
-#: ../js/ui/statusMenu.js:101
+#: ../js/ui/statusMenu.js:102
 msgid "Available"
 msgstr "可用"
 
-#: ../js/ui/statusMenu.js:106
+#: ../js/ui/statusMenu.js:107
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../js/ui/statusMenu.js:114
+#: ../js/ui/statusMenu.js:115
 msgid "My Account"
 msgstr "我的帳號"
 
-#: ../js/ui/statusMenu.js:118
+#: ../js/ui/statusMenu.js:119
 msgid "System Settings"
 msgstr "系統設定值"
 
-#: ../js/ui/statusMenu.js:125
+#: ../js/ui/statusMenu.js:126
 msgid "Lock Screen"
 msgstr "鎖定畫面"
 
-#: ../js/ui/statusMenu.js:129
+#: ../js/ui/statusMenu.js:130
 msgid "Switch User"
 msgstr "切換使用者"
 
-#: ../js/ui/statusMenu.js:134
+#: ../js/ui/statusMenu.js:135
 msgid "Log Out..."
 msgstr "登出…"
 
-#: ../js/ui/statusMenu.js:141
+#: ../js/ui/statusMenu.js:142
 msgid "Suspend..."
 msgstr "暫停…"
 
-#: ../js/ui/statusMenu.js:145
+#: ../js/ui/statusMenu.js:146
 msgid "Shut Down..."
 msgstr "關機…"
 
-#: ../js/ui/status/accessibility.js:82
+#: ../js/ui/status/accessibility.js:83
 msgid "Zoom"
 msgstr "縮放"
 
-#: ../js/ui/status/accessibility.js:88
+#: ../js/ui/status/accessibility.js:89
 msgid "Screen Reader"
 msgstr "螢幕閱讀器"
 
-#: ../js/ui/status/accessibility.js:91
+#: ../js/ui/status/accessibility.js:92
 msgid "Screen Keyboard"
 msgstr "螢幕鍵盤"
 
-#: ../js/ui/status/accessibility.js:94
+#: ../js/ui/status/accessibility.js:95
 msgid "Visual Alerts"
 msgstr "視覺警示"
 
-#: ../js/ui/status/accessibility.js:97
+#: ../js/ui/status/accessibility.js:98
 msgid "Sticky Keys"
 msgstr "黏性特殊鍵"
 
-#: ../js/ui/status/accessibility.js:100
+#: ../js/ui/status/accessibility.js:101
 msgid "Slow Keys"
 msgstr "遲緩按鍵"
 
-#: ../js/ui/status/accessibility.js:103
+#: ../js/ui/status/accessibility.js:104
 msgid "Bounce Keys"
 msgstr "回鍵"
 
-#: ../js/ui/status/accessibility.js:106
+#: ../js/ui/status/accessibility.js:107
 msgid "Mouse Keys"
 msgstr "滑鼠按鍵"
 
-#: ../js/ui/status/accessibility.js:110
+#: ../js/ui/status/accessibility.js:111
 msgid "Universal Access Settings"
 msgstr "無障礙功能設定值"
 
@@ -519,7 +801,7 @@ msgstr "高反差"
 msgid "Large Text"
 msgstr "大型文字"
 
-#: ../js/ui/status/bluetooth.js:42 ../js/ui/status/bluetooth.js:240
+#: ../js/ui/status/bluetooth.js:42 ../js/ui/status/bluetooth.js:241
 msgid "Bluetooth"
 msgstr "藍牙"
 
@@ -535,109 +817,109 @@ msgstr "傳送檔案到裝置…"
 msgid "Setup a New Device..."
 msgstr "設定新的裝置…"
 
-#: ../js/ui/status/bluetooth.js:94
+#: ../js/ui/status/bluetooth.js:95
 msgid "Bluetooth Settings"
 msgstr "藍牙設定值"
 
-#: ../js/ui/status/bluetooth.js:191
+#: ../js/ui/status/bluetooth.js:192
 msgid "Connection"
 msgstr "連線"
 
-#: ../js/ui/status/bluetooth.js:227
+#: ../js/ui/status/bluetooth.js:228
 msgid "Send Files..."
 msgstr "傳送檔案…"
 
-#: ../js/ui/status/bluetooth.js:232
+#: ../js/ui/status/bluetooth.js:233
 msgid "Browse Files..."
 msgstr "瀏覽檔案…"
 
-#: ../js/ui/status/bluetooth.js:241
+#: ../js/ui/status/bluetooth.js:242
 msgid "Error browsing device"
 msgstr "瀏覽裝置時發生錯誤"
 
-#: ../js/ui/status/bluetooth.js:242
+#: ../js/ui/status/bluetooth.js:243
 #, c-format
 msgid "The requested device cannot be browsed, error is '%s'"
 msgstr "要求的裝置是不能瀏覽的，錯誤為「%s」"
 
-#: ../js/ui/status/bluetooth.js:250
+#: ../js/ui/status/bluetooth.js:251
 msgid "Keyboard Settings"
 msgstr "鍵盤設定值"
 
-#: ../js/ui/status/bluetooth.js:255
+#: ../js/ui/status/bluetooth.js:256
 msgid "Mouse Settings"
 msgstr "滑鼠設定值"
 
-#: ../js/ui/status/bluetooth.js:262 ../js/ui/status/volume.js:62
+#: ../js/ui/status/bluetooth.js:263 ../js/ui/status/volume.js:63
 msgid "Sound Settings"
 msgstr "音效設定值"
 
-#: ../js/ui/status/bluetooth.js:336 ../js/ui/status/bluetooth.js:370
-#: ../js/ui/status/bluetooth.js:410 ../js/ui/status/bluetooth.js:443
+#: ../js/ui/status/bluetooth.js:337 ../js/ui/status/bluetooth.js:371
+#: ../js/ui/status/bluetooth.js:411 ../js/ui/status/bluetooth.js:444
 msgid "Bluetooth Agent"
 msgstr "藍牙代理程式"
 
-#: ../js/ui/status/bluetooth.js:371
+#: ../js/ui/status/bluetooth.js:372
 #, c-format
 msgid "Authorization request from %s"
 msgstr "來自「%s」的驗證要求"
 
-#: ../js/ui/status/bluetooth.js:377
+#: ../js/ui/status/bluetooth.js:378
 #, c-format
 msgid "Device %s wants access to the service '%s'"
 msgstr "裝置 %s 想要存取服務「%s」"
 
-#: ../js/ui/status/bluetooth.js:379
+#: ../js/ui/status/bluetooth.js:380
 msgid "Always grant access"
 msgstr "永遠准許存取"
 
-#: ../js/ui/status/bluetooth.js:380
+#: ../js/ui/status/bluetooth.js:381
 msgid "Grant this time only"
 msgstr "只有這次准許"
 
-#: ../js/ui/status/bluetooth.js:381
+#: ../js/ui/status/bluetooth.js:382
 msgid "Reject"
 msgstr "拒絕"
 
-#: ../js/ui/status/bluetooth.js:411
+#: ../js/ui/status/bluetooth.js:412
 #, c-format
 msgid "Pairing confirmation for %s"
 msgstr "%s 的配對確認"
 
-#: ../js/ui/status/bluetooth.js:417 ../js/ui/status/bluetooth.js:451
+#: ../js/ui/status/bluetooth.js:418 ../js/ui/status/bluetooth.js:452
 #, c-format
 msgid "Device %s wants to pair with this computer"
 msgstr "裝置 %s 想要和這個電腦配對"
 
-#: ../js/ui/status/bluetooth.js:418
+#: ../js/ui/status/bluetooth.js:419
 #, c-format
 msgid "Please confirm whether the PIN '%s' matches the one on the device."
 msgstr "請確認 PIN「%s」是否和裝置上的相符。"
 
-#: ../js/ui/status/bluetooth.js:420
+#: ../js/ui/status/bluetooth.js:421
 msgid "Matches"
 msgstr "相符"
 
-#: ../js/ui/status/bluetooth.js:421
+#: ../js/ui/status/bluetooth.js:422
 msgid "Does not match"
 msgstr "不相符"
 
-#: ../js/ui/status/bluetooth.js:444
+#: ../js/ui/status/bluetooth.js:445
 #, c-format
 msgid "Pairing request for %s"
 msgstr "%s 的配對請求"
 
-#: ../js/ui/status/bluetooth.js:452
+#: ../js/ui/status/bluetooth.js:453
 msgid "Please enter the PIN mentioned on the device."
 msgstr "請輸入裝置所提及的 PIN。"
 
-#: ../js/ui/status/bluetooth.js:468
+#: ../js/ui/status/bluetooth.js:469
 msgid "OK"
 msgstr "確定"
 
-#: ../js/ui/status/bluetooth.js:469
-msgid "Cancel"
-msgstr "取消"
+#: ../js/ui/status/keyboard.js:78
+msgid "Localization Settings"
+msgstr "本地化設定值"
 
 #: ../js/ui/status/power.js:85
 msgid "Power Settings"
@@ -671,78 +953,78 @@ msgid "%d minute remaining"
 msgid_plural "%d minutes remaining"
 msgstr[0] "剩下 %d 分鐘"
 
-#: ../js/ui/status/power.js:237
+#: ../js/ui/status/power.js:235
 msgid "AC adapter"
 msgstr "AC 電源"
 
-#: ../js/ui/status/power.js:239
+#: ../js/ui/status/power.js:237
 msgid "Laptop battery"
 msgstr "手提電腦電池"
 
-#: ../js/ui/status/power.js:241
+#: ../js/ui/status/power.js:239
 msgid "UPS"
 msgstr "不斷電系統"
 
-#: ../js/ui/status/power.js:243
+#: ../js/ui/status/power.js:241
 msgid "Monitor"
 msgstr "監視器"
 
-#: ../js/ui/status/power.js:245
+#: ../js/ui/status/power.js:243
 msgid "Mouse"
 msgstr "滑鼠"
 
-#: ../js/ui/status/power.js:247
+#: ../js/ui/status/power.js:245
 msgid "Keyboard"
 msgstr "鍵盤"
 
-#: ../js/ui/status/power.js:249
+#: ../js/ui/status/power.js:247
 msgid "PDA"
 msgstr "PDA"
 
-#: ../js/ui/status/power.js:251
+#: ../js/ui/status/power.js:249
 msgid "Cell phone"
 msgstr "流動電話"
 
-#: ../js/ui/status/power.js:253
+#: ../js/ui/status/power.js:251
 msgid "Media player"
 msgstr "媒體播放器"
 
-#: ../js/ui/status/power.js:255
+#: ../js/ui/status/power.js:253
 msgid "Tablet"
 msgstr "手寫板"
 
-#: ../js/ui/status/power.js:257
+#: ../js/ui/status/power.js:255
 msgid "Computer"
 msgstr "電腦"
 
-#: ../js/ui/status/power.js:259 ../src/shell-app-system.c:1012
+#: ../js/ui/status/power.js:257 ../src/shell-app-system.c:1012
 msgid "Unknown"
 msgstr "不明"
 
-#: ../js/ui/status/volume.js:41
+#: ../js/ui/status/volume.js:42
 msgid "Volume"
 msgstr "音量"
 
-#: ../js/ui/status/volume.js:54
+#: ../js/ui/status/volume.js:55
 msgid "Microphone"
 msgstr "麥克風"
 
-#: ../js/ui/telepathyClient.js:561
+#: ../js/ui/telepathyClient.js:563
 #, c-format
 msgid "%s is online."
 msgstr "%s 現在上線。"
 
-#: ../js/ui/telepathyClient.js:566
+#: ../js/ui/telepathyClient.js:568
 #, c-format
 msgid "%s is offline."
 msgstr "%s 現在離線。"
 
-#: ../js/ui/telepathyClient.js:569
+#: ../js/ui/telepathyClient.js:571
 #, c-format
 msgid "%s is away."
 msgstr "%s 已離開。"
 
-#: ../js/ui/telepathyClient.js:572
+#: ../js/ui/telepathyClient.js:574
 #, c-format
 msgid "%s is busy."
 msgstr "%s 正忙碌。"
@@ -750,7 +1032,7 @@ msgstr "%s 正忙碌。"
 #. Translators: this is a time format string followed by a date.
 #. If applicable, replace %X with a strftime format valid for your
 #. locale, without seconds.
-#: ../js/ui/telepathyClient.js:666
+#: ../js/ui/telepathyClient.js:668
 #, no-c-format
 msgid "Sent at %X on %A"
 msgstr "傳送於 %X %A"
@@ -769,12 +1051,12 @@ msgstr "%s 已完成啟動"
 msgid "'%s' is ready"
 msgstr "「%s」已就緒"
 
-#: ../js/ui/workspacesView.js:244
+#: ../js/ui/workspacesView.js:243
 msgid ""
 "Can't add a new workspace because maximum workspaces limit has been reached."
 msgstr "不能加入新的工作區，因為已達到最大工作區上限。"
 
-#: ../js/ui/workspacesView.js:260
+#: ../js/ui/workspacesView.js:259
 msgid "Can't remove the first workspace."
 msgstr "不能移除第一個工作區。"
 
@@ -798,29 +1080,29 @@ msgstr[0] "%u 輸入"
 msgid "System Sounds"
 msgstr "系統音效"
 
-#: ../src/shell-global.c:1233
+#: ../src/shell-global.c:1365
 msgid "Less than a minute ago"
 msgstr "少於一分鐘之前"
 
-#: ../src/shell-global.c:1237
+#: ../src/shell-global.c:1369
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分鐘前"
 
-#: ../src/shell-global.c:1242
+#: ../src/shell-global.c:1374
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 小時前"
 
-#: ../src/shell-global.c:1247
+#: ../src/shell-global.c:1379
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天前"
 
-#: ../src/shell-global.c:1252
+#: ../src/shell-global.c:1384
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -941,9 +1223,6 @@ msgstr "%1$s：%2$s"
 #~ msgid "Invisible"
 #~ msgstr "隱形"
 
-#~ msgid "Account Information..."
-#~ msgstr "帳號資訊…"
-
 #~ msgid "ON"
 #~ msgstr "開"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b4d8d9b49..d620c5444 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-shell 2.91.4\n"
+"Project-Id-Version: gnome-shell 2.91.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-07 09:43+0800\n"
-"PO-Revision-Date: 2011-01-05 13:31+0800\n"
+"POT-Creation-Date: 2011-02-04 13:12+0800\n"
+"PO-Revision-Date: 2011-02-04 12:41+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n@lists.linux.org.tw>\n"
 "Language: \n"
@@ -55,20 +55,12 @@ msgid "History for command (Alt-F2) dialog"
 msgstr "指令 (Alt-F2) 對話盒歷史紀錄"
 
 #: ../data/org.gnome.shell.gschema.xml.in.h:7
-#, fuzzy
-#| msgid ""
-#| "If true and format is either \"12-hour\" or \"24-hour\", display date in "
-#| "the clock, in addition to time."
 msgid "If true, display date in the clock, in addition to time."
-msgstr ""
-"如果設為 true 且格式為「12-小時」或「24-小時」，在時鐘裡顯示日期，加在時刻後"
-"面。"
+msgstr "如設定為「true」，除了在時鐘內顯示日期外還顯示時刻。"
 
 #: ../data/org.gnome.shell.gschema.xml.in.h:8
-#, fuzzy
-#| msgid "If true, display the ISO week date in the calendar."
 msgid "If true, display seconds in time."
-msgstr "如果設為 true，在日曆中顯示 ISO 週數。"
+msgstr "如設定為「true」，在時刻中顯示秒數。"
 
 #: ../data/org.gnome.shell.gschema.xml.in.h:9
 msgid "If true, display the ISO week date in the calendar."
@@ -78,7 +70,8 @@ msgstr "如果設為 true，在日曆中顯示 ISO 週數。"
 msgid "List of desktop file IDs for favorite applications"
 msgstr "喜好的應用程式桌面檔案 ID 清單"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:11
+#: ../data/org.gnome.shell.gschema.xml.in.h:12
+#, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
 "used for gst-launch. The pipeline should have an unconnected sink pad where "
@@ -87,28 +80,37 @@ msgid ""
 "pipeline can also take care of its own output - this might be used to send "
 "the output to an icecast server via shout2send or similar. When unset or set "
 "to an empty value, the default pipeline will be used. This is currently "
-"'videorate ! theoraenc ! oggmux' and records to Ogg Theora."
+"'videorate ! vp8enc quality=10 speed=2 threads=%T ! queue ! webmmux' and "
+"records to WEBM using the VP8 codec. %T is used as a placeholder for a guess "
+"at the optimal thread count on the system."
 msgstr ""
+"設定用來錄製的 GStreamer 管線。它依據 gst-launch 使用的語法。管線應該要有未連"
+"接的出口(sink pad)，提供錄製視訊之用。它通常會有未連接的入口(source pad)；從"
+"出口輸出的資訊就寫入輸出檔案。然而管線本身也會處理它本身的輸出 - 習慣上是透"
+"過 shout2send 之類將輸出傳送到 icecast 伺服器。當取消設定或設定為空值時，就會"
+"使用預設的管線。這個值目前為 'videorate ! vp8enc quality=10 speed=2 threads="
+"%T ! queue ! webmmux' 即使用 VP8 codec 錄製 WEBM。%T 是在系統的最佳化執行緒計"
+"數猜測時使用的佔位符。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:12
+#: ../data/org.gnome.shell.gschema.xml.in.h:13
 msgid "Show date in clock"
 msgstr "在時鐘內顯示日期"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:13
+#: ../data/org.gnome.shell.gschema.xml.in.h:14
 msgid "Show the week date in the calendar"
 msgstr "在日曆中顯示週數"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.h:15
 msgid "Show time with seconds"
 msgstr "在時刻中顯示秒數"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.h:16
 msgid ""
 "The applications corresponding to these identifiers will be displayed in the "
 "favorites area."
 msgstr "對應這些辨別碼的應用程式會顯示在喜好區域。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.h:17
 msgid ""
 "The filename for recorded screencasts will be a unique filename based on the "
 "current date, and use this extension. It should be changed when recording to "
@@ -117,7 +119,7 @@ msgstr ""
 "錄製好的畫面廣播檔案名稱會以目前的時刻作為獨特的檔名，並使用這個延伸檔名。當"
 "錄製為不同的容器格式時應該做適當變更。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.h:18
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
@@ -125,11 +127,11 @@ msgstr ""
 "由 GNOME Shell 的畫面廣播錄製程式所錄製成果的框架率，以 frames-per-second "
 "計。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.h:19
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "用來編碼畫面廣播的 gstreamer 管線"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.h:20
 msgid ""
 "The shell normally monitors active applications in order to present the most "
 "used ones (e.g. in launchers). While this data will be kept private, you may "
@@ -140,17 +142,21 @@ msgstr ""
 "器中）。雖然這個資料會保持隱密，但是您可能會基於隱私的理由想要停用這個功能。"
 "請注意這麼做並不會移除已儲存的資料。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.h:21
 msgid "Uuids of extensions to disable"
 msgstr "要停用的延伸檔名 Uuid"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.h:22
 msgid "Whether to collect stats about applications usage"
 msgstr "是否收集關於應用程式使用率的狀態"
 
+#: ../data/org.gnome.shell.gschema.xml.in.h:23
+msgid "disabled OpenSearch providers"
+msgstr "已停用 OpenSearch 提供者"
+
 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:1
 msgid "Clip the crosshairs at the center"
-msgstr ""
+msgstr "點選中央的十字準星"
 
 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:2
 msgid "Color of the crosshairs"
@@ -174,6 +180,11 @@ msgid ""
 "push: when the magnified mouse intersects a boundary of the zoom region, the "
 "contents are scrolled into view."
 msgstr ""
+"決定放大的滑鼠圖片在放大鏡檢 視中的位置以及它如何反應系統滑鼠的移動。數值有 "
+"- none: 不追蹤滑鼠；- centered: 滑鼠圖片顯示於放大區域的中央（也代表系統滑鼠"
+"下方的點）而放大的內容也會隨系統滑鼠移動而捲動；- proportional: 放大的滑鼠在"
+"縮放區域中的位置和系統滑鼠在螢幕中的位置是成比例的；- push: 當放大的滑鼠與縮"
+"放區域邊界交錯時，內容會捲動到檢視中。"
 
 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:5
 msgid ""
@@ -189,10 +200,8 @@ msgid ""
 msgstr ""
 
 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:7
-#, fuzzy
-#| msgid "Enabled"
 msgid "Enable lens mode"
-msgstr "啟用觸控螢幕模式"
+msgstr "啟用鏡頭模式"
 
 #: ../data/org.gnome.accessibility.magnifier.gschema.xml.in.h:8
 msgid ""
@@ -277,28 +286,47 @@ msgstr "放大的檢視是否應以系統滑鼠的位置為中心點並隨滑鼠
 msgid "Width of the vertical and horizontal lines that make up the crosshairs."
 msgstr "組成十字準星的垂直和水平線條的寬度。"
 
+#: ../js/misc/util.js:86
+msgid "Command not found"
+msgstr "找不到指令"
+
+#. Replace "Error invoking GLib.shell_parse_argv: " with
+#. something nicer
+#: ../js/misc/util.js:113
+msgid "Could not parse command:"
+msgstr "無法分析指令："
+
+#: ../js/misc/util.js:135
+msgid "No such application"
+msgstr "沒有這個應用程式"
+
+#: ../js/misc/util.js:148
+#, c-format
+msgid "Execution of '%s' failed:"
+msgstr "執行「%s」失敗："
+
 #. Translators: Filter to display all applications
-#: ../js/ui/appDisplay.js:155
+#: ../js/ui/appDisplay.js:164
 msgid "All"
 msgstr "全部"
 
-#: ../js/ui/appDisplay.js:236
+#: ../js/ui/appDisplay.js:245
 msgid "APPLICATIONS"
 msgstr "程式集"
 
-#: ../js/ui/appDisplay.js:266
+#: ../js/ui/appDisplay.js:275
 msgid "PREFERENCES"
 msgstr "偏好設定"
 
-#: ../js/ui/appDisplay.js:563
+#: ../js/ui/appDisplay.js:572
 msgid "New Window"
 msgstr "新視窗"
 
-#: ../js/ui/appDisplay.js:567
+#: ../js/ui/appDisplay.js:576
 msgid "Remove from Favorites"
 msgstr "自喜好中移除"
 
-#: ../js/ui/appDisplay.js:568
+#: ../js/ui/appDisplay.js:577
 msgid "Add to Favorites"
 msgstr "加入喜好"
 
@@ -312,122 +340,392 @@ msgstr "%s 已加入您的喜好中。"
 msgid "%s has been removed from your favorites."
 msgstr "%s 已經從您的喜好中移除。"
 
+#. Translators: Shown in calendar event list for all day events
+#. * Keep it short, best if you can use less then 10 characters
+#.
+#: ../js/ui/calendar.js:65
+#, fuzzy
+#| msgid "All Day"
+msgctxt "event list time"
+msgid "All Day"
+msgstr "整天"
+
+#. Translators: Shown in calendar event list, if 24h format
+#: ../js/ui/calendar.js:70
+msgctxt "event list time"
+msgid "%H:%M"
+msgstr ""
+
+#. Transators: Shown in calendar event list, if 12h format
+#: ../js/ui/calendar.js:77
+#, fuzzy
+#| msgid "%a %l:%M %p"
+msgctxt "event list time"
+msgid "%l:%M %p"
+msgstr "%a %p %l:%M"
+
+#. Translators: Calendar grid abbreviation for Sunday.
+#. *
+#. * NOTE: These grid abbreviations are always shown together
+#. * and in order, e.g. "S M T W T F S".
+#.
+#: ../js/ui/calendar.js:117
+#, fuzzy
+#| msgid "S"
+msgctxt "grid sunday"
+msgid "S"
+msgstr "日"
+
+#. Translators: Calendar grid abbreviation for Monday
+#: ../js/ui/calendar.js:119
+#, fuzzy
+#| msgid "M"
+msgctxt "grid monday"
+msgid "M"
+msgstr "一"
+
+#. Translators: Calendar grid abbreviation for Tuesday
+#: ../js/ui/calendar.js:121
+#, fuzzy
+#| msgid "T"
+msgctxt "grid tuesday"
+msgid "T"
+msgstr "二"
+
+#. Translators: Calendar grid abbreviation for Wednesday
+#: ../js/ui/calendar.js:123
+#, fuzzy
+#| msgid "W"
+msgctxt "grid wednesday"
+msgid "W"
+msgstr "三"
+
+#. Translators: Calendar grid abbreviation for Thursday
+#: ../js/ui/calendar.js:125
+#, fuzzy
+#| msgid "T"
+msgctxt "grid thursday"
+msgid "T"
+msgstr "二"
+
+#. Translators: Calendar grid abbreviation for Friday
+#: ../js/ui/calendar.js:127
+#, fuzzy
+#| msgid "F"
+msgctxt "grid friday"
+msgid "F"
+msgstr "五"
+
+#. Translators: Calendar grid abbreviation for Saturday
+#: ../js/ui/calendar.js:129
+#, fuzzy
+#| msgid "S"
+msgctxt "grid saturday"
+msgid "S"
+msgstr "日"
+
+#. Translators: Event list abbreviation for Sunday.
+#. *
+#. * NOTE: These list abbreviations are normally not shown together
+#. * so they need to be unique (e.g. Tuesday and Thursday cannot
+#. * both be 'T').
+#.
+#: ../js/ui/calendar.js:142
+#, fuzzy
+#| msgid "Su"
+msgctxt "list sunday"
+msgid "Su"
+msgstr "日"
+
+#. Translators: Event list abbreviation for Monday
+#: ../js/ui/calendar.js:144
+#, fuzzy
+#| msgid "M"
+msgctxt "list monday"
+msgid "M"
+msgstr "一"
+
+#. Translators: Event list abbreviation for Tuesday
+#: ../js/ui/calendar.js:146
+#, fuzzy
+#| msgid "T"
+msgctxt "list tuesday"
+msgid "T"
+msgstr "二"
+
+#. Translators: Event list abbreviation for Wednesday
+#: ../js/ui/calendar.js:148
+#, fuzzy
+#| msgid "W"
+msgctxt "list wednesday"
+msgid "W"
+msgstr "三"
+
+#. Translators: Event list abbreviation for Thursday
+#: ../js/ui/calendar.js:150
+#, fuzzy
+#| msgid "Th"
+msgctxt "list thursday"
+msgid "Th"
+msgstr "四"
+
+#. Translators: Event list abbreviation for Friday
+#: ../js/ui/calendar.js:152
+#, fuzzy
+#| msgid "F"
+msgctxt "list friday"
+msgid "F"
+msgstr "五"
+
+#. Translators: Event list abbreviation for Saturday
+#: ../js/ui/calendar.js:154
+#, fuzzy
+#| msgid "S"
+msgctxt "list saturday"
+msgid "S"
+msgstr "日"
+
+#. Translators: Text to show if there are no events
+#: ../js/ui/calendar.js:701
+msgid "Nothing Scheduled"
+msgstr "沒有預訂行程"
+
+#. Translators: Shown on calendar heading when selected day occurs on current year
+#: ../js/ui/calendar.js:717
+#, fuzzy
+#| msgid "%A %B %e, %Y"
+msgctxt "calendar heading"
+msgid "%A, %B %d"
+msgstr "%Y %B %e %A"
+
+#. Translators: Shown on calendar heading when selected day occurs on different year
+#: ../js/ui/calendar.js:720
+#, fuzzy
+#| msgid "%A %B %e, %Y"
+msgctxt "calendar heading"
+msgid "%A, %B %d, %Y"
+msgstr "%Y %B %e %A"
+
+#: ../js/ui/calendar.js:730
+msgid "Today"
+msgstr "今天"
+
+#: ../js/ui/calendar.js:734
+msgid "Tomorrow"
+msgstr "明天"
+
+#: ../js/ui/calendar.js:743
+msgid "This week"
+msgstr "本週"
+
+#: ../js/ui/calendar.js:751
+msgid "Next week"
+msgstr "下週"
+
 #: ../js/ui/dash.js:27
 msgid "Remove"
 msgstr "移除"
 
-#: ../js/ui/docDisplay.js:494
-msgid "RECENT ITEMS"
-msgstr "最近使用項目"
+#: ../js/ui/dateMenu.js:91
+msgid "Date and Time Settings"
+msgstr "日期與時刻設定值"
 
-#: ../js/ui/lookingGlass.js:552
-msgid "No extensions installed"
-msgstr "沒有安裝擴充功能"
-
-#: ../js/ui/lookingGlass.js:589
-msgid "Enabled"
-msgstr "已啟用"
-
-#. translators:
-#. * The device has been disabled
-#: ../js/ui/lookingGlass.js:591 ../src/gvc/gvc-mixer-control.c:1087
-msgid "Disabled"
-msgstr "已停用"
-
-#: ../js/ui/lookingGlass.js:593
-msgid "Error"
-msgstr "錯誤"
-
-#: ../js/ui/lookingGlass.js:595
-msgid "Out of date"
-msgstr "過期"
-
-#: ../js/ui/lookingGlass.js:620
-msgid "View Source"
-msgstr "檢示來源"
-
-#: ../js/ui/lookingGlass.js:626
-msgid "Web Page"
-msgstr "網頁"
-
-#: ../js/ui/overview.js:101
-msgid "Undo"
-msgstr "復原"
-
-#: ../js/ui/overview.js:166
-msgid "Windows"
-msgstr "視窗"
-
-#: ../js/ui/overview.js:169
-msgid "Applications"
-msgstr "應用程式"
-
-#. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:478
-#, c-format
-msgid "Quit %s"
-msgstr "結束 %s"
+#: ../js/ui/dateMenu.js:110
+msgid "Open Calendar"
+msgstr "開啟行事曆"
 
 #. Translators: This is the time format with date used
 #. in 24-hour mode.
-#: ../js/ui/panel.js:563
+#: ../js/ui/dateMenu.js:149
 msgid "%a %b %e, %R:%S"
 msgstr "%b %e %a, %R:%S"
 
-#: ../js/ui/panel.js:564
+#: ../js/ui/dateMenu.js:150
 msgid "%a %b %e, %R"
 msgstr "%b %e %a, %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
-#: ../js/ui/panel.js:568
+#: ../js/ui/dateMenu.js:154
 msgid "%a %R:%S"
 msgstr "%a %R:%S"
 
-#: ../js/ui/panel.js:569
+#: ../js/ui/dateMenu.js:155
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is a time format with date used
 #. for AM/PM.
-#: ../js/ui/panel.js:576
+#: ../js/ui/dateMenu.js:162
 msgid "%a %b %e, %l:%M:%S %p"
 msgstr "%b %e %a, %p %l:%M:%S"
 
-#: ../js/ui/panel.js:577
+#: ../js/ui/dateMenu.js:163
 msgid "%a %b %e, %l:%M %p"
 msgstr "%b %e %a, %p %l:%M"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../js/ui/panel.js:581
+#: ../js/ui/dateMenu.js:167
 msgid "%a %l:%M:%S %p"
 msgstr "%a %p %l:%M:%S"
 
-#: ../js/ui/panel.js:582
+#: ../js/ui/dateMenu.js:168
 msgid "%a %l:%M %p"
 msgstr "%a %p %l:%M"
 
+#. Translators: This is the date format to use when the calendar popup is
+#. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
+#.
+#: ../js/ui/dateMenu.js:194
+msgid "%A %B %e, %Y"
+msgstr "%Y %B %e %A"
+
+#: ../js/ui/docDisplay.js:18
+msgid "RECENT ITEMS"
+msgstr "最近使用項目"
+
+#: ../js/ui/endSessionDialog.js:63
+#, c-format
+msgid "Log Out %s"
+msgstr "登出 %s"
+
+#: ../js/ui/endSessionDialog.js:64 ../js/ui/endSessionDialog.js:69
+msgid "Log Out"
+msgstr "登出"
+
+#: ../js/ui/endSessionDialog.js:65
+msgid "Click Log Out to quit these applications and log out of the system."
+msgstr "點選登出以結束這些應用程式並登出系統。"
+
+#: ../js/ui/endSessionDialog.js:66
+#, c-format
+msgid "%s will be logged out automatically in %d seconds."
+msgstr "%s 會在 %d 秒後自動登出。"
+
+#: ../js/ui/endSessionDialog.js:67
+#, c-format
+msgid "You will be logged out automatically in %d seconds."
+msgstr "您會在 %d 秒後自動登出。"
+
+#: ../js/ui/endSessionDialog.js:68
+msgid "Logging out of the system."
+msgstr "登出系統。"
+
+#: ../js/ui/endSessionDialog.js:74 ../js/ui/endSessionDialog.js:78
+msgid "Shut Down"
+msgstr "關機"
+
+#: ../js/ui/endSessionDialog.js:75
+msgid "Click Shut Down to quit these applications and shut down the system."
+msgstr "點選關機以結束這些應用程式並將系統關機。"
+
+#: ../js/ui/endSessionDialog.js:76
+#, c-format
+msgid "The system will shut down automatically in %d seconds."
+msgstr "本系統會在 %d 秒後自動關閉。"
+
+#: ../js/ui/endSessionDialog.js:77
+msgid "Shutting down the system."
+msgstr "正在關閉系統。"
+
+#: ../js/ui/endSessionDialog.js:84 ../js/ui/endSessionDialog.js:88
+msgid "Restart"
+msgstr "重新啟動"
+
+#: ../js/ui/endSessionDialog.js:85
+msgid "Click Restart to quit these applications and restart the system."
+msgstr "點選重新啟動以結束這些應用程式並將系統重新啟動。"
+
+#: ../js/ui/endSessionDialog.js:86
+#, c-format
+msgid "The system will restart automatically in %d seconds."
+msgstr "系統會在 %d 秒內自動重新啟動。"
+
+#: ../js/ui/endSessionDialog.js:87
+msgid "Restarting the system."
+msgstr "重新啟動系統。"
+
+#: ../js/ui/endSessionDialog.js:395
+msgid "Confirm"
+msgstr "確認"
+
+#: ../js/ui/endSessionDialog.js:400 ../js/ui/status/bluetooth.js:470
+msgid "Cancel"
+msgstr "取消"
+
+#: ../js/ui/lookingGlass.js:556
+msgid "No extensions installed"
+msgstr "沒有安裝擴充功能"
+
+#: ../js/ui/lookingGlass.js:593
+msgid "Enabled"
+msgstr "已啟用"
+
+#. translators:
+#. * The device has been disabled
+#: ../js/ui/lookingGlass.js:595 ../src/gvc/gvc-mixer-control.c:1087
+msgid "Disabled"
+msgstr "已停用"
+
+#: ../js/ui/lookingGlass.js:597
+msgid "Error"
+msgstr "錯誤"
+
+#: ../js/ui/lookingGlass.js:599
+msgid "Out of date"
+msgstr "過期"
+
+#: ../js/ui/lookingGlass.js:624
+msgid "View Source"
+msgstr "檢示來源"
+
+#: ../js/ui/lookingGlass.js:630
+msgid "Web Page"
+msgstr "網頁"
+
+#: ../js/ui/messageTray.js:1809
+msgid "System Information"
+msgstr "系統資訊"
+
+#: ../js/ui/overview.js:88
+msgid "Undo"
+msgstr "復原"
+
+#: ../js/ui/overview.js:159
+msgid "Windows"
+msgstr "視窗"
+
+#: ../js/ui/overview.js:162
+msgid "Applications"
+msgstr "應用程式"
+
+#. TODO - _quit() doesn't really work on apps in state STARTING yet
+#: ../js/ui/panel.js:480
+#, c-format
+msgid "Quit %s"
+msgstr "結束 %s"
+
 #. Button on the left side of the panel.
 #. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:727
+#: ../js/ui/panel.js:614
 msgid "Activities"
 msgstr "概覽 "
 
-#: ../js/ui/placeDisplay.js:111
+#: ../js/ui/placeDisplay.js:106
 #, c-format
 msgid "Failed to unmount '%s'"
 msgstr "無法卸載「%s」"
 
-#: ../js/ui/placeDisplay.js:114
+#: ../js/ui/placeDisplay.js:109
 msgid "Retry"
 msgstr "重試"
 
-#: ../js/ui/placeDisplay.js:159
+#: ../js/ui/placeDisplay.js:150
 msgid "Connect to..."
 msgstr "連接到…"
 
-#: ../js/ui/placeDisplay.js:558
+#: ../js/ui/placeDisplay.js:386
 msgid "PLACES & DEVICES"
 msgstr "位置 & 裝置"
 
@@ -437,88 +735,82 @@ msgstr "位置 & 裝置"
 #. switches containing "◯" and "|"). Other values will
 #. simply result in invisible toggle switches.
 #: ../js/ui/popupMenu.js:33
-#, fuzzy
 msgid "toggle-switch-us"
-msgstr "美式 84 鍵鍵盤"
+msgstr "toggle-switch-us"
 
-#: ../js/ui/runDialog.js:233
+#: ../js/ui/runDialog.js:209
 msgid "Please enter a command:"
 msgstr "請輸入指令："
 
-#: ../js/ui/runDialog.js:378
-#, c-format
-msgid "Execution of '%s' failed:"
-msgstr "執行「%s」失敗："
-
-#: ../js/ui/statusMenu.js:101
+#: ../js/ui/statusMenu.js:102
 msgid "Available"
 msgstr "可用"
 
-#: ../js/ui/statusMenu.js:106
+#: ../js/ui/statusMenu.js:107
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../js/ui/statusMenu.js:114
+#: ../js/ui/statusMenu.js:115
 msgid "My Account"
 msgstr "我的帳號"
 
-#: ../js/ui/statusMenu.js:118
+#: ../js/ui/statusMenu.js:119
 msgid "System Settings"
 msgstr "系統設定值"
 
-#: ../js/ui/statusMenu.js:125
+#: ../js/ui/statusMenu.js:126
 msgid "Lock Screen"
 msgstr "鎖定畫面"
 
-#: ../js/ui/statusMenu.js:129
+#: ../js/ui/statusMenu.js:130
 msgid "Switch User"
 msgstr "切換使用者"
 
-#: ../js/ui/statusMenu.js:134
+#: ../js/ui/statusMenu.js:135
 msgid "Log Out..."
 msgstr "登出…"
 
-#: ../js/ui/statusMenu.js:141
+#: ../js/ui/statusMenu.js:142
 msgid "Suspend..."
 msgstr "暫停…"
 
-#: ../js/ui/statusMenu.js:145
+#: ../js/ui/statusMenu.js:146
 msgid "Shut Down..."
 msgstr "關機…"
 
-#: ../js/ui/status/accessibility.js:82
+#: ../js/ui/status/accessibility.js:83
 msgid "Zoom"
 msgstr "縮放"
 
-#: ../js/ui/status/accessibility.js:88
+#: ../js/ui/status/accessibility.js:89
 msgid "Screen Reader"
 msgstr "螢幕閱讀器"
 
-#: ../js/ui/status/accessibility.js:91
+#: ../js/ui/status/accessibility.js:92
 msgid "Screen Keyboard"
 msgstr "螢幕鍵盤"
 
-#: ../js/ui/status/accessibility.js:94
+#: ../js/ui/status/accessibility.js:95
 msgid "Visual Alerts"
 msgstr "視覺警示"
 
-#: ../js/ui/status/accessibility.js:97
+#: ../js/ui/status/accessibility.js:98
 msgid "Sticky Keys"
 msgstr "黏性特殊鍵"
 
-#: ../js/ui/status/accessibility.js:100
+#: ../js/ui/status/accessibility.js:101
 msgid "Slow Keys"
 msgstr "遲緩按鍵"
 
-#: ../js/ui/status/accessibility.js:103
+#: ../js/ui/status/accessibility.js:104
 msgid "Bounce Keys"
 msgstr "回鍵"
 
-#: ../js/ui/status/accessibility.js:106
+#: ../js/ui/status/accessibility.js:107
 msgid "Mouse Keys"
 msgstr "滑鼠按鍵"
 
-#: ../js/ui/status/accessibility.js:110
+#: ../js/ui/status/accessibility.js:111
 msgid "Universal Access Settings"
 msgstr "無障礙功能設定值"
 
@@ -530,7 +822,7 @@ msgstr "高反差"
 msgid "Large Text"
 msgstr "大型文字"
 
-#: ../js/ui/status/bluetooth.js:42 ../js/ui/status/bluetooth.js:240
+#: ../js/ui/status/bluetooth.js:42 ../js/ui/status/bluetooth.js:241
 msgid "Bluetooth"
 msgstr "藍牙"
 
@@ -546,109 +838,109 @@ msgstr "傳送檔案到裝置…"
 msgid "Setup a New Device..."
 msgstr "設定新的裝置…"
 
-#: ../js/ui/status/bluetooth.js:94
+#: ../js/ui/status/bluetooth.js:95
 msgid "Bluetooth Settings"
 msgstr "藍牙設定值"
 
-#: ../js/ui/status/bluetooth.js:191
+#: ../js/ui/status/bluetooth.js:192
 msgid "Connection"
 msgstr "連線"
 
-#: ../js/ui/status/bluetooth.js:227
+#: ../js/ui/status/bluetooth.js:228
 msgid "Send Files..."
 msgstr "傳送檔案…"
 
-#: ../js/ui/status/bluetooth.js:232
+#: ../js/ui/status/bluetooth.js:233
 msgid "Browse Files..."
 msgstr "瀏覽檔案…"
 
-#: ../js/ui/status/bluetooth.js:241
+#: ../js/ui/status/bluetooth.js:242
 msgid "Error browsing device"
 msgstr "瀏覽裝置時發生錯誤"
 
-#: ../js/ui/status/bluetooth.js:242
+#: ../js/ui/status/bluetooth.js:243
 #, c-format
 msgid "The requested device cannot be browsed, error is '%s'"
 msgstr "要求的裝置是不能瀏覽的，錯誤為「%s」"
 
-#: ../js/ui/status/bluetooth.js:250
+#: ../js/ui/status/bluetooth.js:251
 msgid "Keyboard Settings"
 msgstr "鍵盤設定值"
 
-#: ../js/ui/status/bluetooth.js:255
+#: ../js/ui/status/bluetooth.js:256
 msgid "Mouse Settings"
 msgstr "滑鼠設定值"
 
-#: ../js/ui/status/bluetooth.js:262 ../js/ui/status/volume.js:62
+#: ../js/ui/status/bluetooth.js:263 ../js/ui/status/volume.js:63
 msgid "Sound Settings"
 msgstr "音效設定值"
 
-#: ../js/ui/status/bluetooth.js:336 ../js/ui/status/bluetooth.js:370
-#: ../js/ui/status/bluetooth.js:410 ../js/ui/status/bluetooth.js:443
+#: ../js/ui/status/bluetooth.js:337 ../js/ui/status/bluetooth.js:371
+#: ../js/ui/status/bluetooth.js:411 ../js/ui/status/bluetooth.js:444
 msgid "Bluetooth Agent"
 msgstr "藍牙代理程式"
 
-#: ../js/ui/status/bluetooth.js:371
+#: ../js/ui/status/bluetooth.js:372
 #, c-format
 msgid "Authorization request from %s"
 msgstr "來自「%s」的驗證要求"
 
-#: ../js/ui/status/bluetooth.js:377
+#: ../js/ui/status/bluetooth.js:378
 #, c-format
 msgid "Device %s wants access to the service '%s'"
 msgstr "裝置 %s 想要存取服務「%s」"
 
-#: ../js/ui/status/bluetooth.js:379
+#: ../js/ui/status/bluetooth.js:380
 msgid "Always grant access"
 msgstr "永遠准許存取"
 
-#: ../js/ui/status/bluetooth.js:380
+#: ../js/ui/status/bluetooth.js:381
 msgid "Grant this time only"
 msgstr "只有這次准許"
 
-#: ../js/ui/status/bluetooth.js:381
+#: ../js/ui/status/bluetooth.js:382
 msgid "Reject"
 msgstr "拒絕"
 
-#: ../js/ui/status/bluetooth.js:411
+#: ../js/ui/status/bluetooth.js:412
 #, c-format
 msgid "Pairing confirmation for %s"
 msgstr "%s 的配對確認"
 
-#: ../js/ui/status/bluetooth.js:417 ../js/ui/status/bluetooth.js:451
+#: ../js/ui/status/bluetooth.js:418 ../js/ui/status/bluetooth.js:452
 #, c-format
 msgid "Device %s wants to pair with this computer"
 msgstr "裝置 %s 想要和這個電腦配對"
 
-#: ../js/ui/status/bluetooth.js:418
+#: ../js/ui/status/bluetooth.js:419
 #, c-format
 msgid "Please confirm whether the PIN '%s' matches the one on the device."
 msgstr "請確認 PIN「%s」是否和裝置上的相符。"
 
-#: ../js/ui/status/bluetooth.js:420
+#: ../js/ui/status/bluetooth.js:421
 msgid "Matches"
 msgstr "相符"
 
-#: ../js/ui/status/bluetooth.js:421
+#: ../js/ui/status/bluetooth.js:422
 msgid "Does not match"
 msgstr "不相符"
 
-#: ../js/ui/status/bluetooth.js:444
+#: ../js/ui/status/bluetooth.js:445
 #, c-format
 msgid "Pairing request for %s"
 msgstr "%s 的配對請求"
 
-#: ../js/ui/status/bluetooth.js:452
+#: ../js/ui/status/bluetooth.js:453
 msgid "Please enter the PIN mentioned on the device."
 msgstr "請輸入裝置所提及的 PIN。"
 
-#: ../js/ui/status/bluetooth.js:468
+#: ../js/ui/status/bluetooth.js:469
 msgid "OK"
 msgstr "確定"
 
-#: ../js/ui/status/bluetooth.js:469
-msgid "Cancel"
-msgstr "取消"
+#: ../js/ui/status/keyboard.js:78
+msgid "Localization Settings"
+msgstr "本地化設定值"
 
 #: ../js/ui/status/power.js:85
 msgid "Power Settings"
@@ -682,78 +974,78 @@ msgid "%d minute remaining"
 msgid_plural "%d minutes remaining"
 msgstr[0] "剩下 %d 分鐘"
 
-#: ../js/ui/status/power.js:237
+#: ../js/ui/status/power.js:235
 msgid "AC adapter"
 msgstr "AC 電源"
 
-#: ../js/ui/status/power.js:239
+#: ../js/ui/status/power.js:237
 msgid "Laptop battery"
 msgstr "筆記型電腦電池"
 
-#: ../js/ui/status/power.js:241
+#: ../js/ui/status/power.js:239
 msgid "UPS"
 msgstr "不斷電系統"
 
-#: ../js/ui/status/power.js:243
+#: ../js/ui/status/power.js:241
 msgid "Monitor"
 msgstr "監視器"
 
-#: ../js/ui/status/power.js:245
+#: ../js/ui/status/power.js:243
 msgid "Mouse"
 msgstr "滑鼠"
 
-#: ../js/ui/status/power.js:247
+#: ../js/ui/status/power.js:245
 msgid "Keyboard"
 msgstr "鍵盤"
 
-#: ../js/ui/status/power.js:249
+#: ../js/ui/status/power.js:247
 msgid "PDA"
 msgstr "PDA"
 
-#: ../js/ui/status/power.js:251
+#: ../js/ui/status/power.js:249
 msgid "Cell phone"
 msgstr "行動電話"
 
-#: ../js/ui/status/power.js:253
+#: ../js/ui/status/power.js:251
 msgid "Media player"
 msgstr "媒體播放器"
 
-#: ../js/ui/status/power.js:255
+#: ../js/ui/status/power.js:253
 msgid "Tablet"
 msgstr "手寫板"
 
-#: ../js/ui/status/power.js:257
+#: ../js/ui/status/power.js:255
 msgid "Computer"
 msgstr "電腦"
 
-#: ../js/ui/status/power.js:259 ../src/shell-app-system.c:1012
+#: ../js/ui/status/power.js:257 ../src/shell-app-system.c:1012
 msgid "Unknown"
 msgstr "不明"
 
-#: ../js/ui/status/volume.js:41
+#: ../js/ui/status/volume.js:42
 msgid "Volume"
 msgstr "音量"
 
-#: ../js/ui/status/volume.js:54
+#: ../js/ui/status/volume.js:55
 msgid "Microphone"
 msgstr "麥克風"
 
-#: ../js/ui/telepathyClient.js:561
+#: ../js/ui/telepathyClient.js:563
 #, c-format
 msgid "%s is online."
 msgstr "%s 現在上線。"
 
-#: ../js/ui/telepathyClient.js:566
+#: ../js/ui/telepathyClient.js:568
 #, c-format
 msgid "%s is offline."
 msgstr "%s 現在離線。"
 
-#: ../js/ui/telepathyClient.js:569
+#: ../js/ui/telepathyClient.js:571
 #, c-format
 msgid "%s is away."
 msgstr "%s 已離開。"
 
-#: ../js/ui/telepathyClient.js:572
+#: ../js/ui/telepathyClient.js:574
 #, c-format
 msgid "%s is busy."
 msgstr "%s 正忙碌。"
@@ -761,7 +1053,7 @@ msgstr "%s 正忙碌。"
 #. Translators: this is a time format string followed by a date.
 #. If applicable, replace %X with a strftime format valid for your
 #. locale, without seconds.
-#: ../js/ui/telepathyClient.js:666
+#: ../js/ui/telepathyClient.js:668
 #, no-c-format
 msgid "Sent at %X on %A"
 msgstr "傳送於 %X %A"
@@ -780,12 +1072,12 @@ msgstr "%s 已完成啟動"
 msgid "'%s' is ready"
 msgstr "「%s」已就緒"
 
-#: ../js/ui/workspacesView.js:244
+#: ../js/ui/workspacesView.js:243
 msgid ""
 "Can't add a new workspace because maximum workspaces limit has been reached."
 msgstr "不能加入新的工作區，因為已達到最大工作區上限。"
 
-#: ../js/ui/workspacesView.js:260
+#: ../js/ui/workspacesView.js:259
 msgid "Can't remove the first workspace."
 msgstr "不能移除第一個工作區。"
 
@@ -809,29 +1101,29 @@ msgstr[0] "%u 輸入"
 msgid "System Sounds"
 msgstr "系統音效"
 
-#: ../src/shell-global.c:1233
+#: ../src/shell-global.c:1365
 msgid "Less than a minute ago"
 msgstr "少於一分鐘之前"
 
-#: ../src/shell-global.c:1237
+#: ../src/shell-global.c:1369
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分鐘前"
 
-#: ../src/shell-global.c:1242
+#: ../src/shell-global.c:1374
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 小時前"
 
-#: ../src/shell-global.c:1247
+#: ../src/shell-global.c:1379
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天前"
 
-#: ../src/shell-global.c:1252
+#: ../src/shell-global.c:1384
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -952,9 +1244,6 @@ msgstr "%1$s：%2$s"
 #~ msgid "Invisible"
 #~ msgstr "隱形"
 
-#~ msgid "Account Information..."
-#~ msgstr "帳號資訊…"
-
 #~ msgid "ON"
 #~ msgstr "開"