[metacity] Updated Traditional Chinese translation(Hong Kong and Taiwan)

From: Chao-Hsiung Liao <chliao src gnome org>
To: commits-list gnome org
Cc:
Subject: [metacity] Updated Traditional Chinese translation(Hong Kong and Taiwan)
Date: Fri, 11 Feb 2011 11:08:26 +0000 (UTC)
commit 74aba359e2fc58dbe483b622f24b6131d7073ec6
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Fri Feb 11 19:08:17 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  469 ++++++++++++++++++++++++++++++++++-------------------------
 po/zh_TW.po |  469 ++++++++++++++++++++++++++++++++++-------------------------
 2 files changed, 538 insertions(+), 400 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index c1bf406..6cfc58b 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity 2.30.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 22:36+0800\n"
-"PO-Revision-Date: 2011-01-20 22:36+0800\n"
-"Last-Translator: Wei-Lun Chao <chaoweilun gmail com>\n"
+"POT-Creation-Date: 2011-02-11 19:07+0800\n"
+"PO-Revision-Date: 2011-02-11 19:08+0800\n"
+"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -19,15 +19,25 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../src/50-metacity-desktop-key.xml.in.h:1
-msgid "Desktop"
-msgstr "æ¡?é?¢"
+#: ../src/50-metacity-launchers.xml.in.h:1
+msgid "Launchers"
+msgstr "å?·è¡?å?¨"
 
-#: ../src/50-metacity-key.xml.in.h:1
-#, fuzzy
-#| msgid "/_Windows"
+#: ../src/50-metacity-navigation.xml.in.h:1
+msgid "Navigation"
+msgstr "å°?è?ª"
+
+#: ../src/50-metacity-screenshot.xml.in.h:1
+msgid "Screenshots"
+msgstr "è?¢å¹?æ?ªå??"
+
+#: ../src/50-metacity-system.xml.in.h:1
+msgid "System"
+msgstr "ç³»çµ±"
+
+#: ../src/50-metacity-windows.xml.in.h:1
 msgid "Windows"
-msgstr "/è¦?çª?(_W)"
+msgstr "è¦?çª?"
 
 #: ../src/core/bell.c:299
 msgid "Bell event"
@@ -326,54 +336,54 @@ msgstr ""
 "\n"
 "é??å??æ??é?µçµ?å??å?¯æ??ä¸?ã??shiftã??æ??é?µè®?å®?å??è½?ï¼?å? æ¤ï¼?ã??shiftã??ä¸?è?½æ??ç?ºå®?æ??ä½¿ç?¨ç??æ??é?µä¹?ä¸?ã??"
 
-#: ../src/core/session.c:850 ../src/core/session.c:857
+#: ../src/core/session.c:842 ../src/core/session.c:849
 #, c-format
 msgid "Could not create directory '%s': %s\n"
 msgstr "ç?¡æ³?å»ºç«?ç?®é??â??%sâ??ï¼?%s\n"
 
-#: ../src/core/session.c:867
+#: ../src/core/session.c:859
 #, c-format
 msgid "Could not open session file '%s' for writing: %s\n"
 msgstr "ç?¡æ³?é??å??ä½?æ¥é??æ®µæª?æ¡?â??%sâ??ä»¥ä¾?å¯«å?¥è³?æ??ï¼?%s\n"
 
-#: ../src/core/session.c:1008
+#: ../src/core/session.c:1000
 #, c-format
 msgid "Error writing session file '%s': %s\n"
 msgstr "ç?¡æ³?å¯«å?¥ä½?æ¥é??æ®µæª?æ¡?â??%sâ??ï¼?%s\n"
 
-#: ../src/core/session.c:1013
+#: ../src/core/session.c:1005
 #, c-format
 msgid "Error closing session file '%s': %s\n"
 msgstr "ç?¡æ³?é??é??ä½?æ¥é??æ®µæª?æ¡?â??%sâ??ï¼?%s\n"
 
-#: ../src/core/session.c:1143
+#: ../src/core/session.c:1135
 #, c-format
 msgid "Failed to parse saved session file: %s\n"
 msgstr "ç?¡æ³?å??æ??å·²å?²å?ç??ä½?æ¥é??æ®µæª?æ¡?ï¼?%s\n"
 
-#: ../src/core/session.c:1192
+#: ../src/core/session.c:1184
 #, c-format
 msgid "<metacity_session> attribute seen but we already have the session ID"
 msgstr "å?ºç?¾äº? <metacity_session> ç??å±¬æ?§ï¼?ä½?ä½?æ¥é??æ®µä»£ç¢¼å·²ç¶?å?å?¨"
 
-#: ../src/core/session.c:1205 ../src/core/session.c:1280
-#: ../src/core/session.c:1312 ../src/core/session.c:1384
-#: ../src/core/session.c:1444
+#: ../src/core/session.c:1197 ../src/core/session.c:1272
+#: ../src/core/session.c:1304 ../src/core/session.c:1376
+#: ../src/core/session.c:1436
 #, c-format
 msgid "Unknown attribute %s on <%s> element"
 msgstr "<%2$s> å??ç´ ä¸å?ºç?¾ä¸?æ??ç??å±¬æ?§ %1$s"
 
-#: ../src/core/session.c:1222
+#: ../src/core/session.c:1214
 #, c-format
 msgid "nested <window> tag"
 msgstr "é??ç??ç?? <window> å??å??"
 
-#: ../src/core/session.c:1464
+#: ../src/core/session.c:1456
 #, c-format
 msgid "Unknown element %s"
 msgstr "ä¸?æ??ç??å??ç´  %s"
 
-#: ../src/core/session.c:1816
+#: ../src/core/session.c:1808
 msgid ""
 "These windows do not support &quot;save current setup&quot; and will have to "
 "be restarted manually next time you log in."
@@ -423,7 +433,7 @@ msgid "Metacity"
 msgstr "Metacity"
 
 #. first time through
-#: ../src/core/window.c:5703
+#: ../src/core/window.c:5704
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -437,7 +447,7 @@ msgstr "è¦?çª? %s å°? SM_CLIENT_ID è¨å®?ç?ºè©²è¦?çª?æ?¬èº«ï¼?è??ä¸?æ?¯ ICCCM 
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:6268
+#: ../src/core/window.c:6269
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
@@ -554,259 +564,263 @@ msgstr "å??æ??è?³ç¬¬ 11 å??å·¥ä½?å??"
 msgid "Switch to workspace 12"
 msgstr "å??æ??è?³ç¬¬ 12 å??å·¥ä½?å??"
 
+# (Abel) take care of the same string in libwnck
 #: ../src/include/all-keybindings.h:122
-msgid "Switch to workspace on the left of the current workspace"
-msgstr "å??æ??è?³ç?®å??å·¥ä½?å??ç??å·¦æ?¹å·¥ä½?å??"
+msgid "Move to workspace left"
+msgstr "ç§»è?³å·¦æ?¹ç??å·¥ä½?å??"
 
+# (Abel) take care of the same string in libwnck
 #: ../src/include/all-keybindings.h:126
-msgid "Switch to workspace on the right of the current workspace"
-msgstr "å??æ??è?³ç?®å??å·¥ä½?å??ç??å?³æ?¹å·¥ä½?å??"
+msgid "Move to workspace right"
+msgstr "ç§»è?³å?³æ?¹ç??å·¥ä½?å??"
 
+# (Abel) take care of the same string in libwnck
 #: ../src/include/all-keybindings.h:130
-msgid "Switch to workspace above the current workspace"
-msgstr "å??æ??è?³ç?®å??å·¥ä½?å??ç??ä¸?æ?¹å·¥ä½?å??"
+msgid "Move to workspace above"
+msgstr "ç§»è?³ä¸?æ?¹ç??å·¥ä½?å??"
 
+# (Abel) take care of the same string in libwnck
 #: ../src/include/all-keybindings.h:134
-msgid "Switch to workspace below the current workspace"
-msgstr "å??æ??è?³ç?®å??å·¥ä½?å??ç??ä¸?æ?¹å·¥ä½?å??"
+msgid "Move to workspace below"
+msgstr "ç§»è?³ä¸?æ?¹ç??å·¥ä½?å??"
 
 #: ../src/include/all-keybindings.h:150
-msgid "Move between windows of an application, using a popup window"
-msgstr "å?¨æ??ç?¨ç¨?å¼?ç??è¦?çª?ä¹?é??å??æ??ï¼?ä½¿ç?¨å½?å?ºå¼?è¦?çª?"
+msgid "Switch windows of an application"
+msgstr "å??æ??ç¨?å¼?ç??è¦?çª?"
 
 #: ../src/include/all-keybindings.h:153
-msgid "Move backward between windows of an application, using a popup window"
-msgstr "å?¨æ??ç?¨ç¨?å¼?ç??è¦?çª?ä¹?é??ç?¸å??æ¬¡åº?å??æ??ï¼?ä½¿ç?¨å½?å?ºå¼?è¦?çª?"
+msgid "Reverse switch windows of an application"
+msgstr "å??å??å??æ??ç¨?å¼?ç??è¦?çª?"
 
-#: ../src/include/all-keybindings.h:157
-msgid "Move between windows, using a popup window"
-msgstr "å?¨è¦?çª?ä¹?é??å??æ??ï¼?ä½¿ç?¨å½?å?ºå¼?è¦?çª?"
+#: ../src/include/all-keybindings.h:156
+msgid "Switch applications"
+msgstr "å??æ??ç¨?å¼?"
 
-#: ../src/include/all-keybindings.h:160
-msgid "Move backward between windows, using a popup window"
-msgstr "å?¨è¦?çª?ä¹?é??ä»¥ç?¸å??æ¬¡åº?å??æ??ï¼?ä½¿ç?¨å½?å?ºå¼?è¦?çª?"
+#: ../src/include/all-keybindings.h:159
+msgid "Reverse switch applications"
+msgstr "å??å??å??æ??ç¨?å¼?"
 
-#: ../src/include/all-keybindings.h:163
-msgid "Move between panels and the desktop, using a popup window"
-msgstr "å?¨é?¢æ?¿å??æ¡?é?¢ä¹?é??å??æ??ï¼?ä½¿ç?¨å½?å?ºå¼?è¦?çª?"
+#: ../src/include/all-keybindings.h:162
+msgid "Switch system controls"
+msgstr "å??æ??ç³»çµ±æ?§å?¶"
 
-#: ../src/include/all-keybindings.h:166
-msgid "Move backward between panels and the desktop, using a popup window"
-msgstr "å?¨é?¢æ?¿å??æ¡?é?¢ä¹?é??ä»¥ç?¸å??æ¬¡åº?å??æ??ï¼?ä½¿ç?¨å½?å?ºå¼?è¦?çª?"
+#: ../src/include/all-keybindings.h:165
+msgid "Reverse switch system controls"
+msgstr "å??å??å??æ??ç³»çµ±æ?§å?¶"
 
-#: ../src/include/all-keybindings.h:171
-msgid "Move between windows of an application immediately"
-msgstr "å?¨è¦?çª?å??ç¨?å¼?ä¹?é??å??æ??ï¼?ç«?å?³æ¨¡å¼?ï¼?"
+#: ../src/include/all-keybindings.h:169
+msgid "Switch windows of an app directly"
+msgstr "ç?´æ?¥å??æ??ç¨?å¼?ç??è¦?çª?"
 
-#: ../src/include/all-keybindings.h:174
-msgid "Move backward between windows of an application immediately"
-msgstr "ç«?å?³å?¨æ??ç?¨ç¨?å¼?ç??è¦?çª?ä¹?é??ç?¸å??æ¬¡åº?å??æ??"
+#: ../src/include/all-keybindings.h:172
+msgid "Reverse switch windows of an app directly"
+msgstr "ç?´æ?¥å??å??å??æ??ç¨?å¼?ç??è¦?çª?"
 
-#: ../src/include/all-keybindings.h:177
-msgid "Move between windows immediately"
-msgstr "å°?è¼¸å?¥ç?¦é»?å?¨å??è¦?çª?ä¹?é??å??æ??ï¼?ç«?å?³æ¨¡å¼?ï¼?"
+#: ../src/include/all-keybindings.h:175
+msgid "Switch windows directly"
+msgstr "ç?´æ?¥å??æ??è¦?çª?"
 
-#: ../src/include/all-keybindings.h:180
-msgid "Move backward between windows immediately"
-msgstr "ç«?å?³å?¨è¦?çª?ä¹?é??ç?¸å??æ¬¡åº?å??æ??"
+#: ../src/include/all-keybindings.h:178
+msgid "Reverse switch windows directly"
+msgstr "ç?´æ?¥å??å??å??æ??è¦?çª?"
 
-#: ../src/include/all-keybindings.h:183
-msgid "Move between panels and the desktop immediately"
-msgstr "å°?è¼¸å?¥ç?¦é»?å?¨é?¢æ?¿å??æ¡?é?¢ä¹?é??å??æ??ï¼?ç«?å?³æ¨¡å¼?ï¼?"
+#: ../src/include/all-keybindings.h:181
+msgid "Switch system controls directly"
+msgstr "ç?´æ?¥å??æ??ç³»çµ±æ?§å?¶"
 
