diff --git a/Install b/Install
index 9051e28e..f1a95a6d 100755
--- a/Install
+++ b/Install
@@ -67,10 +67,6 @@ echo "questions. We will IGNORE any questions that are already"
 echo "answered in the documentation."
 echo
 perai
-echo
-echo "Did you install libPropList? If not, please install it now."
-echo
-perai
 echo "Did you read the INSTALL file?"
 echo -n "<y/n> "
 read rtfm
diff --git a/WPrefs.app/po/bg.po b/WPrefs.app/po/bg.po
index 28dcdb3b..9f1aa6bc 100644
--- a/WPrefs.app/po/bg.po
+++ b/WPrefs.app/po/bg.po
@@ -11,7 +11,7 @@ msgstr ""
 "Language-Team: Bulgarian <dict@linux.home.bg>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=windows-1251\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8-bit\n"
 
 #: ../../WPrefs.app/main.c:74
 #, c-format
diff --git a/WPrefs.app/po/hr.po b/WPrefs.app/po/hr.po
index 6029b8d7..3dccf86b 100644
--- a/WPrefs.app/po/hr.po
+++ b/WPrefs.app/po/hr.po
@@ -3,7 +3,7 @@ msgstr ""
 "Date: 1998-08-24 14:36:41-0300\n"
 "From: Toni Biliæ tbilic@oliver.efos.hr \n"
 "Language-Team: Croatian \n"
-"Content-Type: text/plain; charset=ISO8859-2\n"
+"Content-Type: text/plain; charset=iso-8859-2\n"
 "Xgettext-Options: --default-domain=WPrefs --add-comments --keyword=_\n"
 "Files: ../../WPrefs/Configurations.c ../../WPrefs/Expert.c ../../WPrefs/Focus.c ../../WPrefs/KeyboardSettings.c ../../WPrefs/KeyboardShortcuts.c ../../WPrefs/Menu.c ../../WPrefs/MenuGuru.c ../../WPrefs/MenuPreferences.c ../../WPrefs/MouseSettings.c ../../WPrefs/Paths.c ../../WPrefs/Preferences.c ../../WPrefs/Text.c ../../WPrefs/TextureAndColor.c ../../WPrefs/WPrefs.c ../../WPrefs/WindowHandling.c ../../WPrefs/Workspace.c ../../WPrefs/main.c ../../WPrefs/xmodifier.c\n"
 
diff --git a/WPrefs.app/po/zh_TW.Big5.po b/WPrefs.app/po/zh_TW.Big5.po
index 9de0bd5b..03311b68 100644
--- a/WPrefs.app/po/zh_TW.Big5.po
+++ b/WPrefs.app/po/zh_TW.Big5.po
@@ -1,1249 +1,790 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 1999 Free Software Foundation, Inc.
-# Li Wei Jih <lwj83@cs.ccu.edu.tw>, 1999, 2001.
+# Li Wei Jih <lwj83@cs.ccu.edu.tw>, 1999.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Window Maker-0.80.0\n"
-"POT-Creation-Date: 2001-12-24 03:19+0800\n"
-"PO-Revision-Date: 2001-12-24 09:00+0800\n"
-"Last-Translator: Li Wei Jih <lwj@manufacture.com.tw>\n"
+"Project-Id-Version: Window Maker-0.51.0\n"
+"POT-Creation-Date: 1999-02-09 13:00+0800\n"
+"PO-Revision-Date: 1999-02-09 13:00+0800\n"
+"Last-Translator: Li Wei Jih <lwj83@cs.ccu.edu.tw>\n"
 "Language-Team: chinese <zh@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=big5\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8-bit\n" 
 
-#: ../../WPrefs.app/Appearance.c:1131
-msgid "Select File"
-msgstr "¿ï¨úÀÉ®×"
-
-#: ../../WPrefs.app/Appearance.c:1533
-msgid "Focused Window"
-msgstr "µJÂIµøµ¡"
-
-#: ../../WPrefs.app/Appearance.c:1537
-msgid "Unfocused Window"
-msgstr "«DµJÂIµøµ¡"
-
-#: ../../WPrefs.app/Appearance.c:1541
-msgid "Owner of Focused Window"
-msgstr "µJÂIµøµ¡¾Ö¦³ªÌ"
-
-#: ../../WPrefs.app/Appearance.c:1545 ../../WPrefs.app/Appearance.c:1862
-msgid "Menu Title"
-msgstr "¿ï³æ¼ÐÃD"
-
-#: ../../WPrefs.app/Appearance.c:1549 ../../WPrefs.app/Appearance.c:1551
-msgid "Normal Item"
-msgstr "¥¿±`¶µ¥Ø"
-
-#: ../../WPrefs.app/Appearance.c:1555
-msgid "Disabled Item"
-msgstr "¥¢®Ä¶µ¥Ø"
-
-#: ../../WPrefs.app/Appearance.c:1564
-msgid "Highlighted"
-msgstr "±j½Õªº"
-
-#: ../../WPrefs.app/Appearance.c:1755
-msgid "Texture"
-msgstr "§÷½è"
-
-#: ../../WPrefs.app/Appearance.c:1763
-msgid "Titlebar of Focused Window"
-msgstr "µJÂIµøµ¡¼ÐÃD¦C"
-
-#: ../../WPrefs.app/Appearance.c:1764
-msgid "Titlebar of Unfocused Windows"
-msgstr "«DµJÂIµøµ¡¼ÐÃD¦C"
-
-#: ../../WPrefs.app/Appearance.c:1765
-msgid "Titlebar of Focused Window's Owner"
-msgstr "µJÂIµøµ¡¾Ö¦³ªÌ¼ÐÃD¦C"
-
-#: ../../WPrefs.app/Appearance.c:1766
-msgid "Window Resizebar"
-msgstr "µøµ¡¤j¤pÅܧó¦C"
-
-#: ../../WPrefs.app/Appearance.c:1767
-msgid "Titlebar of Menus"
-msgstr "¿ï³æ¼ÐÃD¦C"
-
-#: ../../WPrefs.app/Appearance.c:1768
-msgid "Menu Items"
-msgstr "¿ï³æ¶µ¥Ø"
-
-#: ../../WPrefs.app/Appearance.c:1769
-msgid "Icon Background"
-msgstr "¹Ï¥Ü­I´º"
-
-#: ../../WPrefs.app/Appearance.c:1784
-msgid ""
-"Double click in the texture you want to use\n"
-"for the selected item."
-msgstr ""
-"¦b§A­n¥Î©ó¿ï¨ú¶µ¥Øªº§÷½è¤WÂI¨â¤U¡C"
-
-#: ../../WPrefs.app/Appearance.c:1798
-msgid "New"
-msgstr "·s¼W"
-
-#: ../../WPrefs.app/Appearance.c:1802
-msgid "Create a new texture."
-msgstr "«Ø¥ß·s§÷½è"
-
-#: ../../WPrefs.app/Appearance.c:1810
-msgid "Extract..."
-msgstr "¨ú¥X..."
-
-#: ../../WPrefs.app/Appearance.c:1814
-msgid "Extract texture(s) from a theme or a style file."
-msgstr "±q¥DÃD©Î­·®æÀɨú¥X§÷½è¡C"
-
-#: ../../WPrefs.app/Appearance.c:1824
-msgid "Edit"
-msgstr "½s¿è"
-
-#: ../../WPrefs.app/Appearance.c:1827
-msgid "Edit the highlighted texture."
-msgstr "½s¿è±j½Õªº§÷½è¡C"
-
-#: ../../WPrefs.app/Appearance.c:1835 ../../WPrefs.app/TexturePanel.c:1316
-msgid "Delete"
-msgstr "§R°£"
-
-#: ../../WPrefs.app/Appearance.c:1839
-msgid "Delete the highlighted texture."
-msgstr "§R°£±j½Õªº§÷½è¡C"
-
-#: ../../WPrefs.app/Appearance.c:1852
-msgid "Color"
-msgstr "¦â±m"
-
-#: ../../WPrefs.app/Appearance.c:1859
-msgid "Focused Window Title"
-msgstr "µJÂIµøµ¡¼ÐÃD"
-
-#: ../../WPrefs.app/Appearance.c:1860
-msgid "Unfocused Window Title"
-msgstr "«DµJÂIµøµ¡¼ÐÃD"
-
-#: ../../WPrefs.app/Appearance.c:1861
-msgid "Owner of Focused Window Title"
-msgstr "µJÂIµøµ¡¾Ö¦³ªÌ¼ÐÃD"
-
-#: ../../WPrefs.app/Appearance.c:1863
-msgid "Menu Item Text"
-msgstr "¿ï³æ¶µ¥Ø¤å¦r"
-
-#: ../../WPrefs.app/Appearance.c:1864
-msgid "Disabled Menu Item Text"
-msgstr "¥¢®Ä¿ï³æ¶µ¥Ø¤å¦r"
-
-#: ../../WPrefs.app/Appearance.c:1865
-msgid "Menu Highlight Color"
-msgstr "¿ï³æ±j½Õ¦â±m"
-
-#: ../../WPrefs.app/Appearance.c:1866
-msgid "Highlighted Menu Text Color"
-msgstr "±j½Õ¿ï³æ¤å¦r¦â±m"
-
-#: ../../WPrefs.app/Appearance.c:1905
-msgid "Background"
-msgstr "­I´º"
-
-#: ../../WPrefs.app/Appearance.c:1917 ../../WPrefs.app/TexturePanel.c:1503
-msgid "Browse..."
-msgstr "ÂsÄý..."
-
-#: ../../WPrefs.app/Appearance.c:1930
-msgid "Options"
-msgstr "¿ï¶µ"
-
-#: ../../WPrefs.app/Appearance.c:1937
-msgid "Menu Style"
-msgstr "¿ï³æ­·®æ"
-
-#: ../../WPrefs.app/Appearance.c:1965 ../../WPrefs.app/Configurations.c:242
-#: ../../WPrefs.app/Configurations.c:254 ../../WPrefs.app/Focus.c:288
-#: ../../WPrefs.app/Focus.c:299 ../../WPrefs.app/MenuPreferences.c:134
-#: ../../WPrefs.app/MenuPreferences.c:145
-#: ../../WPrefs.app/MenuPreferences.c:173
-#: ../../WPrefs.app/MenuPreferences.c:188 ../../WPrefs.app/MouseSettings.c:560
-#: ../../WPrefs.app/MouseSettings.c:571 ../../WPrefs.app/WPrefs.c:558
-#: ../../WPrefs.app/WPrefs.c:583
-#, c-format
-msgid "could not load icon file %s"
-msgstr "µLªk¸ü¤J¹Ï¥ÜÀÉ %s"
-
-#: ../../WPrefs.app/Appearance.c:1979
-msgid "Title Alignment"
-msgstr "¼ÐÃD¹ï»ô"
-
-#: ../../WPrefs.app/Appearance.c:1986
-msgid "Left"
-msgstr "¾a¥ª"
-
-#: ../../WPrefs.app/Appearance.c:1989 ../../WPrefs.app/TexturePanel.c:1517
-#: ../../WPrefs.app/Workspace.c:270
-msgid "Center"
-msgstr "¸m¤¤"
-
-#: ../../WPrefs.app/Appearance.c:1992
-msgid "Right"
-msgstr "¾a¥k"
-
-#: ../../WPrefs.app/Appearance.c:2216
-msgid "Appearance Preferences"
-msgstr "¥~Æ[³]©w"
-
-#: ../../WPrefs.app/Appearance.c:2218
-msgid ""
-"Background texture configuration for windows,\n"
-"menus and icons."
-msgstr "µøµ¡¡B¿ï³æ»P¹Ï¥Üªº­I´º§÷½è³]©w¡C"
-
-#: ../../WPrefs.app/Appearance.c:2263
-msgid "Extract Texture"
-msgstr "¨ú¥X§÷½è"
-
-#: ../../WPrefs.app/Appearance.c:2283
-msgid "Textures"
-msgstr "§÷½è"
-
-#: ../../WPrefs.app/Appearance.c:2294 ../../WPrefs.app/WPrefs.c:302
-msgid "Close"
-msgstr "Ãö³¬"
-
-#: ../../WPrefs.app/Appearance.c:2299
-msgid "Extract"
-msgstr "¨ú¥X"
-
-#: ../../WPrefs.app/Configurations.c:150 ../../WPrefs.app/Configurations.c:156
-#: ../../WPrefs.app/MouseSettings.c:490 ../../WPrefs.app/WindowHandling.c:339
-#: ../../WPrefs.app/WindowHandling.c:351 ../../WPrefs.app/Workspace.c:90
-#: ../../WPrefs.app/Workspace.c:101
+#: ../../WPrefs.app/Configurations.c:142 ../../WPrefs.app/Configurations.c:148
+#: ../../WPrefs.app/MouseSettings.c:526 ../../WPrefs.app/WindowHandling.c:274
+#: ../../WPrefs.app/WindowHandling.c:286 ../../WPrefs.app/Workspace.c:71
+#: ../../WPrefs.app/Workspace.c:77
 #, c-format
 msgid "could not load icon %s"
 msgstr "µLªk¸ü¤J¹Ï¥Ü %s"
 
-#: ../../WPrefs.app/Configurations.c:164 ../../WPrefs.app/Workspace.c:109
+#: ../../WPrefs.app/Configurations.c:156 ../../WPrefs.app/Workspace.c:85
 #, c-format
 msgid "could not process icon %s:"
 msgstr "µLªk³B²z¹Ï¥Ü %s:"
 
-#: ../../WPrefs.app/Configurations.c:189 ../../WPrefs.app/Workspace.c:164
+#: ../../WPrefs.app/Configurations.c:181 ../../WPrefs.app/Workspace.c:124
 #, c-format
 msgid "could not load image file %s"
 msgstr "µLªk¸ü¤J¼v¹³ÀÉ %s"
 
-#: ../../WPrefs.app/Configurations.c:203
+#: ../../WPrefs.app/Configurations.c:195
 msgid "Icon Slide Speed"
 msgstr "¹Ï¥Ü²¾°Ê³t«×"
 
-#: ../../WPrefs.app/Configurations.c:209
+#: ../../WPrefs.app/Configurations.c:201
 msgid "Shade Animation Speed"
 msgstr "¾B½ª°Êµe³t«×"
 
-#: ../../WPrefs.app/Configurations.c:271
-msgid "Smooth Scaling"
-msgstr "¥­·ÆÁY©ñ"
+#: ../../WPrefs.app/Configurations.c:234 ../../WPrefs.app/Configurations.c:246
+#: ../../WPrefs.app/Focus.c:310 ../../WPrefs.app/Focus.c:321
+#: ../../WPrefs.app/MenuPreferences.c:135
+#: ../../WPrefs.app/MenuPreferences.c:146
+#: ../../WPrefs.app/MenuPreferences.c:174
+#: ../../WPrefs.app/MenuPreferences.c:189 ../../WPrefs.app/MouseSettings.c:554
+#: ../../WPrefs.app/MouseSettings.c:565 ../../WPrefs.app/MouseSettings.c:627
+#: ../../WPrefs.app/MouseSettings.c:638 ../../WPrefs.app/MouseSettings.c:674
+#: ../../WPrefs.app/MouseSettings.c:689 ../../WPrefs.app/MouseSettings.c:705
+#: ../../WPrefs.app/WPrefs.c:403 ../../WPrefs.app/WPrefs.c:421
+#, c-format
+msgid "could not load icon file %s"
+msgstr "µLªk¸ü¤J¹Ï¥ÜÀÉ %s"
 
-#: ../../WPrefs.app/Configurations.c:272
-msgid ""
-"Smooth scaled background images, neutralizing\n"
-"the `pixelization' effect. This will slow\n"
-"down loading of background images considerably."
-msgstr ""
-"¥­·ÆÁY©ñ­I´º¼v¹³¡A¤¤©M¡u¿÷¾¦¡v®ÄªG¡C\n"
-"³o·|¨Ï­I´º¼v¹³¸ü¤JÅܺC¤£¤Ö¡C"
-
-#: ../../WPrefs.app/Configurations.c:313
+#: ../../WPrefs.app/Configurations.c:262
 msgid "Titlebar Style"
 msgstr "¼ÐÃD¦C­·®æ"
 
-#: ../../WPrefs.app/Configurations.c:351
+#: ../../WPrefs.app/Configurations.c:299
 msgid "Animations and Sound"
 msgstr "°Êµe»P­µ®Ä"
 
-#: ../../WPrefs.app/Configurations.c:357
+#: ../../WPrefs.app/Configurations.c:305
 msgid "Animations"
 msgstr "°Êµe"
 
-#: ../../WPrefs.app/Configurations.c:368
-msgid ""
-"Disable/enable animations such as those shown\n"
-"for window miniaturization, shading etc."
-msgstr "°±¥Î/±Ò¥Î°Êµe¡A¨Ò¦pµøµ¡³Ì¤p¤Æ¡B¾B½ªµ¥ªºÅã¥Ü¡C"
-
-#: ../../WPrefs.app/Configurations.c:376
+#: ../../WPrefs.app/Configurations.c:321
 msgid "Superfluous"
 msgstr "¦h¾lªº"
 
-#: ../../WPrefs.app/Configurations.c:387
-msgid ""
-"Disable/enable `superfluous' features and\n"
-"animations. These include the `ghosting' of the\n"
-"dock when it's being moved to another side and\n"
-"the explosion animation when undocking icons."
-msgstr ""
-"°±¥Î/±Ò¥Î¡u¦h¾lªº¡v¯S¦â»P°Êµe¡C\n"
-"³o¥]¬A°±¾a°Ï³Q²¾¦Ü¥t¤@Ãä®Éªº¡u°­¼v¡v\n"
-"»P¹Ï¥ÜÂ÷¶}°±¾a°Ï®ÉªºÃz¬µ°Êµe¡C"
-
-#: ../../WPrefs.app/Configurations.c:397
+#: ../../WPrefs.app/Configurations.c:337
 msgid "Sounds"
 msgstr "­µ®Ä"
 
-#: ../../WPrefs.app/Configurations.c:408
-msgid ""
-"Disable/enable support for sound effects played\n"
-"for actions like shading and closing a window.\n"
-"You will need a module distributed separately\n"
-"for this. You can get it at:\n"
-"http://shadowmere.student.utwente.nl/"
-msgstr ""
-"°±¥Î/±Ò¥Î¹³¬O¾B½ª»PÃö³¬µøµ¡°Ê§@¼½©ñªº­µ®Ä¤ä´©¡C\n"
-"»Ý­n³æ¿Wµo°eªº¼Ò²Õ¡C§A¥i¥H¦b³oÃä±o¨ì¡G\n"
-"http://shadowmere.student.utwente.nl/"
-
-#: ../../WPrefs.app/Configurations.c:419
-msgid ""
-"Note: sound requires a module distributed\n"
-"separately"
+#: ../../WPrefs.app/Configurations.c:354
+msgid "Note: sound requires a module distributed separately"
 msgstr "µù¡G­µ®Ä»Ý­n³æ¿Wµo°eªº¼Ò²Õ"
 
-#: ../../WPrefs.app/Configurations.c:429
+#: ../../WPrefs.app/Configurations.c:364
 msgid "Dithering colormap for 8bpp"
 msgstr "¬° 8bpp ¦â½L´î¦â"
 
-#: ../../WPrefs.app/Configurations.c:431
-msgid ""
-"Number of colors to reserve for Window Maker\n"
-"on displays that support only 8bpp (PseudoColor)."
-msgstr ""
-"¦b¥u¤ä´© 8bpp¡]µêÀÀ¦â±m¡^ªºÅã¥Ü¾¹¤W\n"
-"«O¯dµ¹ Window Maker ªº¦â±m¼Æ¡C"
-
-#: ../../WPrefs.app/Configurations.c:438
+#: ../../WPrefs.app/Configurations.c:369
 msgid "Disable dithering in any visual/depth"
 msgstr "¨Ï¥ô¦óµøı/²`«×¤¤ªº´î¦â¥¢®Ä"
 
-#: ../../WPrefs.app/Configurations.c:459
-msgid ""
-"More colors for\n"
-"applications"
+#: ../../WPrefs.app/Configurations.c:390
+msgid "More colors for applications"
 msgstr ""
 "À³¥Îµ{¦¡\n"
 "¨Ï¥Î§ó¦h¦â±m"
 
-#: ../../WPrefs.app/Configurations.c:466
-msgid ""
-"More colors for\n"
-"Window Maker"
+#: ../../WPrefs.app/Configurations.c:397
+msgid "More colors for WindowMaker"
 msgstr ""
-"Window Maker\n"
+"WindowMaker\n"
 "¨Ï¥Î§ó¦h¦â±m"
 
-#: ../../WPrefs.app/Configurations.c:521
+#: ../../WPrefs.app/Configurations.c:450
 msgid "Other Configurations"
 msgstr "¨ä¥L³]©w"
 
-#: ../../WPrefs.app/Configurations.c:523
-msgid ""
-"Animation speeds, titlebar styles, various option\n"
-"toggling and number of colors to reserve for\n"
-"Window Maker on 8bit displays."
-msgstr ""
-"°Êµe³t«×¡A¼ÐÃD¦C­·®æ¡A¦UºØ¿ï¶µ¤Á´«»P\n"
-"¦b 8bit Åã¥Ü¾¹¤W«O¯dµ¹ Window Maker ªº¦â±m¼Æ¡C"
+#: ../../WPrefs.app/Expert.c:70
+msgid "Do not set non-WindowMaker specific parameters (do not use xset)"
+msgstr "¤£­n³]«D WindowMaker «ü©w°Ñ¼Æ¡]¤£­n¨Ï¥Î xset¡^"
 
-#: ../../WPrefs.app/Expert.c:75
-msgid ""
-"Disable miniwindows (icons for miniaturized windows). For use with KDE/GNOME."
-msgstr "¨Ï³Ì¤pµøµ¡¡]³Ì¤p¤Æµøµ¡ªº¹Ï¥Ü¡^¥¢®Ä¡C¥Î©ó KDE/GNOME¡C"
+#: ../../WPrefs.app/Expert.c:71
+msgid "Automatically save session when exiting WindowMaker"
+msgstr "Â÷¶} WindowMaker ®É¦Û°ÊÀx¦s¶¥¬qª¬ºA"
 
-#: ../../WPrefs.app/Expert.c:76
-msgid "Do not set non-WindowMaker specific parameters (do not use xset)."
-msgstr "¤£­n³]«D WindowMaker «ü©w°Ñ¼Æ¡]¤£­n¨Ï¥Î xset¡^¡C"
+#: ../../WPrefs.app/Expert.c:72
+msgid "Use SaveUnder in window frames, icons, menus and other objects"
+msgstr "¦bµøµ¡®Ø¬[¡A¹Ï¥Ü¡A¿ï³æ»P¨ä¥Lª«¥ó¨Ï¥Î SaveUnder"
 
-#: ../../WPrefs.app/Expert.c:77
-msgid "Automatically save session when exiting Window Maker."
-msgstr "Â÷¶} Window Maker ®É¦Û°ÊÀx¦s¶¥¬qª¬ºA¡C"
+#: ../../WPrefs.app/Expert.c:73
+msgid "Disable cycling color highlighting of icons."
+msgstr "¨Ï¹Ï¥Üªº´`Àô¦â±m±j½Õ¥¢®Ä"
 
-#: ../../WPrefs.app/Expert.c:78
-msgid "Use SaveUnder in window frames, icons, menus and other objects."
-msgstr "¦bµøµ¡®Ø¬[¹Ï¥Ü¡A¿ï³æ»P¨ä¥Lª«¥ó¨Ï¥Î SaveUnder¡C"
-
-#: ../../WPrefs.app/Expert.c:79
-msgid "Use Windoze style cycling."
-msgstr "¨Ï¥Î Windoze ­·®æ´`Àô¡C"
-
-#: ../../WPrefs.app/Expert.c:80
-msgid "Disable confirmation panel for the Kill command."
-msgstr "¨Ï Kill ©R¥Oªº½T»{­±ªO¥¢®Ä¡C"
-
-#: ../../WPrefs.app/Expert.c:81
-msgid "Disable selection animation for selected icons."
-msgstr "¨Ï¿ï¨ú¹Ï¥Üªº¿ï¾Ü°Êµe¥¢®Ä¡C"
-
-#: ../../WPrefs.app/Expert.c:115
+#: ../../WPrefs.app/Expert.c:103
 msgid "Expert User Preferences"
-msgstr "ºë³qªº¨Ï¥ÎªÌ³]©w"
+msgstr "¼ô½m¨Ï¥ÎªÌ³]©w"
 
-#: ../../WPrefs.app/Expert.c:117
-msgid ""
-"Options for people who know what they're doing...\n"
-"Also have some other misc. options."
-msgstr ""
-"µ¹ª¾¹D¥L­Ì¦b°µ¤°»òªº¤H¥Îªº¿ï¶µ...\n"
-"¤]¦³¤@¨Ç¨ä¥L¦UºØ¿ï¶µ¡C"
-
-#: ../../WPrefs.app/Focus.c:80
+#: ../../WPrefs.app/Focus.c:79
 #, c-format
 msgid "bad option value %s for option FocusMode. Using default Manual"
-msgstr "FocusMode ¿ï¶µ­È %s ¿ù»~¡C¨Ï¥Î¹w³]­È¡u¤â°Ê¡v"
+msgstr "FocusMode ¿ï¶µ­È %s ¿ù»~¡C¨Ï¥Î¹w³]­È"
 
-#: ../../WPrefs.app/Focus.c:94
+#: ../../WPrefs.app/Focus.c:92
 #, c-format
-msgid "bad option value %s for option ColormapMode. Using default Auto"
-msgstr "ColormapMode ¿ï¶µ­È %s ¿ù»~¡C¨Ï¥Î¹w³]­È¡u¦Û°Ê¡v"
+msgid "bad option value %s for option ColormapMode. Using default Manual"
+msgstr "ColormapMode ¿ï¶µ­È %s ¿ù»~¡C¨Ï¥Î¹w³]­È"
 
-#: ../../WPrefs.app/Focus.c:214
+#: ../../WPrefs.app/Focus.c:190
+msgid ""
+"Click on the window to set\n"
+"keyboard input focus."
+msgstr "¦bµøµ¡¤W«ö¤@¤U³]©wÁä½L¿é¤JµJÂI¡C"
+
+#: ../../WPrefs.app/Focus.c:194
+msgid ""
+"Set keyboard input focus to\n"
+"the window under the mouse pointer,\n"
+"including the root window."
+msgstr ""
+"³]©wÁä½L¿é¤JµJÂI¦Ü\n"
+"·Æ¹««ü¼Ð¤U­±ªºµøµ¡¡A\n"
+"¥]§t®Úµøµ¡¡C"
+
+#: ../../WPrefs.app/Focus.c:199
+msgid ""
+"Set keyboard input focus to\n"
+"the window under the mouse pointer,\n"
+"except the root window."
+msgstr ""
+"³]©wÁä½L¿é¤JµJÂI¦Ü\n"
+"·Æ¹««ü¼Ð¤U­±ªºµøµ¡¡A\n"
+"®Úµøµ¡°£¥~¡C"
+
+#: ../../WPrefs.app/Focus.c:243
 msgid "Input Focus Mode"
 msgstr "¿é¤JµJÂI¼Ò¦¡"
 
-#: ../../WPrefs.app/Focus.c:222
-msgid "Manual:  Click on the window to set keyboard input focus"
-msgstr "¤â°Ê¡G¦bµøµ¡¤W«ö¤@¤U³]©wÁä½L¿é¤JµJÂI"
+#: ../../WPrefs.app/Focus.c:248
+msgid "Click window to focus"
+msgstr "«öµøµ¡¨ú±oµJÂI"
 
-#: ../../WPrefs.app/Focus.c:229
-msgid "Auto:  Set keyboard input focus to the window under the mouse pointer"
-msgstr "¦Û°Ê¡G³]©wÁä½L¿é¤JµJÂI¦Ü·Æ¹««ü¼Ð¤U­±ªºµøµ¡"
+#: ../../WPrefs.app/Focus.c:249
+msgid "Focus follows mouse"
+msgstr "µJÂI¸òµÛ·Æ¹«"
 
-#: ../../WPrefs.app/Focus.c:243
+#: ../../WPrefs.app/Focus.c:250
+msgid "\"Sloppy\" focus"
+msgstr "\"Sloppy\" µJÂI"
+
+#: ../../WPrefs.app/Focus.c:265
 msgid "Install colormap in the window..."
 msgstr "¦w¸Ë¦â½L..."
 
-#: ../../WPrefs.app/Focus.c:248
+#: ../../WPrefs.app/Focus.c:270
 msgid "...that has the input focus."
 msgstr "...¿é¤JµJÂI©Ò¦bµøµ¡¡C"
 
-#: ../../WPrefs.app/Focus.c:253
+#: ../../WPrefs.app/Focus.c:275
 msgid "...that is under the mouse pointer."
 msgstr "...·Æ¹««ü¼Ð¤U­±ªºµøµ¡¡C"
 
-#: ../../WPrefs.app/Focus.c:262
+#: ../../WPrefs.app/Focus.c:284
 msgid "Automatic Window Raise Delay"
 msgstr "¦Û°Ê¤É°_µøµ¡©µ¿ð"
 
-#: ../../WPrefs.app/Focus.c:319 ../../WPrefs.app/MouseSettings.c:601
+#: ../../WPrefs.app/Focus.c:341
 msgid "msec"
 msgstr "²@¬í"
 
-#: ../../WPrefs.app/Focus.c:336
-msgid ""
-"Do not let applications receive\n"
-"the click used to focus windows."
+#: ../../WPrefs.app/Focus.c:358
+msgid "Do not let applications receive the click used to focus windows."
 msgstr ""
 "¤£­nÅýÀ³¥Îµ{¦¡±o¨ì¥Î¨Ó³]©w\n"
-"µøµ¡µJÂIªº·Æ¹««öÁä¡C"
+"µøµ¡µJÂIªº·Æ¹««öÁä°Ê§@¡C"
 
-#: ../../WPrefs.app/Focus.c:342
-msgid ""
-"Automatically focus new\n"
-"windows."
+#: ../../WPrefs.app/Focus.c:364
+msgid "Automatically focus new windows."
 msgstr "·sµøµ¡¦Û°Ê±o¨ìµJÂI¡C"
 
-#: ../../WPrefs.app/Focus.c:363
+#: ../../WPrefs.app/Focus.c:385
 msgid "Window Focus Preferences"
 msgstr "µøµ¡µJÂI³]©w"
 
-#: ../../WPrefs.app/Focus.c:365
-msgid ""
-"Keyboard focus switching policy, colormap switching\n"
-"policy for 8bpp displays and other related options."
-msgstr ""
-"Áä½LµJÂI¤Á´«µ¦²¤¡A8bpp Åã¥Ü¾¹¦â½L¤Á´«µ¦²¤\n"
-"»P¨ä¥L¬ÛÃö¿ï¶µ¡C"
-
-#: ../../WPrefs.app/Font.c:276
-msgid "Could not locate font information file WPrefs.app/font.data"
-msgstr "µLªk§ä¨ì¦r«¬¸ê°TÀÉ WPrefs.app/font.data"
-
-#: ../../WPrefs.app/Font.c:282
-msgid "Could not read font information file WPrefs.app/font.data"
-msgstr "µLªkŪ¨ú¦r«¬¸ê°TÀÉ WPrefs.app/font.data"
-
-#: ../../WPrefs.app/Font.c:293
-msgid ""
-"Invalid data in font information file WPrefs.app/font.data.\n"
-"Encodings data not found."
-msgstr ""
-"¦r«¬¸ê°TÀÉ WPrefs.app/font.data ¦³µL®Ä¸ê®Æ¡C\n"
-"§ä¤£¨ì½s½X¸ê®Æ¡C"
-
-#: ../../WPrefs.app/Font.c:298
-msgid "- Custom -"
-msgstr "- ¦Û­q -"
-
-#: ../../WPrefs.app/Font.c:329 ../../WPrefs.app/Menu.c:1534
-#: ../../WPrefs.app/MouseSettings.c:140 ../../WPrefs.app/MouseSettings.c:160
-#: ../../WPrefs.app/TexturePanel.c:613 ../../WPrefs.app/TexturePanel.c:693
-#: ../../WPrefs.app/Themes.c:96 ../../WPrefs.app/WPrefs.c:758
-#: ../../WPrefs.app/WPrefs.c:763 ../../WPrefs.app/WPrefs.c:780
-#: ../../WPrefs.app/WPrefs.c:790 ../../WPrefs.app/WPrefs.c:800
-#: ../../WPrefs.app/WPrefs.c:838 ../../WPrefs.app/WPrefs.c:843
-msgid "Error"
-msgstr "¿ù»~"
-
-#: ../../WPrefs.app/Font.c:329 ../../WPrefs.app/Menu.c:1534
-#: ../../WPrefs.app/MouseSettings.c:142 ../../WPrefs.app/MouseSettings.c:162
-#: ../../WPrefs.app/TexturePanel.c:614 ../../WPrefs.app/TexturePanel.c:695
-#: ../../WPrefs.app/TexturePanel.c:1528 ../../WPrefs.app/Themes.c:98
-#: ../../WPrefs.app/WPrefs.c:758 ../../WPrefs.app/WPrefs.c:763
-#: ../../WPrefs.app/WPrefs.c:782 ../../WPrefs.app/WPrefs.c:794
-#: ../../WPrefs.app/WPrefs.c:800 ../../WPrefs.app/WPrefs.c:807
-#: ../../WPrefs.app/WPrefs.c:838 ../../WPrefs.app/WPrefs.c:843
-#: ../../WPrefs.app/imagebrowser.c:105
-msgid "OK"
-msgstr "½T©w"
-
-#: ../../WPrefs.app/Font.c:376
-msgid "Default Font Sets"
-msgstr "¹w³]¦r«¬¶°"
-
-#: ../../WPrefs.app/Font.c:389
-msgid "Font Set"
-msgstr "¦r«¬¶°"
-
-#: ../../WPrefs.app/Font.c:418
-msgid "Add..."
-msgstr "·s¼W..."
-
-#: ../../WPrefs.app/Font.c:423 ../../WPrefs.app/Font.c:438
-msgid "Change..."
-msgstr "§ïÅÜ..."
-
-#: ../../WPrefs.app/Font.c:428 ../../WPrefs.app/Paths.c:288
-#: ../../WPrefs.app/Paths.c:319
-msgid "Remove"
-msgstr "§R°£"
-
-#: ../../WPrefs.app/Font.c:477
-msgid "Font Preferences"
-msgstr "¦r«¬³]©w"
-
-#: ../../WPrefs.app/Font.c:478
-msgid "Font Configurations for Windows, Menus etc"
-msgstr "µøµ¡¡B¿ï³æµ¥ªº¦r«¬³]©w"
-
-#: ../../WPrefs.app/Icons.c:180
+#: ../../WPrefs.app/Icons.c:178
 msgid "Icon Positioning"
 msgstr "¹Ï¥Ü¦ì¸m"
 
-#: ../../WPrefs.app/Icons.c:227
+#: ../../WPrefs.app/Icons.c:225
 msgid "Iconification Animation"
 msgstr "ÁY¦¨¹Ï¥Ü°Êµe"
 
-#: ../../WPrefs.app/Icons.c:238
+#: ../../WPrefs.app/Icons.c:236
 msgid "Shrinking/Zooming"
 msgstr "ÁY¤p/©ñ¤j"
 
-#: ../../WPrefs.app/Icons.c:239
+#: ../../WPrefs.app/Icons.c:237
 msgid "Spinning/Twisting"
 msgstr "°jÂà/Âà¦V"
 
-#: ../../WPrefs.app/Icons.c:240
+#: ../../WPrefs.app/Icons.c:238
 msgid "3D-flipping"
 msgstr "¥ßÅé½Âà"
 
-#: ../../WPrefs.app/Icons.c:241 ../../WPrefs.app/MouseSettings.c:838
-#: ../../WPrefs.app/MouseSettings.c:843
+#: ../../WPrefs.app/Icons.c:239
 msgid "None"
 msgstr "µL"
 
-#: ../../WPrefs.app/Icons.c:254
+#: ../../WPrefs.app/Icons.c:247
+msgid "Icon Display"
+msgstr "¹Ï¥ÜÅã¥Ü"
+
+#: ../../WPrefs.app/Icons.c:252
 msgid "Auto-arrange icons"
 msgstr "¦Û°Ê±Æ¦C¹Ï¥Ü"
 
-#: ../../WPrefs.app/Icons.c:256
-msgid "Keep icons and miniwindows arranged all the time."
-msgstr "ÀH®É«O«ù¹Ï¥Ü»P³Ì¤pµøµ¡±Æ¦C¾ã»ô¡C"
-
-#: ../../WPrefs.app/Icons.c:262
+#: ../../WPrefs.app/Icons.c:257
 msgid "Omnipresent miniwindows"
 msgstr "³Ì¤pµøµ¡µL©Ò¤£¦b"
 
-#: ../../WPrefs.app/Icons.c:264
-msgid "Make miniwindows be present in all workspaces."
-msgstr "Åý³Ì¤pµøµ¡¥X²{¦b©Ò¦³¤u§@°Ï¡C"
-
-#: ../../WPrefs.app/Icons.c:273
+#: ../../WPrefs.app/Icons.c:265
 msgid "Icon Size"
 msgstr "¹Ï¥Ü¤j¤p"
 
-#: ../../WPrefs.app/Icons.c:275
-msgid "The size of the dock/application icon and miniwindows"
-msgstr "°±¾a°Ï/À³¥Îµ{¦¡¹Ï¥Ü»P³Ì¤pµøµ¡¤§¤j¤p"
-
-#: ../../WPrefs.app/Icons.c:345
+#: ../../WPrefs.app/Icons.c:335
 msgid "Icon Preferences"
 msgstr "¹Ï¥Ü³]©w"
 
-#: ../../WPrefs.app/Icons.c:347
-msgid ""
-"Icon/Miniwindow handling options. Icon positioning\n"
-"area, sizes of icons, miniaturization animation style."
-msgstr ""
-"¹Ï¥Ü/³Ì¤pµøµ¡³B²z¿ï¶µ¡C¹Ï¥Ü©ñ¸m°Ï°ì¡B\n"
-"¹Ï¥Ü¤j¤p¡B³Ì¤p¤Æ°Êµe­·®æ¡C"
-
-#: ../../WPrefs.app/KeyboardSettings.c:73
+#: ../../WPrefs.app/KeyboardSettings.c:72
 msgid "Initial Key Repeat"
 msgstr "±Ò©l«öÁä­«½Æ"
 
-#: ../../WPrefs.app/KeyboardSettings.c:114
+#: ../../WPrefs.app/KeyboardSettings.c:113
 msgid "Key Repeat Rate"
 msgstr "«öÁä­«½Æ³t²v"
 
-#: ../../WPrefs.app/KeyboardSettings.c:154
+#: ../../WPrefs.app/KeyboardSettings.c:153
 msgid "Type here to test"
 msgstr "¦b¦¹¥´¦r´ú¸Õ"
 
-#: ../../WPrefs.app/KeyboardSettings.c:173
+#: ../../WPrefs.app/KeyboardSettings.c:172
 msgid "Keyboard Preferences"
 msgstr "Áä½L³]©w"
 
-#: ../../WPrefs.app/KeyboardSettings.c:175
-msgid "Not done"
-msgstr "¥¼§¹¦¨"
-
-#: ../../WPrefs.app/KeyboardShortcuts.c:186 ../../WPrefs.app/Menu.c:327
-#: ../../WPrefs.app/TexturePanel.c:1534 ../../WPrefs.app/imagebrowser.c:100
+#: ../../WPrefs.app/KeyboardShortcuts.c:183 ../../WPrefs.app/Menu.c:934
+#: ../../WPrefs.app/MenuGuru.c:263
 msgid "Cancel"
 msgstr "¨ú®ø"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:187
+#: ../../WPrefs.app/KeyboardShortcuts.c:184
 msgid "Press the desired shortcut key(s) or click Cancel to stop capturing."
 msgstr "«ö¤U·Q­nªº±¶®|Áä©Î«ö¤U¨ú®ø°±¤î§ì¨ú¡C"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:207
-#: ../../WPrefs.app/KeyboardShortcuts.c:456 ../../WPrefs.app/Menu.c:338
-#: ../../WPrefs.app/Menu.c:782
+#: ../../WPrefs.app/KeyboardShortcuts.c:204
+#: ../../WPrefs.app/KeyboardShortcuts.c:444 ../../WPrefs.app/Menu.c:946
+#: ../../WPrefs.app/Menu.c:1168
 msgid "Capture"
 msgstr "§ì¨ú"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:208
-#: ../../WPrefs.app/KeyboardShortcuts.c:464
+#: ../../WPrefs.app/KeyboardShortcuts.c:205
+#: ../../WPrefs.app/KeyboardShortcuts.c:451
 msgid "Click Capture to interactively define the shortcut key."
 msgstr "«ö¤U§ì¨ú¥i¤¬°Ê¦¡©w¸q±¶®|Áä¡C"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:363
+#: ../../WPrefs.app/KeyboardShortcuts.c:359
 msgid "Actions"
 msgstr "°Ê§@"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:379
+#: ../../WPrefs.app/KeyboardShortcuts.c:375
 msgid "Open applications menu"
 msgstr "¶}±ÒÀ³¥Îµ{¦¡¿ï³æ"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:380
+#: ../../WPrefs.app/KeyboardShortcuts.c:376
 msgid "Open window list menu"
 msgstr "¶}±Òµøµ¡²M³æ¿ï³æ"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:381
+#: ../../WPrefs.app/KeyboardShortcuts.c:377
 msgid "Open window commands menu"
 msgstr "¶}±Òµøµ¡©R¥O¿ï³æ"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:382
+#: ../../WPrefs.app/KeyboardShortcuts.c:378
 msgid "Hide active application"
 msgstr "ÁôÂ조ʤ¤ªºÀ³¥Îµ{¦¡"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:383
+#: ../../WPrefs.app/KeyboardShortcuts.c:379
 msgid "Miniaturize active window"
 msgstr "³Ì¤p¤Æ¬¡°Ê¤¤ªºµøµ¡"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:384
+#: ../../WPrefs.app/KeyboardShortcuts.c:380
 msgid "Close active window"
 msgstr "Ãö³¬¬¡°Ê¤¤ªºµøµ¡"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:385
+#: ../../WPrefs.app/KeyboardShortcuts.c:381
 msgid "Maximize active window"
 msgstr "³Ì¤j¤Æ¬¡°Ê¤¤ªºµøµ¡"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:386
+#: ../../WPrefs.app/KeyboardShortcuts.c:382
 msgid "Maximize active window vertically"
 msgstr "««ª½³Ì¤j¤Æ¬¡°Ê¤¤ªºµøµ¡"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:387
-msgid "Maximize active window horizontally"
-msgstr "¤ô¥­³Ì¤j¤Æ¬¡°Ê¤¤ªºµøµ¡"
-
-#: ../../WPrefs.app/KeyboardShortcuts.c:388
+#: ../../WPrefs.app/KeyboardShortcuts.c:383
 msgid "Raise active window"
 msgstr "¤É°_¬¡°Ê¤¤ªºµøµ¡"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:389
+#: ../../WPrefs.app/KeyboardShortcuts.c:384
 msgid "Lower active window"
 msgstr "­°¤U¬¡°Ê¤¤ªºµøµ¡"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:390
+#: ../../WPrefs.app/KeyboardShortcuts.c:385
 msgid "Raise/Lower window under mouse pointer"
 msgstr "¤É°_/­°¤U·Æ¹««ü¼Ð¤U­±ªºµøµ¡"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:391
+#: ../../WPrefs.app/KeyboardShortcuts.c:386
 msgid "Shade active window"
 msgstr "¾B½ª¬¡°Ê¤¤ªºµøµ¡"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:392
+#: ../../WPrefs.app/KeyboardShortcuts.c:387
 msgid "Move/Resize active window"
 msgstr "¬¡°Ê¤¤ªºµøµ¡²¾°Ê/¤j¤pÅܧó"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:393
+#: ../../WPrefs.app/KeyboardShortcuts.c:388
 msgid "Select active window"
 msgstr "¿ï¨ú¬¡°Ê¤¤ªºµøµ¡"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:394
+#: ../../WPrefs.app/KeyboardShortcuts.c:389
 msgid "Focus next window"
 msgstr "µJÂI²¾¦Ü¤U¤@­Óµøµ¡"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:395
+#: ../../WPrefs.app/KeyboardShortcuts.c:390
 msgid "Focus previous window"
 msgstr "µJÂI²¾¦Ü¤W¤@­Óµøµ¡"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:396
+#: ../../WPrefs.app/KeyboardShortcuts.c:391
 msgid "Switch to next workspace"
 msgstr "¤Á´«¦Ü¤U¤@­Ó¤u§@°Ï"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:397
+#: ../../WPrefs.app/KeyboardShortcuts.c:392
 msgid "Switch to previous workspace"
 msgstr "¤Á´«¦Ü¤W¤@­Ó¤u§@°Ï"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:398
+#: ../../WPrefs.app/KeyboardShortcuts.c:393
 msgid "Switch to next ten workspaces"
 msgstr "¤Á´«¦Ü«á¤Q­Ó¤u§@°Ï"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:399
+#: ../../WPrefs.app/KeyboardShortcuts.c:394
 msgid "Switch to previous ten workspaces"
 msgstr "¤Á´«¦Ü«e¤Q­Ó¤u§@°Ï"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:400
+#: ../../WPrefs.app/KeyboardShortcuts.c:395
 msgid "Switch to workspace 1"
 msgstr "¤Á´«¦Ü¤u§@°Ï 1"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:401
+#: ../../WPrefs.app/KeyboardShortcuts.c:396
 msgid "Switch to workspace 2"
 msgstr "¤Á´«¦Ü¤u§@°Ï 2"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:402
+#: ../../WPrefs.app/KeyboardShortcuts.c:397
 msgid "Switch to workspace 3"
 msgstr "¤Á´«¦Ü¤u§@°Ï 3"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:403
+#: ../../WPrefs.app/KeyboardShortcuts.c:398
 msgid "Switch to workspace 4"
 msgstr "¤Á´«¦Ü¤u§@°Ï 4"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:404
+#: ../../WPrefs.app/KeyboardShortcuts.c:399
 msgid "Switch to workspace 5"
 msgstr "¤Á´«¦Ü¤u§@°Ï 5"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:405
+#: ../../WPrefs.app/KeyboardShortcuts.c:400
 msgid "Switch to workspace 6"
 msgstr "¤Á´«¦Ü¤u§@°Ï 6"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:406
+#: ../../WPrefs.app/KeyboardShortcuts.c:401
 msgid "Switch to workspace 7"
 msgstr "¤Á´«¦Ü¤u§@°Ï 7"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:407
+#: ../../WPrefs.app/KeyboardShortcuts.c:402
 msgid "Switch to workspace 8"
 msgstr "¤Á´«¦Ü¤u§@°Ï 8"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:408
+#: ../../WPrefs.app/KeyboardShortcuts.c:403
 msgid "Switch to workspace 9"
 msgstr "¤Á´«¦Ü¤u§@°Ï 9"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:409
+#: ../../WPrefs.app/KeyboardShortcuts.c:404
 msgid "Switch to workspace 10"
 msgstr "¤Á´«¦Ü¤u§@°Ï 10"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:410
+#: ../../WPrefs.app/KeyboardShortcuts.c:405
 msgid "Shortcut for window 1"
 msgstr "µøµ¡ 1 ªº±¶®|"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:411
+#: ../../WPrefs.app/KeyboardShortcuts.c:406
 msgid "Shortcut for window 2"
 msgstr "µøµ¡ 2 ªº±¶®|"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:412
+#: ../../WPrefs.app/KeyboardShortcuts.c:407
 msgid "Shortcut for window 3"
 msgstr "µøµ¡ 3 ªº±¶®|"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:413
+#: ../../WPrefs.app/KeyboardShortcuts.c:408
 msgid "Shortcut for window 4"
 msgstr "µøµ¡ 4 ªº±¶®|"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:414
-msgid "Shortcut for window 5"
-msgstr "µøµ¡ 5 ªº±¶®|"
-
-#: ../../WPrefs.app/KeyboardShortcuts.c:415
-msgid "Shortcut for window 6"
-msgstr "µøµ¡ 6 ªº±¶®|"
-
-#: ../../WPrefs.app/KeyboardShortcuts.c:416
-msgid "Shortcut for window 7"
-msgstr "µøµ¡ 7 ªº±¶®|"
-
-#: ../../WPrefs.app/KeyboardShortcuts.c:417
-msgid "Shortcut for window 8"
-msgstr "µøµ¡ 8 ªº±¶®|"
-
-#: ../../WPrefs.app/KeyboardShortcuts.c:418
-msgid "Shortcut for window 9"
-msgstr "µøµ¡ 9 ªº±¶®|"
-
-#: ../../WPrefs.app/KeyboardShortcuts.c:419
-msgid "Shortcut for window 10"
-msgstr "µøµ¡ 10 ªº±¶®|"
-
-#: ../../WPrefs.app/KeyboardShortcuts.c:420
-msgid "Switch to Next Screen/Monitor"
-msgstr "¤Á´«¦Ü«á¤Q­Ó¿Ã¹õ/ºÊµø¾¹"
-
-#: ../../WPrefs.app/KeyboardShortcuts.c:421
+#: ../../WPrefs.app/KeyboardShortcuts.c:409
 msgid "Raise Clip"
 msgstr "¤É°_°j¯¾°w"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:422
+#: ../../WPrefs.app/KeyboardShortcuts.c:410
 msgid "Lower Clip"
 msgstr "­°¤U°j¯¾°w"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:423
+#: ../../WPrefs.app/KeyboardShortcuts.c:411
 msgid "Raise/Lower Clip"
 msgstr "¤É°_/­°¤U°j¯¾°w"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:425
+#: ../../WPrefs.app/KeyboardShortcuts.c:413
 msgid "Toggle keyboard language"
 msgstr "¤Á´«Áä½L»y¨¥"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:439
+#: ../../WPrefs.app/KeyboardShortcuts.c:427 ../../WPrefs.app/Menu.c:1157
 msgid "Shortcut"
 msgstr "±¶®|"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:450 ../../WPrefs.app/Menu.c:788
+#: ../../WPrefs.app/KeyboardShortcuts.c:438
 msgid "Clear"
 msgstr "²M°£"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:512
+#: ../../WPrefs.app/KeyboardShortcuts.c:499
 msgid "Keyboard Shortcut Preferences"
 msgstr "Áä½L±¶®|³]©w"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:514
-msgid ""
-"Change the keyboard shortcuts for actions such\n"
-"as changing workspaces and opening menus."
-msgstr "§ïÅܨҦpÅܧó¤u§@°Ï»P¶}±Ò¿ï³æ°Ê§@ªºÁä½L±¶®|¡C"
+#: ../../WPrefs.app/Menu.c:373
+msgid "Window Manager"
+msgstr "µøµ¡ºÞ²z­û"
 
-#: ../../WPrefs.app/Menu.c:477
-msgid "New Items"
-msgstr "·s¶µ¥Ø"
+#: ../../WPrefs.app/Menu.c:375
+msgid "Program to open files"
+msgstr "¶}±ÒÀɮפ§µ{¦¡"
 
-#: ../../WPrefs.app/Menu.c:478
-msgid "Sample Commands"
-msgstr "¼Ë¥»©R¥O"
-
-#: ../../WPrefs.app/Menu.c:479
-msgid "Sample Submenus"
-msgstr "¼Ë¥»°Æ¿ï³æ"
-
-#: ../../WPrefs.app/Menu.c:493
-msgid "Run Program"
-msgstr "°õ¦æµ{¦¡"
-
-#: ../../WPrefs.app/Menu.c:494
-msgid "Internal Command"
-msgstr "¤º³¡©R¥O"
-
-#: ../../WPrefs.app/Menu.c:495
-msgid "Submenu"
-msgstr "°Æ¿ï³æ"
-
-#: ../../WPrefs.app/Menu.c:496
-msgid "External Submenu"
-msgstr "¥~³¡°Æ¿ï³æ"
-
-#: ../../WPrefs.app/Menu.c:497
-msgid "Generated Submenu"
-msgstr "²£¥Íªº°Æ¿ï³æ"
-
-#: ../../WPrefs.app/Menu.c:498
-msgid "Directory Contents"
-msgstr "¥Ø¿ý¤º®e"
-
-#: ../../WPrefs.app/Menu.c:499
-msgid "Workspace Menu"
-msgstr "¤u§@°Ï¿ï³æ"
-
-#: ../../WPrefs.app/Menu.c:500 ../../WPrefs.app/MouseSettings.c:840
-msgid "Window List Menu"
-msgstr "µøµ¡²M³æ¿ï³æ"
-
-#: ../../WPrefs.app/Menu.c:519
-msgid "XTerm"
-msgstr "XTerm"
-
-#: ../../WPrefs.app/Menu.c:522
-msgid "rxvt"
-msgstr "rxvt"
-
-#: ../../WPrefs.app/Menu.c:525
-msgid "ETerm"
-msgstr "ETerm"
-
-#: ../../WPrefs.app/Menu.c:528
-msgid "Run..."
-msgstr "°õ¦æ..."
-
-#: ../../WPrefs.app/Menu.c:529
-msgid "%a(Run,Type command to run)"
-msgstr "%a¡]°õ¦æ¡A¿é¤J°õ¦æ¤§©R¥O¡^"
-
-#: ../../WPrefs.app/Menu.c:531
-msgid "Netscape"
-msgstr "Netscape"
-
-#: ../../WPrefs.app/Menu.c:534
-msgid "gimp"
-msgstr "gimp"
-
-#: ../../WPrefs.app/Menu.c:537
-msgid "epic"
-msgstr "epic"
-
-#: ../../WPrefs.app/Menu.c:540
-msgid "ee"
-msgstr "ee"
-
-#: ../../WPrefs.app/Menu.c:543
-msgid "xv"
-msgstr "xv"
-
-#: ../../WPrefs.app/Menu.c:546
-msgid "Acrobat Reader"
-msgstr "Acrobat Reader"
-
-#: ../../WPrefs.app/Menu.c:549
-msgid "ghostview"
-msgstr "ghostview"
-
-#: ../../WPrefs.app/Menu.c:552 ../../WPrefs.app/Menu.c:809
-msgid "Exit Window Maker"
-msgstr "Â÷¶} Window Maker"
-
-#: ../../WPrefs.app/Menu.c:575
-msgid "Debian Menu"
-msgstr "Debian Menu"
-
-#: ../../WPrefs.app/Menu.c:578
-msgid "RedHat Menu"
-msgstr "RedHat Menu"
-
-#: ../../WPrefs.app/Menu.c:581
-msgid "Menu Conectiva"
-msgstr "Menu Conectiva"
-
-#: ../../WPrefs.app/Menu.c:584 ../../WPrefs.app/Themes.c:250
-msgid "Themes"
-msgstr "¥DÃD"
-
-#: ../../WPrefs.app/Menu.c:589
-msgid "Bg Images (scale)"
-msgstr "­I´º¼v¹³¡]ÁY©ñ¡^"
-
-#: ../../WPrefs.app/Menu.c:594
-msgid "Bg Images (tile)"
-msgstr "­I´º¼v¹³¡]¨Ã±Æ¡^"
-
-#: ../../WPrefs.app/Menu.c:599
-msgid "Assorted XTerms"
-msgstr "Assorted XTerms"
-
-#: ../../WPrefs.app/Menu.c:601
-msgid "XTerm Yellow on Blue"
-msgstr "XTerm Yellow on Blue"
-
-#: ../../WPrefs.app/Menu.c:604
-msgid "XTerm White on Black"
-msgstr "XTerm White on Black"
-
-#: ../../WPrefs.app/Menu.c:607
-msgid "XTerm Black on White"
-msgstr "XTerm Black on White"
-
-#: ../../WPrefs.app/Menu.c:610
-msgid "XTerm Black on Beige"
-msgstr "XTerm Black on Beig"
-
-#: ../../WPrefs.app/Menu.c:613
-msgid "XTerm White on Green"
-msgstr "XTerm White on Green"
-
-#: ../../WPrefs.app/Menu.c:616
-msgid "XTerm White on Olive"
-msgstr "XTerm White on Olive"
-
-#: ../../WPrefs.app/Menu.c:619
-msgid "XTerm Blue on Blue"
-msgstr "XTerm Blue on Blue"
-
-#: ../../WPrefs.app/Menu.c:622
-msgid "XTerm BIG FONTS"
-msgstr "XTerm BIG FONTS"
-
-#: ../../WPrefs.app/Menu.c:644
+#: ../../WPrefs.app/Menu.c:377 ../../WPrefs.app/Menu.c:1144
 msgid "Program to Run"
 msgstr "°õ¦æ¤§µ{¦¡"
 
-#: ../../WPrefs.app/Menu.c:658
-msgid "Run the program inside a Xterm"
-msgstr "¦b Xterm ¤¤°õ¦æµ{¦¡"
+#: ../../WPrefs.app/Menu.c:427 ../../WPrefs.app/Menu.c:428
+#, c-format
+msgid "New Command %i"
+msgstr "·s¼W©R¥O %i"
 
-#: ../../WPrefs.app/Menu.c:668
-msgid "Path for Menu"
-msgstr "¿ï³æ¸ô®|"
+#: ../../WPrefs.app/Menu.c:435
+msgid "New Submenu"
+msgstr "·s¼W°Æ¿ï³æ"
 
-#: ../../WPrefs.app/Menu.c:681
-msgid ""
-"Enter the path for a file containing a menu\n"
-"or a list of directories with the programs you\n"
-"want to have listed in the menu. Ex:\n"
-"~/GNUstep/Library/WindowMaker/menu\n"
-"or\n"
-"/usr/X11R6/bin ~/xbin"
-msgstr ""
-"¿é¤J¸ô®|§t¦³§A­n¦C©ó¿ï³æ¤¤\n"
-"µ{¦¡ªº¿ï³æ©Î¥Ø¿ý²M³æªºÀɮ׸ô®|¡C\n"
-"¨Ò¦p¡G~/GNUstep/Library/WindowMaker/menu\n"
-"©Î\n"
-"/usr/X11R6/bin ~/xbin"
+#: ../../WPrefs.app/Menu.c:440
+msgid "External Menu"
+msgstr "¥~³¡¿ï³æ"
 
-#: ../../WPrefs.app/Menu.c:696
+#: ../../WPrefs.app/Menu.c:447
+msgid "Workspaces"
+msgstr "¤u§@°Ï"
+
+#: ../../WPrefs.app/Menu.c:1028 ../../WPrefs.app/Menu.c:1043
+msgid "Commands"
+msgstr "©R¥O"
+
+#: ../../WPrefs.app/Menu.c:1029 ../../WPrefs.app/Menu.c:1044
+msgid "Add Command"
+msgstr "·s¼W©R¥O"
+
+#: ../../WPrefs.app/Menu.c:1030 ../../WPrefs.app/Menu.c:1045
+msgid "Add Submenu"
+msgstr "¼W¥[°Æ¿ï³æ"
+
+#: ../../WPrefs.app/Menu.c:1031 ../../WPrefs.app/Menu.c:1046
+msgid "Add External Menu"
+msgstr "¼W¥[¥~³¡¿ï³æ"
+
+#: ../../WPrefs.app/Menu.c:1032 ../../WPrefs.app/Menu.c:1047
+msgid "Add Workspace Menu"
+msgstr "¼W¥[¤u§@°Ï"
+
+#: ../../WPrefs.app/Menu.c:1033 ../../WPrefs.app/Menu.c:1048
+msgid "Remove Item"
+msgstr "§R°£¶µ¥Ø"
+
+#: ../../WPrefs.app/Menu.c:1034 ../../WPrefs.app/Menu.c:1049
+msgid "Cut Item"
+msgstr "°Å¤U¶µ¥Ø"
+
+#: ../../WPrefs.app/Menu.c:1035 ../../WPrefs.app/Menu.c:1050
+msgid "Copy Item"
+msgstr "½Æ»s¶µ¥Ø"
+
+#: ../../WPrefs.app/Menu.c:1036 ../../WPrefs.app/Menu.c:1051
+msgid "Paste Item"
+msgstr "¶K¤W¶µ¥Ø"
+
+#: ../../WPrefs.app/Menu.c:1080
+msgid "Label"
+msgstr "¼ÐÅÒ"
+
+#: ../../WPrefs.app/Menu.c:1093
 msgid "Command"
 msgstr "©R¥O"
 
-#: ../../WPrefs.app/Menu.c:710
-msgid ""
-"Enter a command that outputs a menu\n"
-"definition to stdout when invoked."
-msgstr "¿é¤J¤Þ¥Î®É¿é¥X¿ï³æ©w¸q¦Ü¼Ð·Ç¿é¥Xªº«ü¥O¡C"
+#: ../../WPrefs.app/Menu.c:1098
+msgid "Run Program"
+msgstr "°õ¦æµ{¦¡"
 
-#: ../../WPrefs.app/Menu.c:721
-msgid "Command to Open Files"
-msgstr "¶}±ÒÀɮפ§©R¥O"
-
-#: ../../WPrefs.app/Menu.c:735
-msgid ""
-"Enter the command you want to use to open the\n"
-"files in the directories listed below."
-msgstr "¿é¤J§A­n¥Î¨Ó¶}±Ò¤U¦C¥Ø¿ý¤¤Àɮתº©R¥O¡C"
-
-#: ../../WPrefs.app/Menu.c:744
-msgid "Directories with Files"
-msgstr "Àɮץؿý"
-
-#: ../../WPrefs.app/Menu.c:757
-msgid "Strip extensions from file names"
-msgstr "°£¥h©µ¦ùÀɦW"
-
-#: ../../WPrefs.app/Menu.c:769
-msgid "Keyboard Shortcut"
-msgstr "Áä½L±¶®|"
-
-#: ../../WPrefs.app/Menu.c:805
+#: ../../WPrefs.app/Menu.c:1099
 msgid "Arrange Icons"
 msgstr "±Æ¦C¹Ï¥Ü"
 
-#: ../../WPrefs.app/Menu.c:806
-msgid "Hide All Windows Except For The Focused One"
-msgstr "°£¤FµJÂIµøµ¡¥H¥~ÁôÂéҦ³µøµ¡"
+#: ../../WPrefs.app/Menu.c:1100
+msgid "Hide Others"
+msgstr "ÁôÂèä¥L"
 
-#: ../../WPrefs.app/Menu.c:807
+#: ../../WPrefs.app/Menu.c:1101
 msgid "Show All Windows"
 msgstr "Åã¥Ü©Ò¦³µøµ¡"
 
-#: ../../WPrefs.app/Menu.c:810
+#: ../../WPrefs.app/Menu.c:1102
+msgid "Exit WindowMaker"
+msgstr "Â÷¶} WindowMaker"
+
+#: ../../WPrefs.app/Menu.c:1103
 msgid "Exit X Session"
 msgstr "Â÷¶} X µøµ¡¨t²Î"
 
-#: ../../WPrefs.app/Menu.c:811
-msgid "Restart Window Maker"
-msgstr "­«·s±Ò°Ê Window Maker"
+#: ../../WPrefs.app/Menu.c:1104
+msgid "Start window manager"
+msgstr "±Ò°Êµøµ¡ºÞ²z­û"
 
-#: ../../WPrefs.app/Menu.c:812
-msgid "Start Another Window Manager   : ("
-msgstr "±Ò°Ê¨ä¥Lµøµ¡ºÞ²z­û    ¡G¡}"
+#: ../../WPrefs.app/Menu.c:1105
+msgid "Restart WindowMaker"
+msgstr "­«·s±Ò°Ê WindowMaker"
 
-#: ../../WPrefs.app/Menu.c:814
-msgid "Save Current Session"
-msgstr "Àx¦s¥Ø«e¶¥¬q"
+#: ../../WPrefs.app/Menu.c:1106
+msgid "Save Session"
+msgstr "Àx¦s¶¥¬qª¬ºA"
 
-#: ../../WPrefs.app/Menu.c:815
-msgid "Clear Saved Session"
-msgstr "²M°£¤wÀx¦s¶¥¬q"
+#: ../../WPrefs.app/Menu.c:1107
+msgid "Clear Session"
+msgstr "²M°£¶¥¬qª¬ºA"
 
-#: ../../WPrefs.app/Menu.c:816
+#: ../../WPrefs.app/Menu.c:1108
 msgid "Refresh Screen"
 msgstr "§ó·s¿Ã¹õ"
 
-#: ../../WPrefs.app/Menu.c:817
-msgid "Open Info Panel"
-msgstr "¶}±Ò¸ê°T­±ªO"
+#: ../../WPrefs.app/Menu.c:1109
+msgid "Info Panel"
+msgstr "¸ê°T­±ªO"
 