-#: ../src/include/all-keybindings.h:186
-msgid "Move backward between panels and the desktop immediately"
-msgstr "å°?è¼¸å?¥ç?¦é»?å?¨é?¢æ?¿å??æ¡?é?¢ä¹?é??ä»¥ç?¸å??æ¬¡åº?å??æ??ï¼?ç«?å?³æ¨¡å¼?ï¼?"
+#: ../src/include/all-keybindings.h:184
+msgid "Reverse switch system controls directly"
+msgstr "ç?´æ?¥å??å??å??æ??ç³»çµ±æ?§å?¶"
 
-#: ../src/include/all-keybindings.h:191
-msgid "Hide all normal windows and set focus to the desktop"
-msgstr "é?±è??æ??æ??ä¸?è?¬è¦?çª?ä¸¦å°?ç?¦é»?è¨è?³æ¡?é?¢"
+#: ../src/include/all-keybindings.h:189
+msgid "Hide all normal windows"
+msgstr "é?±è??æ??æ??ä¸?è?¬è¦?çª?"
 
-#: ../src/include/all-keybindings.h:194
-msgid "Show the panel's main menu"
-msgstr "é¡¯ç¤ºé?¢æ?¿ç??ä¸»é?¸å?®"
+#: ../src/include/all-keybindings.h:192
+msgid "Show the activities overview"
+msgstr "é¡¯ç¤ºæ´»å??æ¦?è¦½"
 
-#: ../src/include/all-keybindings.h:197
-msgid "Show the panel's \"Run Application\" dialog box"
-msgstr "é¡¯ç¤ºé?¢æ?¿ç??ã??å?·è¡?ç¨?å¼?ã??å°?è©±ç??"
+#: ../src/include/all-keybindings.h:195
+msgid "Show the run command prompt"
+msgstr "é¡¯ç¤ºå?·è¡?æ??ä»¤æ??ç¤º"
 
-#: ../src/include/all-keybindings.h:238
+#: ../src/include/all-keybindings.h:236
 msgid "Take a screenshot"
-msgstr "æ?·å??ç?«é?¢å¿«ç?§"
+msgstr "æ?·å??è?¢å¹?æ?ªå??"
 
-#: ../src/include/all-keybindings.h:240
+#: ../src/include/all-keybindings.h:238
 msgid "Take a screenshot of a window"
-msgstr "æ??ä¸?è¦?çª?ç??ç?«é?¢å¿«ç?§"
+msgstr "æ??ä¸?è¦?çª?ç??è?¢å¹?æ?ªå??"
 
-#: ../src/include/all-keybindings.h:242
-msgid "Run a terminal"
+#: ../src/include/all-keybindings.h:240
+msgid "Launch Terminal"
 msgstr "å?·è¡?çµ?ç«¯æ©?"
 
-#: ../src/include/all-keybindings.h:257
+#: ../src/include/all-keybindings.h:255
 msgid "Activate the window menu"
 msgstr "ä½¿ç?¨è¦?çª?é?¸å?®"
 
-#: ../src/include/all-keybindings.h:260
+#: ../src/include/all-keybindings.h:258
 msgid "Toggle fullscreen mode"
 msgstr "å??æ??å?¨è?¢å¹?æ¨¡å¼?"
 
-#: ../src/include/all-keybindings.h:262
+#: ../src/include/all-keybindings.h:260
 msgid "Toggle maximization state"
 msgstr "å??æ??æ??å¤§å??ç??æ??"
 
-#: ../src/include/all-keybindings.h:264
-msgid "Toggle whether a window will always be visible over other windows"
-msgstr "å??æ??æ??å??è¦?çª?æ?¯å?¦æ°¸é? å?¯ä»¥é?®è?½å?¶ä»?è¦?çª?"
+#: ../src/include/all-keybindings.h:262
+msgid "Toggle window always appearing on top"
+msgstr "å??æ??è®?è¦?çª?ä¿?æ??å?¨æ??ä¸?å±¤"
 
-#: ../src/include/all-keybindings.h:266
+#: ../src/include/all-keybindings.h:264
 msgid "Maximize window"
 msgstr "è¦?çª?æ??å¤§å??"
 
-#: ../src/include/all-keybindings.h:268
+#: ../src/include/all-keybindings.h:266
 msgid "Restore window"
 msgstr "é??å??è¦?çª?"
 
-#: ../src/include/all-keybindings.h:270
+#: ../src/include/all-keybindings.h:268
 msgid "Toggle shaded state"
 msgstr "å??æ??è¦?çª?æ?²èµ·/æ?¾ä¸?ç??æ??"
 
-#: ../src/include/all-keybindings.h:272
+#: ../src/include/all-keybindings.h:270
 msgid "Minimize window"
 msgstr "è¦?çª?æ??å°?å??"
 
-#: ../src/include/all-keybindings.h:274
+#: ../src/include/all-keybindings.h:272
 msgid "Close window"
 msgstr "é??é??è¦?çª?"
 
-#: ../src/include/all-keybindings.h:276
+#: ../src/include/all-keybindings.h:274
 msgid "Move window"
 msgstr "ç§»å??è¦?çª?"
 
-#: ../src/include/all-keybindings.h:278
+#: ../src/include/all-keybindings.h:276
 msgid "Resize window"
 msgstr "èª¿æ?´è¦?çª?å¤§å°?"
 
-#: ../src/include/all-keybindings.h:281
-msgid "Toggle whether window is on all workspaces or just one"
-msgstr "å??æ??è¦?çª?æ?¯å?¦å?¨æ??æ??å·¥ä½?å??é¡¯ç¤ºæ??æ?¯å?ªé¡¯ç¤ºæ?¼å?¶ä¸ä¹?ä¸?"
+#: ../src/include/all-keybindings.h:279
+msgid "Toggle window on all workspaces or one"
+msgstr "å??æ??è¦?çª?é¡¯ç¤ºå?¨æ??æ??å·¥ä½?å??æ??æ?¯å?ªé¡¯ç¤ºæ?¼å?¶ä¸ä¹?ä¸?"
 
-#: ../src/include/all-keybindings.h:285
+#: ../src/include/all-keybindings.h:283
 msgid "Move window to workspace 1"
 msgstr "å°?è¦?çª?ç§»è?³ç¬¬ 1 å??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:288
+#: ../src/include/all-keybindings.h:286
 msgid "Move window to workspace 2"
 msgstr "å°?è¦?çª?ç§»è?³ç¬¬ 2 å??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:291
+#: ../src/include/all-keybindings.h:289
 msgid "Move window to workspace 3"
 msgstr "å°?è¦?çª?ç§»è?³ç¬¬ 3 å??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:294
+#: ../src/include/all-keybindings.h:292
 msgid "Move window to workspace 4"
 msgstr "å°?è¦?çª?ç§»è?³ç¬¬ 4 å??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:297
+#: ../src/include/all-keybindings.h:295
 msgid "Move window to workspace 5"
 msgstr "å°?è¦?çª?ç§»è?³ç¬¬ 5 å??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:300
+#: ../src/include/all-keybindings.h:298
 msgid "Move window to workspace 6"
 msgstr "å°?è¦?çª?ç§»è?³ç¬¬ 6 å??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:303
+#: ../src/include/all-keybindings.h:301
 msgid "Move window to workspace 7"
 msgstr "å°?è¦?çª?ç§»è?³ç¬¬ 7 å??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:306
+#: ../src/include/all-keybindings.h:304
 msgid "Move window to workspace 8"
 msgstr "å°?è¦?çª?ç§»è?³ç¬¬ 8 å??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:309
+#: ../src/include/all-keybindings.h:307
 msgid "Move window to workspace 9"
 msgstr "å°?è¦?çª?ç§»è?³ç¬¬ 9 å??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:312
+#: ../src/include/all-keybindings.h:310
 msgid "Move window to workspace 10"
 msgstr "å°?è¦?çª?ç§»è?³ç¬¬ 10 å??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:315
+#: ../src/include/all-keybindings.h:313
 msgid "Move window to workspace 11"
 msgstr "å°?è¦?çª?ç§»è?³ç¬¬ 11 å??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:318
+#: ../src/include/all-keybindings.h:316
 msgid "Move window to workspace 12"
 msgstr "å°?è¦?çª?ç§»è?³ç¬¬ 12 å??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:330
+#: ../src/include/all-keybindings.h:328
 msgid "Move window one workspace to the left"
 msgstr "å°?è¦?çª?ç§»è?³å·¦æ?¹ç??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:333
+#: ../src/include/all-keybindings.h:331
 msgid "Move window one workspace to the right"
 msgstr "å°?è¦?çª?ç§»è?³å?³æ?¹ç??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:336
+#: ../src/include/all-keybindings.h:334
 msgid "Move window one workspace up"
 msgstr "å°?è¦?çª?ç§»è?³ä¸?æ?¹ç??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:339
+#: ../src/include/all-keybindings.h:337
 msgid "Move window one workspace down"
 msgstr "å°?è¦?çª?ç§»è?³ä¸?æ?¹ç??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:342
-msgid "Raise window if it's covered by another window, otherwise lower it"
-msgstr "è?¥è¦?çª?è¢«å?¶ä»?è¦?çª?é?®è?½å°±æ?¬å??å®?ï¼?å?¦å??å°?å®?é??ä¸?"
+#: ../src/include/all-keybindings.h:340
+msgid "Raise window if covered, otherwise lower it"
+msgstr "è?¥è¢«å?¶ä»?è¦?çª?é?®è?½å°±æ?¬å??å®?ï¼?å?¦å??å°?å®?é??ä¸?"
 
-#: ../src/include/all-keybindings.h:344
+#: ../src/include/all-keybindings.h:342
 msgid "Raise window above other windows"
 msgstr "ä»¤æ??å??è¦?çª?è¦?è??å?¶å®?è¦?çª?"
 
-#: ../src/include/all-keybindings.h:346
+#: ../src/include/all-keybindings.h:344
 msgid "Lower window below other windows"
 msgstr "é?®è?½æ??å??è¦?çª?"
 
-#: ../src/include/all-keybindings.h:350
+#: ../src/include/all-keybindings.h:348
 msgid "Maximize window vertically"
 msgstr "å°?è¦?çª?ç¸±å??æ??å¤§å??"
 
-#: ../src/include/all-keybindings.h:354
+#: ../src/include/all-keybindings.h:352
 msgid "Maximize window horizontally"
 msgstr "å°?è¦?çª?æ©«å??æ??å¤§å??"
 
-#: ../src/include/all-keybindings.h:358
-msgid "Move window to north-west (top left) corner"
-msgstr "å°?è¦?çª?ç§»è?³å??-è¥¿(å·¦ä¸?)è§?"
+#: ../src/include/all-keybindings.h:356
+msgid "Move window to top left corner"
+msgstr "å°?è¦?çª?ç§»è?³å·¦ä¸?è§?"
 
-#: ../src/include/all-keybindings.h:361
-msgid "Move window to north-east (top right) corner"
-msgstr "å°?è¦?çª?ç§»è?³å??-æ?±(å?³ä¸?)è§?"
+#: ../src/include/all-keybindings.h:359
+msgid "Move window to top right corner"
+msgstr "å°?è¦?çª?ç§»è?³å?³ä¸?è§?"
 
-#: ../src/include/all-keybindings.h:364
-msgid "Move window to south-west (bottom left) corner"
-msgstr "å°?è¦?çª?ç§»è?³å??-è¥¿(å·¦ä¸?)è§?"
+#: ../src/include/all-keybindings.h:362
+msgid "Move window to bottom left corner"
+msgstr "å°?è¦?çª?ç§»è?³å·¦ä¸?è§?"
 
-#: ../src/include/all-keybindings.h:367
-msgid "Move window to south-east (bottom right) corner"
-msgstr "å°?è¦?çª?ç§»è?³å??-æ?±(å?³ä¸?)è§?"
+#: ../src/include/all-keybindings.h:365
+msgid "Move window to bottom right corner"
+msgstr "å°?è¦?çª?ç§»è?³å?³ä¸?è§?"
 
-#: ../src/include/all-keybindings.h:371
-msgid "Move window to north (top) side of screen"
-msgstr "å°?è¦?çª?ç§»è?³ç?«é?¢ç??å??(ä¸?)æ?¹"
+#: ../src/include/all-keybindings.h:369
+msgid "Move window to top edge of screen"
+msgstr "å°?è¦?çª?ç§»è?³ç?«é?¢ç??ä¸?æ?¹"
 
-#: ../src/include/all-keybindings.h:374
-msgid "Move window to south (bottom) side of screen"
-msgstr "å°?è¦?çª?ç§»è?³ç?«é?¢ç??å??(ä¸?)æ?¹"
+#: ../src/include/all-keybindings.h:372
+msgid "Move window to bottom edge of screen"
+msgstr "å°?è¦?çª?ç§»è?³ç?«é?¢ç??ä¸?æ?¹"
 
-#: ../src/include/all-keybindings.h:377
-msgid "Move window to east (right) side of screen"
-msgstr "å°?è¦?çª?ç§»è?³ç?«é?¢ç??æ?±(å?³)æ?¹"
+#: ../src/include/all-keybindings.h:375
+msgid "Move window to right side of screen"
+msgstr "å°?è¦?çª?ç§»è?³ç?«é?¢ç??å?³æ?¹"
 
-#: ../src/include/all-keybindings.h:380
-msgid "Move window to west (left) side of screen"
-msgstr "å°?è¦?çª?ç§»è?³ç?«é?¢ç??è¥¿(å·¦)æ?¹"
+#: ../src/include/all-keybindings.h:378
+msgid "Move window to left side of screen"
+msgstr "å°?è¦?çª?ç§»è?³ç?«é?¢ç??å·¦æ?¹"
 
-#: ../src/include/all-keybindings.h:383
+#: ../src/include/all-keybindings.h:381
 msgid "Move window to center of screen"
 msgstr "å°?è¦?çª?ç§»å??è?³è?¢å¹?ä¸å¤®"
 
@@ -1052,7 +1066,7 @@ msgstr "å·¥ä½?å??ç??å??ç¨±ã??"
 
 #: ../src/metacity.schemas.in.in.h:39
 msgid "The screenshot command"
-msgstr "æ¡?é?¢ç?«é?¢å¿«ç?§æ??ä»¤"
+msgstr "æ¡?é?¢è?¢å¹?æ?ªå??æ??ä»¤"
 
 #: ../src/metacity.schemas.in.in.h:40
 msgid ""
@@ -1081,7 +1095,7 @@ msgstr ""
 
 #: ../src/metacity.schemas.in.in.h:43
 msgid "The window screenshot command"
-msgstr "è¦?çª?ç?«é?¢å¿«ç?§æ??ä»¤"
+msgstr "è¦?çª?è?¢å¹?æ?ªå??æ??ä»¤"
 
 #: ../src/metacity.schemas.in.in.h:44
 msgid ""
@@ -1163,48 +1177,48 @@ msgstr "è¦?çª?æ¨?é¡?å??å?å??"
 msgid "Usage: %s\n"
 msgstr "ç?¨æ³?ï¼?%s\n"
 
-#: ../src/ui/frames.c:1118
+#: ../src/ui/frames.c:1120
 msgid "Close Window"
 msgstr "é??é??è¦?çª?"
 
-#: ../src/ui/frames.c:1121
+#: ../src/ui/frames.c:1123
 msgid "Window Menu"
 msgstr "è¦?çª?é?¸å?®"
 
-#: ../src/ui/frames.c:1124
+#: ../src/ui/frames.c:1126
 msgid "Minimize Window"
 msgstr "è¦?çª?æ??å°?å??"
 
-#: ../src/ui/frames.c:1127
+#: ../src/ui/frames.c:1129
 msgid "Maximize Window"
 msgstr "è¦?çª?æ??å¤§å??"
 
-#: ../src/ui/frames.c:1130
+#: ../src/ui/frames.c:1132
 msgid "Restore Window"
 msgstr "é??å??è¦?çª?"
 
-#: ../src/ui/frames.c:1133
+#: ../src/ui/frames.c:1135
 msgid "Roll Up Window"
 msgstr "æ?²èµ·è¦?çª?(_U)"
 
-#: ../src/ui/frames.c:1136
+#: ../src/ui/frames.c:1138
 msgid "Unroll Window"
 msgstr "æ?¾ä¸?è¦?çª?"
 
-#: ../src/ui/frames.c:1139
+#: ../src/ui/frames.c:1141
 msgid "Keep Window On Top"
 msgstr "è¦?çª?ä¿?ç??å?¨æ??ä¸?å±¤"
 
-#: ../src/ui/frames.c:1142
+#: ../src/ui/frames.c:1144
 msgid "Remove Window From Top"
 msgstr "è¦?çª?ç§»é?¢æ??ä¸?å±¤"
 
 # (Abel) take care of the same string in libwnck
-#: ../src/ui/frames.c:1145
+#: ../src/ui/frames.c:1147
 msgid "Always On Visible Workspace"
 msgstr "å?¨æ??æ??å·¥ä½?å??é¡¯ç¤º"
 
-#: ../src/ui/frames.c:1148
+#: ../src/ui/frames.c:1150
 msgid "Put Window On Only One Workspace"
 msgstr "è¦?çª?å?ªç½®æ?¼ä¸?å??å·¥ä½?å??"
 
@@ -1459,204 +1473,204 @@ msgstr "æ??é??ç??é?·å¯¬æ¯? %g ä¸?å??ç??"
 msgid "Frame geometry does not specify size of buttons"
 msgstr "é??æ¡?ç??ä½?ç½®å¤§å°?è¦?æ ¼å?§æ?ªæ??æ??å®?æ??é??ç??å¤§å°?"
 
-#: ../src/ui/theme.c:1021
+#: ../src/ui/theme.c:1058
 #, c-format
 msgid "Gradients should have at least two colors"
 msgstr "æ¼¸è®?è?²è?³å°?æ??è©²æ??å?©ç¨®é¡?è?²"
 
-#: ../src/ui/theme.c:1147
+#: ../src/ui/theme.c:1184
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
 "where NORMAL is the state; could not parse \"%s\""
 msgstr "GTK è?²å½©è¦?æ ¼è¦?å®?å¿?é ?å?¨ç??æ??å¤?å? ä¸?æ?¹æ?¬è??ï¼?ä¾?å¦? gtk:fg[NORMAL]ï¼?é??è£? NORMAL è¡¨ç¤ºç??æ??ï¼?ç?¡æ³?å??æ??â??%sâ??"
 
-#: ../src/ui/theme.c:1161
+#: ../src/ui/theme.c:1198
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
 "fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
 msgstr "GTK è?²å½©è¦?æ ¼è¦?å®?å¿?é ?å?¨ç??æ??å¾?å? ä¸?é??æ?¹æ?¬è??ï¼?ä¾?å¦? gtk:fg[NORMAL]ï¼?é??è£? NORMAL è¡¨ç¤ºç??æ??ï¼?ç?¡æ³?å??æ??â??%sâ??"
 
-#: ../src/ui/theme.c:1172
+#: ../src/ui/theme.c:1209
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "ç?¡æ³?å°?â??%sâ??ç??è§£ç?ºè?²å½©è¦?æ ¼ä¸ç??ç??æ??"
 
-#: ../src/ui/theme.c:1185
+#: ../src/ui/theme.c:1222
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "ç?¡æ³?å°?â??%sâ??ç??è§£ç?ºè?²å½©è¦?æ ¼ä¸ç??è?²å½©é?¨å??"
 
-#: ../src/ui/theme.c:1215
+#: ../src/ui/theme.c:1252
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
 "format"
 msgstr "æ??å®?æ··è?²ç??æ ¼å¼?æ?¯â??blend/è??æ?¯é¡?è?²/å??æ?¯é¡?è?²/é??æ??åº¦â??ï¼?â??%sâ??ä¸?ç¬¦å??è¦?æ ¼"
 
-#: ../src/ui/theme.c:1226
+#: ../src/ui/theme.c:1263
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "ç?¡æ³?ç??è§£â??%sâ??ä½?ç?ºæ··è?²ç??é??æ??åº¦æ?¸å?¼"
 
-#: ../src/ui/theme.c:1236
+#: ../src/ui/theme.c:1273
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr "æ··è?²ç??é??æ??åº¦æ?¸å?¼â??%sâ??ä¸?æ?¯å?¨ 0.0 è?³ 1.0 ä¹?é??"
 
-#: ../src/ui/theme.c:1283
+#: ../src/ui/theme.c:1320
 #, c-format
 msgid ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
 msgstr "é?°å½±ç??æ ¼å¼?æ?¯â??shade/å?ºæ?¬é¡?è?²/æ¯?é??â??ï¼?ä½?â??%sâ??ä¸?ç¬¦å??æ ¼å¼?"
 
-#: ../src/ui/theme.c:1294
+#: ../src/ui/theme.c:1331
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr "å?¨é?°å½±é¡?è?²ä¸ç?¡æ³?å°?â??%sâ??ç??è§£ç?ºé?°å½±æ¯?é??"
 
-#: ../src/ui/theme.c:1304
+#: ../src/ui/theme.c:1341
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "å?¨é?°å½±é¡?è?²ä¸é?°å½±æ¯?é??â??%sâ??æ?¯è² æ?¸"
 
-#: ../src/ui/theme.c:1333
+#: ../src/ui/theme.c:1370
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "ç?¡æ³?å??æ??é¡?è?²â??%sâ??"
 
-#: ../src/ui/theme.c:1587
+#: ../src/ui/theme.c:1624
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "åº§æ¨?è¡¨é??å¼?ä¸å?ºç?¾ä¸?å?¯æ?¥å??ç??å?ç¬¦â??%sâ??"
 
-#: ../src/ui/theme.c:1614
+#: ../src/ui/theme.c:1651
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
 "parsed"
 msgstr "åº§æ¨?è¡¨é??å¼?ä¸å?ºç?¾ç?¡æ³?å??æ??ç??æµ®é»?å°?æ?¸â??%sâ??"
 
-#: ../src/ui/theme.c:1628
+#: ../src/ui/theme.c:1665
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr "åº§æ¨?è¡¨é??å¼?ä¸å?ºç?¾ç?¡æ³?å??æ??ç??æ?´æ?¸â??%sâ??"
 
-#: ../src/ui/theme.c:1750
+#: ../src/ui/theme.c:1787
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
 "\"%s\""
 msgstr "å?¨åº§æ¨?è¡¨é??å¼?ä¸ï¼?ä»¥ä¸?æ??å?ç??é??å§?é?¨å??å?«æ??ä¸?æ??ç??é??ç®?ç¬¦ï¼?â??%sâ??"
 
-#: ../src/ui/theme.c:1807
+#: ../src/ui/theme.c:1844
 #, c-format
 msgid "Coordinate expression was empty or not understood"
 msgstr "åº§æ¨?è¡¨é??å¼?æ?¯ç©ºç?½ç??æ??æ?¯ç?¡æ³?å??æ??"
 
-#: ../src/ui/theme.c:1918 ../src/ui/theme.c:1928 ../src/ui/theme.c:1962
+#: ../src/ui/theme.c:1955 ../src/ui/theme.c:1965 ../src/ui/theme.c:1999
 #, c-format
 msgid "Coordinate expression results in division by zero"
 msgstr "åº§æ¨?è¡¨é??å¼?ä¸å?ºç?¾è¢« 0 æ?´é?¤ç??é?¯èª¤"
 
-#: ../src/ui/theme.c:1970
+#: ../src/ui/theme.c:2007
 #, c-format
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr "åº§æ¨?è¡¨é??å¼?ä¸å?ºç?¾å°?æµ®é»?æ?¸ä½¿ç?¨æ?¼é¤?æ?¸é??ç®?ç¬¦ (mod) ç??é?¯èª¤"
 
-#: ../src/ui/theme.c:2026
+#: ../src/ui/theme.c:2063
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr "å?¨åº§æ¨?è¡¨é??å¼?ä¸ï¼?æ??è©²æ??é??ç®?å?ç??å?°æ?¹å?ºç?¾äº?é??ç®?ç¬¦â??%sâ??"
 
-#: ../src/ui/theme.c:2035
+#: ../src/ui/theme.c:2072
 #, c-format
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "å?¨åº§æ¨?è¡¨é??å¼?ä¸ï¼?æ??è©²æ??é??ç®?ç¬¦ç??å?°æ?¹å?ºç?¾äº?é??ç®?å?"
 
-#: ../src/ui/theme.c:2043
+#: ../src/ui/theme.c:2080
 #, c-format
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "çµ?æ??åº§æ¨?è¡¨é??å¼?ç??æ?¯ä¸?å??é??ç®?ç¬¦è??é??é??ç®?å?"
 
-#: ../src/ui/theme.c:2053
+#: ../src/ui/theme.c:2090
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
 "operand in between"
 msgstr "å?¨åº§æ¨?è¡¨é??å¼?ä¸ï¼?é??ç®?ç¬¦â??%câ??ç·?é?¨é??ç®?ç¬¦â??%câ??å?ºç?¾ï¼?ä½?ä¸é??æ²?æ??ä»»ä½?é??ç®?å?"
 
-#: ../src/ui/theme.c:2200 ../src/ui/theme.c:2241
+#: ../src/ui/theme.c:2237 ../src/ui/theme.c:2278
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "åº§æ¨?è¡¨é??å¼?ä¸å?ºç?¾ä¸?æ??ç??è®?æ?¸æ??å¸¸æ?¸â??%sâ??"
 
-#: ../src/ui/theme.c:2295
+#: ../src/ui/theme.c:2332
 #, c-format
 msgid "Coordinate expression parser overflowed its buffer."
 msgstr "åº§æ¨?è¡¨é??å¼?å??æ??å?¨ä»¤ç·©è¡?æº¢ä½?ã??"
 
-#: ../src/ui/theme.c:2324
+#: ../src/ui/theme.c:2361
 #, c-format
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "åº§æ¨?è¡¨é??å¼?ä¸ç??é??æ?¬è??æ²?æ??ç?¸æ??ç??é??æ?¬è??"
 