-#: ../../WPrefs.app/Menu.c:818
-msgid "Open Copyright Panel"
-msgstr "¶}±Òª©Åv­±ªO"
+#: ../../WPrefs.app/Menu.c:1110
+msgid "Legal Panel"
+msgstr "ªk«ß­±ªO"
 
-#: ../../WPrefs.app/Menu.c:824
-msgid "Window Manager to Start"
-msgstr "±Ò°Ê¤§µøµ¡ºÞ²z­û"
+#: ../../WPrefs.app/Menu.c:1118
+msgid "Open workspace menu"
+msgstr "¶}±Ò¤u§@°Ï¿ï³æ"
 
-#: ../../WPrefs.app/Menu.c:840
-msgid "Do not confirm action."
-msgstr "¤£­n½T»{°Ê§@¡C"
+#: ../../WPrefs.app/Menu.c:1125
+msgid "No confirmation panel"
+msgstr "µL½T»{­±ªO"
 
-#: ../../WPrefs.app/Menu.c:850
-msgid ""
-"Instructions:\n"
-"\n"
-" - drag items from the left to the menu to add new items\n"
-" - drag items out of the menu to remove items\n"
-" - drag items in menu to change their position\n"
-" - drag items with Control pressed to copy them\n"
-" - double click in a menu item to change the label\n"
-" - click on a menu item to change related information"
-msgstr ""
-"«ü¤Þ¡G\n"
-"\n"
-" - ±q¥ª¦Ü¿ï³æ©ì¦²¶µ¥Ø¼W¥[·s¶µ¥Ø\n"
-" - ©ì¦²¶µ¥ØÂ÷¶}¿ï³æ²¾°£¶µ¥Ø\n"
-" - ¦b¿ï³æ¤¤©ì¦²¶µ¥Ø§ïÅܨä¦ì¸m\n"
-" - «ö¤U Control ©ì¦²¶µ¥Ø½Æ»s\n"
-" - ¦b¿ï³æ¶µ¥ØÂI¨â¤U§ïÅܼÐÅÒ\n"
-" - ¦b¿ï³æ¶µ¥ØÂI¤@¤U§ïÅܬÛÃö¸ê°T"
+#: ../../WPrefs.app/Menu.c:1131
+msgid "Menu Path/Directory List"
+msgstr "¿ï³æ¸ô®|/¥Ø¿ý²M³æ"
 
-#: ../../WPrefs.app/Menu.c:1068
-#, c-format
-msgid "unknown command '%s' in menu"
-msgstr "¦b¿ï³æ¤¤¦³¤£©ú©R¥O¡u%s¡v"
-
-#: ../../WPrefs.app/Menu.c:1100
-msgid ": Execute Program"
-msgstr "¡G°õ¦æµ{¦¡"
-
-#: ../../WPrefs.app/Menu.c:1104
-msgid ": Perform Internal Command"
-msgstr "¡G°õ¦æ¤º³¡©R¥O"
-
-#: ../../WPrefs.app/Menu.c:1108
-msgid ": Open a Submenu"
-msgstr "¡G¶}±Ò°Æ¿ï³æ"
-
-#: ../../WPrefs.app/Menu.c:1112
-msgid ": Program Generated Submenu"
-msgstr "¡Gµ{¦¡²£¥Í°Æ¿ï³æ"
-
-#: ../../WPrefs.app/Menu.c:1116
-msgid ": Directory Contents Menu"
-msgstr "¡G¥Ø¿ý¤º®e¿ï³æ"
-
-#: ../../WPrefs.app/Menu.c:1120
-msgid ": Open Workspaces Submenu"
-msgstr "¡G¶}±Ò¤u§@°Ï°Æ¿ï³æ"
-
-#: ../../WPrefs.app/Menu.c:1124
-msgid ": Open Window List Submenu"
-msgstr "¡G¶}±Òµøµ¡²M³æ°Æ¿ï³æ"
-
-#: ../../WPrefs.app/Menu.c:1344
-msgid "Remove Submenu"
-msgstr "§R°£°Æ¿ï³æ"
-
-#: ../../WPrefs.app/Menu.c:1345
-msgid ""
-"Removing this item will destroy all items inside\n"
-"the submenu. Do you really want to do that?"
-msgstr ""
-"²¾°£³o¶µ¥Ø±N¯}Ãa°Æ¿ï³æ¤¤©Ò¦³¶µ¥Ø¡C\n"
-"§A¯uªº­n¨º¼Ë°µ¡H"
-
-#: ../../WPrefs.app/Menu.c:1347
-msgid "Yes"
-msgstr "¬O"
-
-#: ../../WPrefs.app/Menu.c:1347
-msgid "No"
-msgstr "§_"
-
-#: ../../WPrefs.app/Menu.c:1348
-msgid "Yes, don't ask again."
-msgstr "¬O¡A¤£­n¦A°Ý¡C"
+#: ../../WPrefs.app/Menu.c:1176
+msgid "Ask help to the Guru"
+msgstr "¦V±M®a¨D§U"
 
 #. if there is a localized plmenu for the tongue put it's filename here
-#: ../../WPrefs.app/Menu.c:1515 ../../WPrefs.app/Menu.c:1522
+#: ../../WPrefs.app/Menu.c:1287 ../../WPrefs.app/Menu.c:1294
 #, c-format
 msgid "%s/Library/WindowMaker/plmenu"
 msgstr "%s/Library/WindowMaker/plmenu"
 
-#: ../../WPrefs.app/Menu.c:1531
-#, c-format
-msgid "Could not open default menu from '%s'"
-msgstr "µLªk±q¡u%s¡v¶}±Ò¹w³]¿ï³æ"
+#: ../../WPrefs.app/Menu.c:1302 ../../WPrefs.app/MouseSettings.c:146
+#: ../../WPrefs.app/MouseSettings.c:169 ../../WPrefs.app/Text.c:181
+#: ../../WPrefs.app/Themes.c:96 ../../WPrefs.app/WPrefs.c:558
+#: ../../WPrefs.app/WPrefs.c:563 ../../WPrefs.app/WPrefs.c:572
+#: ../../WPrefs.app/WPrefs.c:582 ../../WPrefs.app/WPrefs.c:590
+#: ../../WPrefs.app/WPrefs.c:614 ../../WPrefs.app/WPrefs.c:619
+msgid "Error"
+msgstr "¿ù»~"
 
-#: ../../WPrefs.app/Menu.c:1569 ../../WPrefs.app/WPrefs.c:807
+#: ../../WPrefs.app/Menu.c:1302
+msgid "Could not copy default plmenu file from ~/GNUstep/Library/WindowMaker"
+msgstr "¦b ~/GNUstep/Library/WindowMaker ©³¤U§ä¤£¨ì¹w³]ªº plmenu ÀÉ®×"
+
+#: ../../WPrefs.app/Menu.c:1304 ../../WPrefs.app/Menu.c:1354
+#: ../../WPrefs.app/MenuGuru.c:119 ../../WPrefs.app/MenuGuru.c:126
+#: ../../WPrefs.app/MenuGuru.c:140 ../../WPrefs.app/MouseSettings.c:148
+#: ../../WPrefs.app/MouseSettings.c:171 ../../WPrefs.app/Text.c:181
+#: ../../WPrefs.app/Themes.c:98 ../../WPrefs.app/WPrefs.c:558
+#: ../../WPrefs.app/WPrefs.c:563 ../../WPrefs.app/WPrefs.c:574
+#: ../../WPrefs.app/WPrefs.c:584 ../../WPrefs.app/WPrefs.c:590
+#: ../../WPrefs.app/WPrefs.c:597 ../../WPrefs.app/WPrefs.c:614
+#: ../../WPrefs.app/WPrefs.c:619
+msgid "OK"
+msgstr "½T©w"
+
+#: ../../WPrefs.app/Menu.c:1339
+msgid ""
+"The format of the menu in ~/G/D/WMRootMenu is not recognized by WPrefs. It "
+"might be in a format different than the one supported by WPrefs or contain a "
+"syntax error. Do you want to continue using the current menu to edit it by "
+"hand later or replace it with a default menu in the new format?"
+msgstr "WPrefs µLªk¿ë»{ ~/G/D/WMRootMenu ªº¿ï³æ®æ¦¡¡A­ì¦³ªº¿ï³æ¥i¯à¬O WPrefs ¤£¤ä´©ªº®æ¦¡¡A¤]¥i¯à¬O¿ï³æ©w¸q¦³»yªk¿ù»~¡F§A§Æ±æÄ~Äò¨Ï¥Î¥Ø«eªº¿ï³æ¨Ã¥B¦b¥H«á³£¥H¤â°Ê½s¿è¡AÁÙ¬OÅý WPrefs ¬°±z´«¤W¤@­Ó·sªº¹w³]¿ï³æ? "
+
+#: ../../WPrefs.app/Menu.c:1346 ../../WPrefs.app/Menu.c:1353
+#: ../../WPrefs.app/WPrefs.c:597
 msgid "Warning"
 msgstr "ª`·N"
 
-#: ../../WPrefs.app/Menu.c:1570
-msgid ""
-"The menu file format currently in use is not supported\n"
-"by this tool. Do you want to discard the current menu\n"
-"to use this tool?"
-msgstr ""
-"¥Ø«e¨Ï¥Îªº¿ï³æÀɮ׮榡¥¼³Q¦¹¤u¨ã¤ä´©¡C\n"
-"§A­n©ß±ó¥Ø«e¿ï³æ¥H¨Ï¥Î¦¹¤u¨ã¡H"
+#: ../../WPrefs.app/Menu.c:1346
+msgid "Keep current menu"
+msgstr "Àx¦s¥Ø«e¿ï³æ"
 
-#: ../../WPrefs.app/Menu.c:1573
-msgid "Yes, Discard and Update"
-msgstr "¬O¡A©ñ±ó¥B§ó·s"
+#: ../../WPrefs.app/Menu.c:1347
+msgid "Install default menu"
+msgstr "¦w¸Ë¹w³]¿ï³æ"
 
-#: ../../WPrefs.app/Menu.c:1574
-msgid "No, Keep Current Menu"
-msgstr "§_¡A«O¦s¥Ø«e¿ï³æ"
+#: ../../WPrefs.app/Menu.c:1353
+msgid "Any changes made in this section will not be saved"
+msgstr "¦b³o³¡¥÷ªº¥ô¦ó§ïÅܤ£·|³QÀx¦s"
 
-#: ../../WPrefs.app/Menu.c:1834
+#: ../../WPrefs.app/Menu.c:1419
 msgid "Applications Menu Definition"
 msgstr "À³¥Îµ{¦¡¿ï³æ©w¸q"
 
-#: ../../WPrefs.app/Menu.c:1836
-msgid "Edit the menu for launching applications."
-msgstr "½s¿è±Ò°ÊÀ³¥Îµ{¦¡ªº¿ï³æ¡C"
+#: ../../WPrefs.app/MenuGuru.c:106
+msgid "Menu Guru - Select Type"
+msgstr "¿ï³æ±M®a - ¿ï¨ú«¬ºA"
 
-#: ../../WPrefs.app/MenuPreferences.c:111
+#: ../../WPrefs.app/MenuGuru.c:111 ../../WPrefs.app/MenuGuru.c:133
+#: ../../WPrefs.app/MenuGuru.c:251
+msgid "Next"
+msgstr "¤U¤@¨B"
+
+#: ../../WPrefs.app/MenuGuru.c:114
+msgid "Menu Guru - Select Menu File"
+msgstr "¿ï³æ±M®a - ¿ï¨ú¿ï³æÀÉ"
+
+#: ../../WPrefs.app/MenuGuru.c:122
+msgid "Menu Guru - Select Pipe Command"
+msgstr "¿ï³æ±M®a - ¿ï¨ú Pipe ©R¥O"
+
+#: ../../WPrefs.app/MenuGuru.c:129
+msgid "Menu Guru - Select Directories"
+msgstr "¿ï³æ±M®a - ¿ï¨ú¥Ø¿ý"
+
+#: ../../WPrefs.app/MenuGuru.c:136
+msgid "Menu Guru - Select Command"
+msgstr "¿ï³æ±M®a - ¿ï¨ú©R¥O"
+
+#: ../../WPrefs.app/MenuGuru.c:257
+msgid "Back"
+msgstr "¤W¤@¨B"
+
+#: ../../WPrefs.app/MenuGuru.c:271
+msgid ""
+"This process will help you create a submenu which definition is located in "
+"another file or is created dynamically.\n"
+"What do you want to use as the contents of the submenu?"
+msgstr ""
+"³oµ{§Ç·|À°±z«Ø¥ß¦b¥t¤@­ÓÀɮשΰʺA«Ø¥ß©w¸qªº°Æ¥Ø¿ý¡C\n"
+"±z­n¥Î¤°»ò·í§@°Æ¥Ø¿ýªº¤º®e¡H"
+
+#: ../../WPrefs.app/MenuGuru.c:279
+msgid ""
+"A file containing the menu definition in the plain text (non-property list) "
+"menu format."
+msgstr "§t¦³¯Â¤å¦r¡]µL¯S½è²M³æ¡^¿ï³æ®æ¦¡¿ï³æ©w¸qªºÀɮסC"
+
+#: ../../WPrefs.app/MenuGuru.c:285
+msgid "The menu definition generated by a script/program read through a pipe."
+msgstr "¥Ñ¤â½Z/µ{¦¡¸g¹L pipe Ū¤J²£¥Í¿ï³æ©w¸q"
+
+#: ../../WPrefs.app/MenuGuru.c:291
+msgid "The files in one or more directories."
+msgstr "Àɮצb¤@­Ó©Î¦h­Ó¥Ø¿ý¤¤"
+
+#: ../../WPrefs.app/MenuGuru.c:303
+msgid "Type the path for the menu file:"
+msgstr "¿é¤J¿ï³æÀɸô®|¡G"
+
+#: ../../WPrefs.app/MenuGuru.c:318
+msgid ""
+"The menu file must contain a menu in the plain text menu file format. This "
+"format is described in the menu files included with WindowMaker, probably at "
+"~/GNUstep/Library/WindowMaker/menu"
+msgstr ""
+"¿ï³æÀÉ¥²¶·§t¦³¯Â¤å¦r¿ï³æÀɮ榡ªº¿ï³æ¡C³o®æ¦¡¦b WindowMaker "
+"¥]§tªº¿ï³æÀɤ¤¦³´y­z¡A¥i¯à¦b~/GNUstep/Library/WindowMaker/menu"
+
+#: ../../WPrefs.app/MenuGuru.c:328
+msgid "Type the command that will generate the menu definition:"
+msgstr "¿é¤J·|²£¥Í¿ï³æ©w¸qªº©R¥O¡G"
+
+#: ../../WPrefs.app/MenuGuru.c:338
+msgid ""
+"The command supplied must generate and output a valid menu definition to "
+"stdout. This definition should be in the plain text menu file format, "
+"described in the menu files included with WindowMaker, usually at "
+"~/GNUstep/Library/WindowMaker/menu"
+msgstr ""
+"´£¨Ñªº©R¥O¥²¶·²£¥Í¥B¿é¥X¦³®Äªº¿ï³æ©w¸q¦Ü¼Ð·Ç¿é¥X¡C³o©w¸qÀ³¸Ó¬O¯Â¤å¦r¿ï³æÀÉ®æ"
+"¡¡A¦b WindowMaker ¥]§tªº¿ï³æÀɤ¤¦³´y­z¡A³q±`¦b "
+"~/GNUstep/Library/WindowMaker/menu"
+
+#: ../../WPrefs.app/MenuGuru.c:350 ../../WPrefs.app/MenuGuru.c:372
+#: ../../WPrefs.app/MenuGuru.c:394
+msgid ""
+"Type the path for the directory. You can type more than one path by "
+"separating them with spaces."
+msgstr "¿é¤J¥Ø¿ýªº¸ô®|¡C±z¥i¥H§Q¥ÎªÅ¥Õ¤À¹j¿é¤J¶W¹L¤@­Ó¸ô®|¡C"
+
+#: ../../WPrefs.app/MenuGuru.c:361 ../../WPrefs.app/MenuGuru.c:383
+#: ../../WPrefs.app/MenuGuru.c:405
+msgid ""
+"The menu generated will have an item for each file in the directory. The "
+"directories can contain program executables or data files (such as jpeg "
+"images)."
+msgstr ""
+"²£¥Íªº¿ï³æ·|¦³¤@­Ó¶µ¥Øµ¹¥Ø¿ý¤¤ªº¨C¤@­ÓÀɮסC¥Ø¿ý¥i¥H§t¦³¥i°õ¦æªºµ{¦¡©Î¸ê®ÆÀÉ"
+"]¨Ò¦p jpeg ¼v¹³¡^¡C"
+
+#: ../../WPrefs.app/MenuGuru.c:415
+msgid ""
+"If the directory contain data files, type the command used to open these "
+"files. Otherwise, leave it in blank."
+msgstr "¦pªG¥Ø¿ý§t¦³¸ê®ÆÀÉ¡A¿é¤J¥Î¨Ó¶}±Ò³o¨ÇÀɮתº©R¥O¡C§_«h¡A¯dªÅ¥Õ¡C"
+
+#: ../../WPrefs.app/MenuGuru.c:426
+msgid ""
+"Each file in the directory will have an item and they will be opened with "
+"the supplied command.For example, if the directory contains image files and "
+"the command is \"xv -root\", each file in the directory will have a menu "
+"item like \"xv -root imagefile\"."
+msgstr ""
+"¥Ø¿ý¤¤ªº¨C¤@­ÓÀÉ®×·|¦³¤@­Ó¶µ¥Ø¥B·|¥H´£¨Ñªº©R¥O¶}±Ò¡CÁ|¨Ò¨Ó»¡¡A¦pªG¥Ø¿ý§t¦³¼v"
+"³ÀÉ¥B©R¥O¬O \"xv -root\"¡A¥Ø¿ý¤¤ªº¨C¤@­ÓÀÉ®×·|¦³¤@­Ó¹³ \"xv -root "
+"imagefile\" ªº¶µ¥Ø¡C"
+
+#: ../../WPrefs.app/MenuPreferences.c:112
 msgid "Menu Scrolling Speed"
 msgstr "¿ï³æ±²°Ê³t«×"
 
-#: ../../WPrefs.app/MenuPreferences.c:160
+#: ../../WPrefs.app/MenuPreferences.c:161
 msgid "Submenu Alignment"
 msgstr "°Æ¿ï³æ¹ï»ô"
 
 #: ../../WPrefs.app/MenuPreferences.c:204
 msgid ""
 "Always open submenus inside the screen, instead of scrolling.\n"
-"Note: this is annoying."
+"Note: this can be an annoyance at some circumstances."
 msgstr ""
 "¨C¦¸³£¦b¿Ã¹õ¤º¶}±Ò°Æ¿ï³æ¡A¦Ó¤£¬O±²°Ê¡C\n"
-"µù¡G·|¥O¤H¥Í¹½¡C"
+"µù¡G¦b¤@¨Ç±¡ªp¤U·|¥O¤H¥Í¹½¡C"
 
 #: ../../WPrefs.app/MenuPreferences.c:209
 msgid "Scroll off-screen menus when pointer is moved over them."
@@ -1253,409 +794,359 @@ msgstr "
 msgid "Menu Preferences"
 msgstr "¿ï³æ³]©w"
 
-#: ../../WPrefs.app/MenuPreferences.c:231
-msgid ""
-"Menu usability related options. Scrolling speed,\n"
-"alignment of submenus etc."
-msgstr "¿ï³æ¥i¥Î¬ÛÃö¿ï¶µ¡C±²°Ê³t«×¡B°Æ¿ï³æ¹ï»ôµ¥¡C"
-
-#: ../../WPrefs.app/MouseSettings.c:141
+#: ../../WPrefs.app/MouseSettings.c:147
 msgid "Invalid mouse acceleration value. Must be a positive real value."
 msgstr "·Æ¹«¥[³t­­«×­ÈµL®Ä¡C¥²¶·¬O¤@¥¿¹ê¼Æ­È¡C"
 
-#: ../../WPrefs.app/MouseSettings.c:161
+#: ../../WPrefs.app/MouseSettings.c:170
 msgid ""
 "Invalid mouse acceleration threshold value. Must be the number of pixels to "
 "travel before accelerating."
 msgstr "·Æ¹«¥[³t­­«×­ÈµL®Ä¡C¥²¶·¬O¥[³t«e²¾°Êªº¹³¯À¼Æ¥Ø¡C"
 
-#: ../../WPrefs.app/MouseSettings.c:262 ../../WPrefs.app/MouseSettings.c:274
-#: ../../WPrefs.app/MouseSettings.c:286 ../../WPrefs.app/MouseSettings.c:298
+#: ../../WPrefs.app/MouseSettings.c:225
+#, c-format
+msgid "mouse button %s not supported by WPrefs."
+msgstr "·Æ¹««ö¶s %s ¥¼³Q WPrefs ¤ä´©"
+
+#: ../../WPrefs.app/MouseSettings.c:259 ../../WPrefs.app/MouseSettings.c:270
+#: ../../WPrefs.app/MouseSettings.c:281
 #, c-format
 msgid "bad value %s for option %s"
 msgstr "¿ï¶µ %s ªº­È %s ¿ù»~"
 
-#: ../../WPrefs.app/MouseSettings.c:357
+#: ../../WPrefs.app/MouseSettings.c:341
 #, c-format
 msgid ""
 "modifier key %s for option ModifierKey was not recognized. Using %s as "
 "default"
 msgstr "ModifierKey ¿ï¶µªº­×¥¿Áä %s µLªk¿ë»{¡C¨Ï¥Î %s ¬°¹w³]­È"
 
-#: ../../WPrefs.app/MouseSettings.c:382
+#: ../../WPrefs.app/MouseSettings.c:366
 msgid "could not retrieve keyboard modifier mapping"
 msgstr "µLªk¨ú¦^Áä½L­×¥¿¹ïÀ³"
 
-#: ../../WPrefs.app/MouseSettings.c:477
+#: ../../WPrefs.app/MouseSettings.c:513
 msgid "Mouse Speed"
 msgstr "·Æ¹«³t«×"
 
-#: ../../WPrefs.app/MouseSettings.c:507
+#: ../../WPrefs.app/MouseSettings.c:575
 msgid "Acceler.:"
 msgstr "¥[³t­È:"
 
-#: ../../WPrefs.app/MouseSettings.c:520
+#: ../../WPrefs.app/MouseSettings.c:587
 msgid "Threshold:"
 msgstr "­­«×¡G"
 
-#: ../../WPrefs.app/MouseSettings.c:535
+#: ../../WPrefs.app/MouseSettings.c:602
 msgid "Double-Click Delay"
 msgstr "³s«ö¨â¤U©µ¿ð"
 
-#: ../../WPrefs.app/MouseSettings.c:579
+#: ../../WPrefs.app/MouseSettings.c:646
 msgid "Test"
 msgstr "´ú¸Õ"
 
-#: ../../WPrefs.app/MouseSettings.c:609
+#: ../../WPrefs.app/MouseSettings.c:656
 msgid "Workspace Mouse Actions"
 msgstr "¤u§@°Ï·Æ¹«°Ê§@"
 
-#: ../../WPrefs.app/MouseSettings.c:614
+#: ../../WPrefs.app/MouseSettings.c:661
 msgid "Disable mouse actions"
 msgstr "¨Ï·Æ¹«°Ê§@¥¢®Ä"
 
-#: ../../WPrefs.app/MouseSettings.c:620
-msgid "Left Button"
-msgstr "¥ªÁä"
+#: ../../WPrefs.app/MouseSettings.c:714
+msgid "Applications menu"
+msgstr "À³¥Îµ{µø¿ï³æ"
 
-#: ../../WPrefs.app/MouseSettings.c:630
-msgid "Middle Button"
-msgstr "¤¤Áä"
+#: ../../WPrefs.app/MouseSettings.c:720
+msgid "Window list menu"
+msgstr "µøµ¡²M³æ¿ï³æ"
 
-#: ../../WPrefs.app/MouseSettings.c:640
-msgid "Right Button"
-msgstr "¥kÁä"
+#: ../../WPrefs.app/MouseSettings.c:726
+msgid "Select windows"
+msgstr "¿ï¨úµøµ¡"
 
-#: ../../WPrefs.app/MouseSettings.c:650
-msgid "Mouse Wheel"
-msgstr "·Æ¹«ºu½ü"
-
-#: ../../WPrefs.app/MouseSettings.c:672
+#: ../../WPrefs.app/MouseSettings.c:761
 msgid "Mouse Grab Modifier"
 msgstr "·Æ¹«§ì¨ú­×¹¢"
 
-#: ../../WPrefs.app/MouseSettings.c:674
-msgid ""
-"Keyboard modifier to use for actions that\n"
-"involve dragging windows with the mouse,\n"
-"clicking inside the window."
-msgstr "¥Î©ó¥]§t·Æ¹«©ì¦²µøµ¡¡B¦bµøµ¡¤¤ÂI¿ï°Ê§@ªºÁä½L­×¹¢¡C"
-
-#: ../../WPrefs.app/MouseSettings.c:708
+#: ../../WPrefs.app/MouseSettings.c:795
 #, c-format
 msgid "could not create %s"
 msgstr "µLªk«Ø¥ß %s"
 
-#: ../../WPrefs.app/MouseSettings.c:724
+#: ../../WPrefs.app/MouseSettings.c:811
 #, c-format
 msgid "could not create temporary file %s"
 msgstr "µLªk«Ø¥ß¼È¦sÀÉ %s"
 
-#: ../../WPrefs.app/MouseSettings.c:756
+#: ../../WPrefs.app/MouseSettings.c:836
 #, c-format
 msgid "could not rename file %s to %s\n"
 msgstr "µLªkÅܧóÀɦW %s ¦Ü %s\n"
 
-#: ../../WPrefs.app/MouseSettings.c:829
-msgid "Shift"
-msgstr "Shift"
-
-#: ../../WPrefs.app/MouseSettings.c:830
-msgid "Lock"
-msgstr "Lock"
-
-#: ../../WPrefs.app/MouseSettings.c:831
-msgid "Control"
-msgstr "Control"
-
-#: ../../WPrefs.app/MouseSettings.c:832
-msgid "Mod1"
-msgstr "Mod1"
-
-#: ../../WPrefs.app/MouseSettings.c:833
-msgid "Mod2"
-msgstr "Mod2"
-
-#: ../../WPrefs.app/MouseSettings.c:834
-msgid "Mod3"
-msgstr "Mod3"
-
-#: ../../WPrefs.app/MouseSettings.c:835
-msgid "Mod4"
-msgstr "Mod4"
-
-#: ../../WPrefs.app/MouseSettings.c:836
-msgid "Mod5"
-msgstr "Mod5"
-
-#: ../../WPrefs.app/MouseSettings.c:839
-msgid "Applications Menu"
-msgstr "À³¥Îµ{¦¡¿ï³æ"
-
-#: ../../WPrefs.app/MouseSettings.c:841
-msgid "Select Windows"
-msgstr "¿ï¨úµøµ¡"
-
-#: ../../WPrefs.app/MouseSettings.c:844
-msgid "Switch Workspaces"
-msgstr "¤Á´«¤u§@°Ï"
-
-#: ../../WPrefs.app/MouseSettings.c:849
+#: ../../WPrefs.app/MouseSettings.c:919
 msgid "Mouse Preferences"
 msgstr "·Æ¹«³]©w"
 
-#: ../../WPrefs.app/MouseSettings.c:851
-msgid ""
-"Mouse speed/acceleration, double click delay,\n"
-"mouse button bindings etc."
-msgstr "·Æ¹«³t«×/¥[³t¡B«ö¨â¤Uªº©µ¿ð¡B·Æ¹««ö¶sµ²¦Xµ¥¡C"
-
-#: ../../WPrefs.app/Paths.c:84
+#: ../../WPrefs.app/Paths.c:82
 msgid "bad value in option IconPath. Using default path list"
 msgstr "IconPath ¿ï¶µªº­È¿ù»~¡C¨Ï¥Î¹w³]¸ô®|²M³æ"
 
-#: ../../WPrefs.app/Paths.c:101
+#: ../../WPrefs.app/Paths.c:99
 msgid "bad value in option PixmapPath. Using default path list"
 msgstr "PixmapPath ¿ï¶µªº­È¿ù»~¡C¨Ï¥Î¹w³]¸ô®|²M³æ"
 
-#: ../../WPrefs.app/Paths.c:149
-msgid "Select directory"
-msgstr "¿ï¨ú¥Ø¿ý"
-
-#: ../../WPrefs.app/Paths.c:270
+#: ../../WPrefs.app/Paths.c:302
 msgid "Icon Search Paths"
 msgstr "¹Ï¥Ü·j´M¸ô®|"
 
-#: ../../WPrefs.app/Paths.c:281 ../../WPrefs.app/Paths.c:312
-#: ../../WPrefs.app/TexturePanel.c:1310
+#: ../../WPrefs.app/Paths.c:314 ../../WPrefs.app/Paths.c:350
 msgid "Add"
 msgstr "·s¼W"
 
-#: ../../WPrefs.app/Paths.c:301
+#: ../../WPrefs.app/Paths.c:321 ../../WPrefs.app/Paths.c:357
+msgid "Remove"
+msgstr "§R°£"
+
+#: ../../WPrefs.app/Paths.c:338
 msgid "Pixmap Search Paths"
 msgstr "Pixmap ·j´M¸ô®|"
 
-#: ../../WPrefs.app/Paths.c:341
+#: ../../WPrefs.app/Paths.c:386
 msgid "Search Path Configuration"
 msgstr "·j´M¸ô®|³]©w"
 
-#: ../../WPrefs.app/Paths.c:343
-msgid ""
-"Search paths to use when looking for pixmaps\n"
-"and icons."
-msgstr "·í´M§ä pixmap »P¹Ï¥Ü®Éªº·j´M¸ô®|¡C"
-
-#: ../../WPrefs.app/Preferences.c:75
-msgid "OFF"
-msgstr "Ãö±¼"
-
-#: ../../WPrefs.app/Preferences.c:77
-msgid "1 pixel"
-msgstr "1 ¹³¯À"
-
-#. 2-4
-#: ../../WPrefs.app/Preferences.c:80
-#, c-format
-msgid "%i pixels"
-msgstr "%i ¹³¯À"
-
-#. >4
-#: ../../WPrefs.app/Preferences.c:83
-#, c-format
-msgid "%i pixels "
-msgstr "%i ¹³¯À "
-
-#: ../../WPrefs.app/Preferences.c:229
+#: ../../WPrefs.app/Preferences.c:151
 msgid "Size Display"
 msgstr "µøµ¡¤j¤pÅã¥Ü"
 
-#: ../../WPrefs.app/Preferences.c:231
-msgid ""
-"The position or style of the window size\n"
-"display that's shown when a window is resized."
-msgstr "·í§ïÅܵøµ¡¤j¤p®Éµøµ¡¤j¤pÅã¥Üªº¦ì¸m©Î­·®æ¡C"
-
-#: ../../WPrefs.app/Preferences.c:238 ../../WPrefs.app/Preferences.c:259
+#: ../../WPrefs.app/Preferences.c:156 ../../WPrefs.app/Preferences.c:172
 msgid "Corner of screen"
 msgstr "¿Ã¹õ¨¤¸¨"
 
-#: ../../WPrefs.app/Preferences.c:239 ../../WPrefs.app/Preferences.c:260
+#: ../../WPrefs.app/Preferences.c:157 ../../WPrefs.app/Preferences.c:173
 msgid "Center of screen"
 msgstr "¿Ã¹õ¤¤¥¡"
 
-#: ../../WPrefs.app/Preferences.c:240 ../../WPrefs.app/Preferences.c:261
+#: ../../WPrefs.app/Preferences.c:158 ../../WPrefs.app/Preferences.c:174
 msgid "Center of resized window"
 msgstr "µøµ¡¤¤¥¡"
 
-#: ../../WPrefs.app/Preferences.c:241
+#: ../../WPrefs.app/Preferences.c:159
 msgid "Technical drawing-like"
 msgstr "¬ì¾Çø¹Ï¤è¦¡"
 
-#: ../../WPrefs.app/Preferences.c:242 ../../WPrefs.app/Preferences.c:262
-msgid "Disabled"
-msgstr "¥¢®Ä"
-
-#: ../../WPrefs.app/Preferences.c:250
+#: ../../WPrefs.app/Preferences.c:167
 msgid "Position Display"
 msgstr "¦ì¸mÅã¥Ü"
 
-#: ../../WPrefs.app/Preferences.c:252
-msgid ""
-"The position or style of the window position\n"
-"display that's shown when a window is moved."
-msgstr "·í²¾°Êµøµ¡®Éµøµ¡¦ì¸mÅã¥Üªº¦ì¸m©Î­·®æ¡C"
-
-#: ../../WPrefs.app/Preferences.c:270
+#: ../../WPrefs.app/Preferences.c:182
 msgid "Show balloon text for..."
 msgstr "Åã¥Ü®ð²y¤å¦r..."
 
-#: ../../WPrefs.app/Preferences.c:277
+#: ../../WPrefs.app/Preferences.c:189
 msgid "incomplete window titles"
 msgstr "¤£§¹¾ãµøµ¡¼ÐÃD"
 
-#: ../../WPrefs.app/Preferences.c:278
+#: ../../WPrefs.app/Preferences.c:190
 msgid "miniwindow titles"
 msgstr "¤pµøµ¡¼ÐÃD"
 
-#: ../../WPrefs.app/Preferences.c:279
+#: ../../WPrefs.app/Preferences.c:191
 msgid "application/dock icons"
 msgstr "À³¥Îµ{¦¡/°±¾a°Ï¹Ï¥Ü"
 
-#: ../../WPrefs.app/Preferences.c:280
-msgid "internal help"
-msgstr "¤º³¡»¡©ú"
+#: ../../WPrefs.app/Preferences.c:204
+msgid "Raise window when switching focus with keyboard (CirculateRaise)."
+msgstr "·í¨Ï¥ÎÁä½L¤Á´«µJÂI®É¤É°_µøµ¡"
 
-#: ../../WPrefs.app/Preferences.c:292
-msgid ""
-"Raise window when switching\n"
-"focus with keyboard."
-msgstr "·í¨Ï¥ÎÁä½L¤Á´«®É¤É°_µøµ¡¡C"
+#: ../../WPrefs.app/Preferences.c:210
+msgid "Keep keyboard language status for each window."
+msgstr "¬°¨C­Óµøµ¡«O«ùÁä½L»y¨¥ª¬ºA"
 
-#: ../../WPrefs.app/Preferences.c:298
-msgid ""
-"Enable keyboard language\n"
-"switch button in window titlebars."
-msgstr "¦bµøµ¡¼ÐÃD¦C±Ò°ÊÁä½L»y¨¥¤Á´«¶s¡C"
-
-#: ../../WPrefs.app/Preferences.c:307
-msgid "Workspace border"
-msgstr "¤u§@°ÏÃä®Ø"
-
-#: ../../WPrefs.app/Preferences.c:323
-msgid "Left/Right"
-msgstr "¥ª/¥k"
-
-#: ../../WPrefs.app/Preferences.c:328
-msgid "Top/Bottom"
-msgstr "¤W/¤U"
-
-#: ../../WPrefs.app/Preferences.c:349
+#: ../../WPrefs.app/Preferences.c:231
 msgid "Miscellaneous Ergonomic Preferences"
 msgstr "¨ä¥L¾Þ§@©Ê³]©w"
 
-#: ../../WPrefs.app/Preferences.c:350
+#: ../../WPrefs.app/Text.c:179
+#, c-format
+msgid "Invalid font %s."
+msgstr "µL®Äªº¦r«¬ %s¡C"
+
+#: ../../WPrefs.app/Text.c:256
+msgid "Set Font..."
+msgstr "³]©w¦r«¬..."
+
+#: ../../WPrefs.app/Text.c:262
+msgid "Window Title Font"
+msgstr "µøµ¡¼ÐÃD¦r«¬"
+
+#: ../../WPrefs.app/Text.c:263
+msgid "Menu Title Font"
+msgstr "¿ï³æ¼ÐÃD¦r«¬"
+
+#: ../../WPrefs.app/Text.c:264
+msgid "Menu Item Font"
+msgstr "¿ï³æ¶µ¥Ø¦r«¬"
+
+#: ../../WPrefs.app/Text.c:265
+msgid "Icon Title Font"
+msgstr "¹Ï¥Ü¼ÐÃD¦r«¬"
+
+#: ../../WPrefs.app/Text.c:266
+msgid "Clip Title Font"
+msgstr "°j¯¾°w¼ÐÃD¦r«¬"
+
+#: ../../WPrefs.app/Text.c:267
+msgid "Geometry Display Font"
+msgstr "¦ì¸mªí¥Ü¦r«¬"
+
+#: ../../WPrefs.app/Text.c:280
 msgid ""
-"Various settings like balloon text, geometry\n"
-"displays etc."
-msgstr "¹³¬O®ð²y¤å¦r¡B´X¦óÅã¥Üµ¥¦UºØ³]©w¡C"
+"Sample Text\n"
+"abcdefghijklmnopqrstuvxywz\n"
+"ABCDEFGHIJKLMNOPQRSTUVXYWZ\n"
+"0123456789"
+msgstr ""
+"½d¨Ò¤å¦r\n"
+"abcdefghijklmn...£t£u£v£w£x\n"
+"ABCDEFGHIJKLMN...µøµ¡ºÞ²z­û\n"
+"123...¤@¤G¤T"
 
-#: ../../WPrefs.app/TexturePanel.c:323
-msgid "Saturation"
-msgstr "¹¡¦X"
+#: ../../WPrefs.app/Text.c:285
+msgid "Alignment"
+msgstr "¹ï»ô"
 
-#: ../../WPrefs.app/TexturePanel.c:325
-msgid "Brightness"
-msgstr "«G«×"
+#: ../../WPrefs.app/Text.c:290
+msgid "Left"
+msgstr "¾a¥ª"
 
-#: ../../WPrefs.app/TexturePanel.c:373 ../../WPrefs.app/TexturePanel.c:380
-msgid "Hue"
-msgstr "¦â½Õ"
+#: ../../WPrefs.app/Text.c:296
+msgid "Center"
+msgstr "¸m¤¤"
 
-#: ../../WPrefs.app/TexturePanel.c:610
-msgid "Could not load the selected file: "
-msgstr "µLªk¸ü¤J¿ï¨úÀɮסG%s"
+#: ../../WPrefs.app/Text.c:303
+msgid "Right"
+msgstr "¾a¥k"
 
-#: ../../WPrefs.app/TexturePanel.c:664
-msgid "Open Image"
-msgstr "¶}±Ò¼v¹³"
+#: ../../WPrefs.app/Text.c:325
+msgid "Text Preferences"
+msgstr "¤å¦r³]©w"
 
-#: ../../WPrefs.app/TexturePanel.c:694
-msgid "The selected file does not contain a supported image."
-msgstr "¿ï¨úªºÀɮרS¦³¤ä´©ªº¼v¹³¡C"
+#: ../../WPrefs.app/TextureAndColor.c:384
+msgid "Window Title Bar"
+msgstr "µøµ¡¼ÐÃD¦C"
 
-#: ../../WPrefs.app/TexturePanel.c:945
-#, c-format
-msgid "could not load file '%s': %s"
-msgstr "µLªk¸ü¤JÀɮסu%s¡v¡G%s"
+#: ../../WPrefs.app/TextureAndColor.c:385
+msgid "Menu Title Bar"
+msgstr "¿ï³æ¼ÐÃD¦C"
 
-#: ../../WPrefs.app/TexturePanel.c:1064
-#, c-format
-msgid "error creating texture %s"
-msgstr "«Ø¥ß§÷½è¿ù»~ %s"
+#: ../../WPrefs.app/TextureAndColor.c:386
+msgid "Menu Items"
+msgstr "¿ï³æ¶µ¥Ø"
 
-#: ../../WPrefs.app/TexturePanel.c:1254
-msgid "Texture Panel"
-msgstr "§÷½è­±ªO"
+#: ../../WPrefs.app/TextureAndColor.c:387
+msgid "Workspace/Clip"
+msgstr "¤u§@°Ï/°j¯¾¯u"
 
-#: ../../WPrefs.app/TexturePanel.c:1262
-msgid "Texture Name"
-msgstr "§÷½è¦WºÙ"
+#: ../../WPrefs.app/TextureAndColor.c:388
+msgid "Icons"
+msgstr "¹Ï¥Ü"
 
-#: ../../WPrefs.app/TexturePanel.c:1274
-msgid "Solid Color"
-msgstr "¹êÅé¦â"
+#: ../../WPrefs.app/TextureAndColor.c:399
+msgid "Focused Window"
+msgstr "µJÂIµøµ¡"
 
-#: ../../WPrefs.app/TexturePanel.c:1275
-msgid "Gradient Texture"
-msgstr "º¥¼h§÷½è"
+#: ../../WPrefs.app/TextureAndColor.c:412
+#: ../../WPrefs.app/TextureAndColor.c:443
+#: ../../WPrefs.app/TextureAndColor.c:474
+msgid "Texture"
+msgstr "§÷½è"
 
-#: ../../WPrefs.app/TexturePanel.c:1276
-msgid "Simple Gradient Texture"
-msgstr "²³æº¥¼h§÷½è"
+#: ../../WPrefs.app/TextureAndColor.c:418
+#: ../../WPrefs.app/TextureAndColor.c:449
+#: ../../WPrefs.app/TextureAndColor.c:480
+msgid "Text Color"
+msgstr "¤å¦r¦â±m"
 
-#: ../../WPrefs.app/TexturePanel.c:1277
-msgid "Textured Gradient"
-msgstr "§÷½èº¥¼h"
+#: ../../WPrefs.app/TextureAndColor.c:423
+#: ../../WPrefs.app/TextureAndColor.c:454
+#: ../../WPrefs.app/TextureAndColor.c:485
+#: ../../WPrefs.app/TextureAndColor.c:509
+#: ../../WPrefs.app/TextureAndColor.c:575
+#: ../../WPrefs.app/TextureAndColor.c:652
+msgid "Set..."
+msgstr "³]©w..."
 
-#: ../../WPrefs.app/TexturePanel.c:1278
-msgid "Image Texture"
-msgstr "¼v¹³§÷½è"
+#: ../../WPrefs.app/TextureAndColor.c:430
+msgid "Unfocused Window"
+msgstr "«DµJÂIµøµ¡"
 
-#: ../../WPrefs.app/TexturePanel.c:1286
-msgid "Default Color"
-msgstr "¹w³]¦â±m"
+#: ../../WPrefs.app/TextureAndColor.c:461
+msgid "Owner of Focused Window"
+msgstr "µJÂIµøµ¡¾Ö¦³ªÌ"
 
-#: ../../WPrefs.app/TexturePanel.c:1298
-msgid "Gradient Colors"
-msgstr "º¥¼h¦â±m"
+#: ../../WPrefs.app/TextureAndColor.c:494
+msgid "Unselected Items"
+msgstr "¥¼¿ï¨ú¶µ¥Ø"
 
-#: ../../WPrefs.app/TexturePanel.c:1394
-msgid "Direction"
-msgstr "¤è¦V"
+#: ../../WPrefs.app/TextureAndColor.c:504
+#: ../../WPrefs.app/TextureAndColor.c:558
+msgid "Background"
+msgstr "­I´º"
 
-#: ../../WPrefs.app/TexturePanel.c:1422
-msgid "Gradient"
-msgstr "º¥¼h"
+#: ../../WPrefs.app/TextureAndColor.c:519
+msgid "Normal Text"
+msgstr "¥¿±`¤å¦r"
 
-#: ../../WPrefs.app/TexturePanel.c:1440
-msgid "Gradient Opacity"
-msgstr "º¥¼h³z©ú«×"
+#: ../../WPrefs.app/TextureAndColor.c:529
+msgid "Disabled Text"
+msgstr "¥¢®Ä¤å¦r"
 
-#: ../../WPrefs.app/TexturePanel.c:1483
-msgid "Image"
-msgstr "¼v¹³"
+#: ../../WPrefs.app/TextureAndColor.c:538
+msgid "Selected Items"
+msgstr "¿ï¨ú¶µ¥Ø"
 
-#: ../../WPrefs.app/TexturePanel.c:1515
-msgid "Tile"
-msgstr "¨Ã±Æ"
+#: ../../WPrefs.app/TextureAndColor.c:548
+msgid "Text"
+msgstr "¤å¦r"
 
-#: ../../WPrefs.app/TexturePanel.c:1516
-msgid "Scale"
-msgstr "ÁY©ñ"
+#: ../../WPrefs.app/TextureAndColor.c:566
+msgid "Menu Title Background"
+msgstr "¿ï³æ¼ÐÃD­I´º"
 
-#: ../../WPrefs.app/TexturePanel.c:1518
-msgid "Maximize"
-msgstr "³Ì¤j¤Æ"
+#: ../../WPrefs.app/TextureAndColor.c:584
+msgid "Menu Title Text"
+msgstr "¿ï³æ¼ÐÃD¤å¦r"
+
+#: ../../WPrefs.app/TextureAndColor.c:596
+msgid "Workspace Background"
+msgstr "¤u§@°Ï­I´º"
+
+#: ../../WPrefs.app/TextureAndColor.c:605
+msgid "Change"
+msgstr "§ïÅÜ"
+
+#: ../../WPrefs.app/TextureAndColor.c:611
+msgid "Clip Title Text"
+msgstr "°j¤å°w¼ÐÃD¤å¦r"
+
+#: ../../WPrefs.app/TextureAndColor.c:621
+msgid "Normal"
+msgstr "¥¿±`"
+
+#: ../../WPrefs.app/TextureAndColor.c:631
+msgid "Collapsed"
+msgstr "§éÅ|"
+
+#: ../../WPrefs.app/TextureAndColor.c:643
+msgid "Icon Background"
+msgstr "¹Ï¥Ü­I´º"
+
+#: ../../WPrefs.app/TextureAndColor.c:677
+msgid "Texture and Color Preferences"
+msgstr "§÷½è»P¦â±m³]©w"
 
 #: ../../WPrefs.app/Themes.c:71 ../../WPrefs.app/Themes.c:82
 msgid "Set"
@@ -1665,134 +1156,136 @@ msgstr "
 msgid "Stop"
 msgstr "°±¤î"
 
-#: ../../WPrefs.app/Themes.c:143 ../../WPrefs.app/Themes.c:203
-#: ../../WPrefs.app/Themes.c:223
+#: ../../WPrefs.app/Themes.c:143 ../../WPrefs.app/Themes.c:205
+#: ../../WPrefs.app/Themes.c:225
 msgid "Download"
 msgstr "¤U¸ü"
 
-#: ../../WPrefs.app/Themes.c:171
+#: ../../WPrefs.app/Themes.c:173
 msgid "Save Current Theme"
 msgstr "Àx¦s¥Ø«e¥DÃD"
 
-#: ../../WPrefs.app/Themes.c:180
+#: ../../WPrefs.app/Themes.c:182
 msgid "Load"
 msgstr "¸ü¤J"
 
-#: ../../WPrefs.app/Themes.c:185
+#: ../../WPrefs.app/Themes.c:187
 msgid "Install"
 msgstr "¦w¸Ë"
 
-#: ../../WPrefs.app/Themes.c:193
+#: ../../WPrefs.app/Themes.c:195
 msgid "Tile of The Day"
 msgstr "¥»¤é¼ÐÃD"
 
-#: ../../WPrefs.app/Themes.c:213
+#: ../../WPrefs.app/Themes.c:215
 msgid "Bar of The Day"
 msgstr "¥»¤é¼ÐÃD¦C"
 
-#: ../../WPrefs.app/WPrefs.c:260
+#: ../../WPrefs.app/Themes.c:252
+msgid "Themes"
+msgstr "¥DÃD"
+
+#: ../../WPrefs.app/WPrefs.c:201
 msgid "Window Maker Preferences"
 msgstr "Window Maker ³]©w"
 
-#: ../../WPrefs.app/WPrefs.c:284
+#: ../../WPrefs.app/WPrefs.c:225
 msgid "Revert Page"
 msgstr "ÁÙ­ì"
 
-#: ../../WPrefs.app/WPrefs.c:290
+#: ../../WPrefs.app/WPrefs.c:231
 msgid "Revert All"
 msgstr "¥þ³¡ÁÙ­ì"
 
-#: ../../WPrefs.app/WPrefs.c:296
+#: ../../WPrefs.app/WPrefs.c:237
 msgid "Save"
 msgstr "Àx¦s"
 
-#: ../../WPrefs.app/WPrefs.c:309
-msgid "Balloon Help"
-msgstr "®ð²y«¬»¡©ú"
+#: ../../WPrefs.app/WPrefs.c:243
+msgid "Close"
+msgstr "Ãö³¬"
 
-#: ../../WPrefs.app/WPrefs.c:334
+#: ../../WPrefs.app/WPrefs.c:260
 msgid "Window Maker Preferences Utility"
 msgstr "Window Maker ³]©w¤½¥Îµ{¦¡"
 
-#: ../../WPrefs.app/WPrefs.c:341
+#: ../../WPrefs.app/WPrefs.c:267
 #, c-format
-msgid "Version %s for Window Maker %s or newer"
-msgstr "ª©¥» %s¡A¾A¥Î©ó Window Maker %s ©Î§ó·sª©¥»"
+msgid "Version %s for Window Maker %s"
+msgstr "Window Maker %s ¥Îª©¥» %s"
 
-#: ../../WPrefs.app/WPrefs.c:349
+#: ../../WPrefs.app/WPrefs.c:274
 msgid "Starting..."
 msgstr "±Ò°Ê¤¤..."
 
-#: ../../WPrefs.app/WPrefs.c:355
+#: ../../WPrefs.app/WPrefs.c:280
 msgid ""
 "Programming/Design: Alfredo K. Kojima\n"
-"Artwork: Marco van Hylckama Vlieg, Largo et al\n"
-"More Programming: James Thompson et al"
+"Artwork: Marco van Hylckama Vlieg\n"
+"More Programming: James Thompson"
 msgstr ""
 "µ{¦¡/³]­p¡GAlfredo K. Kojima\n"
-"¬ü³N¡GMarco van Hylckama Vlieg, Largo et al\n"
-"µ{¦¡¡GJames Thompson et al"
+"¬ü³N¡GMarco van Hylckama Vlieg\n"
+"µ{¦¡¡GJames Thompson"
 
-#: ../../WPrefs.app/WPrefs.c:455
+#: ../../WPrefs.app/WPrefs.c:368
 #, c-format
 msgid "could not locate image file %s\n"
 msgstr "µLªk§ä¥X¼v¹³ÀÉ %s\n"
 
-#: ../../WPrefs.app/WPrefs.c:670
+#: ../../WPrefs.app/WPrefs.c:474
 #, c-format
 msgid "could not load image file %s:%s"
 msgstr "µLªk¸ü¤J¼v¹³ÀÉ %s:%s"
 
-#: ../../WPrefs.app/WPrefs.c:689
+#: ../../WPrefs.app/WPrefs.c:493
 msgid "Loading Window Maker configuration files..."
 msgstr "¸ü¤J Window Maker ³]©wÀÉ..."
 
-#: ../../WPrefs.app/WPrefs.c:693
+#: ../../WPrefs.app/WPrefs.c:497
 msgid "Initializing configuration panels..."
 msgstr "±Ò©l³]©w­±ªO..."
 
-#: ../../WPrefs.app/WPrefs.c:727
+#: ../../WPrefs.app/WPrefs.c:525
 msgid ""
-"WPrefs is free software and is distributed WITHOUT ANY\n"
-"WARRANTY under the terms of the GNU General Public License."
+"WPrefs is free software and is distributed WITHOUT ANY WARRANTY under the "
+"terms of the GNU General Public License. Redistribution of the icons in this "
+"program separately from the program is prohibited."
 msgstr ""
-"WPrefs ¬O¦Û¥Ñ³nÅé¥B¦b GNU General Public License ±ø´Ú¤U\n"
-"µL¥ô¦ó«Oµý¦aµo°e¡C"
+"WPrefs ¬O¦Û¥Ñ³nÅé¥B¦b GNU General Public License "
+"±ø´Ú¤UµL¥ô¦ó«Oµý¦aµo°e¡C¸T¤î³æ¿W­«·sµo°e³oµ{¦¡¤¤ªº¹Ï¥Ü"
 
-#: ../../WPrefs.app/WPrefs.c:757 ../../WPrefs.app/WPrefs.c:837
+#: ../../WPrefs.app/WPrefs.c:557 ../../WPrefs.app/WPrefs.c:613
 #, c-format
 msgid "Window Maker domain (%s) is corrupted!"
 msgstr "Window Maker ©w¸q°ì (%s) ¤w·lÃa¡I"
 
-#: ../../WPrefs.app/WPrefs.c:761
+#: ../../WPrefs.app/WPrefs.c:561
 #, c-format
 msgid "Could not load Window Maker domain (%s) from defaults database."
 msgstr "µLªk±q¹w³]¸ê®Æ®w¸ü¤J Window Maker ©w¸q°ì (%s)"
 
-#: ../../WPrefs.app/WPrefs.c:777
+#: ../../WPrefs.app/WPrefs.c:569
 msgid "could not extract version information from Window Maker"
 msgstr "µLªk±oª¾ Window Maker ªºª©¥»¸ê°T"
 
-#: ../../WPrefs.app/WPrefs.c:778
+#: ../../WPrefs.app/WPrefs.c:570
 msgid "Make sure wmaker is in your search path."
 msgstr "½T©w wmaker ¦b±zªº·j´M¸ô®|¤¤¡C"
 
-#: ../../WPrefs.app/WPrefs.c:781
+#: ../../WPrefs.app/WPrefs.c:573
 msgid ""
 "Could not extract version from Window Maker. Make sure it is correctly "
 "installed and is in your PATH environment variable."
 msgstr "µLªk±oª¾ Window Maker ªºª©¥»¡C½T©w¥¦¦w¸Ë¥¿½T¥B¦b±zªº PATH Àô¹ÒÅܼƤ¤¡C"
 
-#: ../../WPrefs.app/WPrefs.c:791
+#: ../../WPrefs.app/WPrefs.c:583
 msgid ""
 "Could not extract version from Window Maker. Make sure it is correctly "
-"installed and the path where it installed is in the PATH environment "
-"variable."
-msgstr ""
-"µLªk±oª¾ Window Maker ªºª©¥»¡C½T©w¥¦¦w¸Ë¥¿½T¥B¥¦¦w¸Ëªº¸ô®|¦b±zªº PATH "
-"Àô¹ÒÅܼƤ¤¡C"
+"installed."
+msgstr "µLªk±oª¾ Window Maker ªºª©¥»¡C½T©w¥¦¦w¸Ë¥¿½T¡C"
 
-#: ../../WPrefs.app/WPrefs.c:798
+#: ../../WPrefs.app/WPrefs.c:588
 #, c-format
 msgid ""
 "WPrefs only supports Window Maker 0.18.0 or newer.\n"
@@ -1801,24 +1294,23 @@ msgstr ""
 "WPrefs ¥u¤ä´© Window Maker 0.18.0 ©Î§ó·sª©¥»¡C\n"
 "¦w¸Ëªºª©¥»¬O %i.%i.%i\n"
 
-#: ../../WPrefs.app/WPrefs.c:805
+#: ../../WPrefs.app/WPrefs.c:595
 #, c-format
 msgid ""
 "Window Maker %i.%i.%i, which is installed in your system, is not fully "
 "supported by this version of WPrefs."
 msgstr "¦b±zªº¨t²Î¤¤¦w¸Ëªº Window Maker %i.%i.%i ¤£§¹¥þ¤ä´©³oª©¥»ªº WPrefs¡C"
 
-#: ../../WPrefs.app/WPrefs.c:818
-#, c-format
-msgid "could not run \"%s --global_defaults_path\"."
-msgstr "µLªk°õ¦æ \"%s -global_defaults_path\"¡C"
+#: ../../WPrefs.app/WPrefs.c:602
+msgid "could not run \"wmaker --global_defaults_path\"."
+msgstr "µLªk°õ¦æ \"wmaker -global_defaults_path\"¡C"
 
-#: ../../WPrefs.app/WPrefs.c:841
+#: ../../WPrefs.app/WPrefs.c:617
 #, c-format
 msgid "Could not load global Window Maker domain (%s)."
 msgstr "µLªk¸ü¤J¾ãÅé Window Maker ©w¸q°ì (%s)¡C"
 
-#: ../../WPrefs.app/WPrefs.c:1090
+#: ../../WPrefs.app/WPrefs.c:863
 #, c-format
 msgid ""
 "bad speed value for option %s\n"
@@ -1827,239 +1319,137 @@ msgstr ""
 "%s ¿ï¶µ³t«×­È¿ù»~¡C\n"
 "¨Ï¥Î¹w³]­È"
 
-#: ../../WPrefs.app/WindowHandling.c:141
+#: ../../WPrefs.app/WindowHandling.c:108
 #, c-format
 msgid "bad option value %s in WindowPlacement. Using default value"
 msgstr "WindowPlacement ¿ï¶µ %s ¸ê®Æ¿ù»~¡C¨Ï¥Î¹w³]­È"
 
-#: ../../WPrefs.app/WindowHandling.c:163
+#: ../../WPrefs.app/WindowHandling.c:130
 msgid "invalid data in option WindowPlaceOrigin. Using default (0,0)"
 msgstr "WindowPlaceOrigin ¿ï¶µ¤¤¸ê®ÆµL®Ä¡C¨Ï¥Î¹w³]¤§ (0,0)"
 
-#: ../../WPrefs.app/WindowHandling.c:243
+#: ../../WPrefs.app/WindowHandling.c:192
 msgid "Window Placement"
 msgstr "µøµ¡©ñ¸m"
 
-#: ../../WPrefs.app/WindowHandling.c:244
-msgid ""
-"How to place windows when they are first put\n"
-"on screen."
-msgstr "·í²Ä¤@¦¸©ñ¦Ü¿Ã¹õ®É¦p¦ó©ñ¸mµøµ¡¡C"
-
-#: ../../WPrefs.app/WindowHandling.c:250
+#: ../../WPrefs.app/WindowHandling.c:197
 msgid "Automatic"
 msgstr "¦Û°Ê"
 
-#: ../../WPrefs.app/WindowHandling.c:251
+#: ../../WPrefs.app/WindowHandling.c:198
 msgid "Random"
 msgstr "ÀH·N"
 
-#: ../../WPrefs.app/WindowHandling.c:252
+#: ../../WPrefs.app/WindowHandling.c:199
 msgid "Manual"
 msgstr "¤â°Ê"
 
-#: ../../WPrefs.app/WindowHandling.c:253
+#: ../../WPrefs.app/WindowHandling.c:200
 msgid "Cascade"
 msgstr "­«Å|"
 
-#: ../../WPrefs.app/WindowHandling.c:254
-msgid "Smart"
-msgstr "Áo©ú"
-
-#: ../../WPrefs.app/WindowHandling.c:260
+#: ../../WPrefs.app/WindowHandling.c:206
 msgid "Placement Origin"
 msgstr "©ñ¸m°ò·ÇÂI"
 
-#: ../../WPrefs.app/WindowHandling.c:321
+#: ../../WPrefs.app/WindowHandling.c:260
 msgid "Opaque Move"
 msgstr "¤£³z©ú²¾°Ê"
 
-#: ../../WPrefs.app/WindowHandling.c:322
-msgid ""
-"Whether the window contents should be moved\n"
-"when dragging windows aroung or if only a\n"
-"frame should be displayed.\n"
-msgstr "·í©ì¦²µøµ¡®É¬O§_²¾°Êµøµ¡¤º®e©Î¥uÅã¥Ü¥~®Ø¡C\n"
-
-#: ../../WPrefs.app/WindowHandling.c:361
+#: ../../WPrefs.app/WindowHandling.c:296
 msgid "When maximizing..."
 msgstr "·í³Ì¤j¤Æ®É..."
 
-#: ../../WPrefs.app/WindowHandling.c:366
-msgid "...do not cover icons"
-msgstr "...¤£­nÂл\\¹Ï¥Ü"
+#: ../../WPrefs.app/WindowHandling.c:301
+msgid "...do not resize over icons"
+msgstr "...¤£­n¶W¹L¹Ï¥Ü°Ï"
 
-#: ../../WPrefs.app/WindowHandling.c:372
-msgid "...do not cover dock"
-msgstr "...¤£­nÂл\\°±¾a°Ï"
+#: ../../WPrefs.app/WindowHandling.c:307
+msgid "...do not resize over dock"
+msgstr "...¤£­n¶W¹L°±¾a°Ï"
 
-#: ../../WPrefs.app/WindowHandling.c:381
-msgid "Edge Resistance"
-msgstr "Ãä½t©è§Ü"
+#: ../../WPrefs.app/WindowHandling.c:320
+msgid "Open transients in same workspace as their owners"
+msgstr "«O«ù½T»{¡Bĵ§iµ¥µøµ¡¦b¾Ö¦³ªÌ¤§¤W"
 
-#: ../../WPrefs.app/WindowHandling.c:383
-msgid ""
-"Edge resistance will make windows `resist'\n"
-"being moved further for the defined threshold\n"
-"when moved against other windows or the edges\n"
-"of the screen."
-msgstr ""
-"·í¾aµÛ¨ä¥Lµøµ¡©Î¿Ã¹õÃä½t²¾°Ê®É¡A\n"
-"Ãä½t©è§Ü·|¨Ïµøµ¡¡u©è§Ü¡v¦A³Q²¾°Ê¦Ü©w¸q­­«×¡C"
-
-#: ../../WPrefs.app/WindowHandling.c:402
-msgid "Resist"
-msgstr "©è§Ü"
-
-#: ../../WPrefs.app/WindowHandling.c:407
-msgid "Attract"
-msgstr "§l¤Þ"
-
-#: ../../WPrefs.app/WindowHandling.c:423
-msgid ""
-"Open dialogs in same workspace\n"
-"as their owners"
-msgstr "¦b¾Ö¦³ªÌ¤§¤u§@°Ï¶}±Ò¹ï¸Ü"
-
-#: ../../WPrefs.app/WindowHandling.c:450
+#: ../../WPrefs.app/WindowHandling.c:347
 msgid "Window Handling Preferences"
-msgstr "µøµ¡³B²z³]©w"
+msgstr "µøµ¡¾Þ§@³]©w"
 
-#: ../../WPrefs.app/WindowHandling.c:452
-msgid ""
-"Window handling options. Initial placement style\n"
-"edge resistance, opaque move etc."
-msgstr ""
-"µøµ¡³B²z¿ï¶µ¡C°_©l¦ì¸m­·®æ¡BÃä½t©è§Ü¡B\n"
-"¤£³z©ú²¾°Êµ¥¡C"
-
-#: ../../WPrefs.app/Workspace.c:176
+#: ../../WPrefs.app/Workspace.c:137
 msgid "Workspace Navigation"
-msgstr "¤u§@°Ï»â¯è"
+msgstr "¤u§@°Ï¤§¾Þ§@"
 
-#: ../../WPrefs.app/Workspace.c:183
+#: ../../WPrefs.app/Workspace.c:161
+msgid "drag windows between workspaces."
+msgstr "¦b¤u§@°Ï¤§¶¡©ì¦²µøµ¡¡C"
+
+#: ../../WPrefs.app/Workspace.c:186
 msgid ""
-"wrap to the first workspace after the\n"
-"last workspace."
-msgstr "³Ì«á¤@­Ó¤u§@°Ï¤§«á¸õ¦Ü²Ä¤@­Ó¤u§@°Ï¡C"
+"switch to first workspace when switching past the last workspace and "
+"vice-versa"
+msgstr "·í¤Á´«¶W¹L³Ì«á¤@­Ó¤u§@°Ï®É¤Á´«¦Ü²Ä¤@­Ó¤u§@°Ï¡A¤Ï¤§¥çµM¡C"
 
-#: ../../WPrefs.app/Workspace.c:205
-msgid "switch workspaces while dragging windows."
-msgstr "©ì¦²µøµ¡®É¤Á´«¤u§@°Ï¡C"
+#: ../../WPrefs.app/Workspace.c:210
+msgid "create a new workspace when switching past the last workspace."
+msgstr "·í¤Á´«¶W¹L³Ì«á¤@­Ó¤u§@°Ï®É«Ø¥ß·sªº¤u§@°Ï¡C"
 