-#: ../src/ui/theme.c:2388
+#: ../src/ui/theme.c:2425
 #, c-format
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr "åº§æ¨?è¡¨é??å¼?ä¸ç??é??æ?¬è??æ²?æ??ç?¸æ??ç??é??æ?¬è??"
 
-#: ../src/ui/theme.c:2399
+#: ../src/ui/theme.c:2436
 #, c-format
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "åº§æ¨?è¡¨é??å¼?ä¸ä¼¼ä¹?æ²?æ??ä»»ä½?é??ç®?ç¬¦æ??é??ç®?å?"
 
-#: ../src/ui/theme.c:2603 ../src/ui/theme.c:2623 ../src/ui/theme.c:2643
+#: ../src/ui/theme.c:2640 ../src/ui/theme.c:2660 ../src/ui/theme.c:2680
 #, c-format
 msgid "Theme contained an expression that resulted in an error: %s\n"
 msgstr "ä½?æ?¯ä¸»é¡?ä¸å?«æ??å¼?è?´é?¯èª¤ç??è¡¨é??å¼?ï¼?%s\n"
 
-#: ../src/ui/theme.c:4220
+#: ../src/ui/theme.c:4315
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
 "specified for this frame style"
 msgstr "æ¤é??æ¡?æ¬¾å¼?å¿?é ?æ??å®? <button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/>"
 
-#: ../src/ui/theme.c:4728 ../src/ui/theme.c:4753
+#: ../src/ui/theme.c:4827 ../src/ui/theme.c:4852
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr "ç¼ºå°?äº? <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 
-#: ../src/ui/theme.c:4797
+#: ../src/ui/theme.c:4896
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "ç?¡æ³?è¼?å?¥ä½?æ?¯ä¸»é¡?â??%sâ??ï¼?%s\n"
 
-#: ../src/ui/theme.c:4927 ../src/ui/theme.c:4934 ../src/ui/theme.c:4941
-#: ../src/ui/theme.c:4948 ../src/ui/theme.c:4955
+#: ../src/ui/theme.c:5026 ../src/ui/theme.c:5033 ../src/ui/theme.c:5040
+#: ../src/ui/theme.c:5047 ../src/ui/theme.c:5054
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "ä½?æ?¯ä¸»é¡?â??%sâ??æ?ªæ??å®? <%s>"
 
-#: ../src/ui/theme.c:4963
+#: ../src/ui/theme.c:5062
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
 "type=\"%s\" style_set=\"whatever\"/> element"
 msgstr "å?¨ä½?æ?¯ä¸»é¡?â??%2$sâ??ä¸ï¼?è¦?çª?é¡?å??â??%1$sâ??æ²?æ??æ??å®?ä»»ä½?é??æ¡?æ¬¾å¼?ã??è«?å? ä¸? <window type=\"%3$s\" style_set=\"whatever\"/> å??ç´ "
 
-#: ../src/ui/theme.c:5406 ../src/ui/theme.c:5468 ../src/ui/theme.c:5531
+#: ../src/ui/theme.c:5505 ../src/ui/theme.c:5567 ../src/ui/theme.c:5630
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr "è?ªè¡?å®?ç¾©ç??å¸¸æ?¸å¿?é ?ä»¥å¤§å¯«å?æ¯?é??å§?ï¼?ä½?â??%sâ??ä¸?æ?¯"
 
-#: ../src/ui/theme.c:5414 ../src/ui/theme.c:5476 ../src/ui/theme.c:5539
+#: ../src/ui/theme.c:5513 ../src/ui/theme.c:5575 ../src/ui/theme.c:5638
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "å·²å®?ç¾©äº?â??%sâ??å¸¸æ?¸"
@@ -2196,6 +2210,64 @@ msgstr "y ç??æ?¸å?¼æ?¯ %dï¼?%dæ?¯é ?æ??ä¸ç??æ?¸å?¼"
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "å??æ?? %d åº§æ¨?è¡¨ç?¾é??æ?? %g ç§?ï¼?å¹³å?? %g ç§?ï¼?\n"
 
+#~ msgid "Desktop"
+#~ msgstr "æ¡?é?¢"
+
+#~ msgid "Switch to workspace on the left of the current workspace"
+#~ msgstr "å??æ??è?³ç?®å??å·¥ä½?å??ç??å·¦æ?¹å·¥ä½?å??"
+
+#~ msgid "Switch to workspace on the right of the current workspace"
+#~ msgstr "å??æ??è?³ç?®å??å·¥ä½?å??ç??å?³æ?¹å·¥ä½?å??"
+
+#~ msgid "Switch to workspace above the current workspace"
+#~ msgstr "å??æ??è?³ç?®å??å·¥ä½?å??ç??ä¸?æ?¹å·¥ä½?å??"
+
+#~ msgid "Switch to workspace below the current workspace"
+#~ msgstr "å??æ??è?³ç?®å??å·¥ä½?å??ç??ä¸?æ?¹å·¥ä½?å??"
+
+#~ msgid "Move between windows of an application, using a popup window"
+#~ msgstr "å?¨æ??ç?¨ç¨?å¼?ç??è¦?çª?ä¹?é??å??æ??ï¼?ä½¿ç?¨å½?å?ºå¼?è¦?çª?"
+
+#~ msgid ""
+#~ "Move backward between windows of an application, using a popup window"
+#~ msgstr "å?¨æ??ç?¨ç¨?å¼?ç??è¦?çª?ä¹?é??ç?¸å??æ¬¡åº?å??æ??ï¼?ä½¿ç?¨å½?å?ºå¼?è¦?çª?"
+
+#~ msgid "Move between windows, using a popup window"
+#~ msgstr "å?¨è¦?çª?ä¹?é??å??æ??ï¼?ä½¿ç?¨å½?å?ºå¼?è¦?çª?"
+
+#~ msgid "Move backward between windows, using a popup window"
+#~ msgstr "å?¨è¦?çª?ä¹?é??ä»¥ç?¸å??æ¬¡åº?å??æ??ï¼?ä½¿ç?¨å½?å?ºå¼?è¦?çª?"
+
+#~ msgid "Move between panels and the desktop, using a popup window"
+#~ msgstr "å?¨é?¢æ?¿å??æ¡?é?¢ä¹?é??å??æ??ï¼?ä½¿ç?¨å½?å?ºå¼?è¦?çª?"
+
+#~ msgid "Move backward between panels and the desktop, using a popup window"
+#~ msgstr "å?¨é?¢æ?¿å??æ¡?é?¢ä¹?é??ä»¥ç?¸å??æ¬¡åº?å??æ??ï¼?ä½¿ç?¨å½?å?ºå¼?è¦?çª?"
+
+#~ msgid "Move backward between windows of an application immediately"
+#~ msgstr "ç«?å?³å?¨æ??ç?¨ç¨?å¼?ç??è¦?çª?ä¹?é??ç?¸å??æ¬¡åº?å??æ??"
+
+#~ msgid "Move between windows immediately"
+#~ msgstr "å°?è¼¸å?¥ç?¦é»?å?¨å??è¦?çª?ä¹?é??å??æ??ï¼?ç«?å?³æ¨¡å¼?ï¼?"
+
+#~ msgid "Move backward between windows immediately"
+#~ msgstr "ç«?å?³å?¨è¦?çª?ä¹?é??ç?¸å??æ¬¡åº?å??æ??"
+
+#~ msgid "Move between panels and the desktop immediately"
+#~ msgstr "å°?è¼¸å?¥ç?¦é»?å?¨é?¢æ?¿å??æ¡?é?¢ä¹?é??å??æ??ï¼?ç«?å?³æ¨¡å¼?ï¼?"
+
+#~ msgid "Move backward between panels and the desktop immediately"
+#~ msgstr "å°?è¼¸å?¥ç?¦é»?å?¨é?¢æ?¿å??æ¡?é?¢ä¹?é??ä»¥ç?¸å??æ¬¡åº?å??æ??ï¼?ç«?å?³æ¨¡å¼?ï¼?"
+
+#~ msgid "Show the panel's \"Run Application\" dialog box"
+#~ msgstr "é¡¯ç¤ºé?¢æ?¿ç??ã??å?·è¡?ç¨?å¼?ã??å°?è©±ç??"
+
+#~ msgid "Toggle whether a window will always be visible over other windows"
+#~ msgstr "å??æ??æ??å??è¦?çª?æ?¯å?¦æ°¸é? å?¯ä»¥é?®è?½å?¶ä»?è¦?çª?"
+
+#~ msgid "Move window to north (top) side of screen"
+#~ msgstr "å°?è¦?çª?ç§»è?³ç?«é?¢ç??å??(ä¸?)æ?¹"
+
 #~ msgid "Window Management"
 #~ msgstr "è¦?çª?ç®¡ç??å?¡"
 
@@ -3091,7 +3163,7 @@ msgstr "å??æ?? %d åº§æ¨?è¡¨ç?¾é??æ?? %g ç§?ï¼?å¹³å?? %g ç§?ï¼?\n"
 #~ "\"&lt;Ctrl&gt;\". If you set the option to the special string \"disabled"
 #~ "\", then there will be no keybinding for this action."
 #~ msgstr ""
-#~ "æ?¬æ??é?µçµ?å??å?¯ä»¥å??å??ç?«é?¢å¿«ç?§å?¬ç?¨ç¨?å¼?ï¼?æ?·å??æ??è¦?çª?ç??ç?«é?¢ã??æ ¼å¼?å?¯ä»¥å??â??&lt;"
+#~ "æ?¬æ??é?µçµ?å??å?¯ä»¥å??å??è?¢å¹?æ?ªå??å?¬ç?¨ç¨?å¼?ï¼?æ?·å??æ??è¦?çª?ç??ç?«é?¢ã??æ ¼å¼?å?¯ä»¥å??â??&lt;"
 #~ "Control&gt;aâ??æ??æ?¯â??&lt;Shift&gt;&lt;Alt&gt;F1â??ã??å??æ??æ??é?µçµ?å??å?ä¸²æ??æ?¯æ¯?è¼?å¯¬"
 #~ "é¬?ç??ï¼?å??è¨±ä½¿ç?¨å¤§å¯«æ??å°?å¯«ï¼?ä¹?å??è¨±ä½¿ç?¨å??â??&lt;Ctl&gt;â??å??â??&lt;Ctrl&gt;â??ç?ç??ç¸®"
 #~ "å¯«ã??å¦?æ??å°?æ¤é?¸é ?è¨å®?ç?ºå?ä¸²â??disabledâ??ï¼?å??ä¸?æ??ç?ºè©²é ?æ??ä½?å®?æ??ä»»ä½?æ??é?µçµ?å??ã??"
@@ -3104,7 +3176,7 @@ msgstr "å??æ?? %d åº§æ¨?è¡¨ç?¾é??æ?? %g ç§?ï¼?å¹³å?? %g ç§?ï¼?\n"
 #~ "the option to the special string \"disabled\", then there will be no "
 #~ "keybinding for this action."
 #~ msgstr ""
-#~ "æ?¬æ??é?µçµ?å??å?¯ä»¥å??å??ç?«é?¢å¿«ç?§å?¬ç?¨ç¨?å¼?ã??æ ¼å¼?å?¯ä»¥å??â??&lt;Control&gt;aâ??æ??æ?¯â??&lt;"
+#~ "æ?¬æ??é?µçµ?å??å?¯ä»¥å??å??è?¢å¹?æ?ªå??å?¬ç?¨ç¨?å¼?ã??æ ¼å¼?å?¯ä»¥å??â??&lt;Control&gt;aâ??æ??æ?¯â??&lt;"
 #~ "Shift&gt;&lt;Alt&gt;F1â??ã??å??æ??æ??é?µçµ?å??å?ä¸²æ??æ?¯æ¯?è¼?å¯¬é¬?ç??ï¼?å??è¨±ä½¿ç?¨å¤§å¯«æ??å°?"
 #~ "å¯«ï¼?ä¹?å??è¨±ä½¿ç?¨å??â??&lt;Ctl&gt;â??å??â??&lt;Ctrl&gt;â??ç?ç??ç¸®å¯«ã??å¦?æ??å°?æ¤é?¸é ?è¨å®?ç?º"
 #~ "å?ä¸²â??disabledâ??ï¼?å??ä¸?æ??ç?ºè©²é ?æ??ä½?å®?æ??ä»»ä½?æ??é?µçµ?å??ã??"
@@ -3295,9 +3367,6 @@ msgstr "å??æ?? %d åº§æ¨?è¡¨ç?¾é??æ?? %g ç§?ï¼?å¹³å?? %g ç§?ï¼?\n"
 #~ "ç?¨å¤§å¯«æ??å°?å¯«ï¼?ä¹?å??è¨±ä½¿ç?¨å??â??&lt;Ctl&gt;â??å??â??&lt;Ctrl&gt;â??ç?ç??ç¸®å¯«ã??å¦?æ??å°?æ¤"
 #~ "é?¸é ?è¨å®?ç?ºå?ä¸²â??disabledâ??ï¼?å??ä¸?æ??ç?ºè©²é ?æ??ä½?å®?æ??ä»»ä½?æ??é?µçµ?å??ã??"
 