-#: ../../WPrefs.app/Workspace.c:227
-msgid "automatically create new workspaces."
-msgstr "¦Û°Ê«Ø¥ß·s¤u§@°Ï¡C"
-
-#: ../../WPrefs.app/Workspace.c:250
-msgid ""
-"Position of workspace\n"
-"name display"
-msgstr "¤u§@°Ï¦WºÙÅã¥Ü¦ì¸m"
-
-#: ../../WPrefs.app/Workspace.c:269
-msgid "Disable"
-msgstr "¥¢®Ä"
-
-#: ../../WPrefs.app/Workspace.c:271
-msgid "Top"
-msgstr "³»ºÝ"
-
-#: ../../WPrefs.app/Workspace.c:272
-msgid "Bottom"
-msgstr "©³³¡"
-
-#: ../../WPrefs.app/Workspace.c:273
-msgid "Top/Left"
-msgstr "¥ª¤W"
-
-#: ../../WPrefs.app/Workspace.c:274
-msgid "Top/Right"
-msgstr "¥k¤W"
-
-#: ../../WPrefs.app/Workspace.c:275
-msgid "Bottom/Left"
-msgstr "¥ª¤U"
-
-#: ../../WPrefs.app/Workspace.c:276
-msgid "Bottom/Right"
-msgstr "¥k¤W"
-
-#: ../../WPrefs.app/Workspace.c:284
+#: ../../WPrefs.app/Workspace.c:218
 msgid "Dock/Clip"
 msgstr "°±¾a°Ï/°j¯¾°w"
 
-#: ../../WPrefs.app/Workspace.c:303
-msgid ""
-"Disable/enable the application Dock (the\n"
-"vertical icon bar in the side of the screen)."
-msgstr ""
-"°±¥Î/±Ò¥ÎÀ³¥Îµ{¦¡°±¾a°Ï\n"
-"¡]¿Ã¹õÃ䪺««ª½¹Ï¥Ü¦C¡^¡C"
-
-#: ../../WPrefs.app/Workspace.c:324
-msgid ""
-"Disable/enable the Clip (that thing with\n"
-"a paper clip icon)."
-msgstr ""
-"°±¥Î/±Ò¥Î°j¯¾°w\n"
-"¡]¦³°j¯¾°w¹Ï¥ÜªºªF¦è¡^¡C"
-
-#: ../../WPrefs.app/Workspace.c:364
+#: ../../WPrefs.app/Workspace.c:287
 msgid "Workspace Preferences"
 msgstr "¤u§@°Ï³]©w"
 
-#: ../../WPrefs.app/Workspace.c:366
-msgid ""
-"Workspace navigation features.\n"
-"You can also enable/disable the Dock and Clip here."
-msgstr ""
-"¤u§@°Ï»â¯è¯S¦â¡C\n"
-"§A¤]¥i¥H¦b¦¹±Ò¥Î/°±¥Î°±¾a°Ï»P°j¯¾°w¡C"
-
-#: ../../WPrefs.app/imagebrowser.c:95
-msgid "View"
-msgstr "À˵ø"
-
-#: ../../WPrefs.app/main.c:59
+#: ../../WPrefs.app/main.c:71
 #, c-format
 msgid "usage: %s [options]\n"
 msgstr "¨Ï¥Îªk: %s [¿ï¶µ]\n"
 
-#: ../../WPrefs.app/main.c:60
+#: ../../WPrefs.app/main.c:72
 msgid "options:"
 msgstr "¿ï¶µ:"
 
-#: ../../WPrefs.app/main.c:61
+#: ../../WPrefs.app/main.c:73
 msgid " -display <display>\tdisplay to be used"
 msgstr " -display <display>\t­n¨Ï¥Îªº display"
 
-#: ../../WPrefs.app/main.c:62
+#: ../../WPrefs.app/main.c:74
 msgid " --version\t\tprint version number and exit"
 msgstr " --version\t\t¦L¥Xª©¥»½s¸¹¨ÃÂ÷¶}"
 
-#: ../../WPrefs.app/main.c:63
+#: ../../WPrefs.app/main.c:75
 msgid " --help\t\tprint this message and exit"
 msgstr " --help\t\tÅã¥Ü¥»»¡©ú°T®§"
 
-#: ../../WPrefs.app/main.c:122
+#: ../../WPrefs.app/main.c:134
 #, c-format
 msgid "too few arguments for %s"
 msgstr "%s ªº°Ñ¼Æ¤Ó¤Ö"
 
-#: ../../WPrefs.app/main.c:144
+#: ../../WPrefs.app/main.c:156
 msgid "X server does not support locale"
-msgstr "X ¦øªA¾¹¨Ã¤£¤ä´©·í¦a¤Æ¡]locale¡^"
+msgstr "X ¦øªA¾¹¨Ã¤£¤ä´©·í¦a¤Æ (locale)"
 
-#: ../../WPrefs.app/main.c:147
+#: ../../WPrefs.app/main.c:159
 msgid "cannot set locale modifiers"
 msgstr "µLªk³]©w locale modifiers"
 
-#: ../../WPrefs.app/main.c:153
+#: ../../WPrefs.app/main.c:165
 #, c-format
 msgid "could not open display %s"
 msgstr "µLªk¶}±Ò display %s"
 
-#: ../../WPrefs.app/main.c:161
+#: ../../WPrefs.app/main.c:173
 msgid "could not initialize application"
 msgstr "µLªk±Ò©lÀ³¥Îµ{¦¡"
+
+#~ msgid ""
+#~ "The format of the current menu in ~/G/D/WMRootMenu is not supported by "
+#~ "WPrefs. A new menu will be created.\n"
+#~ "You can also replace ~/G/D/WMRootMenu with ~/G/L/W/plmenu to get the default "
+#~ "menu."
+#~ msgstr ""
+#~ "¥Ø«e¦b ~/G/D/WMRootMenu ªº¿ï³æ®æ¦¡¥¼³Q WPrefs ¤ä´©¡C·s¿ï³æ·|³Q«Ø¥ß¡C\n"
+#~ "±z¤]¥i¥H¥Î§â ~/G/D/WMRootMenu ´«¦¨ ~/G/L/W/plmenu ¨Ó±o¨ì¹w³]¿ï³æ¡C"
diff --git a/po/bg.po b/po/bg.po
index 9622c088..1b2d5755 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -16,7 +16,7 @@ msgstr ""
 "Language-Team: Bulgarian <dict@linux.home.bg>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=windows-1251\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8-bit\n"
 
 #: ../src/appicon.c:550 ../src/dialog.c:230 ../src/dock.c:3291
 #: ../src/dockedapp.c:211 ../src/main.c:254 ../src/rootmenu.c:1765
diff --git a/po/el.po b/po/el.po
index 79c6137b..2c39e29f 100644
--- a/po/el.po
+++ b/po/el.po
@@ -11,8 +11,8 @@ msgstr ""
 "Last-Translator: Nikolaos Papagrigoriou <papanikos@freemail.gr>\n"
 "Language-Team: Greek\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=el\n"
-"Content-Transfer-Encoding: iso8859-7\n"
+"Content-Type: text/plain; charset=iso-8859-7\n"
+"Content-Transfer-Encoding: 8-bit\n"
 "**************************\n"
 "Words from the maintainer in Greek:\n"
 "Ç ìåôÜöñáóç åßíáé áêüìç óå áñ÷éêü óôÜäéï. Ôá ìõíÞìáôá ðïõ åìöáíßæïíôáé óôçí\n"
diff --git a/po/no.po b/po/no.po
index f7eb0158..cb1cab6f 100644
--- a/po/no.po
+++ b/po/no.po
@@ -11,8 +11,8 @@ msgstr ""
 "Last-Translator: Marcus Ramberg <draven@mo.himolde.no>\n"
 "Language-Team: Norwegian \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8-bit\n"
 
 #: ../src/generic/error.c:46
 msgid " fatal error: "
diff --git a/po/pl.po b/po/pl.po
index f7743795..f102b923 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "Last-Translator: Piotr Dembiñski <pdemb@fanthom.math.put.poznan.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO8859-2\n"
-"Content-Transfer-Encoding: ISO8859-2\n"
+"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Transfer-Encoding: 8-bit\n"
 
 #: ../src/appicon.c:509 ../src/dialog.c:216 ../src/dialog.c:272
 #: ../src/dock.c:3059 ../src/dockedapp.c:206 ../src/winspector.c:283
diff --git a/po/zh_TW.Big5.po b/po/zh_TW.Big5.po
index 76a7a246..0f3c0baa 100644
--- a/po/zh_TW.Big5.po
+++ b/po/zh_TW.Big5.po
@@ -1,38 +1,38 @@
 # Window Maker PO file for zh_TW.Big5 (Traditional Chinese).
 # Copyright (C) 1999-2001 Free Software Foundation, Inc.
-# Li Wei Jih <lwj83@cs.ccu.edu.tw>, 1999, 2001.
+# Li Wei Jih <lwj83@cs.ccu.edu.tw>, 1999.
 # Minor modifications by Anthony Fok <foka@debian.org>, 2001.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Window Maker-0.80.0\n"
-"POT-Creation-Date: 2001-12-24 03:08+0800\n"
-"PO-Revision-Date: 2001-12-24 10:00+0800\n"
-"Last-Translator: Li Wei Jih <lwj@manufacture.com.tw>\n"
+"Project-Id-Version: Window Maker-0.51.0\n"
+"POT-Creation-Date: 2001-05-10 18:28-0600\n"
+"PO-Revision-Date: 1999-02-09 13:00+0800\n"
+"Last-Translator: Li Wei Jih <lwj83@cs.ccu.edu.tw>\n"
 "Language-Team: chinese <zh@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=big5\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../src/appicon.c:426 ../src/dialog.c:282 ../src/dock.c:3325
-#: ../src/dockedapp.c:230 ../src/main.c:273 ../src/rootmenu.c:1850
-#: ../src/winspector.c:389 ../src/winspector.c:406
+#: ../src/appicon.c:550 ../src/dialog.c:224 ../src/dock.c:3293
+#: ../src/dockedapp.c:211 ../src/main.c:253 ../src/rootmenu.c:1765
+#: ../src/winspector.c:385 ../src/winspector.c:401
 msgid "Error"
 msgstr "¿ù»~"
 
-#: ../src/appicon.c:427
+#: ../src/appicon.c:551
 msgid "Could not open specified icon file"
 msgstr "µLªk¶}±Ò«ü©wªº¹Ï¥ÜÀÉ"
 
-#: ../src/appicon.c:428 ../src/dialog.c:179 ../src/dialog.c:282
-#: ../src/dialog.c:729 ../src/dialog.c:1814 ../src/dock.c:526
-#: ../src/dock.c:534 ../src/dock.c:558 ../src/dock.c:3326
-#: ../src/dockedapp.c:231 ../src/dockedapp.c:426 ../src/main.c:273
-#: ../src/rootmenu.c:1854 ../src/winspector.c:390 ../src/winspector.c:407
+#: ../src/appicon.c:552 ../src/dialog.c:121 ../src/dialog.c:224
+#: ../src/dialog.c:568 ../src/dialog.c:1592 ../src/dock.c:517
+#: ../src/dock.c:525 ../src/dock.c:549 ../src/dock.c:3294
+#: ../src/dockedapp.c:212 ../src/dockedapp.c:370 ../src/main.c:253
+#: ../src/rootmenu.c:1769 ../src/winspector.c:386 ../src/winspector.c:402
 msgid "OK"
 msgstr "½T©w"
 
-#: ../src/appicon.c:456 ../src/dock.c:264
+#: ../src/appicon.c:579 ../src/dock.c:277
 msgid ""
 " will be forcibly closed.\n"
 "Any unsaved changes will be lost.\n"
@@ -42,374 +42,343 @@ msgstr ""
 "¥ô¦ó¥¼Àx¦sªº§ïÅܱN·|¿ò¥¢¡C\n"
 "½Ð½T»{¡C"
 
-#: ../src/appicon.c:464 ../src/dock.c:283 ../src/winmenu.c:124
+#: ../src/appicon.c:585 ../src/dock.c:282 ../src/winmenu.c:128
 msgid "Kill Application"
 msgstr "µ²§ôÀ³¥Îµ{¦¡"
 
-#: ../src/appicon.c:465 ../src/dock.c:284 ../src/winmenu.c:126
+#: ../src/appicon.c:586 ../src/dock.c:283 ../src/winmenu.c:130
 msgid "Yes"
 msgstr "¬O"
 
-#: ../src/appicon.c:465 ../src/dock.c:284 ../src/winmenu.c:126
+#: ../src/appicon.c:586 ../src/dock.c:283 ../src/winmenu.c:130
 msgid "No"
 msgstr "§_"
 
-#: ../src/appicon.c:495 ../src/dock.c:1177 ../src/dock.c:3491
+#: ../src/appicon.c:604 ../src/dock.c:1161 ../src/dock.c:3465
 msgid "Unhide Here"
 msgstr "¦b¦¹Åã²{"
 
-#: ../src/appicon.c:496 ../src/appicon.c:521 ../src/dock.c:1179
-#: ../src/dock.c:1181 ../src/dock.c:3503 ../src/winmenu.c:461
+#: ../src/appicon.c:605 ../src/appicon.c:630 ../src/dock.c:1163
+#: ../src/dock.c:1165 ../src/dock.c:3477 ../src/winmenu.c:471
 msgid "Hide"
 msgstr "ÁôÂÃ"
 
-#: ../src/appicon.c:497
+#: ../src/appicon.c:606
 msgid "Set Icon..."
 msgstr "³]©w¹Ï¥Ü..."
 
-#: ../src/appicon.c:498 ../src/dock.c:1185 ../src/rootmenu.c:248
-#: ../src/rootmenu.c:264 ../src/winmenu.c:508
+#: ../src/appicon.c:607 ../src/dock.c:1169 ../src/rootmenu.c:226
+#: ../src/rootmenu.c:240 ../src/winmenu.c:518
 msgid "Kill"
 msgstr "µ²§ô"
 
-#: ../src/appicon.c:519 ../src/dock.c:3501
+#: ../src/appicon.c:628 ../src/dock.c:3475
 msgid "Unhide"
 msgstr "Åã²{"
 
-#: ../src/application.c:398
-#, c-format
-msgid "recreating missing icon '%s'"
-msgstr "­«·s«Ø¥ß¯Ê¤Öªº¹Ï¥Ü¡u%s¡v"
-
-#: ../src/defaults.c:919 ../src/defaults.c:1008
-#, c-format
-msgid "Domain %s (%s) of global defaults database is corrupted!"
-msgstr "¾ãÅé¹w³]¸ê®Æ®wªº©w¸q°ì %s (%s) ¤w·lÃa¡I"
-
-#: ../src/defaults.c:924
-#, c-format
-msgid "could not load domain %s from global defaults database"
-msgstr "µLªk±q¾ãÅé¹w³]¸ê®Æ®w¸ü¤J©w¸q°ì %s"
-
-#: ../src/defaults.c:946 ../src/startup.c:884 ../src/startup.c:902
-#: ../src/startup.c:908
+#: ../src/defaults.c:904 ../src/startup.c:847 ../src/startup.c:865
+#: ../src/startup.c:871
 #, c-format
 msgid "could not read domain \"%s\" from defaults database"
-msgstr "µLªk±q¹w³]¸ê®Æ®wŪ¨ú©w¸q°ì¡u%s¡v"
+msgstr "µLªk±q¹w³]¸ê®Æ®wŪ¨ú©w¸q°ì \"%s\""
 
-#: ../src/defaults.c:992 ../src/defaults.c:1096 ../src/defaults.c:1137
-#: ../src/defaults.c:1193
+#: ../src/defaults.c:950 ../src/defaults.c:1075 ../src/defaults.c:1114
+#: ../src/defaults.c:1144
 #, c-format
 msgid "Domain %s (%s) of defaults database is corrupted!"
 msgstr "¹w³]¸ê®Æ®wªº©w¸q°ì %s (%s) ¤w·lÃa¡I"
 
-#: ../src/defaults.c:997 ../src/defaults.c:1116 ../src/defaults.c:1173
-#: ../src/defaults.c:1202
+#: ../src/defaults.c:955 ../src/defaults.c:1096 ../src/defaults.c:1127
+#: ../src/defaults.c:1153
 #, c-format
 msgid "could not load domain %s from user defaults database"
 msgstr "µLªk±q¨Ï¥ÎªÌ¹w³]¸ê®Æ®w¸ü¤J©w¸q°ì %s"
 
-#: ../src/defaults.c:1027
+#: ../src/defaults.c:966 ../src/defaults.c:1060
+#, c-format
+msgid "Domain %s (%s) of global defaults database is corrupted!"
+msgstr "¾ãÅé¹w³]¸ê®Æ®wªº©w¸q°ì %s (%s) ¤w·lÃa¡I"
+
+#: ../src/defaults.c:985
 #, c-format
 msgid "could not load domain %s from global defaults database (%s)"
 msgstr "µLªk±q¾ãÅé¹w³]¸ê®Æ®w (%2$s) ¸ü¤J©w¸q°ì %1$s"
 
-#: ../src/defaults.c:1163 ../src/screen.c:458
+#: ../src/defaults.c:1065
 #, c-format
-msgid "could not load logo image for panels: %s"
-msgstr "µLªk¸ü¤J­±ªOªº¼ÐÃѼv¹³¡G%s"
+msgid "could not load domain %s from global defaults database"
+msgstr "µLªk±q¾ãÅé¹w³]¸ê®Æ®w¸ü¤J©w¸q°ì %s"
 
-#: ../src/defaults.c:1444
-#, c-format
-msgid "wrong option value for key \"%s\". Should be one of %s"
-msgstr "key¡u%s¡vªº¿ï¶µ­È¿ù»~¡CÀ³¬° %s "
-
-#: ../src/defaults.c:1489
-#, c-format
-msgid "can't convert \"%s\" to boolean for key \"%s\""
-msgstr "µLªkÂà´« key¡u%2$s¡vªº¡u%1$s¡v¦¨¬° boolean"
-
-#: ../src/defaults.c:1494 ../src/defaults.c:1526 ../src/defaults.c:1558
-#: ../src/defaults.c:1571 ../src/defaults.c:1586 ../src/defaults.c:1600
-#: ../src/defaults.c:1670 ../src/defaults.c:1682 ../src/defaults.c:2149
-#: ../src/defaults.c:2166 ../src/defaults.c:2179 ../src/defaults.c:2211
-#: ../src/defaults.c:2227 ../src/defaults.c:2258 ../src/defaults.c:2345
-#: ../src/defaults.c:2731 ../src/defaults.c:2742
-#, c-format
-msgid "using default \"%s\" instead"
-msgstr "§ï¥Î¹w³]¡u%s¡v"
-
-#: ../src/defaults.c:1523
-#, c-format
-msgid "can't convert \"%s\" to integer for key \"%s\""
-msgstr "µLªkÂà´« key¡u%2$s¡vªº¡u%1$s¡v¦¨¬°¾ã¼Æ"
-
-#: ../src/defaults.c:1553 ../src/defaults.c:1665 ../src/defaults.c:2144
-#: ../src/defaults.c:2161 ../src/defaults.c:2206 ../src/defaults.c:2253
-#: ../src/defaults.c:2726 ../src/wdefaults.c:571 ../src/wdefaults.c:607
+#. --------------------------- Local -----------------------
+#: ../src/defaults.c:1362 ../src/defaults.c:1504 ../src/defaults.c:1616
+#: ../src/defaults.c:2095 ../src/defaults.c:2112 ../src/defaults.c:2157
+#: ../src/defaults.c:2204 ../src/defaults.c:2679 ../src/wdefaults.c:565
+#: ../src/wdefaults.c:601
 #, c-format
 msgid "Wrong option format for key \"%s\". Should be %s."
-msgstr "key¡u%s¡vªº¿ï¶µ®æ¦¡¿ù»~¡CÀ³¬° %s¡C"
+msgstr "key \"%s\" ªº¿ï¶µ®æ¦¡¿ù»~¡CÀ³¬° %s¡C"
 
-#: ../src/defaults.c:1566
+#: ../src/defaults.c:1364 ../src/defaults.c:1445 ../src/defaults.c:1477
+#: ../src/defaults.c:1509 ../src/defaults.c:1522 ../src/defaults.c:1537
+#: ../src/defaults.c:1551 ../src/defaults.c:1621 ../src/defaults.c:1633
+#: ../src/defaults.c:2100 ../src/defaults.c:2117 ../src/defaults.c:2130
+#: ../src/defaults.c:2162 ../src/defaults.c:2178 ../src/defaults.c:2209
+#: ../src/defaults.c:2296 ../src/defaults.c:2684 ../src/defaults.c:2695
+#, c-format
+msgid "using default \"%s\" instead"
+msgstr "§ï¥Î¹w³] \"%s\""
+
+#: ../src/defaults.c:1395
+#, c-format
+msgid "wrong option value for key \"%s\". Should be one of %s"
+msgstr "key \"%s\" ªº¿ï¶µ­È¿ù»~¡CÀ³¬° %s "
+
+#: ../src/defaults.c:1440
+#, c-format
+msgid "can't convert \"%s\" to boolean for key \"%s\""
+msgstr "µLªkÂà´« key \"%2$s\" ªº \"%1$s\" ¦¨¬° boolean"
+
+#: ../src/defaults.c:1474
+#, c-format
+msgid "can't convert \"%s\" to integer for key \"%s\""
+msgstr "µLªkÂà´« key \"%2$s\" ªº \"%1$s\" ¦¨¬°¾ã¼Æ"
+
+#: ../src/defaults.c:1517
 #, c-format
 msgid "Incorrect number of elements in array for key \"%s\"."
-msgstr "key¡u%s¡vªº°}¦C¤¸¯À¼Æ¥Ø¿ù»~¡C"
+msgstr "key \"%s\" ªº°}¦C¤¸¯À¼Æ¥Ø¿ù»~¡C"
 
-#: ../src/defaults.c:1581
+#: ../src/defaults.c:1532
 #, c-format
 msgid "Wrong value for key \"%s\". Should be Coordinate."
-msgstr "key¡u%s¡vªº­È¿ù»~¡CÀ³¬°®y¼Ð¡C"
+msgstr "key \"%s\" ªº­È¿ù»~¡CÀ³¬°®y¼Ð¡C"
 
-#: ../src/defaults.c:1596
+#: ../src/defaults.c:1547
 #, c-format
 msgid "can't convert array to integers for \"%s\"."
-msgstr "µLªk¬°¡u%s¡vÂà´«°}¦C¦¨¬°¾ã¼Æ¡C"
+msgstr "µLªk¬° \"%s\" Âà´«°}¦C¦¨¬°¾ã¼Æ¡C"
 
-#: ../src/defaults.c:1794 ../src/defaults.c:1826 ../src/defaults.c:1842
-#: ../src/defaults.c:1871 ../src/defaults.c:1894 ../src/defaults.c:1947
-#: ../src/defaults.c:1987 ../src/defaults.c:2025 ../src/defaults.c:2041
+#: ../src/defaults.c:1745 ../src/defaults.c:1777 ../src/defaults.c:1793
+#: ../src/defaults.c:1822 ../src/defaults.c:1845 ../src/defaults.c:1898
+#: ../src/defaults.c:1938 ../src/defaults.c:1976 ../src/defaults.c:1992
 #, c-format
 msgid "\"%s\" is not a valid color name"
-msgstr "¡u%s¡v¤£¬O¦³®ÄªºÃC¦â¦W"
+msgstr "\"%s\" ¤£¬O¦³®ÄªºÃC¦â¦W"
 
-#: ../src/defaults.c:1807 ../src/defaults.c:1859
+#: ../src/defaults.c:1758 ../src/defaults.c:1810
 msgid "bad number of arguments in gradient specification"
 msgstr "º¥¼h³W®æ¤¤¤Þ¼Æ¼Æ¥Ø¿ù»~"
 
-#: ../src/defaults.c:1920
+#: ../src/defaults.c:1871
 msgid "too few arguments in multicolor gradient specification"
 msgstr "¦h¦âº¥¼h³W®æ¤¤¤Þ¼Æ¤Ó¤Ö"
 
-#: ../src/defaults.c:2014
+#: ../src/defaults.c:1965
 msgid "bad number of arguments in textured gradient specification"
 msgstr "§÷½èº¥¼h³W®æ¤¤¤Þ¼Æ¼Æ¥Ø¿ù»~"
 
-#: ../src/defaults.c:2057
+#: ../src/defaults.c:2008
 #, c-format
 msgid "bad opacity value for tgradient texture \"%s\". Should be [0..255]"
-msgstr "º¥¼h¡]tgradient¡^§÷½è¡u%s¡v¤£³z©ú­È¿ù»~¡CÀ³¸Ó¬O [0..255]"
+msgstr "º¥¼h (tgradient) §÷½è \"%s\" ¤£³z©ú­È¿ù»~¡CÀ³¸Ó¬O [0..255]"
 
-#: ../src/defaults.c:2117
+#: ../src/defaults.c:2068
 #, c-format
 msgid "could not initialize library %s"
-msgstr "µLªk±Ò©l¨ç¦¡®w %s"
+msgstr "µLªk±Ò©l¨ç¦¡®w: %s"
 
-#: ../src/defaults.c:2120
+#: ../src/defaults.c:2071
 #, c-format
 msgid "could not find function %s::%s"
 msgstr "§ä¤£¨ì¨ç¦¡ %s::%s"
 
-#: ../src/defaults.c:2127
+#: ../src/defaults.c:2078
 #, c-format
 msgid "invalid texture type %s"
 msgstr "§÷½è«¬ºA %s µL®Ä"
 
-#: ../src/defaults.c:2174
+#: ../src/defaults.c:2125
 #, c-format
 msgid "Error in texture specification for key \"%s\""
-msgstr "key¡u%s¡vªº§÷½è³W®æ¿ù»~"
+msgstr "key \"%s\" ªº§÷½è³W®æ¿ù»~"
 
-#: ../src/defaults.c:2223
+#: ../src/defaults.c:2174
 msgid "Wrong type for workspace background. Should be a texture type."
 msgstr "¤u§@°Ï­I´º«¬ºA¿ù»~¡CÀ³¬°§÷½è«¬ºA¡C"
 
-#: ../src/defaults.c:2271
+#: ../src/defaults.c:2222
 #, c-format
 msgid "Wrong type for background of workspace %i. Should be a texture."
 msgstr "¤u§@°Ï %i ­I´º«¬ºA¿ù»~¡CÀ³¬°§÷½è¡C"
 
-#: ../src/defaults.c:2313
+#: ../src/defaults.c:2264
 msgid "could not load any usable font!!!"
-msgstr "µLªk¸ü¤J¥ô¦ó¥i¥Î¦r«¬¡I¡I"
+msgstr "µLªk¸ü¤J¥ô¦ó¥i¥Î¦r«¬!!!"
 
-#: ../src/defaults.c:2340
+#: ../src/defaults.c:2291
 #, c-format
 msgid "could not get color for key \"%s\""
-msgstr "µLªk¨ú±o key¡u%s¡vªº¦â±m"
+msgstr "µLªk¨ú±o key \"%s\" ªº¦â±m"
 
-#: ../src/defaults.c:2398 ../src/rootmenu.c:523
+#: ../src/defaults.c:2349 ../src/rootmenu.c:492
 #, c-format
 msgid "%s:invalid key modifier \"%s\""
-msgstr "%s¡GÁä­×¹¢¡u%s¡vµL®Ä"
+msgstr "%s: Áä­×¥¿ \"%s\" µL®Ä"
 
-#: ../src/defaults.c:2410
+#: ../src/defaults.c:2361
 #, c-format
 msgid "%s:invalid kbd shortcut specification \"%s\""
-msgstr "%s¡GÁä½L±¶®|³W®æ¡u%s¡vµL®Ä"
+msgstr "%s: Áä½L±¶®|³W®æ \"%s\" µL®Ä"
 
-#: ../src/defaults.c:2417
+#: ../src/defaults.c:2368
 #, c-format
 msgid "%s:invalid key in shortcut \"%s\""
-msgstr "%s¡G±¶®|¡u%s¡vªºÁäµL®Ä"
+msgstr "%s: ±¶®| \"%s\" ªºÁäµL®Ä"
 
-#: ../src/defaults.c:2442
+#: ../src/defaults.c:2393
 #, c-format
 msgid "%s: modifier key %s is not valid"
-msgstr "%s¡G­×¹¢Áä %s ¤£¥¿½T"
+msgstr "%s: ­×¥¿Áä %s ¤£¥¿½T"
 
-#: ../src/defaults.c:2474
-#, c-format
+#: ../src/defaults.c:2425
+#, fuzzy, c-format
 msgid "could not load image in option %s: %s"
-msgstr "µLªk¸ü¤J¼v¹³©ó¿ï¶µ¡u%s¡v¡G%s"
+msgstr "µLªk¸ü¤J¹w³]¹Ï¥Ü \"%s\":%s"
 
-#: ../src/defaults.c:2591
+#: ../src/defaults.c:2544
 #, c-format
 msgid "failed to open bitmap file \"%s\""
-msgstr "µLªk¶}±Ò¬M¹³ÀÉ¡u%s¡v"
+msgstr "µLªk¶}±Ò¬M¹³ÀÉ \"%s\""
 
-#: ../src/defaults.c:2594
+#: ../src/defaults.c:2547
 #, c-format
 msgid "\"%s\" is not a valid bitmap file"
-msgstr "¡u%s¡v¤£¬O¦³®Äªº¬M¹³ÀɦW"
+msgstr "\"%s\" ¤£¬O¦³®Äªº¬M¹³ÀɦW"
 
-#: ../src/defaults.c:2597
+#: ../src/defaults.c:2550
 #, c-format
 msgid "out of memory reading bitmap file \"%s\""
-msgstr "Ū¤J¡u%s¡v¬M¹³ÀɮɰO¾ÐÅ餣¨¬"
+msgstr "Ū¤J \"%s\" ¬M¹³ÀɮɰO¾ÐÅ餣¨¬"
 
-#: ../src/defaults.c:2636 ../src/defaults.c:2669
+#: ../src/defaults.c:2589 ../src/defaults.c:2622
 msgid "bad number of arguments in cursor specification"
 msgstr "´å¼Ð³W®æ¤¤¤Þ¼Æ¼Æ¥Ø¿ù»~"
 
-#: ../src/defaults.c:2652
+#: ../src/defaults.c:2605
 #, c-format
 msgid "unknown builtin cursor name \"%s\""
-msgstr "¤£¦Wªº¤ºÁä´å¼Ð¦W¡u%s¡v"
+msgstr ""
 
-#: ../src/defaults.c:2679 ../src/defaults.c:2691
+#: ../src/defaults.c:2632 ../src/defaults.c:2644
 #, c-format
 msgid "could not find cursor bitmap file \"%s\""
-msgstr "µLªk§ä¨ì´å¼Ð¬M¹³ÀÉ¡u%s¡v"
+msgstr "µLªk§ä¨ì´å¼Ð¬M¹³ÀÉ \"%s\""
 
-#: ../src/defaults.c:2738
+#: ../src/defaults.c:2691
 #, c-format
 msgid "Error in cursor specification for key \"%s\""
-msgstr "key¡u%s¡vªº´å¼Ð³W®æ¿ù»~"
+msgstr "key \"%s\" ªº´å¼Ð³W®æ¿ù»~"
 
-#: ../src/defaults.c:2823
+#: ../src/defaults.c:2778
 msgid "could not render texture for icon background"
 msgstr "µLªkªí²{¹Ï¥Ü­I´ºªº§÷½è"
 
-#: ../src/dialog.c:135
-msgid "Save workspace state"
-msgstr "Àx¦s¤u§@°Ïª¬ºA"
-
-#: ../src/dialog.c:179 ../src/dialog.c:736 ../src/dock.c:558
-#: ../src/dockedapp.c:431 ../src/rootmenu.c:198 ../src/rootmenu.c:248
-#: ../src/rootmenu.c:264
+#: ../src/dialog.c:121 ../src/dialog.c:575 ../src/dock.c:549
+#: ../src/dockedapp.c:376 ../src/rootmenu.c:188 ../src/rootmenu.c:226
+#: ../src/rootmenu.c:240
 msgid "Cancel"
 msgstr "¨ú®ø"
 
-#: ../src/dialog.c:277
+#: ../src/dialog.c:219
 msgid "Could not open directory "
 msgstr "µLªk¶}±Ò¥Ø¿ý"
 
-#: ../src/dialog.c:332
+#: ../src/dialog.c:274
 msgid "Could not load image file "
 msgstr "µLªk¸ü¤J¼v¹³ÀÉ"
 
-#: ../src/dialog.c:663
+#: ../src/dialog.c:503
 msgid "Directories"
 msgstr "¥Ø¿ý"
 
-#: ../src/dialog.c:672
+#: ../src/dialog.c:512
 msgid "Icons"
 msgstr "¹Ï¥Ü"
 
-#: ../src/dialog.c:705
+#: ../src/dialog.c:545
 msgid "Preview"
-msgstr "¹wÄý"
+msgstr ""
 
-#: ../src/dialog.c:718
+#: ../src/dialog.c:558
 msgid "File Name:"
-msgstr "ÀɦW¡G"
+msgstr "ÀɦW:"
 
-#: ../src/dialog.c:742
+#: ../src/dialog.c:581
 msgid "Choose File"
 msgstr "¿ï¨úÀÉ®×"
 
-#: ../src/dialog.c:760 ../src/dialog.c:762
+#: ../src/dialog.c:598 ../src/dialog.c:600
 msgid "Icon Chooser"
 msgstr "¹Ï¥Ü¿ï¨ú¾¹"
 
-#: ../src/dialog.c:1241 ../src/dialog.c:1351
+#: ../src/dialog.c:1034 ../src/dialog.c:1139
 #, c-format
 msgid "Version %s"
-msgstr "ª©¥» %s"
+msgstr ""
 
-#: ../src/dialog.c:1348
+#: ../src/dialog.c:1136
 msgid "Window Manager for X"
 msgstr "X ©³¤Uªºµøµ¡ºÞ²z­û"
 
-#: ../src/dialog.c:1371
+#: ../src/dialog.c:1160
+msgid "32 thousand"
+msgstr ""
+
+#: ../src/dialog.c:1163
+msgid "64 thousand"
+msgstr ""
+
+#: ../src/dialog.c:1167
+msgid "16 million"
+msgstr ""
+
+#: ../src/dialog.c:1174
 #, c-format
-msgid "Using visual 0x%x: %s %ibpp "
-msgstr "¨Ï¥Î visual 0x%x: %s %ibpp "
+msgid "Using visual 0x%x: %s %ibpp (%s colors)\n"
+msgstr ""
 
-#: ../src/dialog.c:1379
-msgid "(32 thousand colors)\n"
-msgstr "¡]¤T¸U¤G¤d¦â¡^\n"
-
-#: ../src/dialog.c:1382
-msgid "(64 thousand colors)\n"
-msgstr "¡]¤»¸U¥|¤d¦â¡^\n"
-
-#: ../src/dialog.c:1386
-msgid "(16 million colors)\n"
-msgstr "¡]¤@»õ¤»¦Ê¸U¦â¡^\n"
-
-#: ../src/dialog.c:1389
-#, c-format
-msgid "(%d colors)\n"
-msgstr "¡]%d ¦â¡^\n"
-
-#: ../src/dialog.c:1399
+#: ../src/dialog.c:1182
 #, c-format
 msgid "Total allocated memory: %i kB. Total memory in use: %i kB.\n"
-msgstr "¦X­p°t¸m°O¾ÐÅé¡G%i kB¡C¦X­p¨Ï¥Î¤¤°O¾ÐÅé¡G%i kB¡C\n"
+msgstr ""
 
-#: ../src/dialog.c:1406
+#: ../src/dialog.c:1188
 msgid "Supported image formats: "
-msgstr "¤ä´©¼v¹³®æ¦¡¡G"
+msgstr ""
 
-#: ../src/dialog.c:1413
+#: ../src/dialog.c:1195
 msgid ""
 "\n"
-"Additional support for: "
+"Additional Support For: "
 msgstr ""
-"\n"
-"ÃB¥~¤ä´©¡G"
 
-#: ../src/dialog.c:1436
+#: ../src/dialog.c:1214
+msgid "Sound"
+msgstr ""
+
+#: ../src/dialog.c:1221
 msgid " and "
-msgstr " »P "
-
-#: ../src/dialog.c:1446
-msgid ""
-"\n"
-"Sound disabled"
 msgstr ""
-"\n"
-"¨ú®ø­µ®Ä"
 
-#: ../src/dialog.c:1448
-msgid ""
-"\n"
-"Sound enabled"
-msgstr ""
-"\n"
-"±Ò°Ê­µ®Ä"
-
-#: ../src/dialog.c:1472
+#: ../src/dialog.c:1250
 msgid "Info"
-msgstr "¸ê°T"
+msgstr ""
 
-#: ../src/dialog.c:1495
-msgid "Merry Christmas!"
-msgstr "¸t½Ï§Ö¼Ö¡I"
+#: ../src/dialog.c:1273
+msgid "Merry X'mas!"
+msgstr ""
 
-#: ../src/dialog.c:1565
+#: ../src/dialog.c:1343
 msgid ""
 "    Window Maker is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU General Public License as\n"
@@ -429,19 +398,19 @@ msgid ""
 "02111-1307, USA."
 msgstr ""
 
-#: ../src/dialog.c:1586
+#: ../src/dialog.c:1364
 msgid "Legal"
-msgstr "ªk«ß"
+msgstr ""
 
-#: ../src/dialog.c:1737 ../src/startup.c:395
+#: ../src/dialog.c:1516 ../src/startup.c:349
 msgid "cannot open connection for crashing dialog panel. Aborting."
-msgstr "µLªk¬°±Y¼ì¹ï¸Ü­±ªO¶}±Ò³sµ²¡C©ñ±ó¡C"
+msgstr ""
 
-#: ../src/dialog.c:1763
+#: ../src/dialog.c:1542
 msgid "Fatal error"
-msgstr "ÄY­«¿ù»~"
+msgstr ""
 
-#: ../src/dialog.c:1774
+#: ../src/dialog.c:1553
 #, c-format
 msgid ""
 "Window Maker received signal %i\n"
@@ -450,40 +419,41 @@ msgstr ""
 "Window Maker ¦¬¨ì°T¸¹ %i\n"
 "(%s)."
 
-#: ../src/dialog.c:1777
+#: ../src/dialog.c:1556
 #, c-format
 msgid "Window Maker received signal %i."
 msgstr "Window Maker ¦¬¨ì°T¸¹ %i¡C"
 
-#: ../src/dialog.c:1786
+#: ../src/dialog.c:1565
 msgid ""
 " This fatal error occured probably due to a bug. Please fill the included "
 "BUGFORM and report it to bugs@windowmaker.org."
 msgstr ""
-"³o­ÓÄY­«¿ù»~¥i¯à¬O¦]¬°µ{¦¡¿ù»~©Ò­P¡C½Ð¶ñ¼gªþ±aªº BUGFORM ¨Ã¦V "
-"bugs@windowmaker.org ´£¥X³ø§i¡C"
+"³o­ÓÄY­«¿ù»~¥i¯à¬O¦]¬°µ{¦¡¿ù»~©Ò­P¡C½Ð¶ñ¼gªþ±aªº BUGFORM "
+"¨Ã¦V bugs@windowmaker.org ´£¥X³ø§i¡C"
 
-#: ../src/dialog.c:1795
+#: ../src/dialog.c:1573
 msgid "What do you want to do now?"
-msgstr "§A²{¦b­n°µ¤°»ò¡H"
+msgstr ""
 
-#: ../src/dialog.c:1801
+#: ../src/dialog.c:1579
+#, fuzzy
 msgid "Select action"
-msgstr "¿ï¨ú°Ê§@"
+msgstr "¿ï¨ú¹Ï¥Ü¡]¨ú®ø¡^"
 
-#: ../src/dialog.c:1802
+#: ../src/dialog.c:1580
 msgid "Abort and leave a core file"
-msgstr "©ñ±ó¥B¯d¤U core ÀÉ"
+msgstr ""
 
-#: ../src/dialog.c:1803
+#: ../src/dialog.c:1581
 msgid "Restart Window Maker"
 msgstr "­«·s±Ò°Ê Window Maker"
 
-#: ../src/dialog.c:1804
+#: ../src/dialog.c:1582
 msgid "Start alternate window manager"
 msgstr "±Ò°Ê¥t¤@®Mµøµ¡ºÞ²z­û"
 
-#: ../src/dialog.c:1982
+#: ../src/dialog.c:1760
 msgid ""
 "Window Maker is part of the GNUstep project.\n"
 "The GNUstep project aims to create a free\n"
@@ -496,232 +466,230 @@ msgid ""
 "GNUstep, please visit: www.gnustep.org"
 msgstr ""
 
-#: ../src/dialog.c:2002
+#: ../src/dialog.c:1780
 msgid "About GNUstep"
 msgstr "¦³Ãö GNUstep"
 
 #: ../src/dock.c:213
 #, c-format
 msgid "Type the name for workspace %i:"
-msgstr "¿é¤J¤u§@°Ï %i ¦WºÙ¡G"
+msgstr "¿é¤J¤u§@°Ï %i ¦WºÙ:"
 
-#: ../src/dock.c:214 ../src/dock.c:1141 ../src/dock.c:1144 ../src/dock.c:3409
+#: ../src/dock.c:214 ../src/dock.c:1125 ../src/dock.c:1128 ../src/dock.c:3383
 msgid "Rename Workspace"
 msgstr "¤u§@°Ï§ó¦W"
 
-#: ../src/dock.c:520 ../src/dock.c:528
+#: ../src/dock.c:511 ../src/dock.c:519
 msgid "Warning"
-msgstr "ª`·N"
+msgstr ""
 
-#: ../src/dock.c:521
+#: ../src/dock.c:512
 msgid ""
 "Some icons cannot be made omnipresent. Please make sure that no other icon "
 "is docked in the same positions on the other workspaces and the Clip is not "
 "full in some workspace."
 msgstr ""
-"¬Y¨Ç¹Ï¥ÜµLªk³]¦¨µL©Ò¤£¦b¡C½Ð½T»{¦b¨ä¥L¤u§@°Ï¦P¤@­Ó¦ì¸m¤W¨S¦³¨ä¥L¹Ï¥Ü°±¾a¥B¦b¬"
-"Y¨Ç¤u§@°Ïªº°j¯¾°w¥¼º¡¡C"
 
-#: ../src/dock.c:529
+#: ../src/dock.c:520
 msgid ""
 "Icon cannot be made omnipresent. Please make sure that no other icon is "
 "docked in the same position on the other workspaces and the Clip is not full "
 "in some workspace."
 msgstr ""
-"¹Ï¥ÜµLªk³]¦¨µL©Ò¤£¦b¡C½Ð½T»{¦b¨ä¥L¤u§@°Ï¦P¤@­Ó¦ì¸m¤W¨S¦³¨ä¥L¹Ï¥Ü°±¾a¥B¦b¬Y¨Ç¤"
-"u§@°Ïªº°j¯¾°w¥¼º¡¡C"
 
-#: ../src/dock.c:556
+#: ../src/dock.c:547
 msgid "Workspace Clip"
 msgstr "¤u§@°Ï°j¯¾°w"
 
-#: ../src/dock.c:557
+#: ../src/dock.c:548
 msgid "All selected icons will be removed!"
 msgstr "©Ò¦³¿ï¨úªº¹Ï¥Ü·|³Q§R°£¡I"
 
-#: ../src/dock.c:608 ../src/dock.c:1156 ../src/dock.c:1158 ../src/dock.c:3445
+#: ../src/dock.c:599 ../src/dock.c:1140 ../src/dock.c:1142 ../src/dock.c:3419
 msgid "Keep Icon"
 msgstr "«O«ù¹Ï¥Ü"
 
-#: ../src/dock.c:609 ../src/dock.c:2137 ../src/dock.c:2278
+#: ../src/dock.c:600 ../src/dock.c:2122 ../src/dock.c:2256
 msgid "Type the command used to launch the application"
 msgstr "¿é¤J¥Î¨Ó±Ò°ÊÀ³¥Îµ{¦¡ªº©R¥O"
 
-#: ../src/dock.c:965
+#: ../src/dock.c:951
 #, c-format
 msgid "could not launch application %s\n"
 msgstr "µLªk±Ò°ÊÀ³¥Îµ{¦¡ %s\n"
 
-#: ../src/dock.c:1020
+#: ../src/dock.c:1006
 msgid "could not create workspace submenu for Clip menu"
 msgstr "µLªk¬°°j¯¾°w¿ï³æ«Ø¥ß¤u§@°Ï°Æ¿ï³æ"
 
-#: ../src/dock.c:1078
-msgid "could not create options submenu for Clip menu"
-msgstr "µLªk¬°°j¯¾°w¿ï³æ«Ø¥ß¿ï¶µ°Æ¿ï³æ"
-
-#: ../src/dock.c:1082 ../src/dock.c:1130
+#: ../src/dock.c:1029 ../src/dock.c:1072 ../src/dock.c:1117 ../src/dock.c:3363
 msgid "Keep on Top"
 msgstr "«O«ù¦b³Ì¤W¼h"
 
-#: ../src/dock.c:1088
+#: ../src/dock.c:1031 ../src/dock.c:3365
+msgid "Allow Lowering"
+msgstr ""
+
+#: ../src/dock.c:1068
+msgid "could not create options submenu for Clip menu"
+msgstr "µLªk¬°°j¯¾°w¿ï³æ«Ø¥ß¿ï¶µ°Æ¿ï³æ"
+
+#: ../src/dock.c:1075
 msgid "Collapsed"
-msgstr "ºPÅ|"
+msgstr "§éÅ|"
 
-#: ../src/dock.c:1094
-msgid "Autocollapse"
-msgstr "¦Û°ÊºPÅ|"
+#: ../src/dock.c:1081
+msgid "AutoCollapse"
+msgstr "¦Û°Ê§éÅ|"
 
-#: ../src/dock.c:1100
-msgid "Autoraise"
+#: ../src/dock.c:1087
+msgid "AutoRaiseLower"
 msgstr "¦Û°Ê¤É­°"
 
-#: ../src/dock.c:1106
-msgid "Autoattract Icons"
+#: ../src/dock.c:1093
+msgid "AutoAttract Icons"
 msgstr "¦Û°Ê§l¤Þ¹Ï¥Ü"
 
-#: ../src/dock.c:1136
+#: ../src/dock.c:1120
 msgid "Clip Options"
 msgstr "°j¯¾°w¿ï¶µ"
 
-#: ../src/dock.c:1146
+#: ../src/dock.c:1130
 msgid "Selected"
 msgstr "¤w¿ï¨ú"
 
-#: ../src/dock.c:1151 ../src/dock.c:1154 ../src/dock.c:3436
+#: ../src/dock.c:1135 ../src/dock.c:1138 ../src/dock.c:3410
+#, fuzzy
 msgid "Select All Icons"
-msgstr "¿ï¨ú©Ò¦³¹Ï¥Ü"
+msgstr "¿ï¨ú©Ò¦³¹Ï¥Ü¡]¨ú®ø¡^"
 
-#: ../src/dock.c:1160 ../src/dock.c:1162 ../src/dock.c:3453
+#: ../src/dock.c:1144 ../src/dock.c:1146 ../src/dock.c:3427
 msgid "Move Icon To"
 msgstr "²¾°Ê¹Ï¥Ü¦Ü"
 
-#: ../src/dock.c:1167 ../src/dock.c:1170 ../src/dock.c:3464
+#: ../src/dock.c:1151 ../src/dock.c:1154 ../src/dock.c:3438
 msgid "Remove Icon"
 msgstr "§R°£¹Ï¥Ü"
 
-#: ../src/dock.c:1172
+#: ../src/dock.c:1156
 msgid "Attract Icons"
 msgstr "§l¤Þ¹Ï¥Ü"
 
-#: ../src/dock.c:1175
+#: ../src/dock.c:1159
 msgid "Launch"
 msgstr "±Ò°Ê"
 
-#: ../src/dock.c:1183
+#: ../src/dock.c:1167
 msgid "Settings..."
 msgstr "³]©w..."
 
-#: ../src/dock.c:1548 ../src/dock.c:1655
+#: ../src/dock.c:1526 ../src/dock.c:1629
 #, c-format
 msgid "bad value in docked icon state info %s"
 msgstr "°±¾aªº¹Ï¥Üª¬ºA¸ê°T %s ­È¤£¥¿½T"
 
-#: ../src/dock.c:1663
+#: ../src/dock.c:1637
 #, c-format
 msgid "bad value in docked icon position %i,%i"
 msgstr "°±¾aªº¹Ï¥Ü¦ì¸m %i,%i ­È¤£¥¿½T"
 
-#: ../src/dock.c:1919
+#: ../src/dock.c:1657
+#, c-format
+msgid "bad value in dock state info:%s"
+msgstr "°±¾a°Ïªºª¬ºA¸ê°T %s ­È¤£¥¿½T"
+
+#: ../src/dock.c:1889
 msgid "there are too many icons stored in dock. Ignoring what doesn't fit"
 msgstr "¤Ó¦h¹Ï¥Ü¦s©ñ¦b°±¾a°Ï¡C©¿²¤¤£¾A·íªº"
 
 #. icon->forced_dock = 1;
-#: ../src/dock.c:2136 ../src/dock.c:2277
+#: ../src/dock.c:2121 ../src/dock.c:2255
 msgid "Dock Icon"
 msgstr "°±¾a¹Ï¥Ü"
 
-#: ../src/dock.c:3323
+#: ../src/dock.c:3286 ../src/dock.c:3290
 #, c-format
 msgid "Could not execute command \"%s\""
-msgstr "µLªk°õ¦æ©R¥O¡u%s¡v"
+msgstr "µLªk°õ¦æ©R¥O \"%s\""
 
-#: ../src/dock.c:3415
+#: ../src/dock.c:3389
+#, fuzzy
 msgid "Toggle Omnipresent"
-msgstr "¤Á´«µL©Ò¤£¦b"
+msgstr "µL©Ò¤£¦b"
 
-#: ../src/dock.c:3420 ../src/kwm.c:637 ../src/winmenu.c:413
-#: ../src/winspector.c:1375
+#: ../src/dock.c:3394 ../src/winmenu.c:423 ../src/winspector.c:1376
 msgid "Omnipresent"
 msgstr "µL©Ò¤£¦b"
 
-#: ../src/dock.c:3434
+#: ../src/dock.c:3408
+#, fuzzy
 msgid "Unselect All Icons"
-msgstr "¨ú®ø¿ï¨ú©Ò¦³¹Ï¥Ü"
+msgstr "¿ï¨ú©Ò¦³¹Ï¥Ü¡]¨ú®ø¡^"
 
-#: ../src/dock.c:3443
+#: ../src/dock.c:3417
 msgid "Keep Icons"
 msgstr "«O«ù¹Ï¥Ü"
 
-#: ../src/dock.c:3451
+#: ../src/dock.c:3425
 msgid "Move Icons To"
 msgstr "²¾°Ê¹Ï¥Ü¦Ü"
 
-#: ../src/dock.c:3462
+#: ../src/dock.c:3436
 msgid "Remove Icons"
 msgstr "§R°£¹Ï¥Ü"
 
-#: ../src/dock.c:3493 ../src/kwm.c:643
+#: ../src/dock.c:3467
 msgid "Bring Here"
-msgstr "±a¨ì³o¸Ì"
+msgstr ""
 
-#: ../src/dockedapp.c:149
+#: ../src/dockedapp.c:131
 #, c-format
 msgid "could not find icon %s, used in a docked application"
 msgstr "µLªk§ä¨ì¹Ï¥Ü %s¡A¥Î©ó°±¾aªºÀ³¥Îµ{¦¡"
 
-#: ../src/dockedapp.c:229
+#: ../src/dockedapp.c:210
 #, c-format
 msgid "Could not open specified icon file: %s"
-msgstr "µLªk¶}±Ò«ü©wªº¹Ï¥ÜÀÉ¡G%s"
+msgstr "µLªk¶}±Ò«ü©wªº¹Ï¥ÜÀÉ: %s"
 
-#: ../src/dockedapp.c:231
+#: ../src/dockedapp.c:212
 msgid "Ignore"
-msgstr "©¿²¤"
+msgstr ""
 
-#: ../src/dockedapp.c:333
-msgid "Start when Window Maker is started"
-msgstr "·í Window Maker ±Ò°Ê®É±Ò°Ê"
+#: ../src/dockedapp.c:305
+msgid "Start when WindowMaker is started"
+msgstr "·í WindowMaker ±Ò°Ê®É±Ò°Ê"
 
-#: ../src/dockedapp.c:340
+#: ../src/dockedapp.c:312
 msgid "Lock (prevent accidental removal)"
-msgstr "Âê©w¡]¨¾¤î·N¥~§R°£¡^"
+msgstr ""
 
-#: ../src/dockedapp.c:344
+#: ../src/dockedapp.c:318
 msgid "Application path and arguments"
 msgstr "À³¥Îµ{¦¡¸ô®|»P¤Þ¼Æ"
 
-#: ../src/dockedapp.c:357
-msgid "Command for middle-click launch"
-msgstr "·Æ¹«¤¤Áä±Ò°Êªº©R¥O"
-
-#: ../src/dockedapp.c:371
-#, c-format
-msgid "%s will be replaced with current selection"
-msgstr "%d ·|³Q¥Ø«e¿ï¨úª«¨ú¥N"
-
-#: ../src/dockedapp.c:376
+#: ../src/dockedapp.c:329
 msgid "Command for files dropped with DND"
 msgstr "DND ©ñ¸mÀɮתº©R¥O"
 
-#: ../src/dockedapp.c:390
+#: ../src/dockedapp.c:341
 #, c-format
 msgid "%d will be replaced with the file name"
 msgstr "%d ·|³QÀɦW¨ú¥N"
 
-#: ../src/dockedapp.c:394
+#: ../src/dockedapp.c:345
 msgid "DND support was not compiled in"
 msgstr "¥¼½sĶ¤J DND ¤ä´©"
 
-#: ../src/dockedapp.c:399
+#: ../src/dockedapp.c:351
 msgid "Icon Image"
 msgstr "¹Ï¥Ü¼v¹³"
 
-#: ../src/dockedapp.c:413 ../src/winspector.c:1513
+#: ../src/dockedapp.c:363 ../src/winspector.c:1514
 msgid "Browse..."
 msgstr "ÂsÄý..."
 
-#: ../src/dockedapp.c:466
+#: ../src/dockedapp.c:408
 msgid "Docked Application Settings"
 msgstr "°±¾aªºÀ³¥Îµ{¦¡³]©w"
 
@@ -729,178 +697,127 @@ msgstr "
 #: ../src/texture.c:594
 #, c-format
 msgid "could not render texture: %s"
-msgstr "µLªkªí²{§÷½è¡G%s"
+msgstr "µLªkªí²{§÷½è: %s"
 
 #: ../src/framewin.c:672 ../src/framewin.c:683 ../src/framewin.c:699
 #: ../src/framewin.c:710 ../src/framewin.c:717 ../src/framewin.c:724
 #: ../src/icon.c:350 ../src/menu.c:485
 #, c-format
 msgid "error rendering image:%s"
-msgstr "ªí²{¼v¹³¿ù»~¡G%s"
+msgstr "ªí²{¼v¹³¿ù»~: %s"
 
 #: ../src/framewin.c:777
 #, c-format
 msgid "error rendering image: %s"
-msgstr "ªí²{¼v¹³¿ù»~¡G%s"
+msgstr "ªí²{¼v¹³¿ù»~: %s"
 
-#: ../src/gnome.c:216 ../src/gnome.c:343 ../src/gnome.c:401
-msgid "out of memory while updating GNOME hints"
-msgstr "§ó·s GNOME ´£¥Ü®É°O¾ÐÅ餣¨¬"
-
-#: ../src/icon.c:229 ../src/wdefaults.c:443
+#: ../src/icon.c:229 ../src/wdefaults.c:435
 #, c-format
 msgid "error loading image file \"%s\""
-msgstr "¸ü¤J¼v¹³ÀÉ¿ù»~¡u%s¡v"
+msgstr "¸ü¤J¼v¹³ÀÉ¿ù»~ \"%s\""
 
-#: ../src/icon.c:491 ../src/icon.c:500
+#: ../src/icon.c:488 ../src/icon.c:497
 #, c-format
 msgid "could not create directory %s"
 msgstr "µLªk«Ø¥ß¥Ø¿ý %s"
 
-#: ../src/icon.c:767
+#: ../src/icon.c:764
 #, c-format
 msgid "could not find default icon \"%s\""
-msgstr "µLªk¸ü¤J¹w³]¹Ï¥Ü¡u%s¡v"
+msgstr "µLªk¸ü¤J¹w³]¹Ï¥Ü \"%s\""
 
-#: ../src/icon.c:773
+#: ../src/icon.c:770
 #, c-format
 msgid "could not load default icon \"%s\":%s"
-msgstr "µLªk¸ü¤J¹w³]¹Ï¥Ü¡u%s¡v¡G%s"
+msgstr "µLªk¸ü¤J¹w³]¹Ï¥Ü \"%s\":%s"
 
-#.
-#. * Warning: If you make some change that affects the order of the
-#. * entries, you must update the command #defines in the top of
-#. * this file.
-#.
-#: ../src/kwm.c:633 ../src/winmenu.c:436 ../src/winmenu.c:571
-msgid "Maximize"
-msgstr "³Ì¤j¤Æ"
-
-#: ../src/kwm.c:634 ../src/winmenu.c:566
-msgid "Unmaximize"
-msgstr "¨ú®ø³Ì¤j¤Æ"
-
-#: ../src/kwm.c:635 ../src/winmenu.c:444 ../src/winmenu.c:557
-msgid "Miniaturize"
-msgstr "³Ì¤p¤Æ"
-
-#: ../src/kwm.c:636 ../src/winmenu.c:552
-msgid "Deminiaturize"
-msgstr "¨ú®ø³Ì¤p¤Æ"
-
-#: ../src/kwm.c:638
-msgid "Not Omnipresent"
-msgstr "«DµL©Ò¤£¦b"
-
-#: ../src/kwm.c:639
-msgid "Move"
-msgstr "²¾°Ê"
-
-#: ../src/kwm.c:640
-msgid "Resize"
-msgstr "¤j¤pÅܧó"
-
-#.
-#. entry = wMenuAddCallback(menu, _("Select Shortcut"), NULL, NULL);
-#. wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr));
-#.
-#: ../src/kwm.c:641 ../src/rootmenu.c:248 ../src/winmenu.c:501
-msgid "Close"
-msgstr "Ãö³¬"
-
-#: ../src/kwm.c:642 ../src/winmenu.c:485
-msgid "Move To"
-msgstr "²¾¦Ü"
-
-#: ../src/kwm.c:1096
-msgid "%a(Run Command,Type the command to run:)"
-msgstr "%a¡]°õ¦æ©R¥O¡A¿é¤J­n°õ¦æªº©R¥O¡G¡^"
-
-#: ../src/main.c:222
+#: ../src/main.c:203
 msgid "failed to restart Window Maker."
-msgstr "­«·s±Ò°Ê Window Maker ¥¢±Ñ¡C"
+msgstr ""
 
-#: ../src/main.c:225
+#: ../src/main.c:206
 #, c-format
 msgid "could not exec %s"
 msgstr "µLªk°õ¦æ %s"
 
-#: ../src/main.c:271
+#: ../src/main.c:251
 msgid "Could not execute command: "
-msgstr "µLªk°õ¦æ©R¥O¡G"
+msgstr "µLªk°õ¦æ©R¥O: "
 
-#: ../src/main.c:428
+#: ../src/main.c:408
 #, c-format
 msgid "%s aborted.\n"
 msgstr "%s ©ñ±ó¡C\n"
 
-#: ../src/main.c:439
+#: ../src/main.c:419
 #, c-format
 msgid "Usage: %s [options]\n"
-msgstr "¨Ï¥Îªk¡G%s [¿ï¶µ]\n"
+msgstr "¨Ï¥Îªk¡G %s [¿ï¶µ]\n"
 
-#: ../src/main.c:440
+#: ../src/main.c:420
 msgid "The Window Maker window manager for the X window system"
-msgstr "X µøµ¡¨t²Î¤§ Window Maker µøµ¡ºÞ²z­û"
+msgstr "The Window Maker window manager for the X window system"
 
-#: ../src/main.c:442
+#: ../src/main.c:422
 msgid " -display host:dpy\tdisplay to use"
 msgstr " -display host:dpy\t­n¨Ï¥Îªº display"
 
-#: ../src/main.c:444
+#: ../src/main.c:424
 msgid " --no-cpp \t\tdisable preprocessing of configuration files"
 msgstr " --no-cpp \t\t¤£¹w¥ý³B²z³]©wÀÉ"
 
-#: ../src/main.c:446
+#: ../src/main.c:426
 msgid " --no-dock\t\tdo not open the application Dock"
 msgstr " --no-dock\t\t¤£­n¶}±Òµ{¦¡°±¾a°Ï"
 
-#: ../src/main.c:447
+#: ../src/main.c:427
 msgid " --no-clip\t\tdo not open the workspace Clip"
 msgstr " --no-clip\t\t¤£­n¶}±Ò¤u§@°Ï°j¯¾°w"
 
-#: ../src/main.c:448
+#: ../src/main.c:428
+#, fuzzy
 msgid " --no-autolaunch\tdo not autolaunch applications"
-msgstr " --no-autolaunch\t¤£­n¦Û°Ê±Ò°ÊÀ³¥Îµ{¦¡"
+msgstr " --no-autolaunch\t¤£­n¦Û°Ê±Ò°ÊÀ³¥Îµ{¦¡\n"
 
-#: ../src/main.c:449
+#: ../src/main.c:429
 msgid " --dont-restore\t\tdo not restore saved session"
-msgstr " --dont-restore\t\t¤£­n¦Û°Ê¦^¦sÀx¦sªº¶¥¬q"
+msgstr ""
 
-#: ../src/main.c:451
+#: ../src/main.c:431
 msgid " --locale locale\tlocale to use"
-msgstr " --locale locale\t¨Ï¥Îªº locale"
+msgstr ""
 
-#: ../src/main.c:453
+#: ../src/main.c:433
 msgid ""
 " --create-stdcmap\tcreate the standard colormap hint in PseudoColor visuals"
-msgstr " --create-stdcmap\t¦bµêÀÀ¦â±m visual ¤¤«Ø¥ß¼Ð·Ç¦â±m¹ïÀ³´£¥Ü"
+msgstr ""
 
-#: ../src/main.c:454
+#: ../src/main.c:434
 msgid " --visual-id visualid\tvisual id of visual to use"
 msgstr " --visual-id visualid\t©Ò±ý¨Ï¥Îªº visual ¤§ visualid"
 
-#: ../src/main.c:455
+#: ../src/main.c:435
 msgid " --static\t\tdo not update or save configurations"
 msgstr " --static\t\t¤£­n§ó·s©ÎÀx¦s³]©wÀÉ"
 
-#: ../src/main.c:456
+#: ../src/main.c:436
+#, fuzzy
 msgid " --no-polling\t\tdo not periodically check for configuration updates"
-msgstr " --no-polling\t\t¤£­n©w®ÉÀˬd³]©wÀɧó·s"
+msgstr " --no-polling\t\t¤£­n©w®ÉÀˬd³]©wÀɦ³¨S¦³§ó·s"
 
-#: ../src/main.c:458
+#: ../src/main.c:438
 msgid " --synchronous\t\tturn on synchronous display mode"
-msgstr " --synchronous\t\t¶}±Ò¦P¨BÅã¥Ü¼Ò¦¡"
+msgstr ""
 
-#: ../src/main.c:460
+#: ../src/main.c:440
 msgid " --version\t\tprint version and exit"
 msgstr " --version\t\t¦L¥Xª©¥»½s¸¹¨ÃÂ÷¶}"
 
-#: ../src/main.c:461
+#: ../src/main.c:441
 msgid " --help\t\t\tshow this message"
 msgstr " --help\t\t\tÅã¥Ü¥»»¡©ú°T®§"
 
-#: ../src/main.c:474
+#: ../src/main.c:453
 #, c-format
 msgid ""
 "could not find user GNUstep directory (%s).\n"
@@ -909,72 +826,59 @@ msgstr ""
 "µLªk§ä¨ì¨Ï¥ÎªÌ GNUstep ¥Ø¿ý (%s)¡C\n"
 "½T©w±z¤w¸g¦w¸Ë WindowMaker ¥¿½T¥B°õ¦æ wmaker.inst"
 
-#: ../src/main.c:479
-#, c-format
-msgid "could not find user GNUstep directory (%s)."
-msgstr "µLªk§ä¨ì¨Ï¥ÎªÌ GNUstep ¥Ø¿ý¡]%s¡^¡C"
-
-#: ../src/main.c:482
-msgid ""
-"There was an error while creating GNUstep directory, please make sure you "
-"have installed Window Maker correctly and run wmaker.inst"
-msgstr ""
-"«Ø¥ß GNUstep ¥Ø¿ý®É¿ù»~¡A½Ð½T©w±z¤w¸g¥¿½T¦a¦w¸Ë WindowMaker ¥B°õ¦æ "
-"wmaker.inst"
-
-#: ../src/main.c:485
-#, c-format
-msgid "%s directory created with default configuration."
-msgstr "¥H¹w³]³]©w«Ø¥ß %s ¥Ø¿ý¡C"
-
-#: ../src/main.c:505 ../src/main.c:510
+#: ../src/main.c:474 ../src/main.c:479
 #, c-format
 msgid "%s:could not execute initialization script"