-#~ msgid "Toggle always on top state"
-#~ msgstr "å??æ??æ?¯å?¦å?¨ã??æ??ä¸?å±¤ã??é¡¯ç¤º"
-
 #~ msgid "Unmaximize window"
 #~ msgstr "è¦?çª?å¾?æ??å¤§å??é??å??"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index fc0b7ab..2be5a0d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity 2.30.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 22:36+0800\n"
-"PO-Revision-Date: 2010-10-16 12:00+0800\n"
-"Last-Translator: Wei-Lun Chao <chaoweilun gmail com>\n"
+"POT-Creation-Date: 2011-02-11 19:07+0800\n"
+"PO-Revision-Date: 2011-02-10 07:35+0800\n"
+"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n lists linux org tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -19,15 +19,25 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../src/50-metacity-desktop-key.xml.in.h:1
-msgid "Desktop"
-msgstr "æ¡?é?¢"
+#: ../src/50-metacity-launchers.xml.in.h:1
+msgid "Launchers"
+msgstr "å?·è¡?å?¨"
 
-#: ../src/50-metacity-key.xml.in.h:1
-#, fuzzy
-#| msgid "/_Windows"
+#: ../src/50-metacity-navigation.xml.in.h:1
+msgid "Navigation"
+msgstr "å°?è?ª"
+
+#: ../src/50-metacity-screenshot.xml.in.h:1
+msgid "Screenshots"
+msgstr "è?¢å¹?æ?ªå??"
+
+#: ../src/50-metacity-system.xml.in.h:1
+msgid "System"
+msgstr "ç³»çµ±"
+
+#: ../src/50-metacity-windows.xml.in.h:1
 msgid "Windows"
-msgstr "/è¦?çª?(_W)"
+msgstr "è¦?çª?"
 
 #: ../src/core/bell.c:299
 msgid "Bell event"
@@ -333,54 +343,54 @@ msgstr ""
 "é??å??æ??é?µçµ?å??å?¯æ??ä¸?ã??shiftã??æ??é?µè®?å®?å??è½?ï¼?å? æ¤ï¼?ã??shiftã??ä¸?è?½æ??ç?ºå®?æ??ä½¿ç?¨ç??æ??"
 "é?µä¹?ä¸?ã??"
 
-#: ../src/core/session.c:850 ../src/core/session.c:857
+#: ../src/core/session.c:842 ../src/core/session.c:849
 #, c-format
 msgid "Could not create directory '%s': %s\n"
 msgstr "ç?¡æ³?å»ºç«?ç?®é??â??%sâ??ï¼?%s\n"
 
-#: ../src/core/session.c:867
+#: ../src/core/session.c:859
 #, c-format
 msgid "Could not open session file '%s' for writing: %s\n"
 msgstr "ç?¡æ³?é??å??ä½?æ¥é??æ®µæª?æ¡?â??%sâ??ä»¥ä¾?å¯«å?¥è³?æ??ï¼?%s\n"
 
-#: ../src/core/session.c:1008
+#: ../src/core/session.c:1000
 #, c-format
 msgid "Error writing session file '%s': %s\n"
 msgstr "ç?¡æ³?å¯«å?¥ä½?æ¥é??æ®µæª?æ¡?â??%sâ??ï¼?%s\n"
 
-#: ../src/core/session.c:1013
+#: ../src/core/session.c:1005
 #, c-format
 msgid "Error closing session file '%s': %s\n"
 msgstr "ç?¡æ³?é??é??ä½?æ¥é??æ®µæª?æ¡?â??%sâ??ï¼?%s\n"
 
-#: ../src/core/session.c:1143
+#: ../src/core/session.c:1135
 #, c-format
 msgid "Failed to parse saved session file: %s\n"
 msgstr "ç?¡æ³?å??æ??å·²å?²å?ç??ä½?æ¥é??æ®µæª?æ¡?ï¼?%s\n"
 
-#: ../src/core/session.c:1192
+#: ../src/core/session.c:1184
 #, c-format
 msgid "<metacity_session> attribute seen but we already have the session ID"
 msgstr "å?ºç?¾äº? <metacity_session> ç??å±¬æ?§ï¼?ä½?ä½?æ¥é??æ®µä»£ç¢¼å·²ç¶?å?å?¨"
 
-#: ../src/core/session.c:1205 ../src/core/session.c:1280
-#: ../src/core/session.c:1312 ../src/core/session.c:1384
-#: ../src/core/session.c:1444
+#: ../src/core/session.c:1197 ../src/core/session.c:1272
+#: ../src/core/session.c:1304 ../src/core/session.c:1376
+#: ../src/core/session.c:1436
 #, c-format
 msgid "Unknown attribute %s on <%s> element"
 msgstr "<%2$s> å??ç´ ä¸å?ºç?¾ä¸?æ??ç??å±¬æ?§ %1$s"
 
-#: ../src/core/session.c:1222
+#: ../src/core/session.c:1214
 #, c-format
 msgid "nested <window> tag"
 msgstr "é??ç??ç?? <window> å??å??"
 
-#: ../src/core/session.c:1464
+#: ../src/core/session.c:1456
 #, c-format
 msgid "Unknown element %s"
 msgstr "ä¸?æ??ç??å??ç´  %s"
 
-#: ../src/core/session.c:1816
+#: ../src/core/session.c:1808
 msgid ""
 "These windows do not support &quot;save current setup&quot; and will have to "
 "be restarted manually next time you log in."
@@ -430,7 +440,7 @@ msgid "Metacity"
 msgstr "Metacity"
 
 #. first time through
-#: ../src/core/window.c:5703
+#: ../src/core/window.c:5704
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -446,7 +456,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:6268
+#: ../src/core/window.c:6269
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
@@ -565,259 +575,263 @@ msgstr "å??æ??è?³ç¬¬ 11 å??å·¥ä½?å??"
 msgid "Switch to workspace 12"
 msgstr "å??æ??è?³ç¬¬ 12 å??å·¥ä½?å??"
 
+# (Abel) take care of the same string in libwnck
 #: ../src/include/all-keybindings.h:122
-msgid "Switch to workspace on the left of the current workspace"
-msgstr "å??æ??è?³ç?®å??å·¥ä½?å??ç??å·¦æ?¹å·¥ä½?å??"
+msgid "Move to workspace left"
+msgstr "ç§»è?³å·¦æ?¹ç??å·¥ä½?å??"
 
+# (Abel) take care of the same string in libwnck
 #: ../src/include/all-keybindings.h:126
-msgid "Switch to workspace on the right of the current workspace"
-msgstr "å??æ??è?³ç?®å??å·¥ä½?å??ç??å?³æ?¹å·¥ä½?å??"
+msgid "Move to workspace right"
+msgstr "ç§»è?³å?³æ?¹ç??å·¥ä½?å??"
 
+# (Abel) take care of the same string in libwnck
 #: ../src/include/all-keybindings.h:130
-msgid "Switch to workspace above the current workspace"
-msgstr "å??æ??è?³ç?®å??å·¥ä½?å??ç??ä¸?æ?¹å·¥ä½?å??"
+msgid "Move to workspace above"
+msgstr "ç§»è?³ä¸?æ?¹ç??å·¥ä½?å??"
 
+# (Abel) take care of the same string in libwnck
 #: ../src/include/all-keybindings.h:134
-msgid "Switch to workspace below the current workspace"
-msgstr "å??æ??è?³ç?®å??å·¥ä½?å??ç??ä¸?æ?¹å·¥ä½?å??"
+msgid "Move to workspace below"
+msgstr "ç§»è?³ä¸?æ?¹ç??å·¥ä½?å??"
 
 #: ../src/include/all-keybindings.h:150
-msgid "Move between windows of an application, using a popup window"
-msgstr "å?¨æ??ç?¨ç¨?å¼?ç??è¦?çª?ä¹?é??å??æ??ï¼?ä½¿ç?¨å½?å?ºå¼?è¦?çª?"
+msgid "Switch windows of an application"
+msgstr "å??æ??ç¨?å¼?ç??è¦?çª?"
 
 #: ../src/include/all-keybindings.h:153
-msgid "Move backward between windows of an application, using a popup window"
-msgstr "å?¨æ??ç?¨ç¨?å¼?ç??è¦?çª?ä¹?é??ç?¸å??æ¬¡åº?å??æ??ï¼?ä½¿ç?¨å½?å?ºå¼?è¦?çª?"
+msgid "Reverse switch windows of an application"
+msgstr "å??å??å??æ??ç¨?å¼?ç??è¦?çª?"
 
-#: ../src/include/all-keybindings.h:157
-msgid "Move between windows, using a popup window"
-msgstr "å?¨è¦?çª?ä¹?é??å??æ??ï¼?ä½¿ç?¨å½?å?ºå¼?è¦?çª?"
+#: ../src/include/all-keybindings.h:156
+msgid "Switch applications"
+msgstr "å??æ??ç¨?å¼?"
 
-#: ../src/include/all-keybindings.h:160
-msgid "Move backward between windows, using a popup window"
-msgstr "å?¨è¦?çª?ä¹?é??ä»¥ç?¸å??æ¬¡åº?å??æ??ï¼?ä½¿ç?¨å½?å?ºå¼?è¦?çª?"
+#: ../src/include/all-keybindings.h:159
+msgid "Reverse switch applications"
+msgstr "å??å??å??æ??ç¨?å¼?"
 
-#: ../src/include/all-keybindings.h:163
-msgid "Move between panels and the desktop, using a popup window"
-msgstr "å?¨é?¢æ?¿å??æ¡?é?¢ä¹?é??å??æ??ï¼?ä½¿ç?¨å½?å?ºå¼?è¦?çª?"
+#: ../src/include/all-keybindings.h:162
+msgid "Switch system controls"
+msgstr "å??æ??ç³»çµ±æ?§å?¶"
 
-#: ../src/include/all-keybindings.h:166
-msgid "Move backward between panels and the desktop, using a popup window"
-msgstr "å?¨é?¢æ?¿å??æ¡?é?¢ä¹?é??ä»¥ç?¸å??æ¬¡åº?å??æ??ï¼?ä½¿ç?¨å½?å?ºå¼?è¦?çª?"
+#: ../src/include/all-keybindings.h:165
+msgid "Reverse switch system controls"
+msgstr "å??å??å??æ??ç³»çµ±æ?§å?¶"
 
-#: ../src/include/all-keybindings.h:171
-msgid "Move between windows of an application immediately"
-msgstr "å?¨è¦?çª?å??ç¨?å¼?ä¹?é??å??æ??ï¼?ç«?å?³æ¨¡å¼?ï¼?"
+#: ../src/include/all-keybindings.h:169
+msgid "Switch windows of an app directly"
+msgstr "ç?´æ?¥å??æ??ç¨?å¼?ç??è¦?çª?"
 
-#: ../src/include/all-keybindings.h:174
-msgid "Move backward between windows of an application immediately"
-msgstr "ç«?å?³å?¨æ??ç?¨ç¨?å¼?ç??è¦?çª?ä¹?é??ç?¸å??æ¬¡åº?å??æ??"
+#: ../src/include/all-keybindings.h:172
+msgid "Reverse switch windows of an app directly"
+msgstr "ç?´æ?¥å??å??å??æ??ç¨?å¼?ç??è¦?çª?"
 
-#: ../src/include/all-keybindings.h:177
-msgid "Move between windows immediately"
-msgstr "å°?è¼¸å?¥ç?¦é»?å?¨å??è¦?çª?ä¹?é??å??æ??ï¼?ç«?å?³æ¨¡å¼?ï¼?"
+#: ../src/include/all-keybindings.h:175
+msgid "Switch windows directly"
+msgstr "ç?´æ?¥å??æ??è¦?çª?"
 
-#: ../src/include/all-keybindings.h:180
-msgid "Move backward between windows immediately"
-msgstr "ç«?å?³å?¨è¦?çª?ä¹?é??ç?¸å??æ¬¡åº?å??æ??"
+#: ../src/include/all-keybindings.h:178
+msgid "Reverse switch windows directly"
+msgstr "ç?´æ?¥å??å??å??æ??è¦?çª?"
 
-#: ../src/include/all-keybindings.h:183
-msgid "Move between panels and the desktop immediately"
-msgstr "å°?è¼¸å?¥ç?¦é»?å?¨é?¢æ?¿å??æ¡?é?¢ä¹?é??å??æ??ï¼?ç«?å?³æ¨¡å¼?ï¼?"
+#: ../src/include/all-keybindings.h:181
+msgid "Switch system controls directly"
+msgstr "ç?´æ?¥å??æ??ç³»çµ±æ?§å?¶"
 
-#: ../src/include/all-keybindings.h:186
-msgid "Move backward between panels and the desktop immediately"
-msgstr "å°?è¼¸å?¥ç?¦é»?å?¨é?¢æ?¿å??æ¡?é?¢ä¹?é??ä»¥ç?¸å??æ¬¡åº?å??æ??ï¼?ç«?å?³æ¨¡å¼?ï¼?"
+#: ../src/include/all-keybindings.h:184
+msgid "Reverse switch system controls directly"
+msgstr "ç?´æ?¥å??å??å??æ??ç³»çµ±æ?§å?¶"
 
-#: ../src/include/all-keybindings.h:191
-msgid "Hide all normal windows and set focus to the desktop"
-msgstr "é?±è??æ??æ??ä¸?è?¬è¦?çª?ä¸¦å°?ç?¦é»?è¨è?³æ¡?é?¢"
+#: ../src/include/all-keybindings.h:189
+msgid "Hide all normal windows"
+msgstr "é?±è??æ??æ??ä¸?è?¬è¦?çª?"
 
-#: ../src/include/all-keybindings.h:194
-msgid "Show the panel's main menu"
-msgstr "é¡¯ç¤ºé?¢æ?¿ç??ä¸»é?¸å?®"
+#: ../src/include/all-keybindings.h:192
+msgid "Show the activities overview"
+msgstr "é¡¯ç¤ºæ´»å??æ¦?è¦½"
 
-#: ../src/include/all-keybindings.h:197
-msgid "Show the panel's \"Run Application\" dialog box"
-msgstr "é¡¯ç¤ºé?¢æ?¿ç??ã??å?·è¡?ç¨?å¼?ã??å°?è©±ç??"
+#: ../src/include/all-keybindings.h:195
+msgid "Show the run command prompt"
+msgstr "é¡¯ç¤ºå?·è¡?æ??ä»¤æ??ç¤º"
 
-#: ../src/include/all-keybindings.h:238
+#: ../src/include/all-keybindings.h:236
 msgid "Take a screenshot"
-msgstr "æ?·å??ç?«é?¢å¿«ç?§"
+msgstr "æ?·å??è?¢å¹?æ?ªå??"
 
-#: ../src/include/all-keybindings.h:240
+#: ../src/include/all-keybindings.h:238
 msgid "Take a screenshot of a window"
-msgstr "æ??ä¸?è¦?çª?ç??ç?«é?¢å¿«ç?§"
+msgstr "æ??ä¸?è¦?çª?ç??è?¢å¹?æ?ªå??"
 
-#: ../src/include/all-keybindings.h:242
-msgid "Run a terminal"
+#: ../src/include/all-keybindings.h:240
+msgid "Launch Terminal"
 msgstr "å?·è¡?çµ?ç«¯æ©?"
 
-#: ../src/include/all-keybindings.h:257
+#: ../src/include/all-keybindings.h:255
 msgid "Activate the window menu"
 msgstr "ä½¿ç?¨è¦?çª?é?¸å?®"
 
-#: ../src/include/all-keybindings.h:260
+#: ../src/include/all-keybindings.h:258
 msgid "Toggle fullscreen mode"
 msgstr "å??æ??å?¨è?¢å¹?æ¨¡å¼?"
 
-#: ../src/include/all-keybindings.h:262
+#: ../src/include/all-keybindings.h:260
 msgid "Toggle maximization state"
 msgstr "å??æ??æ??å¤§å??ç??æ??"
 
-#: ../src/include/all-keybindings.h:264
-msgid "Toggle whether a window will always be visible over other windows"
-msgstr "å??æ??æ??å??è¦?çª?æ?¯å?¦æ°¸é? å?¯ä»¥é?®è?½å?¶ä»?è¦?çª?"
+#: ../src/include/all-keybindings.h:262
+msgid "Toggle window always appearing on top"
+msgstr "å??æ??è®?è¦?çª?ä¿?æ??å?¨æ??ä¸?å±¤"
 
-#: ../src/include/all-keybindings.h:266
+#: ../src/include/all-keybindings.h:264
 msgid "Maximize window"
 msgstr "è¦?çª?æ??å¤§å??"
 
-#: ../src/include/all-keybindings.h:268
+#: ../src/include/all-keybindings.h:266
 msgid "Restore window"
 msgstr "é??å??è¦?çª?"
 
-#: ../src/include/all-keybindings.h:270
+#: ../src/include/all-keybindings.h:268
 msgid "Toggle shaded state"
 msgstr "å??æ??è¦?çª?æ?²èµ·/æ?¾ä¸?ç??æ??"
 
-#: ../src/include/all-keybindings.h:272
+#: ../src/include/all-keybindings.h:270
 msgid "Minimize window"
 msgstr "è¦?çª?æ??å°?å??"
 
-#: ../src/include/all-keybindings.h:274
+#: ../src/include/all-keybindings.h:272
 msgid "Close window"
 msgstr "é??é??è¦?çª?"
 
-#: ../src/include/all-keybindings.h:276
+#: ../src/include/all-keybindings.h:274
 msgid "Move window"
 msgstr "ç§»å??è¦?çª?"
 
-#: ../src/include/all-keybindings.h:278
+#: ../src/include/all-keybindings.h:276
 msgid "Resize window"
 msgstr "èª¿æ?´è¦?çª?å¤§å°?"
 
-#: ../src/include/all-keybindings.h:281
-msgid "Toggle whether window is on all workspaces or just one"
-msgstr "å??æ??è¦?çª?æ?¯å?¦å?¨æ??æ??å·¥ä½?å??é¡¯ç¤ºæ??æ?¯å?ªé¡¯ç¤ºæ?¼å?¶ä¸ä¹?ä¸?"
+#: ../src/include/all-keybindings.h:279
+msgid "Toggle window on all workspaces or one"
+msgstr "å??æ??è¦?çª?é¡¯ç¤ºå?¨æ??æ??å·¥ä½?å??æ??æ?¯å?ªé¡¯ç¤ºæ?¼å?¶ä¸ä¹?ä¸?"
 
-#: ../src/include/all-keybindings.h:285
+#: ../src/include/all-keybindings.h:283
 msgid "Move window to workspace 1"
 msgstr "å°?è¦?çª?ç§»è?³ç¬¬ 1 å??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:288
+#: ../src/include/all-keybindings.h:286
 msgid "Move window to workspace 2"
 msgstr "å°?è¦?çª?ç§»è?³ç¬¬ 2 å??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:291
+#: ../src/include/all-keybindings.h:289
 msgid "Move window to workspace 3"
 msgstr "å°?è¦?çª?ç§»è?³ç¬¬ 3 å??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:294
+#: ../src/include/all-keybindings.h:292
 msgid "Move window to workspace 4"
 msgstr "å°?è¦?çª?ç§»è?³ç¬¬ 4 å??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:297
+#: ../src/include/all-keybindings.h:295
 msgid "Move window to workspace 5"
 msgstr "å°?è¦?çª?ç§»è?³ç¬¬ 5 å??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:300
+#: ../src/include/all-keybindings.h:298
 msgid "Move window to workspace 6"
 msgstr "å°?è¦?çª?ç§»è?³ç¬¬ 6 å??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:303
+#: ../src/include/all-keybindings.h:301
 msgid "Move window to workspace 7"
 msgstr "å°?è¦?çª?ç§»è?³ç¬¬ 7 å??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:306
+#: ../src/include/all-keybindings.h:304
 msgid "Move window to workspace 8"
 msgstr "å°?è¦?çª?ç§»è?³ç¬¬ 8 å??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:309
+#: ../src/include/all-keybindings.h:307
 msgid "Move window to workspace 9"
 msgstr "å°?è¦?çª?ç§»è?³ç¬¬ 9 å??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:312
+#: ../src/include/all-keybindings.h:310
 msgid "Move window to workspace 10"
 msgstr "å°?è¦?çª?ç§»è?³ç¬¬ 10 å??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:315
+#: ../src/include/all-keybindings.h:313
 msgid "Move window to workspace 11"
 msgstr "å°?è¦?çª?ç§»è?³ç¬¬ 11 å??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:318
+#: ../src/include/all-keybindings.h:316
 msgid "Move window to workspace 12"
 msgstr "å°?è¦?çª?ç§»è?³ç¬¬ 12 å??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:330
+#: ../src/include/all-keybindings.h:328
 msgid "Move window one workspace to the left"
 msgstr "å°?è¦?çª?ç§»è?³å·¦æ?¹ç??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:333
+#: ../src/include/all-keybindings.h:331
 msgid "Move window one workspace to the right"
 msgstr "å°?è¦?çª?ç§»è?³å?³æ?¹ç??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:336
+#: ../src/include/all-keybindings.h:334
 msgid "Move window one workspace up"
 msgstr "å°?è¦?çª?ç§»è?³ä¸?æ?¹ç??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:339
+#: ../src/include/all-keybindings.h:337
 msgid "Move window one workspace down"
 msgstr "å°?è¦?çª?ç§»è?³ä¸?æ?¹ç??å·¥ä½?å??"
 
-#: ../src/include/all-keybindings.h:342
-msgid "Raise window if it's covered by another window, otherwise lower it"
-msgstr "è?¥è¦?çª?è¢«å?¶ä»?è¦?çª?é?®è?½å°±æ?¬å??å®?ï¼?å?¦å??å°?å®?é??ä¸?"
+#: ../src/include/all-keybindings.h:340
+msgid "Raise window if covered, otherwise lower it"
+msgstr "è?¥è¢«å?¶ä»?è¦?çª?é?®è?½å°±æ?¬å??å®?ï¼?å?¦å??å°?å®?é??ä¸?"
 
-#: ../src/include/all-keybindings.h:344
+#: ../src/include/all-keybindings.h:342
 msgid "Raise window above other windows"
 msgstr "ä»¤æ??å??è¦?çª?è¦?è??å?¶å®?è¦?çª?"
 
-#: ../src/include/all-keybindings.h:346
+#: ../src/include/all-keybindings.h:344
 msgid "Lower window below other windows"
 msgstr "é?®è?½æ??å??è¦?çª?"
 
-#: ../src/include/all-keybindings.h:350
+#: ../src/include/all-keybindings.h:348
 msgid "Maximize window vertically"
 msgstr "å°?è¦?çª?ç¸±å??æ??å¤§å??"
 
-#: ../src/include/all-keybindings.h:354
+#: ../src/include/all-keybindings.h:352
 msgid "Maximize window horizontally"
 msgstr "å°?è¦?çª?æ©«å??æ??å¤§å??"
 
-#: ../src/include/all-keybindings.h:358
-msgid "Move window to north-west (top left) corner"
-msgstr "å°?è¦?çª?ç§»è?³å??-è¥¿(å·¦ä¸?)è§?"
+#: ../src/include/all-keybindings.h:356
+msgid "Move window to top left corner"
+msgstr "å°?è¦?çª?ç§»è?³å·¦ä¸?è§?"
 
-#: ../src/include/all-keybindings.h:361
-msgid "Move window to north-east (top right) corner"
-msgstr "å°?è¦?çª?ç§»è?³å??-æ?±(å?³ä¸?)è§?"
+#: ../src/include/all-keybindings.h:359
+msgid "Move window to top right corner"
+msgstr "å°?è¦?çª?ç§»è?³å?³ä¸?è§?"
 
-#: ../src/include/all-keybindings.h:364
-msgid "Move window to south-west (bottom left) corner"
-msgstr "å°?è¦?çª?ç§»è?³å??-è¥¿(å·¦ä¸?)è§?"
+#: ../src/include/all-keybindings.h:362
+msgid "Move window to bottom left corner"
+msgstr "å°?è¦?çª?ç§»è?³å·¦ä¸?è§?"
 
-#: ../src/include/all-keybindings.h:367
-msgid "Move window to south-east (bottom right) corner"
-msgstr "å°?è¦?çª?ç§»è?³å??-æ?±(å?³ä¸?)è§?"
+#: ../src/include/all-keybindings.h:365
+msgid "Move window to bottom right corner"
+msgstr "å°?è¦?çª?ç§»è?³å?³ä¸?è§?"
 
-#: ../src/include/all-keybindings.h:371
-msgid "Move window to north (top) side of screen"
-msgstr "å°?è¦?çª?ç§»è?³ç?«é?¢ç??å??(ä¸?)æ?¹"
+#: ../src/include/all-keybindings.h:369
+msgid "Move window to top edge of screen"
+msgstr "å°?è¦?çª?ç§»è?³ç?«é?¢ç??ä¸?æ?¹"
 
-#: ../src/include/all-keybindings.h:374
-msgid "Move window to south (bottom) side of screen"
-msgstr "å°?è¦?çª?ç§»è?³ç?«é?¢ç??å??(ä¸?)æ?¹"
+#: ../src/include/all-keybindings.h:372
+msgid "Move window to bottom edge of screen"
+msgstr "å°?è¦?çª?ç§»è?³ç?«é?¢ç??ä¸?æ?¹"
 
-#: ../src/include/all-keybindings.h:377
-msgid "Move window to east (right) side of screen"
-msgstr "å°?è¦?çª?ç§»è?³ç?«é?¢ç??æ?±(å?³)æ?¹"
+#: ../src/include/all-keybindings.h:375
+msgid "Move window to right side of screen"
+msgstr "å°?è¦?çª?ç§»è?³ç?«é?¢ç??å?³æ?¹"
 
-#: ../src/include/all-keybindings.h:380
-msgid "Move window to west (left) side of screen"
-msgstr "å°?è¦?çª?ç§»è?³ç?«é?¢ç??è¥¿(å·¦)æ?¹"
+#: ../src/include/all-keybindings.h:378
+msgid "Move window to left side of screen"
+msgstr "å°?è¦?çª?ç§»è?³ç?«é?¢ç??å·¦æ?¹"
 