-msgstr "%s¡G±Ò©l¤â½ZµLªk°õ¦æ"
+msgstr "%s: ±Ò©l¤â½ZµLªk°õ¦æ"
 
-#: ../src/main.c:530 ../src/main.c:535
+#: ../src/main.c:499 ../src/main.c:504
 #, c-format
 msgid "%s:could not execute exit script"
-msgstr "%s¡GÂ÷¶}¤â½ZµLªk°õ¦æ"
+msgstr "%s: Â÷¶}¤â½ZµLªk°õ¦æ"
 
-#: ../src/main.c:651 ../src/main.c:659 ../src/main.c:667 ../src/main.c:687
+#: ../src/main.c:620 ../src/main.c:628 ../src/main.c:636 ../src/main.c:656
 #, c-format
 msgid "too few arguments for %s"
 msgstr "%s ªº¤Þ¼Æ¤Ó¤Ö"
 
-#: ../src/main.c:671
+#: ../src/main.c:640
 #, c-format
 msgid "bad value for visualid: \"%s\""
-msgstr "visualid ªº­È¤£¥¿½T¡G¡u%s¡v"
+msgstr "visualid ªº­È¤£¥¿½T: \"%s\""
 
 # y, c-format
-#: ../src/main.c:695
+#: ../src/main.c:664
 #, c-format
 msgid "%s: invalid argument '%s'\n"
-msgstr "%s¡G¤Þ¼Æ¡u%s¡vµL®Ä\n"
+msgstr "%s: ¤Þ¼Æ '%s' µL®Ä\n"
 
-#: ../src/main.c:696
+#: ../src/main.c:665
 #, c-format
 msgid "Try '%s --help' for more information\n"
-msgstr "¸Õ¥Î¡u%s --help¡v¨ÓÀò±o§ó¦h¸ê°T\n"
+msgstr "¸Õ¥Î '%s --help' ¨ÓÀò±o§ó¦h¸ê°T\n"
 
-#: ../src/main.c:727
+#: ../src/main.c:696
 msgid "X server does not support locale"
 msgstr "X ¦øªA¾¹¤£¤ä´© locale"
 
-#: ../src/main.c:731
+#: ../src/main.c:700
 msgid "cannot set locale modifiers"
 msgstr "µLªk³]©w locale modifiers"
 
-#: ../src/main.c:747
+#: ../src/main.c:716
 #, c-format
 msgid "could not open display \"%s\""
-msgstr "µLªk¶}±Ò display¡u%s¡v"
+msgstr "µLªk¶}±Ò display \"%s\""
 
 #: ../src/menu.c:1255
 msgid "could not grab keyboard"
 msgstr "µLªk§ì¨úÁä½L"
 
+#: ../src/menu.c:2565
+#, c-format
+msgid "bad value in menus state info:%s"
+msgstr "¿ï³æªºª¬ºA¸ê°T %s ­È¤£¥¿½T"
+
 #: ../src/misc.c:71
 #, c-format
 msgid "could not define value for %s for cpp"
@@ -985,100 +889,164 @@ msgstr "
 msgid "could not get password entry for UID %i"
 msgstr "µLªk¨ú±o UID %i ªº±K½X°O¿ý"
 
-#: ../src/misc.c:126
+#: ../src/misc.c:127
 #, c-format
 msgid "your machine is misconfigured. HOSTNAME is set to %s"
 msgstr "±zªº¾÷¾¹³]©w¿ù»~¡CHOSTNAME ³]¬° %s"
 
-#: ../src/misc.c:132
+#: ../src/misc.c:133
 #, c-format
 msgid "your machine is misconfigured. HOST is set to %s"
 msgstr "±zªº¾÷¾¹³]©w¿ù»~¡CHOST ³]¬° %s"
 
-#: ../src/misc.c:630
+#: ../src/misc.c:632
 msgid "Program Arguments"
 msgstr "µ{¦¡¤Þ¼Æ"
 
-#: ../src/misc.c:631
+#: ../src/misc.c:633
 msgid "Enter command arguments:"
-msgstr "¿é¤J©R¥O¤Þ¼Æ¡G"
+msgstr "¿é¤J©R¥O¤Þ¼Æ:"
 
-#: ../src/misc.c:724
+#: ../src/misc.c:726
 msgid "unable to get dropped data from DND drop"
 msgstr "µLªk±q DND ©ñ¸m¨ú±o©ñ¸m¸ê®Æ"
 
-#: ../src/misc.c:732
+#: ../src/misc.c:734
 msgid "error getting dropped data from DND drop"
 msgstr "±q DND ©ñ¸m¨ú±o©ñ¸m¸ê®Æ¿ù»~"
 
-#: ../src/misc.c:738
+#: ../src/misc.c:740
 msgid "out of memory while getting data from DND drop"
 msgstr "±q DND ©ñ¸m¨ú±o¸ê®Æ®É°O¾ÐÅ餣¨¬"
 
-#: ../src/misc.c:783 ../src/misc.c:923
+#: ../src/misc.c:785 ../src/misc.c:925
 #, c-format
 msgid "out of memory during expansion of \"%s\""
-msgstr "®i¶}¡u%s¡v®É°O¾ÐÅ餣¨¬"
+msgstr "®i¶} \"%s\" ®É°O¾ÐÅ餣¨¬"
 
-#: ../src/misc.c:837
+#: ../src/misc.c:839
 msgid "out of memory during expansion of \"%w\""
-msgstr "®i¶}¡u%w¡v®É°O¾ÐÅ餣¨¬"
+msgstr "®i¶} \"%w\" ®É°O¾ÐÅ餣¨¬"
 
 #
-#: ../src/misc.c:855
+#: ../src/misc.c:857
 msgid "out of memory during expansion of \"%W\""
-msgstr "®i¶}¡u%W¡v®É°O¾ÐÅ餣¨¬"
+msgstr "®i¶} \"%W\" ®É°O¾ÐÅ餣¨¬"
 
-#: ../src/misc.c:871
+#: ../src/misc.c:873
 msgid "out of memory during expansion of \"%a\""
-msgstr "®i¶}¡u%a¡v®É°O¾ÐÅ餣¨¬"
+msgstr "®i¶} \"%a\" ®É°O¾ÐÅ餣¨¬"
 
-#: ../src/misc.c:902
+#: ../src/misc.c:904
 #, c-format
 msgid "out of memory during expansion of \"%d\""
-msgstr "®i¶}¡u%d¡v®É°O¾ÐÅ餣¨¬"
+msgstr "®i¶} \"%d\" ®É°O¾ÐÅ餣¨¬"
 
-#: ../src/misc.c:916
+#: ../src/misc.c:918
 msgid "selection not available"
-msgstr "¿ï¨úª«¤£¯à¨Ï¥Î"
+msgstr "¿ï¨ú¤£¯à¨Ï¥Î"
 
-#: ../src/misc.c:972 ../src/misc.c:978
+#: ../src/misc.c:991 ../src/misc.c:997
 #, c-format
 msgid "bad window name value in %s state info"
 msgstr "%s ª¬ºA¸ê°T¤¤¦³µL®Äªºµøµ¡¦WºÙ­È"
 
-#: ../src/misc.c:1235
+#: ../src/misc.c:1253
 msgid "could not send message to background image helper"
 msgstr "µLªk¶Ç°e°T®§¦Ü­I´º¼v¹³§U¤â"
 
 #: ../src/pixmap.c:235
 #, c-format
 msgid "could not load mask bitmap file \"%s\". Won't use mask"
-msgstr "µLªk¸ü¤J¾B¸n¦ì¤¸¬M¹³ÀÉ¡u%s¡v¡C¤£¨Ï¥Î¾B¸n"
+msgstr "µLªk¸ü¤J¾B¸n¦ì¤¸¬M¹³ÀÉ \"%s\"¡C¤£¨Ï¥Î¾B¸n"
+
+#: ../src/proplist.c:151
+#, c-format
+msgid "syntax error in %s, line %i:%s"
+msgstr ""
+
+#: ../src/proplist.c:180
+msgid "unterminated string"
+msgstr "¦r¦ê¥¼²×¤î"
+
+#: ../src/proplist.c:247
+msgid "unterminated array"
+msgstr "°}¦C¥¼²×¤î"
+
+#: ../src/proplist.c:256
+msgid "missing , in array or unterminated array"
+msgstr "¦b°}¦C¯Ê¤Ö , ©Î°}¦C¥¼²×¤î"
+
+#: ../src/proplist.c:267
+msgid "could not get array element"
+msgstr "µLªk¨ú±o°}¦C¤¸¯À"
+
+#: ../src/proplist.c:297
+msgid "unterminated dictionary"
+msgstr "¦rÂI¥¼²×¤î"
+
+#: ../src/proplist.c:315
+msgid "missing dictionary key"
+msgstr "¯Ê¤Ö¦r¨åÁä"
+
+#: ../src/proplist.c:317
+msgid "missing dictionary entry key or unterminated dictionary"
+msgstr "¯Ê¤Ö¦r¨å°O¿ýÁä©Î¦r¨å¥¼¤¤¤î"
+
+#: ../src/proplist.c:323
+msgid "error parsing dictionary key"
+msgstr "¦r¨åÁä¸ÑªR¿ù»~"
+
+#: ../src/proplist.c:332
+msgid "missing = in dictionary entry"
+msgstr "¦r¨å°O¿ý¤¤¯Ê¤Ö = "
+
+#: ../src/proplist.c:351
+msgid "missing ; in dictionary entry"
+msgstr "¦r¨å°O¿ý¤¤¯Ê¤Ö ; "
+
+#: ../src/proplist.c:432
+msgid ""
+"was expecting a string, dictionary, data or array. If it's a string, try "
+"enclosing it with \"."
+msgstr "­n¨D¦r¦ê¡A¦r¨å¡A¸ê®Æ©Î°}¦C¡C¦pªG¬O¦r¦ê¡A½Ð¥Î \" ¸¹¬A°_¨Ó¡C"
+
+#: ../src/proplist.c:434
+msgid "Comments are not allowed inside WindowMaker owned domain files."
+msgstr "¦b WindowMaker ªº©w¸q°ìÀɤ¤¤£¤¹³\µù¸Ñ¡C"
+
+#: ../src/proplist.c:453
+#, c-format
+msgid "could not open domain file %s"
+msgstr "µLªk¶}±Ò©w¸q°ìÀÉ %s"
+
+#: ../src/proplist.c:466
+msgid "extra data after end of file"
+msgstr "ÀÉ®×µ²§ô«á¦³ÃB¥~¸ê®Æ"
 
 #: ../src/resources.c:44
 #, c-format
 msgid "could not parse color \"%s\""
-msgstr "µLªk¸ÑªR¦â±m¡u%s¡v"
+msgstr "µLªk¸ÑªR¦â±m \"%s\""
 
 #: ../src/resources.c:48
 #, c-format
 msgid "could not allocate color \"%s\""
-msgstr "µLªk°t¸m¦â±m¡u%s¡v"
+msgstr "µLªk°t¸m¦â±m \"%s\""
 
-#: ../src/rootmenu.c:196 ../src/rootmenu.c:198
+#: ../src/rootmenu.c:186 ../src/rootmenu.c:188
 msgid "Exit"
 msgstr "Â÷¶}"
 
-#: ../src/rootmenu.c:197
+#: ../src/rootmenu.c:187
 msgid "Exit window manager?"
 msgstr "Â÷¶}µøµ¡ºÞ²z­û¡H"
 
-#: ../src/rootmenu.c:245
+#: ../src/rootmenu.c:223
 msgid "Close X session"
 msgstr "Ãö³¬ X µøµ¡¨t²Î"
 
-#: ../src/rootmenu.c:246
+#: ../src/rootmenu.c:224
 msgid ""
 "Close Window System session?\n"
 "Kill might close applications with unsaved data."
@@ -1086,11 +1054,19 @@ msgstr ""
 "Ãö³¬µøµ¡¨t²Î¡H\n"
 "µ²§ô¥i¯àÃö³¬©|¥¼Àx¦s¸ê®ÆªºÀ³¥Îµ{¦¡¡C"
 
-#: ../src/rootmenu.c:261
+#.
+#. entry = wMenuAddCallback(menu, _("Select Shortcut"), NULL, NULL);
+#. wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr));
+#.
+#: ../src/rootmenu.c:226 ../src/winmenu.c:511
+msgid "Close"
+msgstr "Ãö³¬"
+
+#: ../src/rootmenu.c:237
 msgid "Kill X session"
 msgstr "µ²§ô X µøµ¡¨t²Î"
 
-#: ../src/rootmenu.c:262
+#: ../src/rootmenu.c:238
 msgid ""
 "Kill Window System session?\n"
 "(all applications will be closed)"
@@ -1098,196 +1074,197 @@ msgstr ""
 "µ²§ôµøµ¡¨t²Î¡H\n"
 "¡]©Ò¦³À³¥Îµ{¦¡·|³QÃö³¬¡^"
 
-#: ../src/rootmenu.c:536
+#: ../src/rootmenu.c:505
 #, c-format
 msgid "%s:invalid kbd shortcut specification \"%s\" for entry %s"
-msgstr "%s¡GÁä½L±¶®|³W®æ¡u%s¡vµL®Ä¡]%s¡^"
+msgstr "%s: Áä½L±¶®|³W®æ \"%s\" µL®Ä (%s)"
 
-#: ../src/rootmenu.c:544
+#: ../src/rootmenu.c:513
 #, c-format
 msgid "%s:invalid key in shortcut \"%s\" for entry %s"
-msgstr "%s¡G±¶®|¡u%s¡vªºÁäµL®Ä¡]%s¡^"
+msgstr "%s: ±¶®| \"%s\" ªºÁäµL®Ä (%s)"
 
-#: ../src/rootmenu.c:597
+#: ../src/rootmenu.c:566
 #, c-format
 msgid "%s: unmatched '\"' in menu file"
-msgstr "%s¡G¿ï³æÀɤ¤¡u\"¡v¤£¦¨¹ï"
+msgstr "%s: ¿ï³æÀɤ¤ '\"' ¤£¦¨¹ï"
 
-#: ../src/rootmenu.c:647
+#: ../src/rootmenu.c:616
 #, c-format
 msgid "%s: missing command"
-msgstr "%s¡G¯Ê¤Ö©R¥O"
+msgstr "%s: ¯Ê¤Ö©R¥O"
 
-#: ../src/rootmenu.c:679
+#: ../src/rootmenu.c:648
 #, c-format
 msgid "invalid OPEN_MENU specification: %s"
-msgstr "µL®Äªº OPEN_MENU ³W®æ¡G%s"
+msgstr "µL®Äªº OPEN_MENU ³W®æ: %s"
 
-#: ../src/rootmenu.c:730
+#: ../src/rootmenu.c:696
 #, c-format
 msgid "%s:could not stat menu"
-msgstr "%s¡GµLªk stat ¿ï³æ"
+msgstr "%s: µLªk stat ¿ï³æ"
 
-#: ../src/rootmenu.c:738
+#: ../src/rootmenu.c:704
 #, c-format
 msgid "%s:could not stat menu:%s"
-msgstr "%s¡GµLªk stat ¿ï³æ¡G%s"
+msgstr "%s: µLªk stat ¿ï³æ: %s"
 
-#: ../src/rootmenu.c:756
+#: ../src/rootmenu.c:722
 #, c-format
 msgid "too many parameters in OPEN_MENU: %s"
-msgstr "OPEN_MENU ¤¤¦³¤Ó¦h°Ñ¼Æ¡G%s"
+msgstr "OPEN_MENU ¤¤¦³¤Ó¦h°Ñ¼Æ: %s"
 
-#: ../src/rootmenu.c:800
+#: ../src/rootmenu.c:758
 msgid ""
 "There are more than one WORKSPACE_MENU commands in the applications menu. "
 "Only one is allowed."
-msgstr "À³¥Îµ{¦¡¿ï³æ¤¤¦³¶W¹L¤@­Ó WORKSPACE_MENU ©R¥O¡C¥u¤¹³\\¤@­Ó¡C"
+msgstr "À³¥Îµ{¦¡¿ï³æ¤¤¦³¶W¹L¤@­Ó WORKSPACE_MENU ©R¥O¡C¥u¤¹³\¦³¤@­Ó¡C"
 
-#: ../src/rootmenu.c:834
-msgid ""
-"There are more than one WINDOWS_MENU commands in the applications menu. Only "
-"one is allowed."
-msgstr "À³¥Îµ{¦¡¿ï³æ¤¤¦³¶W¹L¤@­Ó WINDOWS_MENU ©R¥O¡C¥u¤¹³\\¤@­Ó¡C"
-
-#: ../src/rootmenu.c:839
-msgid "Window List"
-msgstr "µøµ¡²M³æ"
-
-#: ../src/rootmenu.c:868 ../src/rootmenu.c:886 ../src/rootmenu.c:896
+#: ../src/rootmenu.c:787 ../src/rootmenu.c:805 ../src/rootmenu.c:815
 #, c-format
 msgid "%s:missing parameter for menu command \"%s\""
-msgstr "%s¡G¿ï³æ©R¥O¡u%s¡v¯Ê¤Ö°Ñ¼Æ"
+msgstr "%s: ¿ï³æ©R¥O \"%s\" ¯Ê¤Ö°Ñ¼Æ"
 
-#: ../src/rootmenu.c:964
+#: ../src/rootmenu.c:879
 #, c-format
 msgid "%s:unknown command \"%s\" in menu config."
-msgstr "%s¡G¿ï³æ³]©w¤¤¦³¤£¦Wªº©R¥O¡u%s¡v¡C"
+msgstr "%s: ¿ï³æ³]©w¤¤¦³¤£¦Wªº©R¥O \"%s\"¡C"
 
-#: ../src/rootmenu.c:972
+#: ../src/rootmenu.c:887
 #, c-format
 msgid "%s:can't add shortcut for entry \"%s\""
-msgstr "%s¡GµLªk¬°¡u%s¡v¼W¥[±¶®|"
+msgstr "%s: µLªk¬° \"%s\" ¼W¥[±¶®|"
 
-#: ../src/rootmenu.c:1109
+#: ../src/rootmenu.c:1024
 #, c-format
 msgid "%s:maximal line size exceeded in menu config: %s"
-msgstr "%s¡G¿ï³æÀɤ¤¶W¹L³Ì¤j¦æ¼Æ¡G%s"
+msgstr "%s: ¿ï³æÀɤ¤¶W¹L³Ì¤j¦æ¼Æ: %s"
 
-#: ../src/rootmenu.c:1131 ../src/rootmenu.c:1224 ../src/rootmenu.c:1326
+#: ../src/rootmenu.c:1046 ../src/rootmenu.c:1138 ../src/rootmenu.c:1239
 #, c-format
 msgid "%s:missing command in menu config: %s"
-msgstr "%s¡G¿ï³æ³]©w¤¤¯Ê¤Ö©R¥O¡G%s"
+msgstr "%s: ¿ï³æ³]©w¤¤¯Ê¤Ö©R¥O: %s"
 
-#: ../src/rootmenu.c:1161
+#: ../src/rootmenu.c:1076
 #, c-format
 msgid "%s:syntax error in menu file:END declaration missing"
-msgstr "%s¡G¿ï³æÀɤ¤»yªk¿ù»~¡G¯Ê¤Ö END «Å§i"
+msgstr "%s: ¿ï³æÀɤ¤»yªk¿ù»~: ¯Ê¤Ö END «Å§i"
 
-#: ../src/rootmenu.c:1190 ../src/rootmenu.c:1290
+#: ../src/rootmenu.c:1105 ../src/rootmenu.c:1204
 msgid "could not make arguments for menu file preprocessor"
 msgstr "µLªk¬°¿ï³æÀɹw¥ý³B²z¾¹²£¥Í¤Þ¼Æ"
 
-#: ../src/rootmenu.c:1197 ../src/rootmenu.c:1298
+#: ../src/rootmenu.c:1111 ../src/rootmenu.c:1211
 #, c-format
 msgid "%s:could not open/preprocess menu file"
-msgstr "%s¡GµLªk¶}±Ò/¹w¥ý³B²z¿ï³æÀÉ"
+msgstr "%s: µLªk¶}±Ò/¹w¥ý³B²z¿ï³æÀÉ"
 
-#: ../src/rootmenu.c:1209 ../src/rootmenu.c:1311
+#: ../src/rootmenu.c:1123 ../src/rootmenu.c:1224
 #, c-format
 msgid "%s:could not open menu file"
-msgstr "%s¡GµLªk¶}±Ò¿ï³æÀÉ"
+msgstr "%s: µLªk¶}±Ò¿ï³æÀÉ"
 
-#: ../src/rootmenu.c:1236
+#: ../src/rootmenu.c:1150
 #, c-format
 msgid "%s:invalid menu file. MENU command is missing"
-msgstr "%s¡GµL®Äªº¿ï³æÀÉ¡C¯Ê¤Ö MENU ©R¥O"
+msgstr "%s: µL®Äªº¿ï³æÀÉ¡C¯Ê¤Ö MENU ©R¥O"
 
-#: ../src/rootmenu.c:1245
+#: ../src/rootmenu.c:1159
 msgid "error reading preprocessed menu data"
 msgstr "¹w¥ý³B²z¿ï³æ¸ê®ÆŪ¨ú¿ù»~"
 
-#: ../src/rootmenu.c:1338
+#: ../src/rootmenu.c:1251
 #, c-format
 msgid "%s:no title given for the root menu"
-msgstr "%s¡G¨S¦³µ¹¥D¿ï³æ¼ÐÃD"
+msgstr "%s: ¨S¦³µ¹¥D¿ï³æ¼ÐÃD"
 
-#: ../src/rootmenu.c:1429 ../src/rootmenu.c:1502 ../src/rootmenu.c:1543
+#: ../src/rootmenu.c:1341 ../src/rootmenu.c:1416 ../src/rootmenu.c:1459
 #, c-format
 msgid "out of memory while constructing directory menu %s"
 msgstr "«Ø¥ß¥Ø¿ý¿ï³æ %s ®É°O¾ÐÅ餣¨¬"
 
-#: ../src/rootmenu.c:1439
+#: ../src/rootmenu.c:1351
 #, c-format
 msgid "%s:could not stat file \"%s\" in menu directory"
-msgstr "%s¡GµLªk stat ¿ï³æ¥Ø¿ý¤¤Àɮסu%s¡v"
+msgstr "%s: µLªk stat ¿ï³æ¥Ø¿ý¤¤ÀÉ®× \"%s\""
 
-#: ../src/rootmenu.c:1597
+#: ../src/rootmenu.c:1513
 msgid "Commands"
 msgstr "©R¥O"
 
-#: ../src/rootmenu.c:1600
+#: ../src/rootmenu.c:1516
 msgid "Restart"
 msgstr "­«·s±Ò°Ê"
 
-#: ../src/rootmenu.c:1601
+#: ../src/rootmenu.c:1517
 msgid "Exit..."
 msgstr "Â÷¶}..."
 
-#: ../src/rootmenu.c:1646
+#: ../src/rootmenu.c:1562
 #, c-format
 msgid "could not find menu file \"%s\" referenced in WMRootMenu"
-msgstr "µLªk§ä¨ì WMRootMenu °Ñ·Óªº¿ï³æÀÉ¡u%s¡v"
+msgstr "µLªk§ä¨ì WMRootMenu °Ñ·Óªº¿ï³æÀÉ \"%s\""
 
-#: ../src/rootmenu.c:1653
+#: ../src/rootmenu.c:1569
 #, c-format
 msgid "could not access menu \"%s\" referenced in WMRootMenu"
-msgstr "µLªk¦s¨ú WMRootMenu °Ñ·Óªº¿ï³æÀÉ¡u%s¡v"
+msgstr "µLªk¦s¨ú WMRootMenu °Ñ·Óªº¿ï³æÀÉ \"%s\""
 
-#: ../src/rootmenu.c:1664
+#: ../src/rootmenu.c:1580
 #, c-format
 msgid ""
 "using default menu file \"%s\" as the menu referenced in WMRootMenu could "
 "not be found "
-msgstr "µLªk§ä¨ì WMRootMenu °Ñ·Óªº¿ï³æ¡A¨Ï¥Î¹w³]¿ï³æÀÉ¡u%s¡v"
+msgstr "µLªk§ä¨ì WMRootMenu °Ñ·Óªº¿ï³æ¡A¨Ï¥Î¹w³]¿ï³æÀÉ \"%s\""
 
-#: ../src/rootmenu.c:1687 ../src/rootmenu.c:1763
+#: ../src/rootmenu.c:1603 ../src/rootmenu.c:1679
 #, c-format
 msgid "%s:format error in root menu configuration \"%s\""
-msgstr "%s¡G¥D¿ï³æ³]©w¤¤®æ¦¡¿ù»~¡u%s¡v"
+msgstr "%s: ¥D¿ï³æ³]©w¤¤®æ¦¡¿ù»~ \"%s\""
 
-#: ../src/rootmenu.c:1851
+#: ../src/rootmenu.c:1766
 msgid ""
 "The applications menu could not be loaded. Look at the console output for a "
 "detailed description of the errors."
-msgstr "À³¥Îµ{¦¡¿ï³æµLªk¸ü¤J¡C¦b¥D±±¥x¿é¥X¬d¬Ý¦¹¿ù»~ªº¸Ô²Ó±Ô­z¡C"
+msgstr ""
 
-#: ../src/screen.c:740
+#: ../src/screen.c:460
+#, c-format
+msgid "could not load logo image for panels: %s"
+msgstr "µLªk¸ü¤J­±ªOªº¼ÐÃѼv¹³: %s"
+
+#: ../src/screen.c:464
+#, c-format
+msgid "error making logo image for panel:%s"
+msgstr "­±ªOªº¼ÐÃѼv¹³²£¥Í¿ù»~: %s"
+
+#: ../src/screen.c:750
 #, c-format
 msgid "could not initialize graphics library context: %s"
-msgstr "µLªk±Ò©l¹Ï§Î¨ç¦¡®wÃö³s¡G%s"
+msgstr "µLªk±Ò©l¹Ï§Î¨ç¦¡®wÃö³s: %s"
 
-#: ../src/screen.c:771
+#: ../src/screen.c:781
 msgid "could not do initialization of WINGs widget set"
 msgstr "µLªk±Ò©l WINGs widget set"
 
-#: ../src/screen.c:1139
+#: ../src/screen.c:1150
 #, c-format
 msgid "could not save session state in %s"
 msgstr "µLªk¦b %s Àx¦s¶¥¬qª¬ºA"
 
-#: ../src/session.c:183 ../src/wdefaults.c:589 ../src/winspector.c:454
+#: ../src/session.c:183 ../src/wdefaults.c:583 ../src/winspector.c:449
 #, c-format
 msgid "can't convert \"%s\" to boolean"
-msgstr "µLªkÂà´«¡u%s¡v¦Ü boolean"
+msgstr "µLªkÂà´« \"%s\" ¦Ü boolean"
 
-#: ../src/session.c:1021
+#: ../src/session.c:1018
+#, fuzzy
 msgid "out of memory while saving session state"
 msgstr "Àx¦s¶¥¬qª¬ºA®É°O¾ÐÅ餣¨¬"
 
-#: ../src/session.c:1104
+#: ../src/session.c:1109
 msgid "end of memory while saving session state"
-msgstr "Àx¦s¶¥¬qª¬ºA®É°O¾ÐÅé²×¤F"
+msgstr "Àx¦s¶¥¬qª¬ºA®É°O¾ÐÅ餣¨¬"
 
 #. This is not fatal but can mean the session manager exited.
 #. * If the session manager exited normally we would get a
@@ -1295,143 +1272,144 @@ msgstr "
 #. * If the sm was the last client of session, then we'll die
 #. * anyway, otherwise we can continue doing our stuff.
 #.
-#: ../src/session.c:1242
+#: ../src/session.c:1243
 msgid "connection to the session manager was lost"
 msgstr "¿ò¥¢¦Ü¶¥¬qºÞ²z­ûªº³sµ²"
 
-#: ../src/stacking.c:79
+#: ../src/stacking.c:73
 msgid "could not get window list!!"
-msgstr "µLªk±o¨ìµøµ¡²M³æ¡I¡I"
+msgstr "µLªk±o¨ìµøµ¡²M³æ!!"
 
 #: ../src/startup.c:202
 #, c-format
 msgid "internal X error: %s\n"
-msgstr "X ¤º³¡¿ù»~¡G%s\n"
+msgstr "X ¤º³¡¿ù»~: %s\n"
 
-#: ../src/startup.c:260
+#: ../src/startup.c:267
 #, c-format
 msgid "got signal %i (%s) - restarting\n"
 msgstr "¦¬¨ì°T¸¹ %i (%s) - ­«·s±Ò°Ê\n"
 
-#: ../src/startup.c:262
+#: ../src/startup.c:269
 #, c-format
 msgid "got signal %i - restarting\n"
 msgstr "¦¬¨ì°T¸¹ %i - ­«·s±Ò°Ê\n"
 
-#: ../src/startup.c:272
+#: ../src/startup.c:283
 #, c-format
 msgid "got signal %i (%s) - rereading defaults\n"
 msgstr "¦¬¨ì°T¸¹ %i (%s) - ­«Åª¹w³]­È\n"
 
-#: ../src/startup.c:274
+#: ../src/startup.c:285
 #, c-format
 msgid "got signal %i - rereading defaults\n"
 msgstr "¦¬¨ì°T¸¹ %i - ­«Åª¹w³]­È\n"
 
-#: ../src/startup.c:284
+#: ../src/startup.c:299
 #, c-format
 msgid "got signal %i (%s) - exiting...\n"
 msgstr "¦¬¨ì°T¸¹ %i (%s) - Â÷¶}¤¤...\n"
 
-#: ../src/startup.c:286
+#: ../src/startup.c:301
 #, c-format
 msgid "got signal %i - exiting...\n"
 msgstr "¦¬¨ì°T¸¹ %i - Â÷¶}¤¤...\n"
 
-#: ../src/startup.c:329
+#: ../src/startup.c:314
 #, c-format
 msgid "got signal %i (%s)\n"
 msgstr "¦¬¨ì°T¸¹ %i (%s)\n"
 
-#: ../src/startup.c:331
+#: ../src/startup.c:316
 #, c-format
 msgid "got signal %i\n"
 msgstr "¦¬¨ì°T¸¹ %i\n"
 
-#: ../src/startup.c:342
+#: ../src/startup.c:327
 msgid ""
 "crashed while trying to do some post-crash cleanup. Aborting immediatelly."
 msgstr "¹Á¸Õ±Y¼ì«á²M°£³B²z®É±Y¼ì¡Cª½±µ©ñ±ó¡C"
 
 #. we try to restart Window Maker
-#: ../src/startup.c:407
+#: ../src/startup.c:361
 msgid "trying to restart Window Maker..."
 msgstr "¹Á¸Õ­«·s±Ò°Ê Window Maker..."
 
-#: ../src/startup.c:412
+#: ../src/startup.c:366
 msgid "trying to start alternate window manager..."
 msgstr "¹Á¸Õ±Ò°Ê¥t¤@®Mµøµ¡ºÞ²z­û..."
 
-#: ../src/startup.c:417
+#: ../src/startup.c:371
 msgid "failed to start alternate window manager. Aborting."
 msgstr "¥t¤@®Mµøµ¡ºÞ²z­û±Ò°Ê¥¢±Ñ¡C©ñ±ó¤¤¡C"
 
-#: ../src/startup.c:419
+#: ../src/startup.c:373
 msgid ""
 "a fatal error has occured, probably due to a bug. Please fill the included "
 "BUGFORM and report it."
 msgstr "µo¥ÍÄY­«¿ù»~¡A¥i¯à¦]¬°µ{¦¡¿ù»~¡C½Ð¶ñ¼g BUGFORM ¨Ã´£¥X³ø§i¡C"
 
-#: ../src/startup.c:894
+#: ../src/startup.c:857
 #, c-format
 msgid "icon size is configured to %i, but it's too small. Using 16, instead\n"
 msgstr "¹Ï¥Ü¤j¤p³]¬° %i ¤Ó¤p¡C§ï¥Î 16\n"
 
-#: ../src/startup.c:922
+#: ../src/startup.c:885
 msgid "XKB is not supported. KbdModeLock is automatically disabled."
-msgstr "XKB ¥¼¤ä´©¡CKbdModeLock ¦Û°Ê¥¢®Ä¡C"
+msgstr ""
 