-#: ../src/include/all-keybindings.h:383
+#: ../src/include/all-keybindings.h:381
 msgid "Move window to center of screen"
 msgstr "å°?è¦?çª?ç§»å??è?³è?¢å¹?ä¸å¤®"
 
@@ -1123,7 +1137,7 @@ msgstr "å·¥ä½?å??ç??å??ç¨±ã??"
 
 #: ../src/metacity.schemas.in.in.h:39
 msgid "The screenshot command"
-msgstr "æ¡?é?¢ç?«é?¢å¿«ç?§æ??ä»¤"
+msgstr "æ¡?é?¢è?¢å¹?æ?ªå??æ??ä»¤"
 
 #: ../src/metacity.schemas.in.in.h:40
 msgid ""
@@ -1155,7 +1169,7 @@ msgstr ""
 
 #: ../src/metacity.schemas.in.in.h:43
 msgid "The window screenshot command"
-msgstr "è¦?çª?ç?«é?¢å¿«ç?§æ??ä»¤"
+msgstr "è¦?çª?è?¢å¹?æ?ªå??æ??ä»¤"
 
 #: ../src/metacity.schemas.in.in.h:44
 msgid ""
@@ -1260,48 +1274,48 @@ msgstr "è¦?çª?æ¨?é¡?å??å?å??"
 msgid "Usage: %s\n"
 msgstr "ç?¨æ³?ï¼?%s\n"
 
-#: ../src/ui/frames.c:1118
+#: ../src/ui/frames.c:1120
 msgid "Close Window"
 msgstr "é??é??è¦?çª?"
 
-#: ../src/ui/frames.c:1121
+#: ../src/ui/frames.c:1123
 msgid "Window Menu"
 msgstr "è¦?çª?é?¸å?®"
 
-#: ../src/ui/frames.c:1124
+#: ../src/ui/frames.c:1126
 msgid "Minimize Window"
 msgstr "è¦?çª?æ??å°?å??"
 
-#: ../src/ui/frames.c:1127
+#: ../src/ui/frames.c:1129
 msgid "Maximize Window"
 msgstr "è¦?çª?æ??å¤§å??"
 
-#: ../src/ui/frames.c:1130
+#: ../src/ui/frames.c:1132
 msgid "Restore Window"
 msgstr "é??å??è¦?çª?"
 
-#: ../src/ui/frames.c:1133
+#: ../src/ui/frames.c:1135
 msgid "Roll Up Window"
 msgstr "æ?²èµ·è¦?çª?(_U)"
 
-#: ../src/ui/frames.c:1136
+#: ../src/ui/frames.c:1138
 msgid "Unroll Window"
 msgstr "æ?¾ä¸?è¦?çª?"
 
-#: ../src/ui/frames.c:1139
+#: ../src/ui/frames.c:1141
 msgid "Keep Window On Top"
 msgstr "è¦?çª?ä¿?ç??å?¨æ??ä¸?å±¤"
 
-#: ../src/ui/frames.c:1142
+#: ../src/ui/frames.c:1144
 msgid "Remove Window From Top"
 msgstr "è¦?çª?ç§»é?¢æ??ä¸?å±¤"
 
 # (Abel) take care of the same string in libwnck
-#: ../src/ui/frames.c:1145
+#: ../src/ui/frames.c:1147
 msgid "Always On Visible Workspace"
 msgstr "å?¨æ??æ??å·¥ä½?å??é¡¯ç¤º"
 
-#: ../src/ui/frames.c:1148
+#: ../src/ui/frames.c:1150
 msgid "Put Window On Only One Workspace"
 msgstr "è¦?çª?å?ªç½®æ?¼ä¸?å??å·¥ä½?å??"
 
@@ -1556,12 +1570,12 @@ msgstr "æ??é??ç??é?·å¯¬æ¯? %g ä¸?å??ç??"
 msgid "Frame geometry does not specify size of buttons"
 msgstr "é??æ¡?ç??ä½?ç½®å¤§å°?è¦?æ ¼å?§æ?ªæ??æ??å®?æ??é??ç??å¤§å°?"
 
-#: ../src/ui/theme.c:1021
+#: ../src/ui/theme.c:1058
 #, c-format
 msgid "Gradients should have at least two colors"
 msgstr "æ¼¸å±¤è?³å°?æ??è©²æ??å?©ç¨®é¡?è?²"
 
-#: ../src/ui/theme.c:1147
+#: ../src/ui/theme.c:1184
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@@ -1570,7 +1584,7 @@ msgstr ""
 "GTK è?²å½©è¦?æ ¼è¦?å®?å¿?é ?å?¨ç??æ??å¤?å? ä¸?æ?¹æ?¬è??ï¼?ä¾?å¦? gtk:fg[NORMAL]ï¼?é??è£¡ NORMAL è¡¨ç¤º"
 "ç??æ??ï¼?ç?¡æ³?å??æ??â??%sâ??"
 
-#: ../src/ui/theme.c:1161
+#: ../src/ui/theme.c:1198
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@@ -1579,148 +1593,148 @@ msgstr ""
 "GTK è?²å½©è¦?æ ¼è¦?å®?å¿?é ?å?¨ç??æ??å¾?å? ä¸?é??æ?¹æ?¬è??ï¼?ä¾?å¦? gtk:fg[NORMAL]ï¼?é??è£¡ NORMAL è¡¨"
 "ç¤ºç??æ??ï¼?ç?¡æ³?å??æ??â??%sâ??"
 
-#: ../src/ui/theme.c:1172
+#: ../src/ui/theme.c:1209
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "ç?¡æ³?å°?â??%sâ??ç??è§£ç?ºè?²å½©è¦?æ ¼ä¸ç??ç??æ??"
 
-#: ../src/ui/theme.c:1185
+#: ../src/ui/theme.c:1222
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "ç?¡æ³?å°?â??%sâ??ç??è§£ç?ºè?²å½©è¦?æ ¼ä¸ç??è?²å½©é?¨å??"
 
-#: ../src/ui/theme.c:1215
+#: ../src/ui/theme.c:1252
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
 "format"
 msgstr "æ??å®?æ··è?²ç??æ ¼å¼?æ?¯â??blend/è??æ?¯é¡?è?²/å??æ?¯é¡?è?²/é??æ??åº¦â??ï¼?â??%sâ??ä¸?ç¬¦å??è¦?æ ¼"
 
-#: ../src/ui/theme.c:1226
+#: ../src/ui/theme.c:1263
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "ç?¡æ³?ç??è§£â??%sâ??ä½?ç?ºæ··è?²ç??é??æ??åº¦æ?¸å?¼"
 
-#: ../src/ui/theme.c:1236
+#: ../src/ui/theme.c:1273
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr "æ··è?²ç??é??æ??åº¦æ?¸å?¼â??%sâ??ä¸?æ?¯å?¨ 0.0 è?³ 1.0 ä¹?é??"
 
-#: ../src/ui/theme.c:1283
+#: ../src/ui/theme.c:1320
 #, c-format
 msgid ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
 msgstr "é?°å½±ç??æ ¼å¼?æ?¯â??shade/å?ºæ?¬é¡?è?²/æ¯?é??â??ï¼?ä½?â??%sâ??ä¸?ç¬¦å??æ ¼å¼?"
 
-#: ../src/ui/theme.c:1294
+#: ../src/ui/theme.c:1331
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr "å?¨é?°å½±é¡?è?²ä¸ç?¡æ³?å°?â??%sâ??ç??è§£ç?ºé?°å½±æ¯?é??"
 
-#: ../src/ui/theme.c:1304
+#: ../src/ui/theme.c:1341
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "å?¨é?°å½±é¡?è?²ä¸é?°å½±æ¯?é??â??%sâ??æ?¯è² æ?¸"
 
-#: ../src/ui/theme.c:1333
+#: ../src/ui/theme.c:1370
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "ç?¡æ³?å??æ??é¡?è?²â??%sâ??"
 
-#: ../src/ui/theme.c:1587
+#: ../src/ui/theme.c:1624
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "åº§æ¨?è¡¨é??å¼?ä¸å?ºç?¾ä¸?å?¯æ?¥å??ç??å?å??â??%sâ??"
 
-#: ../src/ui/theme.c:1614
+#: ../src/ui/theme.c:1651
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
 "parsed"
 msgstr "åº§æ¨?è¡¨é??å¼?ä¸å?ºç?¾ç?¡æ³?å??æ??ç??æµ®é»?å°?æ?¸â??%sâ??"
 
-#: ../src/ui/theme.c:1628
+#: ../src/ui/theme.c:1665
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr "åº§æ¨?è¡¨é??å¼?ä¸å?ºç?¾ç?¡æ³?å??æ??ç??æ?´æ?¸â??%sâ??"
 
-#: ../src/ui/theme.c:1750
+#: ../src/ui/theme.c:1787
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
 "\"%s\""
 msgstr "å?¨åº§æ¨?è¡¨é??å¼?ä¸ï¼?ä»¥ä¸?æ??å?ç??é??å§?é?¨å??å?«æ??ä¸?æ??ç??é??ç®?ç¬¦ï¼?â??%sâ??"
 
-#: ../src/ui/theme.c:1807
+#: ../src/ui/theme.c:1844
 #, c-format
 msgid "Coordinate expression was empty or not understood"
 msgstr "åº§æ¨?è¡¨é??å¼?æ?¯ç©ºç?½ç??æ??æ?¯ç?¡æ³?å??æ??"
 
-#: ../src/ui/theme.c:1918 ../src/ui/theme.c:1928 ../src/ui/theme.c:1962
+#: ../src/ui/theme.c:1955 ../src/ui/theme.c:1965 ../src/ui/theme.c:1999
 #, c-format
 msgid "Coordinate expression results in division by zero"
 msgstr "åº§æ¨?è¡¨é??å¼?ä¸å?ºç?¾è¢« 0 æ?´é?¤ç??é?¯èª¤"
 
-#: ../src/ui/theme.c:1970
+#: ../src/ui/theme.c:2007
 #, c-format
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr "åº§æ¨?è¡¨é??å¼?ä¸å?ºç?¾å°?æµ®é»?æ?¸ä½¿ç?¨æ?¼é¤?æ?¸é??ç®?ç¬¦ (mod) ç??é?¯èª¤"
 
-#: ../src/ui/theme.c:2026
+#: ../src/ui/theme.c:2063
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr "å?¨åº§æ¨?è¡¨é??å¼?ä¸ï¼?æ??è©²æ??é??ç®?å?ç??å?°æ?¹å?ºç?¾äº?é??ç®?ç¬¦â??%sâ??"
 
-#: ../src/ui/theme.c:2035
+#: ../src/ui/theme.c:2072
 #, c-format
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "å?¨åº§æ¨?è¡¨é??å¼?ä¸ï¼?æ??è©²æ??é??ç®?ç¬¦ç??å?°æ?¹å?ºç?¾äº?é??ç®?å?"
 
-#: ../src/ui/theme.c:2043
+#: ../src/ui/theme.c:2080
 #, c-format
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "çµ?æ??åº§æ¨?è¡¨é??å¼?ç??æ?¯ä¸?å??é??ç®?ç¬¦è??é??é??ç®?å?"
 
-#: ../src/ui/theme.c:2053
+#: ../src/ui/theme.c:2090
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
 "operand in between"
 msgstr "å?¨åº§æ¨?è¡¨é??å¼?ä¸ï¼?é??ç®?ç¬¦â??%câ??ç·?é?¨é??ç®?ç¬¦â??%câ??å?ºç?¾ï¼?ä½?ä¸é??æ²?æ??ä»»ä½?é??ç®?å?"
 
-#: ../src/ui/theme.c:2200 ../src/ui/theme.c:2241
+#: ../src/ui/theme.c:2237 ../src/ui/theme.c:2278
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "åº§æ¨?è¡¨é??å¼?ä¸å?ºç?¾ä¸?æ??ç??è®?æ?¸æ??å¸¸æ?¸â??%sâ??"
 
-#: ../src/ui/theme.c:2295
+#: ../src/ui/theme.c:2332
 #, c-format
 msgid "Coordinate expression parser overflowed its buffer."
 msgstr "åº§æ¨?è¡¨é??å¼?å??æ??å?¨ä»¤ç·©è¡?æº¢ä½?ã??"
 
-#: ../src/ui/theme.c:2324
+#: ../src/ui/theme.c:2361
 #, c-format
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "åº§æ¨?è¡¨é??å¼?ä¸ç??é??æ?¬è??æ²?æ??ç?¸æ??ç??é??æ?¬è??"
 
-#: ../src/ui/theme.c:2388
+#: ../src/ui/theme.c:2425
 #, c-format
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr "åº§æ¨?è¡¨é??å¼?ä¸ç??é??æ?¬è??æ²?æ??ç?¸æ??ç??é??æ?¬è??"
 
-#: ../src/ui/theme.c:2399
+#: ../src/ui/theme.c:2436
 #, c-format
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "åº§æ¨?è¡¨é??å¼?ä¸ä¼¼ä¹?æ²?æ??ä»»ä½?é??ç®?ç¬¦æ??é??ç®?å?"
 