-#: ../src/startup.c:941
+#: ../src/startup.c:904
 msgid "it seems that there is already a window manager running"
 msgstr "¦ü¥G¤w¸g¦³µøµ¡ºÞ²z­û¦b°õ¦æ¤¤"
 
-#: ../src/startup.c:947
+#: ../src/startup.c:910
 #, c-format
 msgid "could not manage screen %i"
 msgstr "µLªkºÞ²z¿Ã¹õ %i"
 
-#: ../src/startup.c:1015
+#: ../src/startup.c:971
 msgid "could not manage any screen"
 msgstr "µLªkºÞ²z¥ô¦ó¿Ã¹õ"
 
-#: ../src/switchmenu.c:137
+#: ../src/switchmenu.c:114
 msgid "Windows"
 msgstr "µøµ¡"
 
 #: ../src/texture.c:329 ../src/texture.c:371
 #, c-format
 msgid "image file \"%s\" used as texture could not be found."
-msgstr "§ä¤£¨ì§@¬°§÷½èªº¼v¹³ÀÉ¡u%s¡v"
+msgstr "§ä¤£¨ì§@¬°§÷½èªº¼v¹³ÀÉ \"%s\""
 
 #: ../src/texture.c:335 ../src/texture.c:377
 #, c-format
 msgid "could not load texture pixmap \"%s\":%s"
-msgstr "µLªk¸ü¤J§÷½è¹Ï¹³¡u%s¡v¡G%s"
+msgstr "µLªk¸ü¤J§÷½è¹Ï¹³ \"%s\":%s"
 
 #: ../src/texture.c:437
 #, c-format
 msgid "library \"%s\" cound not be opened."
-msgstr "µLªk¶}±Ò¨ç¦¡®w¡u%s¡v¡C"
+msgstr ""
 
 #: ../src/texture.c:446
 #, c-format
 msgid "function \"%s\" not found in library \"%s\""
-msgstr "¨ç¦¡¡u%s¡v¤£¦b¨ç¦¡®w¡u%s¡v¤¤"
+msgstr ""
 
 #: ../src/texture.c:453
 msgid "function textures not supported on this system, sorry."
-msgstr "§÷½è¨ç¦¡¦b¦¹¨t²Î¤£¤ä´©¡A©êºp¡C"
+msgstr ""
 
 #: ../src/texture.c:598
+#, fuzzy
 msgid "could not allocate image buffer"
-msgstr "µLªk°t¸m¼v¹³½w½Ä°Ï"
+msgstr "µLªk¸ü¤J¼v¹³ÀÉ"
 
-#: ../src/wdefaults.c:437
+#: ../src/wdefaults.c:429
 #, c-format
 msgid "could not find icon file \"%s\""
-msgstr "µLªk§ä¨ì¹Ï¥ÜÀÉ¡u%s¡v"
+msgstr "µLªk§ä¨ì¹Ï¥ÜÀÉ \"%s\""
 
-#: ../src/window.c:2936 ../src/window.c:3075
+#: ../src/window.c:2741 ../src/window.c:2876
 msgid ""
 "the NumLock, ScrollLock or similar key seems to be turned on.\n"
 "Turn it off or some mouse actions and keyboard shortcuts will not work."
@@ -1439,7 +1417,7 @@ msgstr ""
 "NumLock, ScrollLock ©ÎÃþ¦üªºÁä¦ü¥G³Q¥´¶}¡C\n"
 "Ãö³¬¥¦§_«h¤@¨Ç·Æ¹«°Ê§@»PÁä½L???·|µLªk§@¥Î¡C"
 
-#: ../src/winmenu.c:125
+#: ../src/winmenu.c:129
 msgid ""
 "This will kill the application.\n"
 "Any unsaved changes will be lost.\n"
@@ -1449,66 +1427,92 @@ msgstr ""
 "¥ô¦ó¥¼Àx¦sªº§ïÅܱN·|¿ò¥¢¡C\n"
 "½Ð½T»{¡C"
 
-#: ../src/winmenu.c:267 ../src/winmenu.c:276
+#: ../src/winmenu.c:278 ../src/winmenu.c:286
 msgid "Set Shortcut"
 msgstr "³]©w±¶®|"
 
-#: ../src/winmenu.c:354 ../src/winmenu.c:399
+#: ../src/winmenu.c:364 ../src/winmenu.c:409
 msgid "could not create submenu for window menu"
 msgstr "µLªk¬°µøµ¡¿ï³æ«Ø¥ß°Æ¿ï³æ"
 
-#: ../src/winmenu.c:403
+#: ../src/winmenu.c:413
 msgid "Keep on top"
 msgstr "«O«ù¦b³Ì¤W¼h"
 
-#: ../src/winmenu.c:408
+#: ../src/winmenu.c:418
 msgid "Keep at bottom"
 msgstr "«O«ù¦b³Ì¤U¼h"
 
-#: ../src/winmenu.c:453 ../src/winmenu.c:588
+#.
+#. * Warning: If you make some change that affects the order of the
+#. * entries, you must update the command #defines in the top of
+#. * this file.
+#.
+#: ../src/winmenu.c:446 ../src/winmenu.c:581
+msgid "Maximize"
+msgstr "³Ì¤j¤Æ"
+
+#: ../src/winmenu.c:454 ../src/winmenu.c:567
+msgid "Miniaturize"
+msgstr "³Ì¤p¤Æ"
+
+#: ../src/winmenu.c:463 ../src/winmenu.c:598
 msgid "Shade"
 msgstr "¾B½ª"
 
-#: ../src/winmenu.c:469
+#: ../src/winmenu.c:479
 msgid "Resize/Move"
 msgstr "¤j¤pÅܧó/²¾°Ê"
 
-#: ../src/winmenu.c:477
+#: ../src/winmenu.c:487
 msgid "Select"
 msgstr "¿ï¨ú"
 
-#: ../src/winmenu.c:490
+#: ../src/winmenu.c:495
+msgid "Move To"
+msgstr "²¾¦Ü"
+
+#: ../src/winmenu.c:500
 msgid "Attributes..."
 msgstr "ÄÝ©Ê..."
 
-#: ../src/winmenu.c:492
+#: ../src/winmenu.c:502
 msgid "Options"
 msgstr "¿ï¶µ"
 
-#: ../src/winmenu.c:583
+#: ../src/winmenu.c:562
+msgid "Deminiaturize"
+msgstr "¨ú®ø³Ì¤p¤Æ"
+
+#: ../src/winmenu.c:576
+msgid "Unmaximize"
+msgstr "¨ú®ø³Ì¤j¤Æ"
+
+#: ../src/winmenu.c:593
 msgid "Unshade"
 msgstr "¨ú®ø¾B½ª"
 
-#: ../src/winspector.c:387
+#: ../src/winspector.c:383
 #, c-format
 msgid "Could not find icon \"%s\" specified for this window"
-msgstr "µLªk§ä¨ì«ü©wµ¹³o­Óµøµ¡ªº¹Ï¥Ü¡u%s¡v"
+msgstr "µLªk§ä¨ì«ü©wµ¹³o­Óµøµ¡ªº¹Ï¥Ü \"%s\""
 
-#: ../src/winspector.c:404
+#: ../src/winspector.c:399
 #, c-format
 msgid "Could not open specified icon \"%s\":%s"
-msgstr "µLªk¶}±Ò«ü©wªº¹Ï¥Ü¡u%s¡v:%s"
+msgstr "µLªk¶}±Ò«ü©wªº¹Ï¥Ü \"%s\":%s"
 
-#: ../src/winspector.c:1121
+#: ../src/winspector.c:1122
 #, c-format
 msgid "Inspecting  %s.%s"
-msgstr "À˾\\  %s.%s"
+msgstr ""
 
-#: ../src/winspector.c:1147
+#: ../src/winspector.c:1148
 msgid "Click in the window you wish to inspect."
-msgstr "¦b§A·QÀ˾\\ªºµøµ¡ÂI¤@¤U"
+msgstr ""
 
-#: ../src/winspector.c:1186
+#: ../src/winspector.c:1187
+#, fuzzy
 msgid ""
 "The configuration will apply to all\n"
 "windows that have their WM_CLASS\n"
@@ -1516,58 +1520,57 @@ msgid ""
 "name, when saved."
 msgstr ""
 "Àx¦s®É¡A³]©w­È·|®M¥Î¦Ü©Ò¦³\n"
-"WM_CLASS ¯S©Ê³]¬°¥H¤W¿ï¨ú\n"
-"¦WºÙªºµøµ¡¡C"
+"WM_CLASS ¯S©Ê³]¬°¥H¤W¿ï¨ú¦WºÙªºµøµ¡¡C"
 
-#: ../src/winspector.c:1215
+#: ../src/winspector.c:1216
 msgid "Save"
 msgstr "Àx¦s"
 
-#: ../src/winspector.c:1223
+#: ../src/winspector.c:1224
 msgid "Apply"
 msgstr "®M¥Î"
 
-#: ../src/winspector.c:1229
+#: ../src/winspector.c:1230
 msgid "Reload"
 msgstr "ÁÙ­ì"
 
-#: ../src/winspector.c:1238 ../src/winspector.c:1248
+#: ../src/winspector.c:1239 ../src/winspector.c:1249
 msgid "Window Specification"
 msgstr "µøµ¡³W®æ"
 
-#: ../src/winspector.c:1239
+#: ../src/winspector.c:1240
 msgid "Window Attributes"
 msgstr "µøµ¡ÄÝ©Ê"
 
-#: ../src/winspector.c:1240
+#: ../src/winspector.c:1241
 msgid "Advanced Options"
 msgstr "¶i¶¥¿ï¶µ"
 
-#: ../src/winspector.c:1241
+#: ../src/winspector.c:1242
 msgid "Icon and Initial Workspace"
 msgstr "¹Ï¥Ü»P±Ò©l¤u§@°Ï"
 
-#: ../src/winspector.c:1242
+#: ../src/winspector.c:1243
 msgid "Application Specific"
 msgstr "À³¥Îµ{¥Ü¯S©w"
 
-#: ../src/winspector.c:1256
+#: ../src/winspector.c:1257
 msgid "Defaults for all windows"
 msgstr "©Ò¦³µøµ¡¹w³]­È"
 
-#: ../src/winspector.c:1310
-msgid "Select window"
+#: ../src/winspector.c:1311
+msgid "Select Window"
 msgstr "¿ï¨úµøµ¡"
 
-#: ../src/winspector.c:1324
+#: ../src/winspector.c:1325
 msgid "Attributes"
 msgstr "ÄÝ©Ê"
 
-#: ../src/winspector.c:1335
-msgid "Disable titlebar"
+#: ../src/winspector.c:1336
+msgid "Disable Titlebar"
 msgstr "¨Ï¡u¼ÐÃD¦C¡v¥¢®Ä"
 
-#: ../src/winspector.c:1337
+#: ../src/winspector.c:1338
 msgid ""
 "Remove the titlebar of this window.\n"
 "To access the window commands menu of a window\n"
@@ -1575,276 +1578,339 @@ msgid ""
 "equivalent shortcut, if you changed the default\n"
 "settings)."
 msgstr ""
-"§R°£¦¹µøµ¡ªº¡u¼ÐÃD¦C¡v¡C\n"
-"­n¦s¨úµL¼ÐÃD¦Cµøµ¡ªºµøµ¡©R¥O¿ï³æ¡A\n"
-"«ö¤U Control+Esc¡]©Î¦P¼Ë®ÄªGªº±¶®|¡A\n"
-"¦pªG§A§ï¤F¹w³]³]©w¡^¡C"
 
-#: ../src/winspector.c:1344
-msgid "Disable resizebar"
+#: ../src/winspector.c:1345
+msgid "Disable Resizebar"
 msgstr "¨Ï¡u¤j¤pÅܧó¦C¡v¥¢®Ä"
 
-#: ../src/winspector.c:1346
+#: ../src/winspector.c:1347
 msgid "Remove the resizebar of this window."
-msgstr "§R°£¦¹µøµ¡ªº¡u¤j¤pÅܧó¦C¡v¡C"
+msgstr ""
 
-#: ../src/winspector.c:1349
-msgid "Disable close button"
+#: ../src/winspector.c:1350
+msgid "Disable Close Button"
 msgstr "¨Ï¡uÃö³¬«ö¶s¡v¥¢®Ä"
 
-#: ../src/winspector.c:1351
+#: ../src/winspector.c:1352
 msgid "Remove the `close window' button of this window."
-msgstr "§R°£¦¹µøµ¡ªº¡uÃö³¬«ö¶s¡v¡C"
+msgstr ""
 
-#: ../src/winspector.c:1354
-msgid "Disable miniaturize button"
+#: ../src/winspector.c:1355
+msgid "Disable Miniaturize Button"
 msgstr "¨Ï¡u³Ì¤p¤Æ«ö¶s¡v¥¢®Ä"
 
-#: ../src/winspector.c:1356
+#: ../src/winspector.c:1357
 msgid "Remove the `miniaturize window' button of the window."
-msgstr "§R°£¦¹µøµ¡ªº¡u³Ì¤p¤Æ«ö¶s¡v¡C"
+msgstr ""
 
-#: ../src/winspector.c:1359
-msgid "Disable border"
-msgstr "¨Ï¡uÃä®Ø¡v¥¢®Ä"
+#: ../src/winspector.c:1360
+#, fuzzy
+msgid "Disable Border"
+msgstr "¨Ï¡u¤j¤pÅܧó¦C¡v¥¢®Ä"
 
-#: ../src/winspector.c:1361
+#: ../src/winspector.c:1362
 msgid "Remove the 1 pixel black border around the window."
-msgstr "§R°£¦¹µøµ¡©P³ò 1 ¹³¯Àªº¶Â®Ø¡C"
+msgstr ""
 
-#: ../src/winspector.c:1364
-msgid "Keep on top (floating)"
-msgstr "«O«ù¦b³Ì¤W¼h¡]º}¯B¡^"
+#: ../src/winspector.c:1365
+msgid "Keep on Top / Floating"
+msgstr "«O«ù¦b³Ì¤W¼h / º}¯B"
 
-#: ../src/winspector.c:1366
+#: ../src/winspector.c:1367
 msgid ""
 "Keep the window over other windows, not allowing\n"
 "them to cover it."
-msgstr "Åýµøµ¡«O«ù¦b¨ä¥Lµøµ¡¤§¤W¡A¤£³\\¥¦­ÌÂл\\¥¦¡C"
+msgstr ""
 
-#: ../src/winspector.c:1370
-msgid "Keep at bottom (sunken)"
-msgstr "«O«ù¦b³Ì¤U¼h¡]¤U¨I¡^"
+#: ../src/winspector.c:1371
+msgid "Keep at Bottom / Sunken"
+msgstr "«O«ù¦b³Ì¤U¼h / ¤U¨I"
 
-#: ../src/winspector.c:1372
+#: ../src/winspector.c:1373
 msgid "Keep the window under all other windows."
-msgstr "Åýµøµ¡«O«ù¦b©Ò¦³¨ä¥Lµøµ¡¤§¤U¡C"
+msgstr ""
 
-#: ../src/winspector.c:1377
-msgid "Make window present in all workspaces."
-msgstr "Åýµøµ¡¥X²{¦b©Ò¦³¤u§@°Ï¡C"
+#: ../src/winspector.c:1378
+msgid "Make window occupy all workspaces."
+msgstr ""
 
-#: ../src/winspector.c:1380
-msgid "Start miniaturized"
+#: ../src/winspector.c:1381
+msgid "Start Miniaturized"
 msgstr "±Ò°Ê®É³Ì¤p¤Æ"
 
-#: ../src/winspector.c:1382
+#: ../src/winspector.c:1383
 msgid ""
 "Make the window be automatically miniaturized when it's\n"
 "first shown."
-msgstr "·í²Ä¤@¦¸Åã¥Ü®ÉÅýµøµ¡¦Û°Ê³Ì¤p¤Æ¡C"
+msgstr ""
 
-#: ../src/winspector.c:1386
-msgid "Start maximized"
+#: ../src/winspector.c:1387
+msgid "Start Maximized"
 msgstr "±Ò°Ê®É³Ì¤j¤Æ"
 
-#: ../src/winspector.c:1388
+#: ../src/winspector.c:1389
 msgid ""
 "Make the window be automatically maximized when it's\n"
 "first shown."
-msgstr "·í²Ä¤@¦¸Åã¥Ü®ÉÅýµøµ¡¦Û°Ê³Ì¤j¤Æ¡C"
-
-#: ../src/winspector.c:1392
-msgid "Full screen maximization"
-msgstr "¥þ¿Ã¹õ³Ì¤j¤Æ"
-
-#: ../src/winspector.c:1394
-msgid ""
-"Make the window use the whole screen space when it's\n"
-"maximized. The titlebar and resizebar will be moved\n"
-"to outside the screen."
 msgstr ""
-"·í³Ì¤j¤Æ®ÉÅýµøµ¡¨Ï¥Î¾ã­Ó¿Ã¹õªÅ¶¡¡C¡u¼ÐÃD¦C¡v»P¡u¤j¤pÅܧó¦C¡v·|²¾¦Ü¿Ã¹õ¥~¡C"
 
-#: ../src/winspector.c:1411
+#: ../src/winspector.c:1393
+msgid "Skip Window List"
+msgstr "²¤¹Lµøµ¡²M³æ"
+
+#: ../src/winspector.c:1395
+msgid "Do not list the window in the window list menu."
+msgstr ""
+
+#: ../src/winspector.c:1410
 msgid "Advanced"
 msgstr "¶i¶¥"
 
-#: ../src/winspector.c:1428
-msgid "Do not bind keyboard shortcuts"
+#: ../src/winspector.c:1427
+msgid "Ignore HideOthers"
+msgstr "©¿²¤¡uÁôÂèä¥L¡v"
+
+#: ../src/winspector.c:1429
+msgid ""
+"Do not hide the window when issuing the\n"
+"`HideOthers' command."
+msgstr ""
+
+#: ../src/winspector.c:1433
+msgid "Don't Bind Keyboard Shortcuts"
 msgstr "¤£­nµ²¦XÁä½L±¶®|"
 
-#: ../src/winspector.c:1430
+#: ../src/winspector.c:1435
 msgid ""
 "Do not bind keyboard shortcuts from Window Maker\n"
 "when this window is focused. This will allow the\n"
 "window to receive all key combinations regardless\n"
 "of your shortcut configuration."
 msgstr ""
-"·í¦¹µøµ¡±o¨ìµJÂI®É¤£­n±q Window Maker µ²¦XÁä½L±¶®|¡C\n"
-"³o¤¹³\\µøµ¡±o¨ì©Ò¦³Áä½L²Õ¦X¤£²z·|§Aªº±¶®|³]©w¡C"
 
-#: ../src/winspector.c:1436
-msgid "Do not bind mouse clicks"
+#: ../src/winspector.c:1441
+msgid "Don't Bind Mouse Clicks"
 msgstr "¤£­nµ²¦X·Æ¹««öÁä"
 
-#: ../src/winspector.c:1438
+#: ../src/winspector.c:1443
 msgid ""
 "Do not bind mouse actions, such as `Alt'+drag\n"
 "in the window (when alt is the modifier you haveconfigured)."
-msgstr "¤£­nµ²¦X·Æ¹«°Ê§@¡A¨Ò¦p¦bµøµ¡¤¤¡uAlt¡v+©ì¦²¡]·í Alt ¬O§A³]©wªº­×¹¢¡^¡C"
-
-#: ../src/winspector.c:1443
-msgid "Do not show in the window list"
-msgstr "¤£­n¦bµøµ¡²M³æ¤¤Åã¥Ü"
-
-#: ../src/winspector.c:1445
-msgid "Do not list the window in the window list menu."
-msgstr "¤£­n¦bµøµ¡²M³æ¿ï³æ¤¤¦C¥X¦¹µøµ¡¡C"
+msgstr ""
 
 #: ../src/winspector.c:1448
-msgid "Do not let it take focus"
-msgstr "¤£­nÅý¥¦¨ú±oµJÂI"
+msgid "Keep Inside Screen"
+msgstr "«O«ù¦b¿Ã¹õ¤º"
 
 #: ../src/winspector.c:1450
 msgid ""
-"Do not let the window take keyboard focus when you\n"
-"click on it."
-msgstr "·í¦bµøµ¡¤W«ö·Æ¹«®É¤£­nÅý¥¦¨ú±oÁä½LµJÂI¡C"
+"Do not allow the window to move itself completely\n"
+"outside the screen. For bug compatibility.\n"
+msgstr ""
 
 #: ../src/winspector.c:1454
-msgid "Keep inside screen"
-msgstr "«O«ù¦b¿Ã¹õ¤º"
+msgid "Don't Let It Take Focus"
+msgstr "¤£­nÅý¥¦¨ú±oµJÂI"
 
 #: ../src/winspector.c:1456
 msgid ""
-"Do not allow the window to move itself completely\n"
-"outside the screen. For bug compatibility.\n"
-msgstr "¤£¤¹³\\µøµ¡§¹¥þ²¾¥X¿Ã¹õ¡C¥Î©ó¿ù»~¬Û®e©Ê¡C\n"
+"Do not let the window take keyboard focus when you\n"
+"click on it."
+msgstr ""
 
 #: ../src/winspector.c:1460
-msgid "Ignore 'Hide Others'"
-msgstr "©¿²¤¡uÁôÂèä¥L¡v"
+msgid "Don't Save Session"
+msgstr "¤£­nÀx¦sª¬ºA"
 
 #: ../src/winspector.c:1462
 msgid ""
-"Do not hide the window when issuing the\n"
-"`HideOthers' command."
-msgstr "·íµo¥X¡uÁôÂèä¥L¡v©R¥O®É¤£­nÁôÂõøµ¡¡C"
-
-#: ../src/winspector.c:1466
-msgid "Ignore 'Save Session'"
-msgstr "©¿²¤¡uÀx¦sª¬ºA¡v"
-
-#: ../src/winspector.c:1468
-msgid ""
 "Do not save the associated application in the\n"
 "session's state, so that it won't be restarted\n"
 "together with other applications when Window Maker\n"
 "starts."
 msgstr ""
-"¤£­n¦b¶¥¬qª¬ºA¤¤°£¦sÃö³sªºÀ³¥Îµ{¦¡¡A\n"
-"¦p¦¹·íµøµ¡ºÞ²z­û±Ò°Ê®É¤£·|¸òµÛ¨ä¥L\n"
-"À³¥Îµ{¦¡¤@°_³Q­«·s±Ò°Ê¡C"
 
-#: ../src/winspector.c:1474
-msgid "Emulate application icon"
+#: ../src/winspector.c:1468
+msgid "Emulate Application Icon"
 msgstr "¼ÒÀÀÀ³¥Îµ{¦¡¹Ï¥Ü"
 
-#: ../src/winspector.c:1476
+#: ../src/winspector.c:1470
 msgid ""
 "Make this window act as an application that provides\n"
 "enough information to Window Maker for a dockable\n"
 "application icon to be created."
 msgstr ""
-"Åý¦¹µøµ¡¼Ò¥é´£¨Ñ¨¬°÷¸ê°Tµ¹ Window Maker \n"
-"«Ø¥ß°±¾aÀ³¥Îµ{¦¡¹Ï¥ÜªºÀ³¥Îµ{¦¡"
 
-#: ../src/winspector.c:1482
-msgid "Disable language button"
-msgstr "¨Ï¡u»y¨¥«ö¶s¡v¥¢®Ä"
+#: ../src/winspector.c:1475
+msgid "Full Screen Maximization"
+msgstr ""
 
-#: ../src/winspector.c:1484
+#: ../src/winspector.c:1477
+msgid ""
+"Make the window use the whole screen space when it's\n"
+"maximized. The titlebar and resizebar will be moved\n"
+"to outside the screen."
+msgstr ""
+
+#: ../src/winspector.c:1483
+#, fuzzy
+msgid "Disable Language Button"
+msgstr "¨Ï¡uÃö³¬«ö¶s¡v¥¢®Ä"
+
+#: ../src/winspector.c:1485
 msgid "Remove the `toggle language' button of the window."
-msgstr "§R°£¦¹µøµ¡ªº¡u¤Á´«»y¨¥¡v«ö¶s¡C"
+msgstr ""
 
-#: ../src/winspector.c:1501
+#: ../src/winspector.c:1502
 msgid "Miniwindow Image"
 msgstr "°g§Aµøµ¡¼v¹³"
 
-#: ../src/winspector.c:1528
-msgid "Icon filename:"
-msgstr "¹Ï¥ÜÀɦW¡G"
+#: ../src/winspector.c:1529
+msgid "Icon File Name:"
+msgstr "¹Ï¥ÜÀɦW:"
 
-#: ../src/winspector.c:1541
+#: ../src/winspector.c:1542
 msgid "Ignore client supplied icon"
 msgstr "©¿²¤µ{¦¡´£¨Ñªº¹Ï¥Ü"
 
-#: ../src/winspector.c:1548
+#: ../src/winspector.c:1549
 msgid "Initial Workspace"
 msgstr "±Ò©l¤u§@°Ï"
 
-#: ../src/winspector.c:1550
+#: ../src/winspector.c:1551
 msgid "The workspace to place the window when it'sfirst shown."
-msgstr "·í²Ä¤@¦¸Åã¥Ü®Éµøµ¡©ñ¸mªº¤u§@°Ï¡C"
+msgstr ""
 
-#: ../src/winspector.c:1556
+#: ../src/winspector.c:1557
 msgid "Nowhere in particular"
 msgstr "µL¯S§O«ü©w"
 
-#: ../src/winspector.c:1574
-msgid "Application Attributes"
-msgstr "À³¥Îµ{¦¡ÄÝ©Ê"
+#: ../src/winspector.c:1575
+msgid "Application Wide"
+msgstr "¾ã­ÓÀ³¥Îµ{¦¡"
 
-#: ../src/winspector.c:1585
-msgid "Start hidden"
+#: ../src/winspector.c:1586
+msgid "Start Hidden"
 msgstr "±Ò°Ê®ÉÁôÂÃ"
 
-#: ../src/winspector.c:1587
+#: ../src/winspector.c:1588
 msgid "Automatically hide application when it's started."
-msgstr "·í±Ò°Ê®É¦Û°ÊÁôÂÃÀ³¥Îµ{¦¡¡C"
+msgstr ""
 
-#: ../src/winspector.c:1590
-msgid "No application icon"
+#: ../src/winspector.c:1591
+msgid "No Application Icon"
 msgstr "µLÀ³¥Îµ{¦¡¹Ï¥Ü"
 
-#: ../src/winspector.c:1592
+#: ../src/winspector.c:1593
 msgid ""
 "Disable the application icon for the application.\n"
 "Note that you won't be able to dock it anymore,\n"
 "and any icons that are already docked will stop\n"
 "working correctly."
 msgstr ""
-"¨ÏÀ³¥Îµ{¦¡¹Ï¥Ü¥¢®Ä¡C\n"
-"ª`·N¡G§A¤£¯à¦A°±¾a¥¦¡A¥ô¦ó¤w°±¾aªº¹Ï¥Ü·|°±¤î¥¿±`¹B§@¡C"
 
-#: ../src/winspector.c:1598
-msgid "Shared application icon"
-msgstr "¦@¥ÎÀ³¥Îµ{¦¡¹Ï¥Ü"
-
-#: ../src/winspector.c:1600
-msgid ""
-"Use a single shared application icon for all of\n"
-"the instances of this application.\n"
-msgstr "¦¹À³¥Îµ{¦¡ªº©Ò¦³ª«¥ó¨Ï¥Î³æ¤@¦@¥ÎÀ³¥Îµ{¦¡¹Ï¥Ü¡C\n"
-
-#: ../src/workspace.c:107 ../src/workspace.c:108 ../src/workspace.c:876
+#: ../src/workspace.c:110 ../src/workspace.c:111 ../src/workspace.c:893
 #, c-format
 msgid "Workspace %i"
 msgstr "¤u§@°Ï  %i"
 
-#: ../src/workspace.c:926
+#: ../src/workspace.c:950
 msgid "Workspaces"
 msgstr "¤u§@°Ï"
 
-#: ../src/workspace.c:928
+#: ../src/workspace.c:952
 msgid "could not create Workspace menu"
 msgstr "µLªk«Ø¥ß¤u§@°Ï¿ï³æ"
 
-#: ../src/workspace.c:935
+#: ../src/workspace.c:959
 msgid "New"
 msgstr "·s¼W¤u§@°Ï"
 
-#: ../src/workspace.c:936
+#: ../src/workspace.c:960
 msgid "Destroy Last"
 msgstr "§R°£³Ì«áªº¤u§@°Ï"
+
+#~ msgid "Keep Attracted Icons"
+#~ msgstr "«O«ù§l¤Þªº¹Ï¥Ü"
+
+#~ msgid "Keep Icon(s)"
+#~ msgstr "«O«ù¹Ï¥Ü"
+
+#~ msgid "stack overflow: too many dead processes"
+#~ msgstr "°ïÅ|·¸¦ì: ¤Ó¦h²×¤îªº¦æµ{"
+
+#~ msgid "could not render gradient: %s"
+#~ msgstr "µLªkªí²{º¥¼h: %s"
+
+#~ msgid "could not exec window manager"
+#~ msgstr "µLªk°õ¦æµøµ¡ºÞ²z­û"
+
+#~ msgid "Restart failed!!!"
+#~ msgstr "­«·s±Ò°Ê¥¢±Ñ!!!"
+
+#~ msgid "wrealloc() failed while trying to add menu item"
+#~ msgstr "¹Á¸Õ¼W¥[¿ï³æ¶µ¥Ø®É wrealloc() ¥¢±Ñ"
+
+#~ msgid "selection timed-out"
+#~ msgstr "¿ï¨ú¹O®É"
+
+#~ msgid "The following character sets are missing in %s:"
+#~ msgstr "%s ¤¤¤U¦C¦r¤¸¶°¯Ê¤Ö:"
+
+#~ msgid "The string \"%s\" will be used in place"
+#~ msgstr "¦r¦ê \"%s\" ·|³Q¥Î¨Ó¨ú¥N"
+
+#~ msgid "of any characters from those sets."
+#~ msgstr "¨º¨Ç¶°¦Xªº¥ô¦ó¦r¤¸¡C"
+
+#~ msgid "could not create font set %s. Trying fixed"
+#~ msgstr "µLªk«Ø¥ß¦r«¬¶° %s¡C¸Õ¥Î fixed"
+
+#~ msgid "could not load font %s. Trying fixed"
+#~ msgstr "µLªk¸ü¤J¦r«¬ %s¡C¸Õ¥Î fixed"
+
+#~ msgid ""
+#~ "Enable the \"Don't bind...\" options to allow the application to receive "
+#~ "all mouse or keyboard events."
+#~ msgstr ""
+#~ "±Ò°Ê \"¤£­nµ²¦X...\" ¿ï¶µ\n"
+#~ "¤¹³\À³¥Îµ{¦¡±µ¨ü©Ò¦³·Æ¹«©ÎÁä½L¨Æ¥ó¡C"
+
+#~ msgid "Update"
+#~ msgstr "§ó·s"
+
+#~ msgid "invalid data in selection"
+#~ msgstr "¿ï¨úªº¸ê®ÆµL®Ä"
+
+#~ msgid "Keep Clip On Top"
+#~ msgstr "«O«ù°j¯¾°w¦b³Ì¤W¼h"
+
+# ??
+#~ msgid "Keep Dock On Top"
+#~ msgstr "«O«ù°±¾a°Ï¦b³Ì¤W¼h"
+
+#~ msgid "(Un)Hide"
+#~ msgstr "ÁôÂá]ÁÙ­ì¡^"
+
+#~ msgid ""
+#~ "Close Window System session?\n"
+#~ "(all applications will be closed)"
+#~ msgstr ""
+#~ "Ãö³¬µøµ¡¨t²Î¡H\n"
+#~ "¡]©Ò¦³À³¥Îµ{¦¡·|³QÃö³¬¡^"
+
+#~ msgid "%s: Received signal SIGTERM. Exiting..."
+#~ msgstr "%s: ¦¬¨ì SIGTERM °T¸¹¡CÂ÷¶}..."
+
+#~ msgid "(Un)Maximize"
+#~ msgstr "³Ì¤j¤Æ¡]ÁÙ­ì¡^"
+
+#~ msgid "(Un)Shade"
+#~ msgstr "¾B½ª¡]ÁÙ­ì¡^"
+
+# ??
+#~ msgid "Hide Others"
+#~ msgstr "ÁôÂèä¥Lµøµ¡"
+
+#~ msgid "Revert"
+#~ msgstr "ÁÙ­ì"