-#: ../src/ui/theme.c:2603 ../src/ui/theme.c:2623 ../src/ui/theme.c:2643
+#: ../src/ui/theme.c:2640 ../src/ui/theme.c:2660 ../src/ui/theme.c:2680
 #, c-format
 msgid "Theme contained an expression that resulted in an error: %s\n"
 msgstr "ä½?æ?¯ä¸»é¡?ä¸å?«æ??å¼?è?´é?¯èª¤ç??è¡¨é??å¼?ï¼?%s\n"
 
-#: ../src/ui/theme.c:4220
+#: ../src/ui/theme.c:4315
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -1729,25 +1743,25 @@ msgstr ""
 "æ¤é??æ¡?æ¬¾å¼?å¿?é ?æ??å®? <button function=\"%s\" state=\"%s\" draw_ops=\"whatever"
 "\"/>"
 
-#: ../src/ui/theme.c:4728 ../src/ui/theme.c:4753
+#: ../src/ui/theme.c:4827 ../src/ui/theme.c:4852
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 "ç¼ºå°?äº? <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 
-#: ../src/ui/theme.c:4797
+#: ../src/ui/theme.c:4896
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "ç?¡æ³?è¼?å?¥ä½?æ?¯ä¸»é¡?â??%sâ??ï¼?%s\n"
 
-#: ../src/ui/theme.c:4927 ../src/ui/theme.c:4934 ../src/ui/theme.c:4941
-#: ../src/ui/theme.c:4948 ../src/ui/theme.c:4955
+#: ../src/ui/theme.c:5026 ../src/ui/theme.c:5033 ../src/ui/theme.c:5040
+#: ../src/ui/theme.c:5047 ../src/ui/theme.c:5054
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "ä½?æ?¯ä¸»é¡?â??%sâ??æ?ªæ??å®? <%s>"
 
-#: ../src/ui/theme.c:4963
+#: ../src/ui/theme.c:5062
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@@ -1756,13 +1770,13 @@ msgstr ""
 "å?¨ä½?æ?¯ä¸»é¡?â??%2$sâ??ä¸ï¼?è¦?çª?é¡?å??â??%1$sâ??æ²?æ??æ??å®?ä»»ä½?é??æ¡?æ¬¾å¼?ã??è«?å? ä¸? <window type="
 "\"%3$s\" style_set=\"whatever\"/> å??ç´ "
 
-#: ../src/ui/theme.c:5406 ../src/ui/theme.c:5468 ../src/ui/theme.c:5531
+#: ../src/ui/theme.c:5505 ../src/ui/theme.c:5567 ../src/ui/theme.c:5630
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr "è?ªè¡?å®?ç¾©ç??å¸¸æ?¸å¿?é ?ä»¥å¤§å¯«å?æ¯?é??å§?ï¼?ä½?â??%sâ??ä¸?æ?¯"
 
-#: ../src/ui/theme.c:5414 ../src/ui/theme.c:5476 ../src/ui/theme.c:5539
+#: ../src/ui/theme.c:5513 ../src/ui/theme.c:5575 ../src/ui/theme.c:5638
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "å·²å®?ç¾©äº?â??%sâ??å¸¸æ?¸"
@@ -2310,6 +2324,64 @@ msgstr "y ç??æ?¸å?¼æ?¯ %dï¼?%dæ?¯é ?æ??ä¸ç??æ?¸å?¼"
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "å??æ?? %d åº§æ¨?è¡¨ç?¾é??æ?? %g ç§?ï¼?å¹³å?? %g ç§?ï¼?\n"
 
+#~ msgid "Desktop"
+#~ msgstr "æ¡?é?¢"
+
+#~ msgid "Switch to workspace on the left of the current workspace"
+#~ msgstr "å??æ??è?³ç?®å??å·¥ä½?å??ç??å·¦æ?¹å·¥ä½?å??"
+
+#~ msgid "Switch to workspace on the right of the current workspace"
+#~ msgstr "å??æ??è?³ç?®å??å·¥ä½?å??ç??å?³æ?¹å·¥ä½?å??"
+
+#~ msgid "Switch to workspace above the current workspace"
+#~ msgstr "å??æ??è?³ç?®å??å·¥ä½?å??ç??ä¸?æ?¹å·¥ä½?å??"
+
+#~ msgid "Switch to workspace below the current workspace"
+#~ msgstr "å??æ??è?³ç?®å??å·¥ä½?å??ç??ä¸?æ?¹å·¥ä½?å??"
+
+#~ msgid "Move between windows of an application, using a popup window"
+#~ msgstr "å?¨æ??ç?¨ç¨?å¼?ç??è¦?çª?ä¹?é??å??æ??ï¼?ä½¿ç?¨å½?å?ºå¼?è¦?çª?"
+
+#~ msgid ""
+#~ "Move backward between windows of an application, using a popup window"
+#~ msgstr "å?¨æ??ç?¨ç¨?å¼?ç??è¦?çª?ä¹?é??ç?¸å??æ¬¡åº?å??æ??ï¼?ä½¿ç?¨å½?å?ºå¼?è¦?çª?"
+
+#~ msgid "Move between windows, using a popup window"
+#~ msgstr "å?¨è¦?çª?ä¹?é??å??æ??ï¼?ä½¿ç?¨å½?å?ºå¼?è¦?çª?"
+
+#~ msgid "Move backward between windows, using a popup window"
+#~ msgstr "å?¨è¦?çª?ä¹?é??ä»¥ç?¸å??æ¬¡åº?å??æ??ï¼?ä½¿ç?¨å½?å?ºå¼?è¦?çª?"
+
+#~ msgid "Move between panels and the desktop, using a popup window"
+#~ msgstr "å?¨é?¢æ?¿å??æ¡?é?¢ä¹?é??å??æ??ï¼?ä½¿ç?¨å½?å?ºå¼?è¦?çª?"
+
+#~ msgid "Move backward between panels and the desktop, using a popup window"
+#~ msgstr "å?¨é?¢æ?¿å??æ¡?é?¢ä¹?é??ä»¥ç?¸å??æ¬¡åº?å??æ??ï¼?ä½¿ç?¨å½?å?ºå¼?è¦?çª?"
+
+#~ msgid "Move backward between windows of an application immediately"
+#~ msgstr "ç«?å?³å?¨æ??ç?¨ç¨?å¼?ç??è¦?çª?ä¹?é??ç?¸å??æ¬¡åº?å??æ??"
+
+#~ msgid "Move between windows immediately"
+#~ msgstr "å°?è¼¸å?¥ç?¦é»?å?¨å??è¦?çª?ä¹?é??å??æ??ï¼?ç«?å?³æ¨¡å¼?ï¼?"
+
+#~ msgid "Move backward between windows immediately"
+#~ msgstr "ç«?å?³å?¨è¦?çª?ä¹?é??ç?¸å??æ¬¡åº?å??æ??"
+
+#~ msgid "Move between panels and the desktop immediately"
+#~ msgstr "å°?è¼¸å?¥ç?¦é»?å?¨é?¢æ?¿å??æ¡?é?¢ä¹?é??å??æ??ï¼?ç«?å?³æ¨¡å¼?ï¼?"
+
+#~ msgid "Move backward between panels and the desktop immediately"
+#~ msgstr "å°?è¼¸å?¥ç?¦é»?å?¨é?¢æ?¿å??æ¡?é?¢ä¹?é??ä»¥ç?¸å??æ¬¡åº?å??æ??ï¼?ç«?å?³æ¨¡å¼?ï¼?"
+
+#~ msgid "Show the panel's \"Run Application\" dialog box"
+#~ msgstr "é¡¯ç¤ºé?¢æ?¿ç??ã??å?·è¡?ç¨?å¼?ã??å°?è©±ç??"
+
+#~ msgid "Toggle whether a window will always be visible over other windows"
+#~ msgstr "å??æ??æ??å??è¦?çª?æ?¯å?¦æ°¸é? å?¯ä»¥é?®è?½å?¶ä»?è¦?çª?"
+
+#~ msgid "Move window to north (top) side of screen"
+#~ msgstr "å°?è¦?çª?ç§»è?³ç?«é?¢ç??å??(ä¸?)æ?¹"
+
 #~ msgid "Window Management"
 #~ msgstr "è¦?çª?ç®¡ç??å?¡"
 
@@ -3205,7 +3277,7 @@ msgstr "å??æ?? %d åº§æ¨?è¡¨ç?¾é??æ?? %g ç§?ï¼?å¹³å?? %g ç§?ï¼?\n"
 #~ "\"&lt;Ctrl&gt;\". If you set the option to the special string \"disabled"
 #~ "\", then there will be no keybinding for this action."
 #~ msgstr ""
-#~ "æ?¬æ??é?µçµ?å??å?¯ä»¥å??å??ç?«é?¢å¿«ç?§å?¬ç?¨ç¨?å¼?ï¼?æ?·å??æ??è¦?çª?ç??ç?«é?¢ã??æ ¼å¼?å?¯ä»¥å??â??&lt;"
+#~ "æ?¬æ??é?µçµ?å??å?¯ä»¥å??å??è?¢å¹?æ?ªå??å?¬ç?¨ç¨?å¼?ï¼?æ?·å??æ??è¦?çª?ç??ç?«é?¢ã??æ ¼å¼?å?¯ä»¥å??â??&lt;"
 #~ "Control&gt;aâ??æ??æ?¯â??&lt;Shift&gt;&lt;Alt&gt;F1â??ã??å??æ??æ??é?µçµ?å??å?ä¸²æ??æ?¯æ¯?è¼?å¯¬"
 #~ "é¬?ç??ï¼?å??è¨±ä½¿ç?¨å¤§å¯«æ??å°?å¯«ï¼?ä¹?å??è¨±ä½¿ç?¨å??â??&lt;Ctl&gt;â??å??â??&lt;Ctrl&gt;â??ç?ç??ç¸®"
 #~ "å¯«ã??å¦?æ??å°?æ¤é?¸é ?è¨å®?ç?ºå?ä¸²â??disabledâ??ï¼?å??ä¸?æ??ç?ºè©²é ?æ??ä½?å®?æ??ä»»ä½?æ??é?µçµ?å??ã??"
@@ -3218,7 +3290,7 @@ msgstr "å??æ?? %d åº§æ¨?è¡¨ç?¾é??æ?? %g ç§?ï¼?å¹³å?? %g ç§?ï¼?\n"
 #~ "the option to the special string \"disabled\", then there will be no "
 #~ "keybinding for this action."
 #~ msgstr ""
-#~ "æ?¬æ??é?µçµ?å??å?¯ä»¥å??å??ç?«é?¢å¿«ç?§å?¬ç?¨ç¨?å¼?ã??æ ¼å¼?å?¯ä»¥å??â??&lt;Control&gt;aâ??æ??æ?¯â??&lt;"
+#~ "æ?¬æ??é?µçµ?å??å?¯ä»¥å??å??è?¢å¹?æ?ªå??å?¬ç?¨ç¨?å¼?ã??æ ¼å¼?å?¯ä»¥å??â??&lt;Control&gt;aâ??æ??æ?¯â??&lt;"
 #~ "Shift&gt;&lt;Alt&gt;F1â??ã??å??æ??æ??é?µçµ?å??å?ä¸²æ??æ?¯æ¯?è¼?å¯¬é¬?ç??ï¼?å??è¨±ä½¿ç?¨å¤§å¯«æ??å°?"
 #~ "å¯«ï¼?ä¹?å??è¨±ä½¿ç?¨å??â??&lt;Ctl&gt;â??å??â??&lt;Ctrl&gt;â??ç?ç??ç¸®å¯«ã??å¦?æ??å°?æ¤é?¸é ?è¨å®?ç?º"
 #~ "å?ä¸²â??disabledâ??ï¼?å??ä¸?æ??ç?ºè©²é ?æ??ä½?å®?æ??ä»»ä½?æ??é?µçµ?å??ã??"
@@ -3409,9 +3481,6 @@ msgstr "å??æ?? %d åº§æ¨?è¡¨ç?¾é??æ?? %g ç§?ï¼?å¹³å?? %g ç§?ï¼?\n"
 #~ "ç?¨å¤§å¯«æ??å°?å¯«ï¼?ä¹?å??è¨±ä½¿ç?¨å??â??&lt;Ctl&gt;â??å??â??&lt;Ctrl&gt;â??ç?ç??ç¸®å¯«ã??å¦?æ??å°?æ¤"
 #~ "é?¸é ?è¨å®?ç?ºå?ä¸²â??disabledâ??ï¼?å??ä¸?æ??ç?ºè©²é ?æ??ä½?å®?æ??ä»»ä½?æ??é?µçµ?å??ã??"
 
-#~ msgid "Toggle always on top state"
-#~ msgstr "å??æ??æ?¯å?¦å?¨ã??æ??ä¸?å±¤ã??é¡¯ç¤º"
-
 #~ msgid "Unmaximize window"
 #~ msgstr "è¦?çª?å¾?æ??å¤§å??é??å??"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]