[gnome-panel] Updated Traditional Chinese translation(Hong Kong and Taiwan)

From: Chao-Hsiung Liao <chliao src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-panel] Updated Traditional Chinese translation(Hong Kong and Taiwan)
Date: Mon, 23 Aug 2010 11:53:11 +0000 (UTC)
commit cdb8281751bc84abff05546677450a89e0f4961d
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Mon Aug 23 19:53:03 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 1018 +++++++++++++++++++++++++++++-----------------------------
 po/zh_TW.po | 1025 ++++++++++++++++++++++++++++++-----------------------------
 2 files changed, 1023 insertions(+), 1020 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index e4840b9..5c3abb2 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -14,10 +14,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-panel 2.29.90\n"
+"Project-Id-Version: gnome-panel 2.31.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-16 09:57+0800\n"
-"PO-Revision-Date: 2010-02-16 09:57+0800\n"
+"POT-Creation-Date: 2010-08-23 19:52+0800\n"
+"PO-Revision-Date: 2010-08-23 19:52+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "MIME-Version: 1.0\n"
@@ -25,65 +25,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../applets/clock/GNOME_ClockApplet.xml.h:1
-msgid "Ad_just Date & Time"
-msgstr "èª¿æ?´æ?¥æ??å??æ??å?»(_J)"
-
-#: ../applets/clock/GNOME_ClockApplet.xml.h:2
-msgid "Copy _Date"
-msgstr "è¤?è£½æ?¥æ??(_D)"
-
-#: ../applets/clock/GNOME_ClockApplet.xml.h:3
-msgid "Copy _Time"
-msgstr "è¤?è£½æ??å?»(_T)"
-
-#: ../applets/clock/GNOME_ClockApplet.xml.h:4
-#: ../applets/fish/GNOME_FishApplet.xml.h:1
-#: ../applets/notification_area/GNOME_NotificationAreaApplet.xml.h:1
-#: ../applets/wncklet/GNOME_ShowDesktopApplet.xml.h:1
-#: ../applets/wncklet/GNOME_WindowListApplet.xml.h:1
-#: ../applets/wncklet/GNOME_WindowMenuApplet.xml.h:1
-#: ../applets/wncklet/GNOME_WorkspaceSwitcherApplet.xml.h:1
-msgid "_About"
-msgstr "é??æ?¼(_A)"
-
-#: ../applets/clock/GNOME_ClockApplet.xml.h:5
-#: ../applets/fish/GNOME_FishApplet.xml.h:2
-#: ../applets/notification_area/GNOME_NotificationAreaApplet.xml.h:2
-#: ../applets/wncklet/GNOME_ShowDesktopApplet.xml.h:2
-#: ../applets/wncklet/GNOME_WindowListApplet.xml.h:2
-#: ../applets/wncklet/GNOME_WindowMenuApplet.xml.h:2
-#: ../applets/wncklet/GNOME_WorkspaceSwitcherApplet.xml.h:2
-#: ../gnome-panel/drawer.c:601 ../gnome-panel/panel-action-button.c:710
-#: ../gnome-panel/panel-context-menu.c:285 ../gnome-panel/panel-menu-bar.c:345
-#: ../gnome-panel/panel-menu-button.c:664
-msgid "_Help"
-msgstr "æ±?å?©(_H)"
-
-#: ../applets/clock/GNOME_ClockApplet.xml.h:6
-#: ../applets/fish/GNOME_FishApplet.xml.h:3
-#: ../applets/wncklet/GNOME_WindowListApplet.xml.h:3
-#: ../applets/wncklet/GNOME_WorkspaceSwitcherApplet.xml.h:3
-msgid "_Preferences"
-msgstr "å??å¥½è¨å®?(_P)"
-
-#: ../applets/clock/GNOME_ClockApplet_Factory.server.in.in.h:1
-#: ../applets/clock/clock.c:3668
-msgid "Clock"
-msgstr "æ??é??"
-
-#: ../applets/clock/GNOME_ClockApplet_Factory.server.in.in.h:2
-msgid "Clock Applet Factory"
-msgstr "æ??é??é?¢æ?¿ç¨?å¼?å·¥å» "
-
-#: ../applets/clock/GNOME_ClockApplet_Factory.server.in.in.h:3
-msgid "Factory for creating clock applets."
-msgstr "ç?¢ç??æ??é??é?¢æ?¿ç¨?å¼?ç??å·¥å» ã??"
-
-#: ../applets/clock/GNOME_ClockApplet_Factory.server.in.in.h:4
-msgid "Get the current time and date"
-msgstr "å??å¾?ç?®å??ç??æ??å?»å??æ?¥æ??"
-
 #. Translators: This is a strftime format string.
 #. * It is used to display the time in 12-hours format
 #. * (eg, like in the US: 8:10 am). The %p expands to
@@ -92,8 +33,8 @@ msgstr "å??å¾?ç?®å??ç??æ??å?»å??æ?¥æ??"
 #. * It is used to display the time in 12-hours format (eg, like
 #. * in the US: 8:10 am). The %p expands to am/pm.
 #.
-#: ../applets/clock/calendar-window.c:303 ../applets/clock/clock.c:445
-#: ../applets/clock/clock-location-tile.c:516
+#: ../applets/clock/calendar-window.c:303 ../applets/clock/clock.c:444
+#: ../applets/clock/clock-location-tile.c:520
 msgid "%l:%M %p"
 msgstr "%p %l:%M"
 
@@ -111,9 +52,9 @@ msgstr "%p %l:%M"
 #. * It is used to display the time in 24-hours format (eg, like
 #. * in France: 20:10).
 #.
-#: ../applets/clock/calendar-window.c:308 ../applets/clock/clock.c:450
-#: ../applets/clock/clock.c:1588 ../applets/clock/clock-location-tile.c:476
-#: ../applets/clock/clock-location-tile.c:523
+#: ../applets/clock/calendar-window.c:308 ../applets/clock/clock.c:449
+#: ../applets/clock/clock.c:1591 ../applets/clock/clock-location-tile.c:480
+#: ../applets/clock/clock-location-tile.c:527
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -161,7 +102,7 @@ msgstr "æ??æ??"
 #. Translators: This is a strftime format string.
 #. * It is used to display the time in 12-hours format (eg, like
 #. * in the US: 8:10 am). The %p expands to am/pm.
-#: ../applets/clock/clock.c:445
+#: ../applets/clock/clock.c:444
 msgid "%l:%M:%S %p"
 msgstr "%p %l:%M:%S"
 
@@ -172,7 +113,7 @@ msgstr "%p %l:%M:%S"
 #. * string.
 #. * It is used to display the time in 24-hours
 #. * format (eg, like in France: 20:10).
-#: ../applets/clock/clock.c:450 ../applets/clock/clock.c:1582
+#: ../applets/clock/clock.c:449 ../applets/clock/clock.c:1585
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -183,7 +124,7 @@ msgstr "%H:%M:%S"
 #. * the day of the month as a decimal number is a single digit,
 #. * it should begin with a 0 in your locale (e.g. "May 01"
 #. * instead of "May  1").
-#: ../applets/clock/clock.c:461
+#: ../applets/clock/clock.c:460
 msgid "%a %b %e"
 msgstr "%-mæ??%-dæ?¥(%a)"
 
@@ -191,7 +132,7 @@ msgstr "%-mæ??%-dæ?¥(%a)"
 #. *              if the time should come before the
 #. *              date on a clock in your locale.
 #.
-#: ../applets/clock/clock.c:468
+#: ../applets/clock/clock.c:467
 #, c-format
 msgid ""
 "%1$s\n"
@@ -204,7 +145,7 @@ msgstr ""
 #. *              if the time should come before the
 #. *              date on a clock in your locale.
 #.
-#: ../applets/clock/clock.c:476
+#: ../applets/clock/clock.c:475
 #, c-format
 msgid "%1$s, %2$s"
 msgstr "%1$s %2$s"
@@ -213,27 +154,27 @@ msgstr "%1$s %2$s"
 #. Translators: This is a strftime format string.
 #. * It is used to display a date. Please leave "%%s" as it is:
 #. * it will be used to insert the timezone name later.
-#: ../applets/clock/clock.c:649
+#: ../applets/clock/clock.c:648
 msgid "%A %B %d (%%s)"
 msgstr "%B %d %A (%%s)"
 
-#: ../applets/clock/clock.c:679
+#: ../applets/clock/clock.c:678
 msgid "Click to hide your appointments and tasks"
 msgstr "æ??ä¸?ä»¥é?±è??ç´?æ??å??å·¥ä½?"
 
-#: ../applets/clock/clock.c:682
+#: ../applets/clock/clock.c:681
 msgid "Click to view your appointments and tasks"
 msgstr "æ??ä¸?ä¾?é¡¯ç¤ºç´?æ??å??å·¥ä½?"
 
-#: ../applets/clock/clock.c:686
+#: ../applets/clock/clock.c:685
 msgid "Click to hide month calendar"
 msgstr "æ??ä¸?ä»¥é?±è??æ??æ??"
 
-#: ../applets/clock/clock.c:689
+#: ../applets/clock/clock.c:688
 msgid "Click to view month calendar"
 msgstr "æ??ä¸?ä¾?é¡¯ç¤ºæ??æ??"
 
-#: ../applets/clock/clock.c:1421
+#: ../applets/clock/clock.c:1423
 msgid "Computer Clock"
 msgstr "é?»è?¦æ??é??"
 
@@ -243,7 +184,7 @@ msgstr "é?»è?¦æ??é??"
 #. * format with a leading 0 if needed (eg, like
 #. * in the US: 08:10 am). The %p expands to
 #. * am/pm.
-#: ../applets/clock/clock.c:1567
+#: ../applets/clock/clock.c:1570
 msgid "%I:%M:%S %p"
 msgstr "%p %I:%M:%S"
 
@@ -253,75 +194,116 @@ msgstr "%p %I:%M:%S"
 #. * format with a leading 0 if needed (eg, like
 #. * in the US: 08:10 am). The %p expands to
 #. * am/pm.
-#: ../applets/clock/clock.c:1575
+#: ../applets/clock/clock.c:1578
 msgid "%I:%M %p"
 msgstr "%p %I:%M"
 
 #. Translators: This is a strftime format string.
 #. * It is used to display a date in the full format (so that people can
 #. * copy and paste it elsewhere).
-#: ../applets/clock/clock.c:1622
+#: ../applets/clock/clock.c:1624
 msgid "%A, %B %d %Y"
 msgstr "%Yå¹´%-mæ??%-dæ?¥(%A)"
 
-#: ../applets/clock/clock.c:1653
+#: ../applets/clock/clock.c:1655
 msgid "Set System Time..."
 msgstr "è¨å®?ç³»çµ±æ??å?»..."
 
-#: ../applets/clock/clock.c:1654
+#: ../applets/clock/clock.c:1656
 msgid "Set System Time"
 msgstr "è¨å®?ç³»çµ±æ??å?»"
 
-#: ../applets/clock/clock.c:1669
+#: ../applets/clock/clock.c:1671
 msgid "Failed to set the system time"
 msgstr "è¨å®?ç³»çµ±æ??å?»å¤±æ??"
 
-#: ../applets/clock/clock.c:2706
+#: ../applets/clock/clock.c:1869 ../applets/fish/fish.c:1836
+#: ../applets/wncklet/window-list.c:192
+#: ../applets/wncklet/workspace-switcher.c:339
+msgid "_Preferences"
+msgstr "å??å¥½è¨å®?(_P)"
+
+#: ../applets/clock/clock.c:1872 ../applets/fish/fish.c:1839
+#: ../applets/notification_area/main.c:171
+#: ../applets/wncklet/showdesktop.c:228 ../applets/wncklet/window-list.c:195
+#: ../applets/wncklet/window-menu.c:95
+#: ../applets/wncklet/workspace-switcher.c:342 ../gnome-panel/drawer.c:601
+#: ../gnome-panel/panel-action-button.c:710
+#: ../gnome-panel/panel-context-menu.c:285 ../gnome-panel/panel-menu-bar.c:350
+#: ../gnome-panel/panel-menu-button.c:665
+msgid "_Help"
+msgstr "æ±?å?©(_H)"
+
+#: ../applets/clock/clock.c:1875 ../applets/fish/fish.c:1842
+#: ../applets/notification_area/main.c:174
+#: ../applets/wncklet/showdesktop.c:231 ../applets/wncklet/window-list.c:198
+#: ../applets/wncklet/window-menu.c:98
+#: ../applets/wncklet/workspace-switcher.c:345
+msgid "_About"
+msgstr "é??æ?¼(_A)"
+
+#: ../applets/clock/clock.c:1878
+msgid "Copy _Time"
+msgstr "è¤?è£½æ??å?»(_T)"
+
+#: ../applets/clock/clock.c:1881
+msgid "Copy _Date"
+msgstr "è¤?è£½æ?¥æ??(_D)"
+
+#: ../applets/clock/clock.c:1884
+msgid "Ad_just Date & Time"
+msgstr "èª¿æ?´æ?¥æ??å??æ??å?»(_J)"
+
+#: ../applets/clock/clock.c:2720
 msgid "Custom format"
 msgstr "è?ªé?¸æ ¼å¼?"
 
-#: ../applets/clock/clock.c:3160
+#: ../applets/clock/clock.c:3207
 msgid "Choose Location"
 msgstr "é?¸æ??ä½?ç½®"
 
-#: ../applets/clock/clock.c:3235
+#: ../applets/clock/clock.c:3286
 msgid "Edit Location"
 msgstr "ç·¨è¼¯ä½?ç½®"
 
-#: ../applets/clock/clock.c:3381
+#: ../applets/clock/clock.c:3432
 msgid "City Name"
 msgstr "å??å¸?å??ç¨±"
 
-#: ../applets/clock/clock.c:3385
+#: ../applets/clock/clock.c:3436
 msgid "City Time Zone"
 msgstr "å??å¸?æ??å??"
 
-#: ../applets/clock/clock.c:3565
+#: ../applets/clock/clock.c:3621
 msgid "24 hour"
 msgstr "24 å°?æ??å?¶"
 
-#: ../applets/clock/clock.c:3566
+#: ../applets/clock/clock.c:3622
 msgid "UNIX time"
 msgstr "UNIX æ??é??"
 
-#: ../applets/clock/clock.c:3567
+#: ../applets/clock/clock.c:3623
 msgid "Internet time"
 msgstr "Internet æ??é??"
 
-#: ../applets/clock/clock.c:3575
+#: ../applets/clock/clock.c:3631
 msgid "Custom _format:"
 msgstr "è?ªé?¸æ ¼å¼?(_F):"
 
-#: ../applets/clock/clock.c:3671
+#: ../applets/clock/clock.c:3721
+msgid "Clock"
+msgstr "æ??é??"
+
+#: ../applets/clock/clock.c:3724
 msgid "The Clock displays the current time and date"
 msgstr "æ??é??ç¨?å¼?å?¯é¡¯ç¤ºç?®å??ç??æ??é??å??æ?¥æ??"
 
 #. Translator credits
-#: ../applets/clock/clock.c:3674 ../applets/fish/fish.c:623
-#: ../applets/notification_area/main.c:155
-#: ../applets/wncklet/showdesktop.c:531 ../applets/wncklet/window-list.c:606
-#: ../applets/wncklet/window-menu.c:79
-#: ../applets/wncklet/workspace-switcher.c:621
+#: ../applets/clock/clock.c:3727 ../applets/fish/fish.c:621
+#: ../applets/notification_area/main.c:153
+#: ../applets/wncklet/showdesktop.c:540 ../applets/wncklet/window-list.c:609
+#: ../applets/wncklet/window-menu.c:77
+#: ../applets/wncklet/workspace-switcher.c:619
 #: ../gnome-panel/panel-context-menu.c:138
 msgid "translator-credits"
 msgstr ""
@@ -661,15 +643,15 @@ msgstr "ä½¿ç?¨ä¸?ç??å??èª¿æ??(UTC)"
 msgid "Failed to set the system timezone"
 msgstr "è¨å®?ç³»çµ±æ??å??å¤±æ??"
 
-#: ../applets/clock/clock-location-tile.c:240
+#: ../applets/clock/clock-location-tile.c:244
 msgid "<small>Set...</small>"
 msgstr "<small>è¨å®?...</small>"
 
-#: ../applets/clock/clock-location-tile.c:241
+#: ../applets/clock/clock-location-tile.c:245
 msgid "<small>Set</small>"
 msgstr "<small>è¨å®?</small>"
 
-#: ../applets/clock/clock-location-tile.c:317
+#: ../applets/clock/clock-location-tile.c:321
 msgid "Set location as current location and use its timezone for this computer"
 msgstr "å°?ä½?ç½®è¨ç?ºç?®å??ç??ä½?ç½®ï¼?ä¸¦ä½¿ç?¨å?¶æ??å??è¨ç?ºé??å?°é?»è?¦ç?®å??ç??æ??å??"
 
@@ -679,7 +661,7 @@ msgstr "å°?ä½?ç½®è¨ç?ºç?®å??ç??ä½?ç½®ï¼?ä¸¦ä½¿ç?¨å?¶æ??å??è¨ç?ºé??å?°é?»è?¦ç?®
 #. * weekday differs from the weekday at the location
 #. * (the %A expands to the weekday). The %p expands to
 #. * am/pm.
-#: ../applets/clock/clock-location-tile.c:453
+#: ../applets/clock/clock-location-tile.c:457
 msgid "%l:%M <small>%p (%A)</small>"
 msgstr "%l:%M <small>%p (%A)</small>"
 
@@ -688,7 +670,7 @@ msgstr "%l:%M <small>%p (%A)</small>"
 #. * (eg, like in France: 20:10), when the local
 #. * weekday differs from the weekday at the location
 #. * (the %A expands to the weekday).
-#: ../applets/clock/clock-location-tile.c:461
+#: ../applets/clock/clock-location-tile.c:465
 msgid "%H:%M <small>(%A)</small>"
 msgstr "%H:%M <small>(%A)</small>"
 
@@ -696,86 +678,45 @@ msgstr "%H:%M <small>(%A)</small>"
 #. * It is used to display the time in 12-hours format
 #. * (eg, like in the US: 8:10 am). The %p expands to
 #. * am/pm.
-#: ../applets/clock/clock-location-tile.c:470
+#: ../applets/clock/clock-location-tile.c:474
 msgid "%l:%M <small>%p</small>"
 msgstr "%l:%M <small>%p</small>"
 
-#: ../applets/clock/clock-location-tile.c:608
+#: ../applets/clock/clock-location-tile.c:613
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
 #. FMQ: it's broken to read from another module's translations; add some API to libgweather.
-#: ../applets/clock/clock-location-tile.c:620
-#: ../applets/clock/clock-location-tile.c:629
+#: ../applets/clock/clock-location-tile.c:625
+#: ../applets/clock/clock-location-tile.c:634
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
 #. Translators: The two strings are temperatures.
-#: ../applets/clock/clock-location-tile.c:622
+#: ../applets/clock/clock-location-tile.c:627
 #, c-format
 msgid "%s, feels like %s"
 msgstr "%sï¼?æ??è¦ºå?? %s"
 
-#: ../applets/clock/clock-location-tile.c:645
+#: ../applets/clock/clock-location-tile.c:650
 #, c-format
 msgid "Sunrise: %s / Sunset: %s"
 msgstr "æ?¥å?º: %s / æ?¥è?½: %s"
 
-#: ../applets/clock/clock-utils.c:93 ../applets/fish/fish.c:168
-#: ../applets/notification_area/main.c:94 ../applets/wncklet/wncklet.c:123
+#: ../applets/clock/clock-utils.c:93 ../applets/fish/fish.c:169
+#: ../applets/notification_area/main.c:93 ../applets/wncklet/wncklet.c:123
 #: ../gnome-panel/libpanel-util/panel-show.c:235
 #, c-format
 msgid "Could not display help document '%s'"
 msgstr "ç?¡æ³?é¡¯ç¤ºã??%sã??ç??æ±?å?©æ??ä»¶ã??"
 
-#: ../applets/clock/clock-utils.c:122 ../applets/fish/fish.c:194
-#: ../applets/notification_area/main.c:115 ../applets/wncklet/wncklet.c:152
+#: ../applets/clock/clock-utils.c:122 ../applets/fish/fish.c:195
+#: ../applets/notification_area/main.c:114 ../applets/wncklet/wncklet.c:152
 msgid "Error displaying help document"
 msgstr "é¡¯ç¤ºæ±?å?©æ??ä»¶æ??ç?¼ç??é?¯èª¤"
 
-#: ../applets/clock/org.gnome.clockapplet.mechanism.policy.in.h:1
-msgid "Change system time"
-msgstr "æ?¹è®?ç³»çµ±æ??å?»"
-
-#: ../applets/clock/org.gnome.clockapplet.mechanism.policy.in.h:2
-msgid "Change system time zone"
-msgstr "æ?¹è®?ç³»çµ±æ??å??"
-
-#: ../applets/clock/org.gnome.clockapplet.mechanism.policy.in.h:3
-msgid "Configure hardware clock"
-msgstr "è¨å®?ç¡¬ä»¶æ??é??"
-
-#: ../applets/clock/org.gnome.clockapplet.mechanism.policy.in.h:4
-msgid "Privileges are required to change the system time zone."
-msgstr "æ?¹è®?ç³»çµ±æ??å??é??è¦?æ??æ¬?é??ã??"
-
-#: ../applets/clock/org.gnome.clockapplet.mechanism.policy.in.h:5
-msgid "Privileges are required to change the system time."
-msgstr "æ?¹è®?ç³»çµ±æ??å?»é??è¦?æ??æ¬?é??ã??"
-
-#: ../applets/clock/org.gnome.clockapplet.mechanism.policy.in.h:6
-msgid "Privileges are required to configure the hardware clock."
-msgstr "è¨å®?ç¡¬ä»¶æ??é??é??è¦?æ??æ¬?é??ã??"
-
-#: ../applets/fish/GNOME_FishApplet_Factory.server.in.in.h:1
-msgid "Display a swimming fish or another animated creature"
-msgstr "é¡¯ç¤ºæ¸¸æ³³ä¸ç??é?å??æ??å?¶å®?ç??ç?©"
-
-#: ../applets/fish/GNOME_FishApplet_Factory.server.in.in.h:2
-#: ../applets/fish/fish.c:617
-msgid "Fish"
-msgstr "å°?é?"
-
-#: ../applets/fish/GNOME_FishApplet_Factory.server.in.in.h:3
-msgid "From Whence That Stupid Fish Came"
-msgstr "é?£æ¢?è ¢é?æ?¯å¾?å?ªè£?ä¾?ç??"
-
-#: ../applets/fish/GNOME_FishApplet_Factory.server.in.in.h:4
-msgid "Wanda Factory"
-msgstr "Wanda å·¥å» "
-
-#: ../applets/fish/fish.c:273
+#: ../applets/fish/fish.c:274
 #, c-format
 msgid ""
 "Warning:  The command appears to be something actually useful.\n"
@@ -791,13 +732,13 @@ msgstr ""
 msgid "Images"
 msgstr "å??ç??"
 
-#: ../applets/fish/fish.c:585 ../applets/fish/fish.c:651
-#: ../applets/fish/fish.c:767
+#: ../applets/fish/fish.c:583 ../applets/fish/fish.c:649
+#: ../applets/fish/fish.c:765
 #, no-c-format
 msgid "%s the Fish"
 msgstr "å°?é? %s"
 
-#: ../applets/fish/fish.c:586
+#: ../applets/fish/fish.c:584
 #, c-format
 msgid ""
 "%s has no use what-so-ever. It only takes up disk space and compilation "
@@ -805,25 +746,29 @@ msgid ""
 "Anybody found using it should be promptly sent for a psychiatric evaluation."
 msgstr "%s ä¸?é»?ç?¨è??ä¹?æ²?æ??ï¼?å®?å?ªæ??ä½?ç¡¬ç¢?ç©ºé??ï¼?ç·¨è¯æ??å??è¦?ä½?ç?¨æ??é??ï¼?å??å??æ??é??å¾?ä½?å?»é?¢æ?¿ç©ºé??å??è¨?æ?¶é«?ç©ºé??ã??ä½¿ç?¨é??å??é?¢æ?¿ç¨?å¼?ç??äººæ??è©²è¦?é??å?»æª¢æ?¥ä¸?ä¸?ç²¾ç¥?ç??æ³?å?¢ã??"
 
-#: ../applets/fish/fish.c:610
+#: ../applets/fish/fish.c:608
 msgid "(with minor help from George)"
 msgstr "ï¼?é??æ?? George ç??å¹«å¿?ï¼?"
 
-#: ../applets/fish/fish.c:652
+#: ../applets/fish/fish.c:615
+msgid "Fish"
+msgstr "å°?é?"
+
+#: ../applets/fish/fish.c:650
 #, c-format
 msgid "%s the Fish, a contemporary oracle"
 msgstr "GNOME å°?é? %s â?? ç?¶ä»£è??äºº"
 
-#: ../applets/fish/fish.c:723
+#: ../applets/fish/fish.c:721
 msgid "Unable to locate the command to execute"
 msgstr "æ?¾ä¸?å?°è¦?å?·è¡?ç??æ??ä»¤"
 
-#: ../applets/fish/fish.c:772
+#: ../applets/fish/fish.c:770
 #, no-c-format
 msgid "%s the Fish Says:"
 msgstr "GNOME å°?é? %s èªªï¼?"
 
-#: ../applets/fish/fish.c:841
+#: ../applets/fish/fish.c:839
 #, c-format
 msgid ""
 "Unable to read output from command\n"
@@ -834,7 +779,7 @@ msgstr ""
 "\n"
 "è©³æ??ï¼?%s"
 
-#: ../applets/fish/fish.c:906
+#: ../applets/fish/fish.c:905
 msgid "_Speak again"
 msgstr "å??å¿µä¸?é??(_S)"
 
@@ -865,15 +810,15 @@ msgstr ""
 "\n"
 "è©³æ??ï¼?%s"
 
-#: ../applets/fish/fish.c:1653
+#: ../applets/fish/fish.c:1679
 msgid "The water needs changing"
 msgstr "è©²æ??æ°´äº?"
 
-#: ../applets/fish/fish.c:1655
+#: ../applets/fish/fish.c:1681
 msgid "Look at today's date!"
 msgstr "ç??ç??ä»?å¤©æ?¯ç??éº¼æ?¥å?ï¼?"
 
-#: ../applets/fish/fish.c:1748
+#: ../applets/fish/fish.c:1774
 #, c-format
 msgid "%s the Fish, the fortune teller"
 msgstr "GNOME å°?é? %s â?? é ?è¨?å®¶"
@@ -983,98 +928,50 @@ msgstr "æ?¬è¨å®?é?µæ??å®?äº?å°?é?ç??å??ç?«æ ¼æ?¸"
 msgid "This key specifies the number of seconds each frame will be displayed."
 msgstr "æ?¬è¨å®?é?µæ??å®?æ¯?æ ¼å??ç?«é¡¯ç¤ºç??æ??é??"
 
-#: ../applets/notification_area/GNOME_NotificationAreaApplet.server.in.in.h:1
-msgid "Area where notification icons appear"
-msgstr "é¡¯ç¤ºç¨?å¼?ç??æ??é??ç?¥å??ç¤ºç??å??å??"
-
-#: ../applets/notification_area/GNOME_NotificationAreaApplet.server.in.in.h:2
-#: ../applets/notification_area/main.c:150
+#: ../applets/notification_area/main.c:148
 msgid "Notification Area"
 msgstr "ç¨?å¼?ç??æ??é??ç?¥å??"
 
-#: ../applets/notification_area/GNOME_NotificationAreaApplet.server.in.in.h:3
-msgid "Notification Area Factory"
-msgstr "ã??ç¨?å¼?ç??æ??é??ç?¥å??ã??å·¥å» "
-
-#: ../applets/notification_area/main.c:261
+#: ../applets/notification_area/main.c:306
 msgid "Panel Notification Area"
 msgstr "é?¢æ?¿ç¨?å¼?ç??æ??é??ç?¥å??"
 
-#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:1
-msgid "Factory for the window navigation related applets"
-msgstr "ç?¨ä¾?ç?¢ç??å??è¦?çª?ç??è¦½æ??é??ç??é?¢æ?¿ç¨?å¼?ç??å·¥å» "
-
-#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:2
-msgid "Hide application windows and show the desktop"
-msgstr "é?±è??æ??æ??ç¨?å¼?è¦?çª?ä¸¦é¡¯ç¤ºæ¡?é?¢"
-
-#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:3
-msgid "Show Desktop"
-msgstr "é¡¯ç¤ºæ¡?é?¢"
-
-#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:4
-msgid "Switch between open windows using a menu"
-msgstr "ä½¿ç?¨é?¸å?®ä¾?å??æ??å·²é??å??ç??è¦?çª?"
-
-#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:5
-msgid "Switch between open windows using buttons"
-msgstr "ä½¿ç?¨æ??é??ä¾?å??æ??å·²é??å??ç??è¦?çª?"
-
-#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:6
-msgid "Switch between workspaces"
-msgstr "å??æ??å·¥ä½?å??"
-
-#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:7
-#: ../applets/wncklet/window-list.c:609
-msgid "Window List"
-msgstr "è¦?çª?æ¸?å?®"
-
-#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:8
-msgid "Window Navigation Applet Factory"
-msgstr "è¦?çª?ç??è¦½é?¢æ?¿ç¨?å¼?å·¥å» "
-
-#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:9
-#: ../applets/wncklet/window-menu.c:82 ../applets/wncklet/window-menu.c:244
-msgid "Window Selector"
-msgstr "è¦?çª?é?¸æ??ç¨?å¼?"
-
-#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:10
-#: ../applets/wncklet/workspace-switcher.c:624
-msgid "Workspace Switcher"
-msgstr "å·¥ä½?å??å??æ??ç¨?å¼?"
-
-#: ../applets/wncklet/showdesktop.c:181
+#: ../applets/wncklet/showdesktop.c:182
 #, c-format
 msgid "Failed to load %s: %s\n"
 msgstr "ç?¡æ³?è¼?å?¥ %sï¼?%s\n"
 
-#: ../applets/wncklet/showdesktop.c:182
+#: ../applets/wncklet/showdesktop.c:183
 msgid "Icon not found"
 msgstr "å??ç¤ºä¸?å?å?¨"
 
-#: ../applets/wncklet/showdesktop.c:241
+#: ../applets/wncklet/showdesktop.c:245
 msgid "Click here to restore hidden windows."
 msgstr "æ??ä¸?é??è£?å?¯ä»¥å°?æ??æ??å·²ç¶?é?±è??ç??è¦?çª?å??å¾©å??ç??ã??"
 
-#: ../applets/wncklet/showdesktop.c:243
+#: ../applets/wncklet/showdesktop.c:247
 msgid "Click here to hide all windows and show the desktop."
 msgstr "æ??ä¸?é??è£?å?¯ä»¥é?±è??æ??æ??è¦?çª?ä¸¦é¡¯ç¤ºæ¡?é?¢ã??"
 
-#: ../applets/wncklet/showdesktop.c:453 ../applets/wncklet/showdesktop.c:534
+#: ../applets/wncklet/showdesktop.c:459 ../applets/wncklet/showdesktop.c:543
 msgid "Show Desktop Button"
 msgstr "é¡¯ç¤ºæ¡?é?¢æ??é??"
 
-#: ../applets/wncklet/showdesktop.c:536
+#: ../applets/wncklet/showdesktop.c:545
 msgid "This button lets you hide all windows and show the desktop."
 msgstr "æ?¬æ??é??å?¯ä»¥é?±è??æ??æ??è¦?çª?ä¸¦é¡¯ç¤ºæ¡?é?¢ã??"
 
-#: ../applets/wncklet/showdesktop.c:566
+#: ../applets/wncklet/showdesktop.c:575
 msgid ""
 "Your window manager does not support the show desktop button, or you are not "
 "running a window manager."
 msgstr "ä½ ä½¿ç?¨ç??è¦?çª?ç¸½ç??å?¡ä¸?æ?¯æ?´ã??é¡¯ç¤ºæ¡?é?¢ã??æ??é??ï¼?æ??æ?¯ä½ æ ¹æ?¬æ²?æ??å?·è¡?ä»»ä½?è¦?çª?ç¸½ç??å?¡ã??"
 
-#: ../applets/wncklet/window-list.c:611
+#: ../applets/wncklet/window-list.c:612
+msgid "Window List"
+msgstr "è¦?çª?æ¸?å?®"
+
+#: ../applets/wncklet/window-list.c:614
 msgid ""
 "The Window List shows a list of all windows in a set of buttons and lets you "
 "browse them."
@@ -1168,40 +1065,48 @@ msgstr "æ¤è¨å®?é?µå?¨ GNOME 2.20 å·²ä¸?å??ä½¿ç?¨ã??å®?ç??å?å?¨ç´?ç²¹æ?¯ç?ºäº?
 msgid "When to group windows"
 msgstr "ä½?æ??å??ä½µå??é¡?ç??è¦?çª?"
 
-#: ../applets/wncklet/window-menu.c:86
+#: ../applets/wncklet/window-menu.c:80 ../applets/wncklet/window-menu.c:247
+msgid "Window Selector"
+msgstr "è¦?çª?é?¸æ??ç¨?å¼?"
+
+#: ../applets/wncklet/window-menu.c:84
 msgid ""
 "The Window Selector shows a list of all windows in a menu and lets you "
 "browse them."
 msgstr "ã??è¦?çª?é?¸æ??ç¨?å¼?ã??æ??å?¨é?¸å?®ä¸é¡¯ç¤ºè¦?çª?æ¸?å?®ä»¥ä¾?ç??è¦½ã??"
 
-#: ../applets/wncklet/workspace-switcher.c:214
-#: ../applets/wncklet/workspace-switcher.c:976
+#: ../applets/wncklet/workspace-switcher.c:211
+#: ../applets/wncklet/workspace-switcher.c:974
 #: ../applets/wncklet/workspace-switcher.ui.h:10
 msgid "rows"
 msgstr "å??"
 
-#: ../applets/wncklet/workspace-switcher.c:214
-#: ../applets/wncklet/workspace-switcher.c:976
+#: ../applets/wncklet/workspace-switcher.c:211
+#: ../applets/wncklet/workspace-switcher.c:974
 msgid "columns"
 msgstr "è¡?"
 
-#: ../applets/wncklet/workspace-switcher.c:488
+#: ../applets/wncklet/workspace-switcher.c:492
 #, c-format
 msgid "Error loading num_rows value for Workspace Switcher: %s\n"
 msgstr "è¼?å?¥ã??å·¥ä½?å??å??æ??ç¨?å¼?ã??ä¸ç?? num_rows æ?¸å?¼æ??å?ºç?¾é?¯èª¤ï¼?%s\n"
 
-#: ../applets/wncklet/workspace-switcher.c:499
+#: ../applets/wncklet/workspace-switcher.c:503
 #, c-format
 msgid ""
 "Error loading display_workspace_names value for Workspace Switcher: %s\n"
 msgstr "è¼?å?¥ã??å·¥ä½?å??å??æ??ç¨?å¼?ã??ä¸ç?? display_workspace_names æ?¸å?¼æ??å?ºç?¾é?¯èª¤ï¼?%s\n"
 
-#: ../applets/wncklet/workspace-switcher.c:514
+#: ../applets/wncklet/workspace-switcher.c:518
 #, c-format
 msgid "Error loading display_all_workspaces value for Workspace Switcher: %s\n"
 msgstr "è¼?å?¥ã??å·¥ä½?å??å??æ??ç¨?å¼?ã??ä¸ç?? display_all_workspaces æ?¸å?¼æ??å?ºç?¾é?¯èª¤ï¼?%s\n"
 
-#: ../applets/wncklet/workspace-switcher.c:626
+#: ../applets/wncklet/workspace-switcher.c:622
+msgid "Workspace Switcher"
+msgstr "å·¥ä½?å??å??æ??ç¨?å¼?"
+
+#: ../applets/wncklet/workspace-switcher.c:624
 msgid ""
 "The Workspace Switcher shows you a small version of your workspaces that "
 "lets you manage your windows."
@@ -1276,6 +1181,164 @@ msgid ""
 "only relevant if the display_all_workspaces key is true."
 msgstr "æ?¬è¨å®?é?µæ??æ±ºå®?ã??å·¥ä½?å??å??æ??ç¨?å¼?ã??ä½¿ç?¨å¤?å°?å??ï¼?æ°´å¹³æ??å??ï¼?æ??å¤?å°?è¡?ï¼?å??ç?´æ??å??ï¼?ä¾?é¡¯ç¤ºå·¥ä½?å??ã??æ?¬è¨å®?é?µæ??å?¨ display_all_workspaces key è¨å®?ç?ºâ??trueâ??æ??æ??ç??æ??ã??"
 
+#: ../bonobo/libpanel-applet/GNOME_Panel_TestApplet.server.in.h:1
+msgid "A simple applet for testing the GNOME-2.0 panel"
+msgstr "ç?¨ä¾?æ¸¬è©¦ GNOME-2.0 é?¢æ?¿ç??ç°¡å?®é?¢æ?¿ç¨?å¼?"
+
+#: ../bonobo/libpanel-applet/GNOME_Panel_TestApplet.server.in.h:2
+msgid "Test Bonobo Applet"
+msgstr "Bonobo é?¢æ?¿æ¸¬è©¦ç¨?å¼?"
+
+#: ../bonobo/libpanel-applet/GNOME_Panel_TestApplet.server.in.h:3
+msgid "Test Bonobo Applet Factory"
+msgstr "Bonobo é?¢æ?¿æ¸¬è©¦ç¨?å¼?å·¥å» "
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:34
+#: ../gnome-panel/panel-test-applets.c:36
+msgid "Specify an applet IID to load"
+msgstr "æ??å®?æº?å??è¼?å?¥ç??é?¢æ?¿ç¨?å¼?ç?? IID"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:35
+#: ../gnome-panel/panel-test-applets.c:37
+msgid ""
+"Specify a gconf location in which the applet preferences should be stored"
+msgstr "é?¢æ?¿ç¨?å¼?ç??å??å¥½è¨å®?æ??è©²å?²å?å?¨æ??å®?ç?? gconf ä½?ç½®"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:36
+#: ../gnome-panel/panel-test-applets.c:38
+msgid "Specify the initial size of the applet (xx-small, medium, large etc.)"
+msgstr "æ??å®?é?¢æ?¿ç¨?å¼?é??å§?æ??ç??å¤§å°?ï¼?è¶?å¾®å??ã??ä¸å??ã??å¤§å??ç?ã??ï¼?"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:37
+#: ../gnome-panel/panel-test-applets.c:39
+msgid ""
+"Specify the initial orientation of the applet (top, bottom, left or right)"
+msgstr "æ??å®?é?¢æ?¿ç¨?å¼?é??å§?é¡¯ç¤ºæ??ç??æ?¹å??ï¼?é ?é?¨ã??åº?é?¨ã??å·¦é??ã??å?³é??ï¼?"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:53
+#: ../gnome-panel/panel-properties-dialog.c:123
+#: ../gnome-panel/panel-test-applets.c:55
+msgctxt "Orientation"
+msgid "Top"
+msgstr "ä¸?"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:54
+#: ../gnome-panel/panel-properties-dialog.c:124
+#: ../gnome-panel/panel-test-applets.c:56
+msgctxt "Orientation"
+msgid "Bottom"
+msgstr "ä¸?"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:55
+#: ../gnome-panel/panel-properties-dialog.c:125
+#: ../gnome-panel/panel-test-applets.c:57
+msgctxt "Orientation"
+msgid "Left"
+msgstr "å·¦"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:56
+#: ../gnome-panel/panel-properties-dialog.c:126
+#: ../gnome-panel/panel-test-applets.c:58
+msgctxt "Orientation"
+msgid "Right"
+msgstr "å?³"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:61
+#: ../gnome-panel/panel-test-applets.c:63
+msgctxt "Size"
+msgid "XX Small"
+msgstr "è¶?å°?"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:62
+#: ../gnome-panel/panel-test-applets.c:64
+msgctxt "Size"
+msgid "X Small"
+msgstr "ç?¹å°?"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:63
+#: ../gnome-panel/panel-test-applets.c:65
+msgctxt "Size"
+msgid "Small"
+msgstr "å°?"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:64
+#: ../gnome-panel/panel-test-applets.c:66
+msgctxt "Size"
+msgid "Medium"
+msgstr "ä¸"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:65
+#: ../gnome-panel/panel-test-applets.c:67
+msgctxt "Size"
+msgid "Large"
+msgstr "å¤§"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:66
+#: ../gnome-panel/panel-test-applets.c:68
+msgctxt "Size"
+msgid "X Large"
+msgstr "ç?¹å¤§"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:67
+#: ../gnome-panel/panel-test-applets.c:69
+msgctxt "Size"
+msgid "XX Large"
+msgstr "è¶?å¤§"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:129
+#: ../gnome-panel/panel-test-applets.c:127
+#, c-format
+msgid "Failed to load applet %s"
+msgstr "è¼?å?¥é?¢æ?¿ç¨?å¼? %s å¤±æ??"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:249
+#, c-format
+msgid "query returned exception %s\n"
+msgstr "è©¢å??æ??å??å?³äº?ä¾?å¤?æ??æ³? %s\n"
+
+#. This is an utility to easily test various applets
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.ui.h:2
+#: ../gnome-panel/panel-test-applets.ui.h:2
+msgid "Test applet utility"
+msgstr "é?¢æ?¿ç¨?å¼?æ¸¬è©¦å·¥å?·"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.ui.h:3
+#: ../gnome-panel/panel-test-applets.ui.h:3
+msgid "_Applet:"
+msgstr "é?¢æ?¿ç¨?å¼?(_A):"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.ui.h:4
+#: ../gnome-panel/panel-properties-dialog.ui.h:23
+#: ../gnome-panel/panel-test-applets.ui.h:4
+msgid "_Orientation:"
+msgstr "ä½?ç½®(_O):"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.ui.h:5
+#: ../gnome-panel/panel-test-applets.ui.h:5
+msgid "_Prefs Dir:"
+msgstr "å??å¥½è¨å®?ç?®é??(_P):"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.ui.h:6
+#: ../gnome-panel/panel-properties-dialog.ui.h:25
+#: ../gnome-panel/panel-test-applets.ui.h:6
+msgid "_Size:"
+msgstr "å¤§å°?(_S):"
+
+#: ../bonobo/panel-module/GNOME_Panel_Popup.xml.h:1
+#: ../gnome-panel/applet.c:554 ../libpanel-applet/panel-applet.c:145
+msgid "Loc_k To Panel"
+msgstr "å?¨é?¢æ?¿é??å®?(_L)"
+
+#: ../bonobo/panel-module/GNOME_Panel_Popup.xml.h:2
+#: ../gnome-panel/applet.c:537 ../libpanel-applet/panel-applet.c:139
+msgid "_Move"
+msgstr "ç§»å??(_M)"
+
+#: ../bonobo/panel-module/GNOME_Panel_Popup.xml.h:3
+#: ../gnome-panel/applet.c:526 ../libpanel-applet/panel-applet.c:136
+msgid "_Remove From Panel"
+msgstr "å¾?é?¢æ?¿ä¸ç§»é?¤(_R)"
+
 #: ../gnome-panel/libegg/eggdesktopfile.c:165
 #, c-format
 msgid "File is not a valid .desktop file"
@@ -1345,8 +1408,8 @@ msgstr "é¡¯ç¤ºä½?æ¥é??æ®µç®¡ç??é?¸é ?"
 #. * http://bugzilla.gnome.org/show_bug.cgi?id=165132
 #. FIXME: http://bugzilla.gnome.org/show_bug.cgi?id=165132
 #: ../gnome-panel/libpanel-util/panel-error.c:82
-#: ../gnome-panel/panel-applet-frame.c:1000
-#: ../gnome-panel/panel-applet-frame.c:1088
+#: ../gnome-panel/panel-applet-frame.c:745
+#: ../gnome-panel/panel-applet-frame.c:915
 msgid "Error"
 msgstr "é?¯èª¤"
 
@@ -1373,28 +1436,16 @@ msgstr "ç?¡æ³?é??å??ä½?ç½®â??%sâ??"
 msgid "No application to handle search folders is installed."
 msgstr "å°?æ?ªå®?è£?ç?¨ä¾?è??ç??æ??å°?è³?æ??å¤¾ç??æ??ç?¨ç¨?å¼?ã??"
 
-#: ../gnome-panel/GNOME_Panel_Popup.xml.h:1 ../gnome-panel/applet.c:544
-msgid "Loc_k To Panel"
-msgstr "å?¨é?¢æ?¿é??å®?(_L)"
-
-#: ../gnome-panel/GNOME_Panel_Popup.xml.h:2 ../gnome-panel/applet.c:527
-msgid "_Move"
-msgstr "ç§»å??(_M)"
-
-#: ../gnome-panel/GNOME_Panel_Popup.xml.h:3 ../gnome-panel/applet.c:516
-msgid "_Remove From Panel"
-msgstr "å¾?é?¢æ?¿ä¸ç§»é?¤(_R)"
-
-#: ../gnome-panel/applet.c:437
+#: ../gnome-panel/applet.c:447
 msgid "???"
 msgstr "???"
 
-#: ../gnome-panel/applet.c:1321
+#: ../gnome-panel/applet.c:1346
 msgid "Cannot find an empty spot"
 msgstr "æ²?æ??ç©ºä½?"
 
-#: ../gnome-panel/drawer.c:350 ../gnome-panel/panel-addto.c:175
-#: ../gnome-panel/panel-toplevel.c:1624
+#: ../gnome-panel/drawer.c:350 ../gnome-panel/panel-addto.c:174
+#: ../gnome-panel/panel-toplevel.c:1626
 msgid "Drawer"
 msgstr "æ?½å±?"
 
@@ -1440,7 +1491,7 @@ msgid ""
 "show the time, etc."
 msgstr "å?·è¡?å?¶ä»?ç??æ??ç?¨ç¨?å¼?ä»¥æ??ä¾?å??ç¨®å·¥å?·ä¾?ç®¡ç??è¦?çª?ã??é¡¯ç¤ºæ??å?»ç?ã??"
 
-#: ../gnome-panel/gnome-panel.desktop.in.in.h:2 ../gnome-panel/main.c:100
+#: ../gnome-panel/gnome-panel.desktop.in.in.h:2 ../gnome-panel/main.c:93
 msgid "Panel"
 msgstr "é?¢æ?¿"
 
@@ -1475,37 +1526,37 @@ msgstr "å??å??å??ç¤º(_L)"
 msgid "Key %s is not set, cannot load launcher\n"
 msgstr "è¨å®?é?µ %s ä¸¦æ?ªè¨å®?ï¼?ç?¡æ³?è¼?å?¥å??å??å??ç¤º\n"
 
-#: ../gnome-panel/launcher.c:966 ../gnome-panel/panel-ditem-editor.c:1357
-#: ../gnome-panel/panel-ditem-editor.c:1391
-#: ../gnome-panel/panel-ditem-editor.c:1422
+#: ../gnome-panel/launcher.c:966 ../gnome-panel/panel-ditem-editor.c:1361
+#: ../gnome-panel/panel-ditem-editor.c:1395
+#: ../gnome-panel/panel-ditem-editor.c:1426
 msgid "Could not save launcher"
 msgstr "ç?¡æ³?å?²å?å??å??å??ç¤º"
 
-#: ../gnome-panel/main.c:47
+#: ../gnome-panel/main.c:45
 msgid "Replace a currently running panel"
 msgstr "æ?¿æ??ç?®å??å?·è¡?ç??é?¢æ?¿"
 
-#: ../gnome-panel/menu.c:914
+#: ../gnome-panel/menu.c:916
 msgid "Add this launcher to _panel"
 msgstr "å°?æ¤å??å??å??ç¤ºå? å?¥é?¢æ?¿(_P)"
 
-#: ../gnome-panel/menu.c:921
+#: ../gnome-panel/menu.c:923
 msgid "Add this launcher to _desktop"
 msgstr "å°?æ¤å??å??å??ç¤ºå? å?¥æ¡?é?¢(_D)"
 
-#: ../gnome-panel/menu.c:933
+#: ../gnome-panel/menu.c:935
 msgid "_Entire menu"
 msgstr "æ?´å??é?¸å?®(_E)"
 
-#: ../gnome-panel/menu.c:938
+#: ../gnome-panel/menu.c:940
 msgid "Add this as _drawer to panel"
 msgstr "å°?æ¤æ?½å±?å? å?¥é?¢æ?¿(_D)"
 
-#: ../gnome-panel/menu.c:945
+#: ../gnome-panel/menu.c:947
 msgid "Add this as _menu to panel"
 msgstr "å°?æ¤é?¸å?®å? å?¥é?¢æ?¿(_M)"
 
-#: ../gnome-panel/nothing.cP:605
+#: ../gnome-panel/nothing.cP:609
 #, c-format
 msgid "<b>GAME OVER</b> at level %d!"
 msgstr "<b>é??æ?²çµ?æ??</b> æ?¼ç¬¬ %d é??ï¼?"
@@ -1514,40 +1565,40 @@ msgstr "<b>é??æ?²çµ?æ??</b> æ?¼ç¬¬ %d é??ï¼?"
 #. * title, and the second string is a small information text.
 #. * The spaces are there only to separate all the strings, so
 #. try to keep them as is.
-#: ../gnome-panel/nothing.cP:612
+#: ../gnome-panel/nothing.cP:616
 #, c-format
 msgid "%1$s   %2$s   %3$s"
 msgstr "%1$s   %2$s   %3$s"
 
-#: ../gnome-panel/nothing.cP:613
+#: ../gnome-panel/nothing.cP:617
 msgid "Press 'q' to quit"
 msgstr "æ??ä¸? ã??qã??é?¢é??"
 
-#: ../gnome-panel/nothing.cP:618
+#: ../gnome-panel/nothing.cP:622
 msgid "Paused"
 msgstr "å·²æ?«å??"
 
 #. Translators: the first string is a title and the second
 #. * string is a small information text.
-#: ../gnome-panel/nothing.cP:621 ../gnome-panel/nothing.cP:632
+#: ../gnome-panel/nothing.cP:625 ../gnome-panel/nothing.cP:636
 #, c-format
 msgid "%1$s\t%2$s"
 msgstr "%1$s\t%2$s"
 
-#: ../gnome-panel/nothing.cP:622
+#: ../gnome-panel/nothing.cP:626
 msgid "Press 'p' to unpause"
 msgstr "æ??ä¸? ã??pã??å??æ¶?æ?«å??"
 
-#: ../gnome-panel/nothing.cP:628
+#: ../gnome-panel/nothing.cP:632
 #, c-format
 msgid "Level: %s,  Lives: %s"
 msgstr "é??å?¡: %s, ç??å?½: %s"
 
-#: ../gnome-panel/nothing.cP:633
+#: ../gnome-panel/nothing.cP:637
 msgid "Left/Right to move, Space to fire, 'p' to pause, 'q' to quit"
 msgstr "å·¦/å?³æ?¹å??é?µå?¯ç§»å??ï¼?ç©ºç?½é?µç?¼å°?ï¼?ã??pã??æ?«å??ï¼?ã??qã??é?¢é??"
 
-#: ../gnome-panel/nothing.cP:1373
+#: ../gnome-panel/nothing.cP:1385
 msgid "Killer GEGLs from Outer Space"
 msgstr "å¤?å¤ªç©ºæ®ºæ?? GEGLs"
 
@@ -1599,7 +1650,7 @@ msgid "Locate documents and folders on this computer by name or content"
 msgstr "ä»¥å??ç¨±æ??å?§å®¹å°?æ?¾æ¤é?»è?¦ä¸ç??æ??ä»¶å??è³?æ??å¤¾"
 
 #: ../gnome-panel/panel-action-button.c:329
-#: ../gnome-panel/panel-force-quit.c:221
+#: ../gnome-panel/panel-force-quit.c:224
 msgid "Force Quit"
 msgstr "å¼·è¡?çµ?æ??"
 
@@ -1624,124 +1675,109 @@ msgstr "é??æ©?..."
 msgid "Shut down the computer"
 msgstr "é??é??é?»è?¦"
 
-#: ../gnome-panel/panel-addto.c:116
+#: ../gnome-panel/panel-addto.c:115
 msgid "Custom Application Launcher"
 msgstr "è?ªé?¸ç??ç¨?å¼?å??å??å??ç¤º"
 
-#: ../gnome-panel/panel-addto.c:117
+#: ../gnome-panel/panel-addto.c:116
 msgid "Create a new launcher"
 msgstr "æ?°å¢?å??å??å??ç¤º"
 
-#: ../gnome-panel/panel-addto.c:127
+#: ../gnome-panel/panel-addto.c:126
 msgid "Application Launcher..."
 msgstr "å??å??å??ç¤º..."
 
-#: ../gnome-panel/panel-addto.c:128
+#: ../gnome-panel/panel-addto.c:127
 msgid "Copy a launcher from the applications menu"
 msgstr "å¾?æ??ç?¨ç¨?å¼?é?¸å?®ä¸è¤?è£½å??å??å??ç¤º"
 
-#: ../gnome-panel/panel-addto.c:142 ../gnome-panel/panel-menu-button.c:1082
+#: ../gnome-panel/panel-addto.c:141 ../gnome-panel/panel-menu-button.c:1091
 msgid "Main Menu"
 msgstr "ä¸»é?¸å?®"
 
-#: ../gnome-panel/panel-addto.c:143
+#: ../gnome-panel/panel-addto.c:142
 msgid "The main GNOME menu"
 msgstr "GNOME ä¸»é?¸å?®"
 
-#: ../gnome-panel/panel-addto.c:153
+#: ../gnome-panel/panel-addto.c:152
 msgid "Menu Bar"
 msgstr "é?¸å?®å??"
 
-#: ../gnome-panel/panel-addto.c:154
+#: ../gnome-panel/panel-addto.c:153
 msgid "A custom menu bar"
 msgstr "è?ªé?¸é?¸å?®å??"
 
-#: ../gnome-panel/panel-addto.c:164
+#: ../gnome-panel/panel-addto.c:163
 msgid "Separator"
 msgstr "å??é??ç·?"
 
-#: ../gnome-panel/panel-addto.c:165
+#: ../gnome-panel/panel-addto.c:164
 msgid "A separator to organize the panel items"
 msgstr "ç?¨ä½?æ?´ç??é?¢æ?¿é ?ç?®ç??å??é??ç·?"
 
-#: ../gnome-panel/panel-addto.c:176
+#: ../gnome-panel/panel-addto.c:175
 msgid "A pop out drawer to store other items in"
 msgstr "å?¯é?¨æ??å½?å?ºä¾?ç??æ?½å±?ï¼?ç?¨ä¾?å?²å?å?¶å®?å??ç¤º"
 
-#: ../gnome-panel/panel-addto.c:267
+#: ../gnome-panel/panel-addto.c:256
 msgid "(empty)"
 msgstr "ï¼?ç©ºç?½ï¼?"
 
-#: ../gnome-panel/panel-addto.c:410
-#: ../libpanel-applet/panel-test-applets.c:249
-#, c-format
-msgid "query returned exception %s\n"
-msgstr "è©¢å??æ??å??å?³äº?ä¾?å¤?æ??æ³? %s\n"
-
-#: ../gnome-panel/panel-addto.c:1071
+#: ../gnome-panel/panel-addto.c:1026
 #, c-format
 msgid "Find an _item to add to \"%s\":"
 msgstr "å°?æ?¾å? å?¥è?³â??%sâ??ç??é ?ç?®(_I):"
 
-#: ../gnome-panel/panel-addto.c:1075
+#: ../gnome-panel/panel-addto.c:1030
 #, c-format
 msgid "Add to Drawer"
 msgstr "å? å?¥è?³æ?½å±?"
 
-#: ../gnome-panel/panel-addto.c:1077
+#: ../gnome-panel/panel-addto.c:1032
 msgid "Find an _item to add to the drawer:"
 msgstr "å°?æ?¾å? å?¥è?³æ?½å±?ç??é ?ç?®(_I):"
 
-#: ../gnome-panel/panel-addto.c:1079
+#: ../gnome-panel/panel-addto.c:1034
 #, c-format
 msgid "Add to Panel"
 msgstr "å? å?¥é?¢æ?¿"
 
-#: ../gnome-panel/panel-addto.c:1081
+#: ../gnome-panel/panel-addto.c:1036
 msgid "Find an _item to add to the panel:"
 msgstr "å°?æ?¾å? å?¥è?³é?¢æ?¿ç??é ?ç?®(_I):"
 
-#: ../gnome-panel/panel-applet-frame.c:844
-#, c-format
-msgid "Exception from popup_menu '%s'\n"
-msgstr "popup_menuâ??%sâ??å?ºç?¾ä¾?å¤?æ??æ³?\n"
-
-#: ../gnome-panel/panel-applet-frame.c:969
+#: ../gnome-panel/panel-applet-frame.c:714
 #, c-format
 msgid "\"%s\" has quit unexpectedly"
 msgstr "â??%sâ??å?¨ç?¡æ³?é ?è¨?ç??æ??æ³?ä¸?é?¢é??"
 
-#: ../gnome-panel/panel-applet-frame.c:971
+#: ../gnome-panel/panel-applet-frame.c:716
 msgid "Panel object has quit unexpectedly"
 msgstr "é?¢æ?¿ç?©ä»¶å?¨ç?¡æ³?é ?è¨?ç??æ??æ³?ä¸?é?¢é??"
 
-#: ../gnome-panel/panel-applet-frame.c:978
+#: ../gnome-panel/panel-applet-frame.c:723
 msgid ""
 "If you reload a panel object, it will automatically be added back to the "
 "panel."
 msgstr "å¦?æ??é??æ?°è¼?å?¥é?¢ç??ç?©ä»¶ï¼?å®?æ??è?ªå??å?°å? å?¥å?°é?¢æ?¿ä¸ã??"
 
-#: ../gnome-panel/panel-applet-frame.c:984
+#: ../gnome-panel/panel-applet-frame.c:729
 msgid "_Don't Reload"
 msgstr "ä¸?è¦?é??æ?°è¼?å?¥(_D)"
 
-#: ../gnome-panel/panel-applet-frame.c:985
+#: ../gnome-panel/panel-applet-frame.c:730
 msgid "_Reload"
 msgstr "é??æ?°è¼?å?¥(_R)"
 
-#: ../gnome-panel/panel-applet-frame.c:1051
+#: ../gnome-panel/panel-applet-frame.c:878
 #, c-format
 msgid "The panel encountered a problem while loading \"%s\"."
 msgstr "è¼?å?¥â??%sâ??æ??é?¢æ?¿å?ºç?¾å??é¡?ã??"
 
-#: ../gnome-panel/panel-applet-frame.c:1067
+#: ../gnome-panel/panel-applet-frame.c:894
 msgid "Do you want to delete the applet from your configuration?"
 msgstr "æ?¯å?¦è¦?å?¨ä½ ç??è¨å®?ä¸å?ªé?¤é?¢æ?¿ç¨?å¼?ï¼?"
 
-#: ../gnome-panel/panel-applet-frame.c:1141
-msgid "Unable to obtain AppletShell interface from control\n"
-msgstr "ç?¡æ³?å¾? control å??å¾? AppletShell ä»?é?¢\n"
-
 #: ../gnome-panel/panel-context-menu.c:104
 msgid "And many, many others..."
 msgstr "é??æ??å¾?å¤?äºº..."
@@ -1797,75 +1833,75 @@ msgid "Location"
 msgstr "ä½?ç½®"
 
 #. Type
-#: ../gnome-panel/panel-ditem-editor.c:618
+#: ../gnome-panel/panel-ditem-editor.c:622
 msgid "_Type:"
 msgstr "é¡?å??(_T):"
 
 #. Name
-#: ../gnome-panel/panel-ditem-editor.c:625
+#: ../gnome-panel/panel-ditem-editor.c:629
 msgid "_Name:"
 msgstr "å??ç¨±(_N):"
 
-#: ../gnome-panel/panel-ditem-editor.c:652
+#: ../gnome-panel/panel-ditem-editor.c:656
 msgid "_Browse..."
 msgstr "ç??è¦½(_B)..."
 
 #. Comment
-#: ../gnome-panel/panel-ditem-editor.c:659
+#: ../gnome-panel/panel-ditem-editor.c:663
 msgid "Co_mment:"
 msgstr "å??è¨»(_M):"
 
-#: ../gnome-panel/panel-ditem-editor.c:1008
+#: ../gnome-panel/panel-ditem-editor.c:1012
 msgid "Choose an application..."
 msgstr "é?¸æ??ç¨?å¼?..."
 
-#: ../gnome-panel/panel-ditem-editor.c:1012
+#: ../gnome-panel/panel-ditem-editor.c:1016
 msgid "Choose a file..."
 msgstr "é?¸æ??æª?æ¡?..."
 
-#: ../gnome-panel/panel-ditem-editor.c:1177
-#: ../gnome-panel/panel-ditem-editor.c:1186
+#: ../gnome-panel/panel-ditem-editor.c:1181
+#: ../gnome-panel/panel-ditem-editor.c:1190
 msgid "Comm_and:"
 msgstr "æ??ä»¤(_A):"
 
-#: ../gnome-panel/panel-ditem-editor.c:1195
+#: ../gnome-panel/panel-ditem-editor.c:1199
 msgid "_Location:"
 msgstr "ä½?ç½®(_L):"
 
-#: ../gnome-panel/panel-ditem-editor.c:1358
+#: ../gnome-panel/panel-ditem-editor.c:1362
 msgid "The name of the launcher is not set."
 msgstr "å??å??å??ç¤ºç??å??ç¨±ä¸¦æ?ªè¨å®?ã??"
 
-#: ../gnome-panel/panel-ditem-editor.c:1362
+#: ../gnome-panel/panel-ditem-editor.c:1366
 msgid "Could not save directory properties"
 msgstr "ç?¡æ³?å?²å?ç?®é??å±¬æ?§"
 
-#: ../gnome-panel/panel-ditem-editor.c:1363
+#: ../gnome-panel/panel-ditem-editor.c:1367
 msgid "The name of the directory is not set."
 msgstr "æ¤ç?®é??ç??å??ç¨±ä¸¦æ?ªè¨å®?ã??"
 
-#: ../gnome-panel/panel-ditem-editor.c:1379
+#: ../gnome-panel/panel-ditem-editor.c:1383
 msgid "The command of the launcher is not set."
 msgstr "å??å??å??ç¤ºç??æ??ä»¤ä¸¦æ?ªè¨å®?ã??"
 
-#: ../gnome-panel/panel-ditem-editor.c:1382
+#: ../gnome-panel/panel-ditem-editor.c:1386
 msgid "The location of the launcher is not set."
 msgstr "å??å??å??ç¤ºç??ä½?ç½®ä¸¦æ?ªè¨å®?ã??"
 
-#: ../gnome-panel/panel-ditem-editor.c:1459
+#: ../gnome-panel/panel-ditem-editor.c:1463
 msgid "Could not display help document"
 msgstr "ç?¡æ³?é¡¯ç¤ºèªªæ??æ??ä»¶"
 
-#: ../gnome-panel/panel-force-quit.c:76
+#: ../gnome-panel/panel-force-quit.c:77
 msgid ""
 "Click on a window to force the application to quit. To cancel press <ESC>."
 msgstr "æ??ä¸?ä»»ä½?ä¸?å??è¦?çª?é?½å?¯ä»¥å¼·è¡?çµ?æ??è©²ç¨?å¼?ã??å¦?æ??æ?³å??æ¶?ï¼?è«?æ?? <ESC>ã??"
 
-#: ../gnome-panel/panel-force-quit.c:204
+#: ../gnome-panel/panel-force-quit.c:207
 msgid "Force this application to exit?"
 msgstr "å¼·è¡?çµ?æ??é??å??æ??ç?¨ç¨?å¼?ï¼?"
 
-#: ../gnome-panel/panel-force-quit.c:207
+#: ../gnome-panel/panel-force-quit.c:210
 msgid ""
 "If you choose to force an application to exit, unsaved changes in any open "
 "documents in it might get lost."
@@ -2056,7 +2092,7 @@ msgstr "æ?´æ?¹æ¡?é?¢ç??å¤?è§?å??é??ä½?æ?¹å¼?ï¼?å??å¾?å??å?©æ??ç?»å?º"
 msgid "Applications"
 msgstr "æ??ç?¨ç¨?å¼?"
 
-#: ../gnome-panel/panel-menu-bar.c:353 ../gnome-panel/panel-menu-button.c:669
+#: ../gnome-panel/panel-menu-bar.c:358 ../gnome-panel/panel-menu-button.c:670
 msgid "_Edit Menus"
 msgstr "ç·¨è¼¯é?¸å?®(_E)"
 
@@ -2065,60 +2101,60 @@ msgid "Bookmarks"
 msgstr "æ?¸ç±¤"
 
 #. Translators: %s is a URI
-#: ../gnome-panel/panel-menu-items.c:494 ../gnome-panel/panel.c:534
+#: ../gnome-panel/panel-menu-items.c:495 ../gnome-panel/panel.c:541
 #, c-format
 msgid "Open '%s'"
 msgstr "é??å??ã??%sã??"
 
-#: ../gnome-panel/panel-menu-items.c:562
+#: ../gnome-panel/panel-menu-items.c:566
 #, c-format
 msgid "Unable to scan %s for media changes"
 msgstr "ç?¡æ³?æ??æ?? %s ä»¥å??å¾?åª?é«?ç??æ?´æ?¹"
 
-#: ../gnome-panel/panel-menu-items.c:605
+#: ../gnome-panel/panel-menu-items.c:609
 #, c-format
 msgid "Rescan %s"
 msgstr "é??æ?°æ??æ?? %s"
 
-#: ../gnome-panel/panel-menu-items.c:642
+#: ../gnome-panel/panel-menu-items.c:646
 #, c-format
 msgid "Unable to mount %s"
 msgstr "ç?¡æ³?æ??è¼? %s"
 
-#: ../gnome-panel/panel-menu-items.c:705
+#: ../gnome-panel/panel-menu-items.c:709
 #, c-format
 msgid "Mount %s"
 msgstr "æ??è¼? %s"
 
-#: ../gnome-panel/panel-menu-items.c:913
+#: ../gnome-panel/panel-menu-items.c:917
 msgid "Removable Media"
 msgstr "æ?½å??å¼?åª?é«?"
 
-#: ../gnome-panel/panel-menu-items.c:1000
+#: ../gnome-panel/panel-menu-items.c:1004
 msgid "Network Places"
 msgstr "ç¶²çµ¡ä½?ç½®"
 
-#: ../gnome-panel/panel-menu-items.c:1039
+#: ../gnome-panel/panel-menu-items.c:1043
 msgid "Open your personal folder"
 msgstr "é??å??ä½ ç??å??äººè³?æ??å¤¾"
 
 #. Translators: Desktop is used here as in
 #. * "Desktop Folder" (this is not the Desktop
 #. * environment).
-#: ../gnome-panel/panel-menu-items.c:1058
+#: ../gnome-panel/panel-menu-items.c:1062
 msgctxt "Desktop Folder"
 msgid "Desktop"
 msgstr "æ¡?é?¢"
 
-#: ../gnome-panel/panel-menu-items.c:1059
+#: ../gnome-panel/panel-menu-items.c:1063
 msgid "Open the contents of your desktop in a folder"
 msgstr "ä»¥è³?æ??å¤¾å½¢å¼?é??å??æ¡?é?¢ä¸ç??æ?±è¥¿"
 
-#: ../gnome-panel/panel-menu-items.c:1450
+#: ../gnome-panel/panel-menu-items.c:1454
 msgid "Places"
 msgstr "ä½?ç½®"
 
-#: ../gnome-panel/panel-menu-items.c:1479
+#: ../gnome-panel/panel-menu-items.c:1483
 msgid "System"
 msgstr "ç³»çµ±"
 
@@ -2127,7 +2163,7 @@ msgstr "ç³»çµ±"
 #. * but "1" if "Log Out %s" doesn't make any sense in your
 #. * language (where %s is a username).
 #.
-#: ../gnome-panel/panel-menu-items.c:1560
+#: ../gnome-panel/panel-menu-items.c:1564
 msgctxt "panel:showusername"
 msgid "1"
 msgstr "1"
@@ -2136,14 +2172,14 @@ msgstr "1"
 #. * panel-action-button.c
 #. Translators: this string is used ONLY if you translated
 #. * "1" (msgctxt: "panel:showusername") to "1"
-#: ../gnome-panel/panel-menu-items.c:1572
+#: ../gnome-panel/panel-menu-items.c:1576
 #, c-format
 msgid "Log Out %s..."
 msgstr "ç?»å?º %s..."
 
 #. Translators: this string is used ONLY if you translated
 #. * "1" (msgctxt: "panel:showusername") to "1"
-#: ../gnome-panel/panel-menu-items.c:1576
+#: ../gnome-panel/panel-menu-items.c:1580
 #, c-format
 msgid "Log out %s of this session to log in as a different user"
 msgstr "ç?»å?º %s é??å??ä½?æ¥é??æ®µï¼?ç?¶å¾?ä»¥å?¶å®?ä½¿ç?¨è??ç?»å?¥"
@@ -2157,69 +2193,67 @@ msgid "Applet Bonobo IID"
 msgstr "é?¢æ?¿ç¨?å¼?ç?? Bonobo IID"
 
 #: ../gnome-panel/panel-object.schemas.in.h:3
+msgid "Applet IID"
+msgstr "Applet IID"
+
+#: ../gnome-panel/panel-object.schemas.in.h:4
 msgid "Icon used for object's button"
 msgstr "æ??é??æ??ç?¨ç??å??ç¤º"
 
-#: ../gnome-panel/panel-object.schemas.in.h:4
+#: ../gnome-panel/panel-object.schemas.in.h:5
 msgid ""
 "If true, the custom_icon key is used as a custom icon for the button. If "
 "false, the custom_icon key is ignored. This key is only relevant if the "
 "object_type key is \"menu-object\" or \"drawer-object\"."
 msgstr "å¦?è¨å®?ç?ºâ??trueâ??ï¼?å??æ??ä½¿ç?¨ custom_icon è¨å®?ä¸æ??å®?ç??å??ç¤ºä½?ç?ºæ??é??å??ç¤ºï¼?å?¦å??ä¸?æ??ç??æ?? custom_icon è¨å®?ã??å?ªæ?? object_type æ?¯â??menu-objectâ??æ??â??drawer-objectâ??æ??ï¼?æ?¬è¨é?µå®?æ?¹æ??ç??æ??ã??"
 
-#: ../gnome-panel/panel-object.schemas.in.h:5
+#: ../gnome-panel/panel-object.schemas.in.h:6
 msgid ""
 "If true, the menu_path key is used as the path from which the menu contents "
 "should be constructed. If false, the menu_path key is ignored. This key is "
 "only relevant if the object_type key is \"menu-object\"."
 msgstr "å¦?è¨å®?ç?ºâ??trueâ??ï¼?å??æ??ä½¿ç?¨ menu_path è¨å®?ä¸æ??å®?ç??è·¯å¾?ä½?ç?ºå?ºç¤?ä¾?ç?¢ç??é?¸å?®ï¼?å?¦å??ä¸?æ??ç??æ?? menu_path è¨å®?ã??å?ªæ?? object_type æ?¯â??menu-objectâ??æ??ï¼?æ?¬è¨å®?é?µæ?¹æ??ç??æ??ã??"
 
-#: ../gnome-panel/panel-object.schemas.in.h:6
+#: ../gnome-panel/panel-object.schemas.in.h:7
 msgid ""
 "If true, the position of the object is interpreted relative to the right (or "
 "bottom if vertical) edge of the panel."
 msgstr "å¦?è¨å®?ç?ºâ??trueâ??ï¼?é?¢æ?¿ç?©ä»¶ç??ä½?ç½®æ??å¾?é?¢æ?¿ç??å?³é??ï¼?æ??è??å??ç?´é?¢æ?¿ç??åº?é?¨ï¼?é??å§?è¨?ç®?ã??"
 
-#: ../gnome-panel/panel-object.schemas.in.h:7
+#: ../gnome-panel/panel-object.schemas.in.h:8
 msgid ""
 "If true, the user may not move the applet without first unlocking the object "
 "using the \"Unlock\" menuitem."
 msgstr "å¦?è¨å®?ç?ºâ??trueâ??ï¼?ä½¿ç?¨è??å¿?é ?å?¨é?¸å?®ä¸é?¸å??ã??ä¸?é??å®?ä½?ç½®ã??ï¼?æ??å?¯ä»¥ç§»å??é?¢æ?¿ç¨?å¼?ã??"
 
-#: ../gnome-panel/panel-object.schemas.in.h:8
+#: ../gnome-panel/panel-object.schemas.in.h:9
 msgid "Interpret position relative to bottom/right edge"
 msgstr "å¾?å?³é??/åº?é?¨é??å§?è¨?ç®?é?¢æ?¿ç?©ä»¶ç??ä½?ç½®"
 
-#: ../gnome-panel/panel-object.schemas.in.h:9
+#: ../gnome-panel/panel-object.schemas.in.h:10
 msgid "Launcher location"
 msgstr "å??å??å??ç¤ºç??ä½?ç½®"
 
-#: ../gnome-panel/panel-object.schemas.in.h:10
+#: ../gnome-panel/panel-object.schemas.in.h:11
 msgid "Lock the object to the panel"
 msgstr "å°?é?¢æ?¿ä¸ç??ç?©ä»¶é??å®?ä½?ç½®"
 
-#: ../gnome-panel/panel-object.schemas.in.h:11
+#: ../gnome-panel/panel-object.schemas.in.h:12
 msgid "Menu content path"
 msgstr "é?¸å?®å?§å®¹ç??è·¯å¾?"
 
-#: ../gnome-panel/panel-object.schemas.in.h:12
+#: ../gnome-panel/panel-object.schemas.in.h:13
 msgid "Object's position on the panel"
 msgstr "ç?©ä»¶å?¨é?¢æ?¿ä¸ç??ä½?ç½®"
 
-#: ../gnome-panel/panel-object.schemas.in.h:13
+#: ../gnome-panel/panel-object.schemas.in.h:14
 msgid "Panel attached to drawer"
 msgstr "æ?¬æ?½å±?æ??é?£æ?¥ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-object.schemas.in.h:14
+#: ../gnome-panel/panel-object.schemas.in.h:15
 msgid "Panel object type"
 msgstr "é?¢æ?¿ç?©ä»¶é¡?å??"
 
-#: ../gnome-panel/panel-object.schemas.in.h:15
-msgid ""
-"The Bonobo implementation ID of the applet - e.g. \"OAFIID:GNOME_ClockApplet"
-"\". This key is only relevant if the object_type key is \"bonobo-applet\"."
-msgstr "é?¢æ?¿ç¨?å¼?ç?? Bonobo implementation ID - ä¾?å¦?â??OAFIID:GNOME_ClockAppletâ??ã??å?ªæ?? object_type æ?¯â??bonobo-appletâ??æ??æ?¬è¨å®?é?µæ?¹æ??ç??æ??ã??"
-
 #: ../gnome-panel/panel-object.schemas.in.h:16
 msgid ""
 "The action type this button represents. Possible values are \"lock\", "
@@ -2239,56 +2273,70 @@ msgstr "å??å?«æ?¬ç?©ä»¶ç??ç??ä¸?å±¤é?¢æ?¿ç??è?å?¥ç¢¼ã??"
 
 #: ../gnome-panel/panel-object.schemas.in.h:19
 msgid ""
+"The implementation ID of the applet - e.g. \"ClockAppletFactory::ClockApplet"
+"\". This key is only relevant if the object_type key is \"bonobo-applet\"."
+msgstr "é?¢æ?¿ç¨?å¼?ç??å¯¦ä½? ID - ä¾?å¦?ã??ClockAppletFactory::ClockAppletã??ã??å?ªæ??å?¨  object_type æ?¯ã??bonobo-appletã??æ??æ?¬è¨å®?é?µæ?¹æ??ç??æ??ã??"
+
+#: ../gnome-panel/panel-object.schemas.in.h:20
+msgid ""
 "The location of the .desktop file describing the launcher. This key is only "
 "relevant if the object_type key is \"launcher-object\"."
 msgstr "è©²å??å??å??ç¤ºç?? .desktop æª?æ¡?ä½?ç½®ã??å?ªæ??å?¨ object_type æ?¯â??launcher-objectâ??æ??ï¼?æ?¬è¨å®?æ?¹æ??ç??æ??ã??"
 
-#: ../gnome-panel/panel-object.schemas.in.h:20
+#: ../gnome-panel/panel-object.schemas.in.h:21
 msgid ""
 "The location of the image file used as the icon for the object's button. "
 "This key is only relevant if the object_type key is \"drawer-object\" or "
 "\"menu-object\" and the use_custom_icon key is true."
 msgstr "å??ç??æª?ä½?ç½®ï¼?ä½?ç?ºä»£è¡¨è©²ç?©ä»¶ç??å??ç¤ºã??å?ªæ?? object_type æ?¯â??drawer-objectâ??æ??â??menu-objectâ??å?? use_custom_icon ç?ºâ??trueâ??æ??ï¼?æ?¬è¨å®?é?µæ?¹æ??ç??æ??ã??"
 
-#: ../gnome-panel/panel-object.schemas.in.h:21
+#: ../gnome-panel/panel-object.schemas.in.h:22
 msgid ""
 "The path from which the menu contents is contructed. This key is only "
 "relevant if the use_menu_path key is true and the object_type key is \"menu-"
 "object\"."
 msgstr "ä½¿ç?¨å?ªå??è·¯å¾?ä½?ç?ºæ ¹ç?®é??ä¾?ç?¢ç??é?¸å?®ã??å?ªæ??å?¨ use_menu_path ç?ºâ??trueâ??å?? object_type æ?¯â??menu-objectâ??æ??ï¼?æ?¬è¨å®?é?µæ?¹æ??ç??æ??ã??"
 
-#: ../gnome-panel/panel-object.schemas.in.h:22
+#: ../gnome-panel/panel-object.schemas.in.h:23
 msgid ""
 "The position of this panel object. The position is specified by the number "
 "of pixels from the left (or top if vertical) panel edge."
 msgstr "è©²é?¢æ?¿ç?©ä»¶ç??ä½?ç½®ã??ä½?ç½®æ?¯å¾?é?¢æ?¿ç??å·¦é??ï¼?æ??è??å??ç?´é?¢æ?¿ç??é ?é?¨ï¼?é??å§?è¨?ç®?ã??"
 
-#: ../gnome-panel/panel-object.schemas.in.h:23
+#: ../gnome-panel/panel-object.schemas.in.h:24
 msgid ""
 "The text to display in a tooltip for this drawer or this menu. This key is "
 "only relevant if the object_type key is \"drawer-object\" or \"menu-object\"."
 msgstr "æ?¬æ?½å±?ç?©ä»¶æ??é?¸å?®ä¸é¡¯ç¤ºç??å·¥å?·æ??ç¤ºæ??å?ã??å?ªæ??å?¨ object_type æ?¯â??drawer-objectâ??æ??è??â??menu-objectâ??æ??ï¼?æ?¬è¨å®?æ?¹æ??ç??æ??ã??"
 
-#: ../gnome-panel/panel-object.schemas.in.h:24
+#: ../gnome-panel/panel-object.schemas.in.h:25
 msgid ""
 "The type of this panel object. Possible values are \"drawer-object\", \"menu-"
 "object\", \"launcher-object\", \"bonobo-applet\", \"action-applet\" and "
 "\"menu-bar\"."
 msgstr "æ?¬é?¢æ?¿ç?©ä»¶ç??é¡?å??ã??å?¯æ?¥å??ç??å?¼ç?ºï¼?â??drawer-objectâ??ã??â??menu-objectâ??ã??â??launcher-objectâ??ã??â??bonobo-appletâ??ã??â??action-appletâ??å??â??menu-barâ??ã??"
 
-#: ../gnome-panel/panel-object.schemas.in.h:25
+#: ../gnome-panel/panel-object.schemas.in.h:26
+msgid ""
+"This key is deprecated, following the migration to a new library for "
+"applets. The Bonobo implementation ID of the applet - e.g. \"OAFIID:"
+"GNOME_ClockApplet\". This key is only relevant if the object_type key is "
+"\"bonobo-applet\"."
+msgstr "é??å??è¨å®?é?µå·²å»¢æ£?ï¼?æ?¥ä¸?ä¾?æ??è©²è½?æ??å?°é?¢æ?¿ç¨?å¼?ç??æ?°ç¨?å¼?åº«ã??é?¢æ?¿ç¨?å¼?ç?? Bonobo implementation ID - ä¾?å¦?â??OAFIID:GNOME_ClockAppletâ??ã??å?ªæ?? object_type æ?¯â??bonobo-appletâ??æ??æ?¬è¨å®?é?µæ?¹æ??ç??æ??ã??"
+
+#: ../gnome-panel/panel-object.schemas.in.h:27
 msgid "Tooltip displayed for drawer or menu"
 msgstr "æ?½å±?æ??é?¸å?®ä¸é¡¯ç¤ºç??å·¥å?·æ??ç¤º"
 
-#: ../gnome-panel/panel-object.schemas.in.h:26
+#: ../gnome-panel/panel-object.schemas.in.h:28
 msgid "Toplevel panel containing object"
 msgstr "è¼?æ??è©²ç?©ä»¶ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-object.schemas.in.h:27
+#: ../gnome-panel/panel-object.schemas.in.h:29
 msgid "Use custom icon for object's button"
 msgstr "å?¨æ??é??ä¸ä½¿ç?¨è?ªé?¸å??ç¤º"
 
-#: ../gnome-panel/panel-object.schemas.in.h:28
+#: ../gnome-panel/panel-object.schemas.in.h:30
 msgid "Use custom path for menu contents"
 msgstr "ä½¿ç?¨è?ªé?¸ç??è·¯å¾?ä½?ç?ºé?¸å?®å?§å®¹"
 
@@ -2317,36 +2365,12 @@ msgstr "é?¢æ?¿â??%sâ??è¢«æ??å®?å?¨ç¬¬ %d å??è?¢å¹?ä¸é¡¯ç¤ºï¼?ä½?è©²è?¢å¹?ä¸?å?
 msgid "Error reading GConf boolean value '%s': %s"
 msgstr "è®?å?? GConf é??è¼¯å?¼â??%sâ??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../gnome-panel/panel-properties-dialog.c:123
-#: ../libpanel-applet/panel-test-applets.c:53
-msgctxt "Orientation"
-msgid "Top"
-msgstr "ä¸?"
-
-#: ../gnome-panel/panel-properties-dialog.c:124
-#: ../libpanel-applet/panel-test-applets.c:54
-msgctxt "Orientation"
-msgid "Bottom"
-msgstr "ä¸?"
-
-#: ../gnome-panel/panel-properties-dialog.c:125
-#: ../libpanel-applet/panel-test-applets.c:55
-msgctxt "Orientation"
-msgid "Left"
-msgstr "å·¦"
-
-#: ../gnome-panel/panel-properties-dialog.c:126
-#: ../libpanel-applet/panel-test-applets.c:56
-msgctxt "Orientation"
-msgid "Right"
-msgstr "å?³"
-
 #: ../gnome-panel/panel-properties-dialog.c:866
 msgid "Drawer Properties"
 msgstr "æ?½å±?å±¬æ?§"
 
 #: ../gnome-panel/panel-properties-dialog.c:981
-#: ../gnome-panel/panel-run-dialog.c:2019
+#: ../gnome-panel/panel-run-dialog.c:2022
 #, c-format
 msgid "Unable to load file '%s': %s."
 msgstr "ç?¡æ³?è¼?å?¥æª?æ¡?ã??%sã??ï¼?%sã??"
@@ -2435,20 +2459,10 @@ msgstr "å??ç¤º(_I):"
 msgid "_None (use system theme)"
 msgstr "ç?¡ï¼?ä½¿ç?¨ç³»çµ±ä½?æ?¯(_N)"
 
-#: ../gnome-panel/panel-properties-dialog.ui.h:23
-#: ../libpanel-applet/panel-test-applets.ui.h:4
-msgid "_Orientation:"
-msgstr "ä½?ç½®(_O):"
-
 #: ../gnome-panel/panel-properties-dialog.ui.h:24
 msgid "_Scale"
 msgstr "æ ¹æ??æ¯?ä¾?ç¸®æ?¾(_S)"
 
-#: ../gnome-panel/panel-properties-dialog.ui.h:25
-#: ../libpanel-applet/panel-test-applets.ui.h:6
-msgid "_Size:"
-msgstr "å¤§å°?(_S):"
-
 #: ../gnome-panel/panel-properties-dialog.ui.h:26
 msgid "_Tile"
 msgstr "é?ªæ??(_T)"
@@ -2507,26 +2521,26 @@ msgstr "ç?¡æ³?å?·è¡?â??%sâ??æ??ä»¤"
 msgid "Could not convert '%s' from UTF-8"
 msgstr "ç?¡æ³?ç?± UTF-8 è½?æ??ç?ºâ??%sâ??"
 
-#: ../gnome-panel/panel-run-dialog.c:1256
+#: ../gnome-panel/panel-run-dialog.c:1259
 msgid "Choose a file to append to the command..."
 msgstr "å?¨æ??ä»¤å¾?é??å? æª?æ¡?å??ç¨±..."
 
-#: ../gnome-panel/panel-run-dialog.c:1634
+#: ../gnome-panel/panel-run-dialog.c:1637
 #: ../gnome-panel/panel-run-dialog.ui.h:8
 msgid "Select an application to view its description."
 msgstr "é?¸å??æ??ç?¨ç¨?å¼?å¾?å?¯ä»¥é¡¯ç¤ºæ??é??è©²ç¨?å¼?ç??èªªæ??ã??"
 
-#: ../gnome-panel/panel-run-dialog.c:1672
+#: ../gnome-panel/panel-run-dialog.c:1675
 #, c-format
 msgid "Will run command: '%s'"
 msgstr "å°?æ??å?·è¡?æ??ä»¤ï¼?â??%sâ??"
 
-#: ../gnome-panel/panel-run-dialog.c:1705
+#: ../gnome-panel/panel-run-dialog.c:1708
 #, c-format
 msgid "URI list dropped on run dialog had wrong format (%d) or length (%d)\n"
 msgstr "æ??æ?³å?°å?·è¡?è¦?çª?ç?? URI æ¸?å?®ç??æ ¼å¼? (%d) æ??é?·åº¦ (%d) é?¯èª¤\n"
 
-#: ../gnome-panel/panel-run-dialog.c:2024
+#: ../gnome-panel/panel-run-dialog.c:2027
 msgid "Could not display run dialog"
 msgstr "ç?¡æ³?é¡¯ç¤ºå?·è¡?å°?è©±è¦?çª?"
 
@@ -2591,73 +2605,73 @@ msgstr "æ¸?é?¤(_L)"
 msgid "D_on't Delete"
 msgstr "ä¸?è¦?å?ªé?¤(_O)"
 
-#: ../gnome-panel/panel-toplevel.c:1188
+#: ../gnome-panel/panel-toplevel.c:1190
 msgid "Hide Panel"
 msgstr "é?±è??æ?¬é?¢æ?¿"
 
 #. translators: these string will be shown in MetaCity's switch window
 #. * popup when you pass the focus to a panel
-#: ../gnome-panel/panel-toplevel.c:1595
+#: ../gnome-panel/panel-toplevel.c:1597
 msgid "Top Expanded Edge Panel"
 msgstr "é ?é?¨æ?´å¤§é??ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1596
+#: ../gnome-panel/panel-toplevel.c:1598
 msgid "Top Centered Panel"
 msgstr "é ?é?¨ç½®ä¸é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1597
+#: ../gnome-panel/panel-toplevel.c:1599
 msgid "Top Floating Panel"
 msgstr "é ?é?¨æµ®å??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1598
+#: ../gnome-panel/panel-toplevel.c:1600
 msgid "Top Edge Panel"
 msgstr "é ?é?¨é??ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1602
+#: ../gnome-panel/panel-toplevel.c:1604
 msgid "Bottom Expanded Edge Panel"
 msgstr "åº?é?¨æ?´å¤§é??ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1603
+#: ../gnome-panel/panel-toplevel.c:1605
 msgid "Bottom Centered Panel"
 msgstr "åº?é?¨ç½®ä¸é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1604
+#: ../gnome-panel/panel-toplevel.c:1606
 msgid "Bottom Floating Panel"
 msgstr "åº?é?¨æµ®å??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1605
+#: ../gnome-panel/panel-toplevel.c:1607
 msgid "Bottom Edge Panel"
 msgstr "åº?é?¨é??ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1609
+#: ../gnome-panel/panel-toplevel.c:1611
 msgid "Left Expanded Edge Panel"
 msgstr "å·¦é??æ?´å¤§é??ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1610
+#: ../gnome-panel/panel-toplevel.c:1612
 msgid "Left Centered Panel"
 msgstr "å·¦é??ç½®ä¸é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1611
+#: ../gnome-panel/panel-toplevel.c:1613
 msgid "Left Floating Panel"
 msgstr "å·¦é??æµ®å??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1612
+#: ../gnome-panel/panel-toplevel.c:1614
 msgid "Left Edge Panel"
 msgstr "å·¦é??é??ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1616
+#: ../gnome-panel/panel-toplevel.c:1618
 msgid "Right Expanded Edge Panel"
 msgstr "å?³é??æ?´å¤§é??ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1617
+#: ../gnome-panel/panel-toplevel.c:1619
 msgid "Right Centered Panel"
 msgstr "å?³é??ç½®ä¸é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1618
+#: ../gnome-panel/panel-toplevel.c:1620
 msgid "Right Floating Panel"
 msgstr "å?³é??æµ®å??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1619
+#: ../gnome-panel/panel-toplevel.c:1621
 msgid "Right Edge Panel"
 msgstr "å?³é??é??ç??é?¢æ?¿"
 
@@ -2962,31 +2976,31 @@ msgstr "é?¢æ?¿ç??å??ç?´åº§æ¨?"
 msgid "Y co-ordinate of panel, starting from the bottom of the screen"
 msgstr "é?¢æ?¿ç?? Y å??æ¨?ï¼?è?ªè?¢å¹?åº?é?¨ç®?èµ·"
 
-#: ../gnome-panel/panel-util.c:306
+#: ../gnome-panel/panel-util.c:315
 #, c-format
 msgid "Icon '%s' not found"
 msgstr "å??ç¤ºâ??%sâ??ä¸?å?å?¨"
 
-#: ../gnome-panel/panel-util.c:409
+#: ../gnome-panel/panel-util.c:418
 #, c-format
 msgid "Could not execute '%s'"
 msgstr "ç?¡æ³?å?·è¡?â??%sâ??"
 
-#: ../gnome-panel/panel-util.c:645
+#: ../gnome-panel/panel-util.c:654
 msgid "file"
 msgstr "æª?æ¡?"
 
-#: ../gnome-panel/panel-util.c:822
+#: ../gnome-panel/panel-util.c:831
 msgid "Home Folder"
 msgstr "å®¶ç?®é??"
 
 #. Translators: this is the same string as the one found in
 #. * nautilus
-#: ../gnome-panel/panel-util.c:834
+#: ../gnome-panel/panel-util.c:843
 msgid "File System"
 msgstr "æª?æ¡?ç³»çµ±"
 
-#: ../gnome-panel/panel-util.c:985
+#: ../gnome-panel/panel-util.c:1016
 msgid "Search"
 msgstr "æ??å°?"
 
@@ -2995,7 +3009,7 @@ msgstr "æ??å°?"
 #. * example, "Trash: some-directory". It means that the
 #. * directory called "some-directory" is in the trash.
 #.
-#: ../gnome-panel/panel-util.c:1031
+#: ../gnome-panel/panel-util.c:1062
 #, c-format
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"
@@ -3005,108 +3019,94 @@ msgstr "%1$s: %2$s"
 msgid "Open URL: %s"
 msgstr "é??å?? URLï¼?%s"
 
-#: ../gnome-panel/panel.c:1302
+#: ../gnome-panel/panel.c:1323
 msgid "Delete this drawer?"
 msgstr "å?ªé?¤é??æ?½å±?ï¼?"
 
-#: ../gnome-panel/panel.c:1303
+#: ../gnome-panel/panel.c:1324
 msgid ""
 "When a drawer is deleted, the drawer and its\n"
 "settings are lost."
 msgstr "ç?¶å?ªé?¤æ?½å±?å¾?ï¼?æ?½å±?å??å?¶è¨å®?é?½æ??æ¶?å¤±ã??"
 
-#: ../gnome-panel/panel.c:1306
+#: ../gnome-panel/panel.c:1327
 msgid "Delete this panel?"
 msgstr "å?ªé?¤æ?¬é?¢æ?¿ï¼?"
 
-#: ../gnome-panel/panel.c:1307
+#: ../gnome-panel/panel.c:1328
 msgid ""
 "When a panel is deleted, the panel and its\n"
 "settings are lost."
 msgstr "ç?¶å?ªé?¤é?¢æ?¿å¾?ï¼?é?¢æ?¿å??å?¶è¨å®?é?½æ??æ¶?å¤±ã??"
 
-#: ../libpanel-applet/GNOME_Panel_TestApplet.server.in.h:1
-msgid "A simple applet for testing the GNOME-2.0 panel"
-msgstr "ç?¨ä¾?æ¸¬è©¦ GNOME-2.0 é?¢æ?¿ç??ç°¡å?®é?¢æ?¿ç¨?å¼?"
+#~ msgid "Clock Applet Factory"
+#~ msgstr "æ??é??é?¢æ?¿ç¨?å¼?å·¥å» "
 
-#: ../libpanel-applet/GNOME_Panel_TestApplet.server.in.h:2
-msgid "Test Bonobo Applet"
-msgstr "Bonobo é?¢æ?¿æ¸¬è©¦ç¨?å¼?"
+#~ msgid "Factory for creating clock applets."
+#~ msgstr "ç?¢ç??æ??é??é?¢æ?¿ç¨?å¼?ç??å·¥å» ã??"
 
-#: ../libpanel-applet/GNOME_Panel_TestApplet.server.in.h:3
-msgid "Test Bonobo Applet Factory"
-msgstr "Bonobo é?¢æ?¿æ¸¬è©¦ç¨?å¼?å·¥å» "
+#~ msgid "Get the current time and date"
+#~ msgstr "å??å¾?ç?®å??ç??æ??å?»å??æ?¥æ??"
 
-#: ../libpanel-applet/panel-test-applets.c:34
-msgid "Specify an applet IID to load"
-msgstr "æ??å®?æº?å??è¼?å?¥ç??é?¢æ?¿ç¨?å¼?ç?? IID"
+#~ msgid "Change system time"
+#~ msgstr "æ?¹è®?ç³»çµ±æ??å?»"
 
-#: ../libpanel-applet/panel-test-applets.c:35
-msgid ""
-"Specify a gconf location in which the applet preferences should be stored"
-msgstr "é?¢æ?¿ç¨?å¼?ç??å??å¥½è¨å®?æ??è©²å?²å?å?¨æ??å®?ç?? gconf ä½?ç½®"
+#~ msgid "Change system time zone"
+#~ msgstr "æ?¹è®?ç³»çµ±æ??å??"
 
-#: ../libpanel-applet/panel-test-applets.c:36
-msgid "Specify the initial size of the applet (xx-small, medium, large etc.)"
-msgstr "æ??å®?é?¢æ?¿ç¨?å¼?é??å§?æ??ç??å¤§å°?ï¼?è¶?å¾®å??ã??ä¸å??ã??å¤§å??ç?ã??ï¼?"
+#~ msgid "Configure hardware clock"
+#~ msgstr "è¨å®?ç¡¬é«?æ??é??"
 
-#: ../libpanel-applet/panel-test-applets.c:37
-msgid ""
-"Specify the initial orientation of the applet (top, bottom, left or right)"
-msgstr "æ??å®?é?¢æ?¿ç¨?å¼?é??å§?é¡¯ç¤ºæ??ç??æ?¹å??ï¼?é ?é?¨ã??åº?é?¨ã??å·¦é??ã??å?³é??ï¼?"
+#~ msgid "Privileges are required to change the system time zone."
+#~ msgstr "æ?¹è®?ç³»çµ±æ??å??é??è¦?æ??æ¬?é??ã??"
 
-#: ../libpanel-applet/panel-test-applets.c:61
-msgctxt "Size"
-msgid "XX Small"
-msgstr "è¶?å°?"
+#~ msgid "Privileges are required to change the system time."
+#~ msgstr "æ?¹è®?ç³»çµ±æ??å?»é??è¦?æ??æ¬?é??ã??"
 
-#: ../libpanel-applet/panel-test-applets.c:62
-msgctxt "Size"
-msgid "X Small"
-msgstr "ç?¹å°?"
+#~ msgid "Privileges are required to configure the hardware clock."
+#~ msgstr "è¨å®?ç¡¬é«?æ??é??é??è¦?æ??æ¬?é??ã??"
 
-#: ../libpanel-applet/panel-test-applets.c:63
-msgctxt "Size"
-msgid "Small"
-msgstr "å°?"
+#~ msgid "Display a swimming fish or another animated creature"
+#~ msgstr "é¡¯ç¤ºæ¸¸æ³³ä¸ç??é?å??æ??å?¶å®?ç??ç?©"
 
-#: ../libpanel-applet/panel-test-applets.c:64
-msgctxt "Size"
-msgid "Medium"
-msgstr "ä¸"
+#~ msgid "From Whence That Stupid Fish Came"
+#~ msgstr "é?£æ¢?è ¢é?æ?¯å¾?å?ªè£¡ä¾?ç??"
 
-#: ../libpanel-applet/panel-test-applets.c:65
-msgctxt "Size"
-msgid "Large"
-msgstr "å¤§"
+#~ msgid "Wanda Factory"
+#~ msgstr "Wanda å·¥å» "
 
-#: ../libpanel-applet/panel-test-applets.c:66
-msgctxt "Size"
-msgid "X Large"
-msgstr "ç?¹å¤§"
+#~ msgid "Area where notification icons appear"
+#~ msgstr "é¡¯ç¤ºç¨?å¼?ç??æ??é??ç?¥å??ç¤ºç??å??å??"
 
-#: ../libpanel-applet/panel-test-applets.c:67
-msgctxt "Size"
-msgid "XX Large"
-msgstr "è¶?å¤§"
+#~ msgid "Notification Area Factory"
+#~ msgstr "ã??ç¨?å¼?ç??æ??é??ç?¥å??ã??å·¥å» "
 
-#: ../libpanel-applet/panel-test-applets.c:129
-#, c-format
-msgid "Failed to load applet %s"
-msgstr "è¼?å?¥é?¢æ?¿ç¨?å¼? %s å¤±æ??"
+#~ msgid "Factory for the window navigation related applets"
+#~ msgstr "ç?¨ä¾?ç?¢ç??å??è¦?çª?ç??è¦½æ??é??ç??é?¢æ?¿ç¨?å¼?ç??å·¥å» "
 
-#. This is an utility to easily test various applets
-#: ../libpanel-applet/panel-test-applets.ui.h:2
-msgid "Test applet utility"
-msgstr "é?¢æ?¿ç¨?å¼?æ¸¬è©¦å·¥å?·"
+#~ msgid "Hide application windows and show the desktop"
+#~ msgstr "é?±è??æ??æ??ç¨?å¼?è¦?çª?ä¸¦é¡¯ç¤ºæ¡?é?¢"
 
-#: ../libpanel-applet/panel-test-applets.ui.h:3
-msgid "_Applet:"
-msgstr "é?¢æ?¿ç¨?å¼?(_A):"
+#~ msgid "Show Desktop"
+#~ msgstr "é¡¯ç¤ºæ¡?é?¢"
 
-#: ../libpanel-applet/panel-test-applets.ui.h:5
-msgid "_Prefs Dir:"
-msgstr "å??å¥½è¨å®?ç?®é??(_P):"
+#~ msgid "Switch between open windows using a menu"
+#~ msgstr "ä½¿ç?¨é?¸å?®ä¾?å??æ??å·²é??å??ç??è¦?çª?"
+
+#~ msgid "Switch between open windows using buttons"
+#~ msgstr "ä½¿ç?¨æ??é??ä¾?å??æ??å·²é??å??ç??è¦?çª?"
+
+#~ msgid "Switch between workspaces"
+#~ msgstr "å??æ??å·¥ä½?å??"
+
+#~ msgid "Window Navigation Applet Factory"
+#~ msgstr "è¦?çª?ç??è¦½é?¢æ?¿ç¨?å¼?å·¥å» "
+
+#~ msgid "Exception from popup_menu '%s'\n"
+#~ msgstr "popup_menuâ??%sâ??å?ºç?¾ä¾?å¤?æ??æ³?\n"
+
+#~ msgid "Unable to obtain AppletShell interface from control\n"
+#~ msgstr "ç?¡æ³?å¾? control å??å¾? AppletShell ä»?é?¢\n"
 
 #~ msgid "If true, display time in Universal Coordinated Time zone."
 #~ msgstr "å¦?è¨å®?ç?ºâ??trueâ??ï¼?å??é¡¯ç¤ºä¸?ç??å??èª¿æ??(UTC)ã??"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 0c01c5d..20df86c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -14,10 +14,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-panel 2.29.90\n"
+"Project-Id-Version: gnome-panel 2.31.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-16 09:57+0800\n"
-"PO-Revision-Date: 2010-02-15 15:22+0800\n"
+"POT-Creation-Date: 2010-08-23 19:52+0800\n"
+"PO-Revision-Date: 2010-08-20 13:15+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n lists linux org tw>\n"
 "MIME-Version: 1.0\n"
@@ -25,65 +25,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../applets/clock/GNOME_ClockApplet.xml.h:1
-msgid "Ad_just Date & Time"
-msgstr "èª¿æ?´æ?¥æ??å??æ??å?»(_J)"
-
-#: ../applets/clock/GNOME_ClockApplet.xml.h:2
-msgid "Copy _Date"
-msgstr "è¤?è£½æ?¥æ??(_D)"
-
-#: ../applets/clock/GNOME_ClockApplet.xml.h:3
-msgid "Copy _Time"
-msgstr "è¤?è£½æ??å?»(_T)"
-
-#: ../applets/clock/GNOME_ClockApplet.xml.h:4
-#: ../applets/fish/GNOME_FishApplet.xml.h:1
-#: ../applets/notification_area/GNOME_NotificationAreaApplet.xml.h:1
-#: ../applets/wncklet/GNOME_ShowDesktopApplet.xml.h:1
-#: ../applets/wncklet/GNOME_WindowListApplet.xml.h:1
-#: ../applets/wncklet/GNOME_WindowMenuApplet.xml.h:1
-#: ../applets/wncklet/GNOME_WorkspaceSwitcherApplet.xml.h:1
-msgid "_About"
-msgstr "é??æ?¼(_A)"
-
-#: ../applets/clock/GNOME_ClockApplet.xml.h:5
-#: ../applets/fish/GNOME_FishApplet.xml.h:2
-#: ../applets/notification_area/GNOME_NotificationAreaApplet.xml.h:2
-#: ../applets/wncklet/GNOME_ShowDesktopApplet.xml.h:2
-#: ../applets/wncklet/GNOME_WindowListApplet.xml.h:2
-#: ../applets/wncklet/GNOME_WindowMenuApplet.xml.h:2
-#: ../applets/wncklet/GNOME_WorkspaceSwitcherApplet.xml.h:2
-#: ../gnome-panel/drawer.c:601 ../gnome-panel/panel-action-button.c:710
-#: ../gnome-panel/panel-context-menu.c:285 ../gnome-panel/panel-menu-bar.c:345
-#: ../gnome-panel/panel-menu-button.c:664
-msgid "_Help"
-msgstr "æ±?å?©(_H)"
-
-#: ../applets/clock/GNOME_ClockApplet.xml.h:6
-#: ../applets/fish/GNOME_FishApplet.xml.h:3
-#: ../applets/wncklet/GNOME_WindowListApplet.xml.h:3
-#: ../applets/wncklet/GNOME_WorkspaceSwitcherApplet.xml.h:3
-msgid "_Preferences"
-msgstr "å??å¥½è¨å®?(_P)"
-
-#: ../applets/clock/GNOME_ClockApplet_Factory.server.in.in.h:1
-#: ../applets/clock/clock.c:3668
-msgid "Clock"
-msgstr "æ??é??"
-
-#: ../applets/clock/GNOME_ClockApplet_Factory.server.in.in.h:2
-msgid "Clock Applet Factory"
-msgstr "æ??é??é?¢æ?¿ç¨?å¼?å·¥å» "
-
-#: ../applets/clock/GNOME_ClockApplet_Factory.server.in.in.h:3
-msgid "Factory for creating clock applets."
-msgstr "ç?¢ç??æ??é??é?¢æ?¿ç¨?å¼?ç??å·¥å» ã??"
-
-#: ../applets/clock/GNOME_ClockApplet_Factory.server.in.in.h:4
-msgid "Get the current time and date"
-msgstr "å??å¾?ç?®å??ç??æ??å?»å??æ?¥æ??"
-
 #. Translators: This is a strftime format string.
 #. * It is used to display the time in 12-hours format
 #. * (eg, like in the US: 8:10 am). The %p expands to
@@ -92,8 +33,8 @@ msgstr "å??å¾?ç?®å??ç??æ??å?»å??æ?¥æ??"
 #. * It is used to display the time in 12-hours format (eg, like
 #. * in the US: 8:10 am). The %p expands to am/pm.
 #.
-#: ../applets/clock/calendar-window.c:303 ../applets/clock/clock.c:445
-#: ../applets/clock/clock-location-tile.c:516
+#: ../applets/clock/calendar-window.c:303 ../applets/clock/clock.c:444
+#: ../applets/clock/clock-location-tile.c:520
 msgid "%l:%M %p"
 msgstr "%p %l:%M"
 
@@ -111,9 +52,9 @@ msgstr "%p %l:%M"
 #. * It is used to display the time in 24-hours format (eg, like
 #. * in France: 20:10).
 #.
-#: ../applets/clock/calendar-window.c:308 ../applets/clock/clock.c:450
-#: ../applets/clock/clock.c:1588 ../applets/clock/clock-location-tile.c:476
-#: ../applets/clock/clock-location-tile.c:523
+#: ../applets/clock/calendar-window.c:308 ../applets/clock/clock.c:449
+#: ../applets/clock/clock.c:1591 ../applets/clock/clock-location-tile.c:480
+#: ../applets/clock/clock-location-tile.c:527
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -161,7 +102,7 @@ msgstr "æ??æ??"
 #. Translators: This is a strftime format string.
 #. * It is used to display the time in 12-hours format (eg, like
 #. * in the US: 8:10 am). The %p expands to am/pm.
-#: ../applets/clock/clock.c:445
+#: ../applets/clock/clock.c:444
 msgid "%l:%M:%S %p"
 msgstr "%p %l:%M:%S"
 
@@ -172,7 +113,7 @@ msgstr "%p %l:%M:%S"
 #. * string.
 #. * It is used to display the time in 24-hours
 #. * format (eg, like in France: 20:10).
-#: ../applets/clock/clock.c:450 ../applets/clock/clock.c:1582
+#: ../applets/clock/clock.c:449 ../applets/clock/clock.c:1585
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -183,7 +124,7 @@ msgstr "%H:%M:%S"
 #. * the day of the month as a decimal number is a single digit,
 #. * it should begin with a 0 in your locale (e.g. "May 01"
 #. * instead of "May  1").
-#: ../applets/clock/clock.c:461
+#: ../applets/clock/clock.c:460
 msgid "%a %b %e"
 msgstr "%-mæ??%-dæ?¥(%a)"
 
@@ -191,7 +132,7 @@ msgstr "%-mæ??%-dæ?¥(%a)"
 #. *              if the time should come before the
 #. *              date on a clock in your locale.
 #.
-#: ../applets/clock/clock.c:468
+#: ../applets/clock/clock.c:467
 #, c-format
 msgid ""
 "%1$s\n"
@@ -204,7 +145,7 @@ msgstr ""
 #. *              if the time should come before the
 #. *              date on a clock in your locale.
 #.
-#: ../applets/clock/clock.c:476
+#: ../applets/clock/clock.c:475
 #, c-format
 msgid "%1$s, %2$s"
 msgstr "%1$s %2$s"
@@ -213,27 +154,27 @@ msgstr "%1$s %2$s"
 #. Translators: This is a strftime format string.
 #. * It is used to display a date. Please leave "%%s" as it is:
 #. * it will be used to insert the timezone name later.
-#: ../applets/clock/clock.c:649
+#: ../applets/clock/clock.c:648
 msgid "%A %B %d (%%s)"
 msgstr "%B %d %A (%%s)"
 
-#: ../applets/clock/clock.c:679
+#: ../applets/clock/clock.c:678
 msgid "Click to hide your appointments and tasks"
 msgstr "æ??ä¸?ä»¥é?±è??ç´?æ??å??å·¥ä½?"
 
-#: ../applets/clock/clock.c:682
+#: ../applets/clock/clock.c:681
 msgid "Click to view your appointments and tasks"
 msgstr "æ??ä¸?ä¾?é¡¯ç¤ºç´?æ??å??å·¥ä½?"
 
-#: ../applets/clock/clock.c:686
+#: ../applets/clock/clock.c:685
 msgid "Click to hide month calendar"
 msgstr "æ??ä¸?ä»¥é?±è??æ??æ??"
 
-#: ../applets/clock/clock.c:689
+#: ../applets/clock/clock.c:688
 msgid "Click to view month calendar"
 msgstr "æ??ä¸?ä¾?é¡¯ç¤ºæ??æ??"
 
-#: ../applets/clock/clock.c:1421
+#: ../applets/clock/clock.c:1423
 msgid "Computer Clock"
 msgstr "é?»è?¦æ??é??"
 
@@ -243,7 +184,7 @@ msgstr "é?»è?¦æ??é??"
 #. * format with a leading 0 if needed (eg, like
 #. * in the US: 08:10 am). The %p expands to
 #. * am/pm.
-#: ../applets/clock/clock.c:1567
+#: ../applets/clock/clock.c:1570
 msgid "%I:%M:%S %p"
 msgstr "%p %I:%M:%S"
 
@@ -253,75 +194,116 @@ msgstr "%p %I:%M:%S"
 #. * format with a leading 0 if needed (eg, like
 #. * in the US: 08:10 am). The %p expands to
 #. * am/pm.
-#: ../applets/clock/clock.c:1575
+#: ../applets/clock/clock.c:1578
 msgid "%I:%M %p"
 msgstr "%p %I:%M"
 
 #. Translators: This is a strftime format string.
 #. * It is used to display a date in the full format (so that people can
 #. * copy and paste it elsewhere).
-#: ../applets/clock/clock.c:1622
+#: ../applets/clock/clock.c:1624
 msgid "%A, %B %d %Y"
 msgstr "%Yå¹´%-mæ??%-dæ?¥(%A)"
 
-#: ../applets/clock/clock.c:1653
+#: ../applets/clock/clock.c:1655
 msgid "Set System Time..."
 msgstr "è¨å®?ç³»çµ±æ??å?»..."
 
-#: ../applets/clock/clock.c:1654
+#: ../applets/clock/clock.c:1656
 msgid "Set System Time"
 msgstr "è¨å®?ç³»çµ±æ??å?»"
 
-#: ../applets/clock/clock.c:1669
+#: ../applets/clock/clock.c:1671
 msgid "Failed to set the system time"
 msgstr "è¨å®?ç³»çµ±æ??å?»å¤±æ??"
 
-#: ../applets/clock/clock.c:2706
+#: ../applets/clock/clock.c:1869 ../applets/fish/fish.c:1836
+#: ../applets/wncklet/window-list.c:192
+#: ../applets/wncklet/workspace-switcher.c:339
+msgid "_Preferences"
+msgstr "å??å¥½è¨å®?(_P)"
+
+#: ../applets/clock/clock.c:1872 ../applets/fish/fish.c:1839
+#: ../applets/notification_area/main.c:171
+#: ../applets/wncklet/showdesktop.c:228 ../applets/wncklet/window-list.c:195
+#: ../applets/wncklet/window-menu.c:95
+#: ../applets/wncklet/workspace-switcher.c:342 ../gnome-panel/drawer.c:601
+#: ../gnome-panel/panel-action-button.c:710
+#: ../gnome-panel/panel-context-menu.c:285 ../gnome-panel/panel-menu-bar.c:350
+#: ../gnome-panel/panel-menu-button.c:665
+msgid "_Help"
+msgstr "æ±?å?©(_H)"
+
+#: ../applets/clock/clock.c:1875 ../applets/fish/fish.c:1842
+#: ../applets/notification_area/main.c:174
+#: ../applets/wncklet/showdesktop.c:231 ../applets/wncklet/window-list.c:198
+#: ../applets/wncklet/window-menu.c:98
+#: ../applets/wncklet/workspace-switcher.c:345
+msgid "_About"
+msgstr "é??æ?¼(_A)"
+
+#: ../applets/clock/clock.c:1878
+msgid "Copy _Time"
+msgstr "è¤?è£½æ??å?»(_T)"
+
+#: ../applets/clock/clock.c:1881
+msgid "Copy _Date"
+msgstr "è¤?è£½æ?¥æ??(_D)"
+
+#: ../applets/clock/clock.c:1884
+msgid "Ad_just Date & Time"
+msgstr "èª¿æ?´æ?¥æ??å??æ??å?»(_J)"
+
+#: ../applets/clock/clock.c:2720
 msgid "Custom format"
 msgstr "è?ªè¨?æ ¼å¼?"
 
-#: ../applets/clock/clock.c:3160
+#: ../applets/clock/clock.c:3207
 msgid "Choose Location"
 msgstr "é?¸æ??ä½?ç½®"
 
-#: ../applets/clock/clock.c:3235
+#: ../applets/clock/clock.c:3286
 msgid "Edit Location"
 msgstr "ç·¨è¼¯ä½?ç½®"
 
-#: ../applets/clock/clock.c:3381
+#: ../applets/clock/clock.c:3432
 msgid "City Name"
 msgstr "å??å¸?å??ç¨±"
 
-#: ../applets/clock/clock.c:3385
+#: ../applets/clock/clock.c:3436
 msgid "City Time Zone"
 msgstr "å??å¸?æ??å??"
 
-#: ../applets/clock/clock.c:3565
+#: ../applets/clock/clock.c:3621
 msgid "24 hour"
 msgstr "24 å°?æ??å?¶"
 
-#: ../applets/clock/clock.c:3566
+#: ../applets/clock/clock.c:3622
 msgid "UNIX time"
 msgstr "UNIX æ??é??"
 
-#: ../applets/clock/clock.c:3567
+#: ../applets/clock/clock.c:3623
 msgid "Internet time"
 msgstr "Internet æ??é??"
 
-#: ../applets/clock/clock.c:3575
+#: ../applets/clock/clock.c:3631
 msgid "Custom _format:"
 msgstr "è?ªè¨?æ ¼å¼?(_F):"
 
-#: ../applets/clock/clock.c:3671
+#: ../applets/clock/clock.c:3721
+msgid "Clock"
+msgstr "æ??é??"
+
+#: ../applets/clock/clock.c:3724
 msgid "The Clock displays the current time and date"
 msgstr "æ??é??ç¨?å¼?å?¯é¡¯ç¤ºç?®å??ç??æ??é??å??æ?¥æ??"
 
 #. Translator credits
-#: ../applets/clock/clock.c:3674 ../applets/fish/fish.c:623
-#: ../applets/notification_area/main.c:155
-#: ../applets/wncklet/showdesktop.c:531 ../applets/wncklet/window-list.c:606
-#: ../applets/wncklet/window-menu.c:79
-#: ../applets/wncklet/workspace-switcher.c:621
+#: ../applets/clock/clock.c:3727 ../applets/fish/fish.c:621
+#: ../applets/notification_area/main.c:153
+#: ../applets/wncklet/showdesktop.c:540 ../applets/wncklet/window-list.c:609
+#: ../applets/wncklet/window-menu.c:77
+#: ../applets/wncklet/workspace-switcher.c:619
 #: ../gnome-panel/panel-context-menu.c:138
 msgid "translator-credits"
 msgstr ""
@@ -673,15 +655,15 @@ msgstr "ä½¿ç?¨ä¸?ç??å??èª¿æ??(UTC)"
 msgid "Failed to set the system timezone"
 msgstr "è¨å®?ç³»çµ±æ??å??å¤±æ??"
 
-#: ../applets/clock/clock-location-tile.c:240
+#: ../applets/clock/clock-location-tile.c:244
 msgid "<small>Set...</small>"
 msgstr "<small>è¨å®?...</small>"
 
-#: ../applets/clock/clock-location-tile.c:241
+#: ../applets/clock/clock-location-tile.c:245
 msgid "<small>Set</small>"
 msgstr "<small>è¨å®?</small>"
 
-#: ../applets/clock/clock-location-tile.c:317
+#: ../applets/clock/clock-location-tile.c:321
 msgid "Set location as current location and use its timezone for this computer"
 msgstr "å°?ä½?ç½®è¨ç?ºç?®å??ç??ä½?ç½®ï¼?ä¸¦ä½¿ç?¨å?¶æ??å??è¨ç?ºé??å?°é?»è?¦ç?®å??ç??æ??å??"
 
@@ -691,7 +673,7 @@ msgstr "å°?ä½?ç½®è¨ç?ºç?®å??ç??ä½?ç½®ï¼?ä¸¦ä½¿ç?¨å?¶æ??å??è¨ç?ºé??å?°é?»è?¦ç?®
 #. * weekday differs from the weekday at the location
 #. * (the %A expands to the weekday). The %p expands to
 #. * am/pm.
-#: ../applets/clock/clock-location-tile.c:453
+#: ../applets/clock/clock-location-tile.c:457
 msgid "%l:%M <small>%p (%A)</small>"
 msgstr "%l:%M <small>%p (%A)</small>"
 
@@ -700,7 +682,7 @@ msgstr "%l:%M <small>%p (%A)</small>"
 #. * (eg, like in France: 20:10), when the local
 #. * weekday differs from the weekday at the location
 #. * (the %A expands to the weekday).
-#: ../applets/clock/clock-location-tile.c:461
+#: ../applets/clock/clock-location-tile.c:465
 msgid "%H:%M <small>(%A)</small>"
 msgstr "%H:%M <small>(%A)</small>"
 
@@ -708,86 +690,45 @@ msgstr "%H:%M <small>(%A)</small>"
 #. * It is used to display the time in 12-hours format
 #. * (eg, like in the US: 8:10 am). The %p expands to
 #. * am/pm.
-#: ../applets/clock/clock-location-tile.c:470
+#: ../applets/clock/clock-location-tile.c:474
 msgid "%l:%M <small>%p</small>"
 msgstr "%l:%M <small>%p</small>"
 
-#: ../applets/clock/clock-location-tile.c:608
+#: ../applets/clock/clock-location-tile.c:613
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
 #. FMQ: it's broken to read from another module's translations; add some API to libgweather.
-#: ../applets/clock/clock-location-tile.c:620
-#: ../applets/clock/clock-location-tile.c:629
+#: ../applets/clock/clock-location-tile.c:625
+#: ../applets/clock/clock-location-tile.c:634
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
 #. Translators: The two strings are temperatures.
-#: ../applets/clock/clock-location-tile.c:622
+#: ../applets/clock/clock-location-tile.c:627
 #, c-format
 msgid "%s, feels like %s"
 msgstr "%sï¼?æ??è¦ºå?? %s"
 
-#: ../applets/clock/clock-location-tile.c:645
+#: ../applets/clock/clock-location-tile.c:650
 #, c-format
 msgid "Sunrise: %s / Sunset: %s"
 msgstr "æ?¥å?º: %s / æ?¥è?½: %s"
 
-#: ../applets/clock/clock-utils.c:93 ../applets/fish/fish.c:168
-#: ../applets/notification_area/main.c:94 ../applets/wncklet/wncklet.c:123
+#: ../applets/clock/clock-utils.c:93 ../applets/fish/fish.c:169
+#: ../applets/notification_area/main.c:93 ../applets/wncklet/wncklet.c:123
 #: ../gnome-panel/libpanel-util/panel-show.c:235
 #, c-format
 msgid "Could not display help document '%s'"
 msgstr "ç?¡æ³?é¡¯ç¤ºã??%sã??ç??æ±?å?©æ??ä»¶ã??"
 
-#: ../applets/clock/clock-utils.c:122 ../applets/fish/fish.c:194
-#: ../applets/notification_area/main.c:115 ../applets/wncklet/wncklet.c:152
+#: ../applets/clock/clock-utils.c:122 ../applets/fish/fish.c:195
+#: ../applets/notification_area/main.c:114 ../applets/wncklet/wncklet.c:152
 msgid "Error displaying help document"
 msgstr "é¡¯ç¤ºæ±?å?©æ??ä»¶æ??ç?¼ç??é?¯èª¤"
 
-#: ../applets/clock/org.gnome.clockapplet.mechanism.policy.in.h:1
-msgid "Change system time"
-msgstr "æ?¹è®?ç³»çµ±æ??å?»"
-
-#: ../applets/clock/org.gnome.clockapplet.mechanism.policy.in.h:2
-msgid "Change system time zone"
-msgstr "æ?¹è®?ç³»çµ±æ??å??"
-
-#: ../applets/clock/org.gnome.clockapplet.mechanism.policy.in.h:3
-msgid "Configure hardware clock"
-msgstr "è¨å®?ç¡¬é«?æ??é??"
-
-#: ../applets/clock/org.gnome.clockapplet.mechanism.policy.in.h:4
-msgid "Privileges are required to change the system time zone."
-msgstr "æ?¹è®?ç³»çµ±æ??å??é??è¦?æ??æ¬?é??ã??"
-
-#: ../applets/clock/org.gnome.clockapplet.mechanism.policy.in.h:5
-msgid "Privileges are required to change the system time."
-msgstr "æ?¹è®?ç³»çµ±æ??å?»é??è¦?æ??æ¬?é??ã??"
-
-#: ../applets/clock/org.gnome.clockapplet.mechanism.policy.in.h:6
-msgid "Privileges are required to configure the hardware clock."
-msgstr "è¨å®?ç¡¬é«?æ??é??é??è¦?æ??æ¬?é??ã??"
-
-#: ../applets/fish/GNOME_FishApplet_Factory.server.in.in.h:1
-msgid "Display a swimming fish or another animated creature"
-msgstr "é¡¯ç¤ºæ¸¸æ³³ä¸ç??é?å??æ??å?¶å®?ç??ç?©"
-
-#: ../applets/fish/GNOME_FishApplet_Factory.server.in.in.h:2
-#: ../applets/fish/fish.c:617
-msgid "Fish"
-msgstr "å°?é?"
-
-#: ../applets/fish/GNOME_FishApplet_Factory.server.in.in.h:3
-msgid "From Whence That Stupid Fish Came"
-msgstr "é?£æ¢?è ¢é?æ?¯å¾?å?ªè£¡ä¾?ç??"
-
-#: ../applets/fish/GNOME_FishApplet_Factory.server.in.in.h:4
-msgid "Wanda Factory"
-msgstr "Wanda å·¥å» "
-
-#: ../applets/fish/fish.c:273
+#: ../applets/fish/fish.c:274
 #, c-format
 msgid ""
 "Warning:  The command appears to be something actually useful.\n"
@@ -803,13 +744,13 @@ msgstr ""
 msgid "Images"
 msgstr "å??ç??"
 
-#: ../applets/fish/fish.c:585 ../applets/fish/fish.c:651
-#: ../applets/fish/fish.c:767
+#: ../applets/fish/fish.c:583 ../applets/fish/fish.c:649
+#: ../applets/fish/fish.c:765
 #, no-c-format
 msgid "%s the Fish"
 msgstr "å°?é? %s"
 
-#: ../applets/fish/fish.c:586
+#: ../applets/fish/fish.c:584
 #, c-format
 msgid ""
 "%s has no use what-so-ever. It only takes up disk space and compilation "
@@ -819,25 +760,29 @@ msgstr ""
 "%s ä¸?é»?ç?¨è??ä¹?æ²?æ??ï¼?å®?å?ªæ??ä½?ç¡¬ç¢?ç©ºé??ï¼?ç·¨è¯æ??å??è¦?ä½?ç?¨æ??é??ï¼?å??å??æ??é??å¾?ä½?å?»é?¢æ?¿ç©º"
 "é??å??è¨?æ?¶é«?ç©ºé??ã??ä½¿ç?¨é??å??é?¢æ?¿ç¨?å¼?ç??äººæ??è©²è¦?é??å?»æª¢æ?¥ä¸?ä¸?ç²¾ç¥?ç??æ³?å?¢ã??"
 
-#: ../applets/fish/fish.c:610
+#: ../applets/fish/fish.c:608
 msgid "(with minor help from George)"
 msgstr "ï¼?é??æ?? George ç??å¹«å¿?ï¼?"
 
-#: ../applets/fish/fish.c:652
+#: ../applets/fish/fish.c:615
+msgid "Fish"
+msgstr "å°?é?"
+
+#: ../applets/fish/fish.c:650
 #, c-format
 msgid "%s the Fish, a contemporary oracle"
 msgstr "GNOME å°?é? %s â?? ç?¶ä»£è??äºº"
 
-#: ../applets/fish/fish.c:723
+#: ../applets/fish/fish.c:721
 msgid "Unable to locate the command to execute"
 msgstr "æ?¾ä¸?å?°è¦?å?·è¡?ç??æ??ä»¤"
 
-#: ../applets/fish/fish.c:772
+#: ../applets/fish/fish.c:770
 #, no-c-format
 msgid "%s the Fish Says:"
 msgstr "GNOME å°?é? %s èªªï¼?"
 
-#: ../applets/fish/fish.c:841
+#: ../applets/fish/fish.c:839
 #, c-format
 msgid ""
 "Unable to read output from command\n"
@@ -848,7 +793,7 @@ msgstr ""
 "\n"
 "è©³æ??ï¼?%s"
 
-#: ../applets/fish/fish.c:906
+#: ../applets/fish/fish.c:905
 msgid "_Speak again"
 msgstr "å??å¿µä¸?é??(_S)"
 
@@ -879,15 +824,15 @@ msgstr ""
 "\n"
 "è©³æ??ï¼?%s"
 
-#: ../applets/fish/fish.c:1653
+#: ../applets/fish/fish.c:1679
 msgid "The water needs changing"
 msgstr "è©²æ??æ°´äº?"
 
-#: ../applets/fish/fish.c:1655
+#: ../applets/fish/fish.c:1681
 msgid "Look at today's date!"
 msgstr "ç??ç??ä»?å¤©æ?¯ç??éº¼æ?¥å?ï¼?"
 
-#: ../applets/fish/fish.c:1748
+#: ../applets/fish/fish.c:1774
 #, c-format
 msgid "%s the Fish, the fortune teller"
 msgstr "GNOME å°?é? %s â?? é ?è¨?å®¶"
@@ -999,99 +944,51 @@ msgstr "æ?¬è¨å®?é?µæ??å®?äº?å°?é?ç??å??ç?«æ ¼æ?¸"
 msgid "This key specifies the number of seconds each frame will be displayed."
 msgstr "æ?¬è¨å®?é?µæ??å®?æ¯?æ ¼å??ç?«é¡¯ç¤ºç??æ??é??"
 
-#: ../applets/notification_area/GNOME_NotificationAreaApplet.server.in.in.h:1
-msgid "Area where notification icons appear"
-msgstr "é¡¯ç¤ºç¨?å¼?ç??æ??é??ç?¥å??ç¤ºç??å??å??"
-
-#: ../applets/notification_area/GNOME_NotificationAreaApplet.server.in.in.h:2
-#: ../applets/notification_area/main.c:150
+#: ../applets/notification_area/main.c:148
 msgid "Notification Area"
 msgstr "ç¨?å¼?ç??æ??é??ç?¥å??"
 
-#: ../applets/notification_area/GNOME_NotificationAreaApplet.server.in.in.h:3
-msgid "Notification Area Factory"
-msgstr "ã??ç¨?å¼?ç??æ??é??ç?¥å??ã??å·¥å» "
-
-#: ../applets/notification_area/main.c:261
+#: ../applets/notification_area/main.c:306
 msgid "Panel Notification Area"
 msgstr "é?¢æ?¿ç¨?å¼?ç??æ??é??ç?¥å??"
 
-#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:1
-msgid "Factory for the window navigation related applets"
-msgstr "ç?¨ä¾?ç?¢ç??å??è¦?çª?ç??è¦½æ??é??ç??é?¢æ?¿ç¨?å¼?ç??å·¥å» "
-
-#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:2
-msgid "Hide application windows and show the desktop"
-msgstr "é?±è??æ??æ??ç¨?å¼?è¦?çª?ä¸¦é¡¯ç¤ºæ¡?é?¢"
-
-#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:3
-msgid "Show Desktop"
-msgstr "é¡¯ç¤ºæ¡?é?¢"
-
-#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:4
-msgid "Switch between open windows using a menu"
-msgstr "ä½¿ç?¨é?¸å?®ä¾?å??æ??å·²é??å??ç??è¦?çª?"
-
-#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:5
-msgid "Switch between open windows using buttons"
-msgstr "ä½¿ç?¨æ??é??ä¾?å??æ??å·²é??å??ç??è¦?çª?"
-
-#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:6
-msgid "Switch between workspaces"
-msgstr "å??æ??å·¥ä½?å??"
-
-#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:7
-#: ../applets/wncklet/window-list.c:609
-msgid "Window List"
-msgstr "è¦?çª?æ¸?å?®"
-
-#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:8
-msgid "Window Navigation Applet Factory"
-msgstr "è¦?çª?ç??è¦½é?¢æ?¿ç¨?å¼?å·¥å» "
-
-#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:9
-#: ../applets/wncklet/window-menu.c:82 ../applets/wncklet/window-menu.c:244
-msgid "Window Selector"
-msgstr "è¦?çª?é?¸æ??ç¨?å¼?"
-
-#: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:10
-#: ../applets/wncklet/workspace-switcher.c:624
-msgid "Workspace Switcher"
-msgstr "å·¥ä½?å??å??æ??ç¨?å¼?"
-
-#: ../applets/wncklet/showdesktop.c:181
+#: ../applets/wncklet/showdesktop.c:182
 #, c-format
 msgid "Failed to load %s: %s\n"
 msgstr "ç?¡æ³?è¼?å?¥ %sï¼?%s\n"
 
-#: ../applets/wncklet/showdesktop.c:182
+#: ../applets/wncklet/showdesktop.c:183
 msgid "Icon not found"
 msgstr "å??ç¤ºä¸?å?å?¨"
 
-#: ../applets/wncklet/showdesktop.c:241
+#: ../applets/wncklet/showdesktop.c:245
 msgid "Click here to restore hidden windows."
 msgstr "æ??ä¸?é??è£¡å?¯ä»¥å°?æ??æ??å·²ç¶?é?±è??ç??è¦?çª?å??å¾©å??ç??ã??"
 
-#: ../applets/wncklet/showdesktop.c:243
+#: ../applets/wncklet/showdesktop.c:247
 msgid "Click here to hide all windows and show the desktop."
 msgstr "æ??ä¸?é??è£¡å?¯ä»¥é?±è??æ??æ??è¦?çª?ä¸¦é¡¯ç¤ºæ¡?é?¢ã??"
 
-#: ../applets/wncklet/showdesktop.c:453 ../applets/wncklet/showdesktop.c:534
+#: ../applets/wncklet/showdesktop.c:459 ../applets/wncklet/showdesktop.c:543
 msgid "Show Desktop Button"
 msgstr "é¡¯ç¤ºæ¡?é?¢æ??é??"
 
-#: ../applets/wncklet/showdesktop.c:536
+#: ../applets/wncklet/showdesktop.c:545
 msgid "This button lets you hide all windows and show the desktop."
 msgstr "æ?¬æ??é??å?¯ä»¥é?±è??æ??æ??è¦?çª?ä¸¦é¡¯ç¤ºæ¡?é?¢ã??"
 
-#: ../applets/wncklet/showdesktop.c:566
+#: ../applets/wncklet/showdesktop.c:575
 msgid ""
 "Your window manager does not support the show desktop button, or you are not "
 "running a window manager."
 msgstr ""
 "æ?¨ä½¿ç?¨ç??è¦?çª?ç¸½ç??å?¡ä¸?æ?¯æ?´ã??é¡¯ç¤ºæ¡?é?¢ã??æ??é??ï¼?æ??æ?¯æ?¨æ ¹æ?¬æ²?æ??å?·è¡?ä»»ä½?è¦?çª?ç¸½ç??å?¡ã??"
 
-#: ../applets/wncklet/window-list.c:611
+#: ../applets/wncklet/window-list.c:612
+msgid "Window List"
+msgstr "è¦?çª?æ¸?å?®"
+
+#: ../applets/wncklet/window-list.c:614
 msgid ""
 "The Window List shows a list of all windows in a set of buttons and lets you "
 "browse them."
@@ -1191,41 +1088,49 @@ msgstr "æ¤è¨å®?é?µå?¨ GNOME 2.20 å·²ä¸?å??ä½¿ç?¨ã??å®?ç??å?å?¨ç´?ç²¹æ?¯ç?ºäº?
 msgid "When to group windows"
 msgstr "ä½?æ??å??ä½µå??é¡?ç??è¦?çª?"
 
-#: ../applets/wncklet/window-menu.c:86
+#: ../applets/wncklet/window-menu.c:80 ../applets/wncklet/window-menu.c:247
+msgid "Window Selector"
+msgstr "è¦?çª?é?¸æ??ç¨?å¼?"
+
+#: ../applets/wncklet/window-menu.c:84
 msgid ""
 "The Window Selector shows a list of all windows in a menu and lets you "
 "browse them."
 msgstr "ã??è¦?çª?é?¸æ??ç¨?å¼?ã??æ??å?¨é?¸å?®ä¸é¡¯ç¤ºè¦?çª?æ¸?å?®ä»¥ä¾?ç??è¦½ã??"
 
-#: ../applets/wncklet/workspace-switcher.c:214
-#: ../applets/wncklet/workspace-switcher.c:976
+#: ../applets/wncklet/workspace-switcher.c:211
+#: ../applets/wncklet/workspace-switcher.c:974
 #: ../applets/wncklet/workspace-switcher.ui.h:10
 msgid "rows"
 msgstr "å??"
 
-#: ../applets/wncklet/workspace-switcher.c:214
-#: ../applets/wncklet/workspace-switcher.c:976
+#: ../applets/wncklet/workspace-switcher.c:211
+#: ../applets/wncklet/workspace-switcher.c:974
 msgid "columns"
 msgstr "è¡?"
 
-#: ../applets/wncklet/workspace-switcher.c:488
+#: ../applets/wncklet/workspace-switcher.c:492
 #, c-format
 msgid "Error loading num_rows value for Workspace Switcher: %s\n"
 msgstr "è¼?å?¥ã??å·¥ä½?å??å??æ??ç¨?å¼?ã??ä¸ç?? num_rows æ?¸å?¼æ??å?ºç?¾é?¯èª¤ï¼?%s\n"
 
-#: ../applets/wncklet/workspace-switcher.c:499
+#: ../applets/wncklet/workspace-switcher.c:503
 #, c-format
 msgid ""
 "Error loading display_workspace_names value for Workspace Switcher: %s\n"
 msgstr ""
 "è¼?å?¥ã??å·¥ä½?å??å??æ??ç¨?å¼?ã??ä¸ç?? display_workspace_names æ?¸å?¼æ??å?ºç?¾é?¯èª¤ï¼?%s\n"
 
-#: ../applets/wncklet/workspace-switcher.c:514
+#: ../applets/wncklet/workspace-switcher.c:518
 #, c-format
 msgid "Error loading display_all_workspaces value for Workspace Switcher: %s\n"
 msgstr "è¼?å?¥ã??å·¥ä½?å??å??æ??ç¨?å¼?ã??ä¸ç?? display_all_workspaces æ?¸å?¼æ??å?ºç?¾é?¯èª¤ï¼?%s\n"
 
-#: ../applets/wncklet/workspace-switcher.c:626
+#: ../applets/wncklet/workspace-switcher.c:622
+msgid "Workspace Switcher"
+msgstr "å·¥ä½?å??å??æ??ç¨?å¼?"
+
+#: ../applets/wncklet/workspace-switcher.c:624
 msgid ""
 "The Workspace Switcher shows you a small version of your workspaces that "
 "lets you manage your windows."
@@ -1306,6 +1211,164 @@ msgstr ""
 "æ?¬è¨å®?é?µæ??æ±ºå®?ã??å·¥ä½?å??å??æ??ç¨?å¼?ã??ä½¿ç?¨å¤?å°?å??ï¼?æ°´å¹³æ??å??ï¼?æ??å¤?å°?è¡?ï¼?å??ç?´æ??å??ï¼?ä¾?"
 "é¡¯ç¤ºå·¥ä½?å??ã??æ?¬è¨å®?é?µæ??å?¨ display_all_workspaces key è¨å®?ç?ºâ??trueâ??æ??æ??ç??æ??ã??"
 
+#: ../bonobo/libpanel-applet/GNOME_Panel_TestApplet.server.in.h:1
+msgid "A simple applet for testing the GNOME-2.0 panel"
+msgstr "ç?¨ä¾?æ¸¬è©¦ GNOME-2.0 é?¢æ?¿ç??ç°¡å?®é?¢æ?¿ç¨?å¼?"
+
+#: ../bonobo/libpanel-applet/GNOME_Panel_TestApplet.server.in.h:2
+msgid "Test Bonobo Applet"
+msgstr "Bonobo é?¢æ?¿æ¸¬è©¦ç¨?å¼?"
+
+#: ../bonobo/libpanel-applet/GNOME_Panel_TestApplet.server.in.h:3
+msgid "Test Bonobo Applet Factory"
+msgstr "Bonobo é?¢æ?¿æ¸¬è©¦ç¨?å¼?å·¥å» "
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:34
+#: ../gnome-panel/panel-test-applets.c:36
+msgid "Specify an applet IID to load"
+msgstr "æ??å®?æº?å??è¼?å?¥ç??é?¢æ?¿ç¨?å¼?ç?? IID"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:35
+#: ../gnome-panel/panel-test-applets.c:37
+msgid ""
+"Specify a gconf location in which the applet preferences should be stored"
+msgstr "é?¢æ?¿ç¨?å¼?ç??å??å¥½è¨å®?æ??è©²å?²å?å?¨æ??å®?ç?? gconf ä½?ç½®"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:36
+#: ../gnome-panel/panel-test-applets.c:38
+msgid "Specify the initial size of the applet (xx-small, medium, large etc.)"
+msgstr "æ??å®?é?¢æ?¿ç¨?å¼?é??å§?æ??ç??å¤§å°?ï¼?è¶?å¾®å??ã??ä¸å??ã??å¤§å??ç?ã??ï¼?"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:37
+#: ../gnome-panel/panel-test-applets.c:39
+msgid ""
+"Specify the initial orientation of the applet (top, bottom, left or right)"
+msgstr "æ??å®?é?¢æ?¿ç¨?å¼?é??å§?é¡¯ç¤ºæ??ç??æ?¹å??ï¼?é ?é?¨ã??åº?é?¨ã??å·¦é??ã??å?³é??ï¼?"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:53
+#: ../gnome-panel/panel-properties-dialog.c:123
+#: ../gnome-panel/panel-test-applets.c:55
+msgctxt "Orientation"
+msgid "Top"
+msgstr "ä¸?"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:54
+#: ../gnome-panel/panel-properties-dialog.c:124
+#: ../gnome-panel/panel-test-applets.c:56
+msgctxt "Orientation"
+msgid "Bottom"
+msgstr "ä¸?"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:55
+#: ../gnome-panel/panel-properties-dialog.c:125
+#: ../gnome-panel/panel-test-applets.c:57
+msgctxt "Orientation"
+msgid "Left"
+msgstr "å·¦"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:56
+#: ../gnome-panel/panel-properties-dialog.c:126
+#: ../gnome-panel/panel-test-applets.c:58
+msgctxt "Orientation"
+msgid "Right"
+msgstr "å?³"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:61
+#: ../gnome-panel/panel-test-applets.c:63
+msgctxt "Size"
+msgid "XX Small"
+msgstr "è¶?å°?"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:62
+#: ../gnome-panel/panel-test-applets.c:64
+msgctxt "Size"
+msgid "X Small"
+msgstr "ç?¹å°?"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:63
+#: ../gnome-panel/panel-test-applets.c:65
+msgctxt "Size"
+msgid "Small"
+msgstr "å°?"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:64
+#: ../gnome-panel/panel-test-applets.c:66
+msgctxt "Size"
+msgid "Medium"
+msgstr "ä¸"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:65
+#: ../gnome-panel/panel-test-applets.c:67
+msgctxt "Size"
+msgid "Large"
+msgstr "å¤§"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:66
+#: ../gnome-panel/panel-test-applets.c:68
+msgctxt "Size"
+msgid "X Large"
+msgstr "ç?¹å¤§"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:67
+#: ../gnome-panel/panel-test-applets.c:69
+msgctxt "Size"
+msgid "XX Large"
+msgstr "è¶?å¤§"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:129
+#: ../gnome-panel/panel-test-applets.c:127
+#, c-format
+msgid "Failed to load applet %s"
+msgstr "è¼?å?¥é?¢æ?¿ç¨?å¼? %s å¤±æ??"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.c:249
+#, c-format
+msgid "query returned exception %s\n"
+msgstr "è©¢å??æ??å??å?³äº?ä¾?å¤?æ??æ³? %s\n"
+
+#. This is an utility to easily test various applets
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.ui.h:2
+#: ../gnome-panel/panel-test-applets.ui.h:2
+msgid "Test applet utility"
+msgstr "é?¢æ?¿ç¨?å¼?æ¸¬è©¦å·¥å?·"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.ui.h:3
+#: ../gnome-panel/panel-test-applets.ui.h:3
+msgid "_Applet:"
+msgstr "é?¢æ?¿ç¨?å¼?(_A):"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.ui.h:4
+#: ../gnome-panel/panel-properties-dialog.ui.h:23
+#: ../gnome-panel/panel-test-applets.ui.h:4
+msgid "_Orientation:"
+msgstr "ä½?ç½®(_O):"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.ui.h:5
+#: ../gnome-panel/panel-test-applets.ui.h:5
+msgid "_Prefs Dir:"
+msgstr "å??å¥½è¨å®?ç?®é??(_P):"
+
+#: ../bonobo/libpanel-applet/panel-test-applets-bonobo.ui.h:6
+#: ../gnome-panel/panel-properties-dialog.ui.h:25
+#: ../gnome-panel/panel-test-applets.ui.h:6
+msgid "_Size:"
+msgstr "å¤§å°?(_S):"
+
+#: ../bonobo/panel-module/GNOME_Panel_Popup.xml.h:1
+#: ../gnome-panel/applet.c:554 ../libpanel-applet/panel-applet.c:145
+msgid "Loc_k To Panel"
+msgstr "å?¨é?¢æ?¿é??å®?(_L)"
+
+#: ../bonobo/panel-module/GNOME_Panel_Popup.xml.h:2
+#: ../gnome-panel/applet.c:537 ../libpanel-applet/panel-applet.c:139
+msgid "_Move"
+msgstr "ç§»å??(_M)"
+
+#: ../bonobo/panel-module/GNOME_Panel_Popup.xml.h:3
+#: ../gnome-panel/applet.c:526 ../libpanel-applet/panel-applet.c:136
+msgid "_Remove From Panel"
+msgstr "å¾?é?¢æ?¿ä¸ç§»é?¤(_R)"
+
 #: ../gnome-panel/libegg/eggdesktopfile.c:165
 #, c-format
 msgid "File is not a valid .desktop file"
@@ -1375,8 +1438,8 @@ msgstr "é¡¯ç¤ºä½?æ¥é??æ®µç®¡ç??é?¸é ?"
 #. * http://bugzilla.gnome.org/show_bug.cgi?id=165132
 #. FIXME: http://bugzilla.gnome.org/show_bug.cgi?id=165132
 #: ../gnome-panel/libpanel-util/panel-error.c:82
-#: ../gnome-panel/panel-applet-frame.c:1000
-#: ../gnome-panel/panel-applet-frame.c:1088
+#: ../gnome-panel/panel-applet-frame.c:745
+#: ../gnome-panel/panel-applet-frame.c:915
 msgid "Error"
 msgstr "é?¯èª¤"
 
@@ -1403,28 +1466,16 @@ msgstr "ç?¡æ³?é??å??ä½?ç½®â??%sâ??"
 msgid "No application to handle search folders is installed."
 msgstr "å°?æ?ªå®?è£?ç?¨ä¾?è??ç??æ??å°?è³?æ??å¤¾ç??æ??ç?¨ç¨?å¼?ã??"
 
-#: ../gnome-panel/GNOME_Panel_Popup.xml.h:1 ../gnome-panel/applet.c:544
-msgid "Loc_k To Panel"
-msgstr "å?¨é?¢æ?¿é??å®?(_L)"
-
-#: ../gnome-panel/GNOME_Panel_Popup.xml.h:2 ../gnome-panel/applet.c:527
-msgid "_Move"
-msgstr "ç§»å??(_M)"
-
-#: ../gnome-panel/GNOME_Panel_Popup.xml.h:3 ../gnome-panel/applet.c:516
-msgid "_Remove From Panel"
-msgstr "å¾?é?¢æ?¿ä¸ç§»é?¤(_R)"
-
-#: ../gnome-panel/applet.c:437
+#: ../gnome-panel/applet.c:447
 msgid "???"
 msgstr "???"
 
-#: ../gnome-panel/applet.c:1321
+#: ../gnome-panel/applet.c:1346
 msgid "Cannot find an empty spot"
 msgstr "æ²?æ??ç©ºä½?"
 
-#: ../gnome-panel/drawer.c:350 ../gnome-panel/panel-addto.c:175
-#: ../gnome-panel/panel-toplevel.c:1624
+#: ../gnome-panel/drawer.c:350 ../gnome-panel/panel-addto.c:174
+#: ../gnome-panel/panel-toplevel.c:1626
 msgid "Drawer"
 msgstr "æ?½å±?"
 
@@ -1470,7 +1521,7 @@ msgid ""
 "show the time, etc."
 msgstr "å?·è¡?å?¶ä»?ç??æ??ç?¨ç¨?å¼?ä»¥æ??ä¾?å??ç¨®å·¥å?·ä¾?ç®¡ç??è¦?çª?ã??é¡¯ç¤ºæ??å?»ç?ã??"
 
-#: ../gnome-panel/gnome-panel.desktop.in.in.h:2 ../gnome-panel/main.c:100
+#: ../gnome-panel/gnome-panel.desktop.in.in.h:2 ../gnome-panel/main.c:93
 msgid "Panel"
 msgstr "é?¢æ?¿"
 
@@ -1505,37 +1556,37 @@ msgstr "å??å??å??ç¤º(_L)"
 msgid "Key %s is not set, cannot load launcher\n"
 msgstr "è¨å®?é?µ %s ä¸¦æ?ªè¨å®?ï¼?ç?¡æ³?è¼?å?¥å??å??å??ç¤º\n"
 
-#: ../gnome-panel/launcher.c:966 ../gnome-panel/panel-ditem-editor.c:1357
-#: ../gnome-panel/panel-ditem-editor.c:1391
-#: ../gnome-panel/panel-ditem-editor.c:1422
+#: ../gnome-panel/launcher.c:966 ../gnome-panel/panel-ditem-editor.c:1361
+#: ../gnome-panel/panel-ditem-editor.c:1395
+#: ../gnome-panel/panel-ditem-editor.c:1426
 msgid "Could not save launcher"
 msgstr "ç?¡æ³?å?²å?å??å??å??ç¤º"
 
-#: ../gnome-panel/main.c:47
+#: ../gnome-panel/main.c:45
 msgid "Replace a currently running panel"
 msgstr "æ?¿æ??ç?®å??å?·è¡?ç??é?¢æ?¿"
 
-#: ../gnome-panel/menu.c:914
+#: ../gnome-panel/menu.c:916
 msgid "Add this launcher to _panel"
 msgstr "å°?æ¤å??å??å??ç¤ºå? å?¥é?¢æ?¿(_P)"
 
-#: ../gnome-panel/menu.c:921
+#: ../gnome-panel/menu.c:923
 msgid "Add this launcher to _desktop"
 msgstr "å°?æ¤å??å??å??ç¤ºå? å?¥æ¡?é?¢(_D)"
 
-#: ../gnome-panel/menu.c:933
+#: ../gnome-panel/menu.c:935
 msgid "_Entire menu"
 msgstr "æ?´å??é?¸å?®(_E)"
 
-#: ../gnome-panel/menu.c:938
+#: ../gnome-panel/menu.c:940
 msgid "Add this as _drawer to panel"
 msgstr "å°?æ¤æ?½å±?å? å?¥é?¢æ?¿(_D)"
 
-#: ../gnome-panel/menu.c:945
+#: ../gnome-panel/menu.c:947
 msgid "Add this as _menu to panel"
 msgstr "å°?æ¤é?¸å?®å? å?¥é?¢æ?¿(_M)"
 
-#: ../gnome-panel/nothing.cP:605
+#: ../gnome-panel/nothing.cP:609
 #, c-format
 msgid "<b>GAME OVER</b> at level %d!"
 msgstr "<b>é??æ?²çµ?æ??</b> æ?¼ç¬¬ %d é??ï¼?"
@@ -1544,40 +1595,40 @@ msgstr "<b>é??æ?²çµ?æ??</b> æ?¼ç¬¬ %d é??ï¼?"
 #. * title, and the second string is a small information text.
 #. * The spaces are there only to separate all the strings, so
 #. try to keep them as is.
-#: ../gnome-panel/nothing.cP:612
+#: ../gnome-panel/nothing.cP:616
 #, c-format
 msgid "%1$s   %2$s   %3$s"
 msgstr "%1$s   %2$s   %3$s"
 
-#: ../gnome-panel/nothing.cP:613
+#: ../gnome-panel/nothing.cP:617
 msgid "Press 'q' to quit"
 msgstr "æ??ä¸? ã??qã??é?¢é??"
 
-#: ../gnome-panel/nothing.cP:618
+#: ../gnome-panel/nothing.cP:622
 msgid "Paused"
 msgstr "å·²æ?«å??"
 
 #. Translators: the first string is a title and the second
 #. * string is a small information text.
-#: ../gnome-panel/nothing.cP:621 ../gnome-panel/nothing.cP:632
+#: ../gnome-panel/nothing.cP:625 ../gnome-panel/nothing.cP:636
 #, c-format
 msgid "%1$s\t%2$s"
 msgstr "%1$s\t%2$s"
 
-#: ../gnome-panel/nothing.cP:622
+#: ../gnome-panel/nothing.cP:626
 msgid "Press 'p' to unpause"
 msgstr "æ??ä¸? ã??pã??å??æ¶?æ?«å??"
 
-#: ../gnome-panel/nothing.cP:628
+#: ../gnome-panel/nothing.cP:632
 #, c-format
 msgid "Level: %s,  Lives: %s"
 msgstr "é??å?¡: %s, ç??å?½: %s"
 
-#: ../gnome-panel/nothing.cP:633
+#: ../gnome-panel/nothing.cP:637
 msgid "Left/Right to move, Space to fire, 'p' to pause, 'q' to quit"
 msgstr "å·¦/å?³æ?¹å??é?µå?¯ç§»å??ï¼?ç©ºç?½é?µç?¼å°?ï¼?ã??pã??æ?«å??ï¼?ã??qã??é?¢é??"
 
-#: ../gnome-panel/nothing.cP:1373
+#: ../gnome-panel/nothing.cP:1385
 msgid "Killer GEGLs from Outer Space"
 msgstr "å¤?å¤ªç©ºæ®ºæ?? GEGLs"
 
@@ -1629,7 +1680,7 @@ msgid "Locate documents and folders on this computer by name or content"
 msgstr "ä»¥å??ç¨±æ??å?§å®¹å°?æ?¾æ¤é?»è?¦ä¸ç??æ??ä»¶å??è³?æ??å¤¾"
 
 #: ../gnome-panel/panel-action-button.c:329
-#: ../gnome-panel/panel-force-quit.c:221
+#: ../gnome-panel/panel-force-quit.c:224
 msgid "Force Quit"
 msgstr "å¼·è¡?çµ?æ??"
 
@@ -1654,124 +1705,109 @@ msgstr "é??æ©?..."
 msgid "Shut down the computer"
 msgstr "é??é??é?»è?¦"
 
-#: ../gnome-panel/panel-addto.c:116
+#: ../gnome-panel/panel-addto.c:115
 msgid "Custom Application Launcher"
 msgstr "è?ªè¨?ç??ç¨?å¼?å??å??å??ç¤º"
 
-#: ../gnome-panel/panel-addto.c:117
+#: ../gnome-panel/panel-addto.c:116
 msgid "Create a new launcher"
 msgstr "æ?°å¢?å??å??å??ç¤º"
 
-#: ../gnome-panel/panel-addto.c:127
+#: ../gnome-panel/panel-addto.c:126
 msgid "Application Launcher..."
 msgstr "å??å??å??ç¤º..."
 
-#: ../gnome-panel/panel-addto.c:128
+#: ../gnome-panel/panel-addto.c:127
 msgid "Copy a launcher from the applications menu"
 msgstr "å¾?æ??ç?¨ç¨?å¼?é?¸å?®ä¸è¤?è£½å??å??å??ç¤º"
 
-#: ../gnome-panel/panel-addto.c:142 ../gnome-panel/panel-menu-button.c:1082
+#: ../gnome-panel/panel-addto.c:141 ../gnome-panel/panel-menu-button.c:1091
 msgid "Main Menu"
 msgstr "ä¸»é?¸å?®"
 
-#: ../gnome-panel/panel-addto.c:143
+#: ../gnome-panel/panel-addto.c:142
 msgid "The main GNOME menu"
 msgstr "GNOME ä¸»é?¸å?®"
 
-#: ../gnome-panel/panel-addto.c:153
+#: ../gnome-panel/panel-addto.c:152
 msgid "Menu Bar"
 msgstr "é?¸å?®å??"
 
-#: ../gnome-panel/panel-addto.c:154
+#: ../gnome-panel/panel-addto.c:153
 msgid "A custom menu bar"
 msgstr "è?ªè¨?é?¸å?®å??"
 
-#: ../gnome-panel/panel-addto.c:164
+#: ../gnome-panel/panel-addto.c:163
 msgid "Separator"
 msgstr "å??é??ç·?"
 
-#: ../gnome-panel/panel-addto.c:165
+#: ../gnome-panel/panel-addto.c:164
 msgid "A separator to organize the panel items"
 msgstr "ç?¨ä½?æ?´ç??é?¢æ?¿é ?ç?®ç??å??é??ç·?"
 
-#: ../gnome-panel/panel-addto.c:176
+#: ../gnome-panel/panel-addto.c:175
 msgid "A pop out drawer to store other items in"
 msgstr "å?¯é?¨æ??å½?å?ºä¾?ç??æ?½å±?ï¼?ç?¨ä¾?å?²å?å?¶å®?å??ç¤º"
 
-#: ../gnome-panel/panel-addto.c:267
+#: ../gnome-panel/panel-addto.c:256
 msgid "(empty)"
 msgstr "ï¼?ç©ºç?½ï¼?"
 
-#: ../gnome-panel/panel-addto.c:410
-#: ../libpanel-applet/panel-test-applets.c:249
-#, c-format
-msgid "query returned exception %s\n"
-msgstr "è©¢å??æ??å??å?³äº?ä¾?å¤?æ??æ³? %s\n"
-
-#: ../gnome-panel/panel-addto.c:1071
+#: ../gnome-panel/panel-addto.c:1026
 #, c-format
 msgid "Find an _item to add to \"%s\":"
 msgstr "å°?æ?¾å? å?¥è?³â??%sâ??ç??é ?ç?®(_I):"
 
-#: ../gnome-panel/panel-addto.c:1075
+#: ../gnome-panel/panel-addto.c:1030
 #, c-format
 msgid "Add to Drawer"
 msgstr "å? å?¥è?³æ?½å±?"
 
-#: ../gnome-panel/panel-addto.c:1077
+#: ../gnome-panel/panel-addto.c:1032
 msgid "Find an _item to add to the drawer:"
 msgstr "å°?æ?¾å? å?¥è?³æ?½å±?ç??é ?ç?®(_I):"
 
-#: ../gnome-panel/panel-addto.c:1079
+#: ../gnome-panel/panel-addto.c:1034
 #, c-format
 msgid "Add to Panel"
 msgstr "å? å?¥é?¢æ?¿"
 
-#: ../gnome-panel/panel-addto.c:1081
+#: ../gnome-panel/panel-addto.c:1036
 msgid "Find an _item to add to the panel:"
 msgstr "å°?æ?¾å? å?¥è?³é?¢æ?¿ç??é ?ç?®(_I):"
 
-#: ../gnome-panel/panel-applet-frame.c:844
-#, c-format
-msgid "Exception from popup_menu '%s'\n"
-msgstr "popup_menuâ??%sâ??å?ºç?¾ä¾?å¤?æ??æ³?\n"
-
-#: ../gnome-panel/panel-applet-frame.c:969
+#: ../gnome-panel/panel-applet-frame.c:714
 #, c-format
 msgid "\"%s\" has quit unexpectedly"
 msgstr "â??%sâ??å?¨ç?¡æ³?é ?è¨?ç??æ??æ³?ä¸?é?¢é??"
 
-#: ../gnome-panel/panel-applet-frame.c:971
+#: ../gnome-panel/panel-applet-frame.c:716
 msgid "Panel object has quit unexpectedly"
 msgstr "é?¢æ?¿ç?©ä»¶å?¨ç?¡æ³?é ?è¨?ç??æ??æ³?ä¸?é?¢é??"
 
-#: ../gnome-panel/panel-applet-frame.c:978
+#: ../gnome-panel/panel-applet-frame.c:723
 msgid ""
 "If you reload a panel object, it will automatically be added back to the "
 "panel."
 msgstr "å¦?æ??é??æ?°è¼?å?¥é?¢ç??ç?©ä»¶ï¼?å®?æ??è?ªå??å?°å? å?¥å?°é?¢æ?¿ä¸ã??"
 
-#: ../gnome-panel/panel-applet-frame.c:984
+#: ../gnome-panel/panel-applet-frame.c:729
 msgid "_Don't Reload"
 msgstr "ä¸?è¦?é??æ?°è¼?å?¥(_D)"
 
-#: ../gnome-panel/panel-applet-frame.c:985
+#: ../gnome-panel/panel-applet-frame.c:730
 msgid "_Reload"
 msgstr "é??æ?°è¼?å?¥(_R)"
 
-#: ../gnome-panel/panel-applet-frame.c:1051
+#: ../gnome-panel/panel-applet-frame.c:878
 #, c-format
 msgid "The panel encountered a problem while loading \"%s\"."
 msgstr "è¼?å?¥â??%sâ??æ??é?¢æ?¿å?ºç?¾å??é¡?ã??"
 
-#: ../gnome-panel/panel-applet-frame.c:1067
+#: ../gnome-panel/panel-applet-frame.c:894
 msgid "Do you want to delete the applet from your configuration?"
 msgstr "æ?¯å?¦è¦?å?¨æ?¨ç??è¨å®?ä¸å?ªé?¤é?¢æ?¿ç¨?å¼?ï¼?"
 
-#: ../gnome-panel/panel-applet-frame.c:1141
-msgid "Unable to obtain AppletShell interface from control\n"
-msgstr "ç?¡æ³?å¾? control å??å¾? AppletShell ä»?é?¢\n"
-
 #: ../gnome-panel/panel-context-menu.c:104
 msgid "And many, many others..."
 msgstr "é??æ??å¾?å¤?äºº..."
@@ -1827,75 +1863,75 @@ msgid "Location"
 msgstr "ä½?ç½®"
 
 #. Type
-#: ../gnome-panel/panel-ditem-editor.c:618
+#: ../gnome-panel/panel-ditem-editor.c:622
 msgid "_Type:"
 msgstr "é¡?å??(_T):"
 
 #. Name
-#: ../gnome-panel/panel-ditem-editor.c:625
+#: ../gnome-panel/panel-ditem-editor.c:629
 msgid "_Name:"
 msgstr "å??ç¨±(_N):"
 
-#: ../gnome-panel/panel-ditem-editor.c:652
+#: ../gnome-panel/panel-ditem-editor.c:656
 msgid "_Browse..."
 msgstr "ç??è¦½(_B)..."
 
 #. Comment
-#: ../gnome-panel/panel-ditem-editor.c:659
+#: ../gnome-panel/panel-ditem-editor.c:663
 msgid "Co_mment:"
 msgstr "å??è¨»(_M):"
 
-#: ../gnome-panel/panel-ditem-editor.c:1008
+#: ../gnome-panel/panel-ditem-editor.c:1012
 msgid "Choose an application..."
 msgstr "é?¸æ??ç¨?å¼?..."
 
-#: ../gnome-panel/panel-ditem-editor.c:1012
+#: ../gnome-panel/panel-ditem-editor.c:1016
 msgid "Choose a file..."
 msgstr "é?¸æ??æª?æ¡?..."
 
-#: ../gnome-panel/panel-ditem-editor.c:1177
-#: ../gnome-panel/panel-ditem-editor.c:1186
+#: ../gnome-panel/panel-ditem-editor.c:1181
+#: ../gnome-panel/panel-ditem-editor.c:1190
 msgid "Comm_and:"
 msgstr "æ??ä»¤(_A):"
 
-#: ../gnome-panel/panel-ditem-editor.c:1195
+#: ../gnome-panel/panel-ditem-editor.c:1199
 msgid "_Location:"
 msgstr "ä½?ç½®(_L):"
 
-#: ../gnome-panel/panel-ditem-editor.c:1358
+#: ../gnome-panel/panel-ditem-editor.c:1362
 msgid "The name of the launcher is not set."
 msgstr "å??å??å??ç¤ºç??å??ç¨±ä¸¦æ?ªè¨å®?ã??"
 
-#: ../gnome-panel/panel-ditem-editor.c:1362
+#: ../gnome-panel/panel-ditem-editor.c:1366
 msgid "Could not save directory properties"
 msgstr "ç?¡æ³?å?²å?ç?®é??å±¬æ?§"
 
-#: ../gnome-panel/panel-ditem-editor.c:1363
+#: ../gnome-panel/panel-ditem-editor.c:1367
 msgid "The name of the directory is not set."
 msgstr "æ¤ç?®é??ç??å??ç¨±ä¸¦æ?ªè¨å®?ã??"
 
-#: ../gnome-panel/panel-ditem-editor.c:1379
+#: ../gnome-panel/panel-ditem-editor.c:1383
 msgid "The command of the launcher is not set."
 msgstr "å??å??å??ç¤ºç??æ??ä»¤ä¸¦æ?ªè¨å®?ã??"
 
-#: ../gnome-panel/panel-ditem-editor.c:1382
+#: ../gnome-panel/panel-ditem-editor.c:1386
 msgid "The location of the launcher is not set."
 msgstr "å??å??å??ç¤ºç??ä½?ç½®ä¸¦æ?ªè¨å®?ã??"
 
-#: ../gnome-panel/panel-ditem-editor.c:1459
+#: ../gnome-panel/panel-ditem-editor.c:1463
 msgid "Could not display help document"
 msgstr "ç?¡æ³?é¡¯ç¤ºèªªæ??æ??ä»¶"
 
-#: ../gnome-panel/panel-force-quit.c:76
+#: ../gnome-panel/panel-force-quit.c:77
 msgid ""
 "Click on a window to force the application to quit. To cancel press <ESC>."
 msgstr "æ??ä¸?ä»»ä½?ä¸?å??è¦?çª?é?½å?¯ä»¥å¼·è¡?çµ?æ??è©²ç¨?å¼?ã??å¦?æ??æ?³å??æ¶?ï¼?è«?æ?? <ESC>ã??"
 
-#: ../gnome-panel/panel-force-quit.c:204
+#: ../gnome-panel/panel-force-quit.c:207
 msgid "Force this application to exit?"
 msgstr "å¼·è¡?çµ?æ??é??å??æ??ç?¨ç¨?å¼?ï¼?"
 
-#: ../gnome-panel/panel-force-quit.c:207
+#: ../gnome-panel/panel-force-quit.c:210
 msgid ""
 "If you choose to force an application to exit, unsaved changes in any open "
 "documents in it might get lost."
@@ -2106,7 +2142,7 @@ msgstr "æ?´æ?¹æ¡?é?¢ç??å¤?è§?å??é??ä½?æ?¹å¼?ï¼?å??å¾?å??å?©æ??ç?»å?º"
 msgid "Applications"
 msgstr "æ??ç?¨ç¨?å¼?"
 
-#: ../gnome-panel/panel-menu-bar.c:353 ../gnome-panel/panel-menu-button.c:669
+#: ../gnome-panel/panel-menu-bar.c:358 ../gnome-panel/panel-menu-button.c:670
 msgid "_Edit Menus"
 msgstr "ç·¨è¼¯é?¸å?®(_E)"
 
@@ -2115,60 +2151,60 @@ msgid "Bookmarks"
 msgstr "æ?¸ç±¤"
 
 #. Translators: %s is a URI
-#: ../gnome-panel/panel-menu-items.c:494 ../gnome-panel/panel.c:534
+#: ../gnome-panel/panel-menu-items.c:495 ../gnome-panel/panel.c:541
 #, c-format
 msgid "Open '%s'"
 msgstr "é??å??ã??%sã??"
 
-#: ../gnome-panel/panel-menu-items.c:562
+#: ../gnome-panel/panel-menu-items.c:566
 #, c-format
 msgid "Unable to scan %s for media changes"
 msgstr "ç?¡æ³?æ??æ?? %s ä»¥å??å¾?åª?é«?ç??è®?æ?´"
 
-#: ../gnome-panel/panel-menu-items.c:605
+#: ../gnome-panel/panel-menu-items.c:609
 #, c-format
 msgid "Rescan %s"
 msgstr "é??æ?°æ??æ?? %s"
 
-#: ../gnome-panel/panel-menu-items.c:642
+#: ../gnome-panel/panel-menu-items.c:646
 #, c-format
 msgid "Unable to mount %s"
 msgstr "ç?¡æ³?æ??è¼? %s"
 
-#: ../gnome-panel/panel-menu-items.c:705
+#: ../gnome-panel/panel-menu-items.c:709
 #, c-format
 msgid "Mount %s"
 msgstr "æ??è¼? %s"
 
-#: ../gnome-panel/panel-menu-items.c:913
+#: ../gnome-panel/panel-menu-items.c:917
 msgid "Removable Media"
 msgstr "æ?½å??å¼?åª?é«?"
 
-#: ../gnome-panel/panel-menu-items.c:1000
+#: ../gnome-panel/panel-menu-items.c:1004
 msgid "Network Places"
 msgstr "ç¶²è·¯ä½?ç½®"
 
-#: ../gnome-panel/panel-menu-items.c:1039
+#: ../gnome-panel/panel-menu-items.c:1043
 msgid "Open your personal folder"
 msgstr "é??å??æ?¨ç??å??äººè³?æ??å¤¾"
 
 #. Translators: Desktop is used here as in
 #. * "Desktop Folder" (this is not the Desktop
 #. * environment).
-#: ../gnome-panel/panel-menu-items.c:1058
+#: ../gnome-panel/panel-menu-items.c:1062
 msgctxt "Desktop Folder"
 msgid "Desktop"
 msgstr "æ¡?é?¢"
 
-#: ../gnome-panel/panel-menu-items.c:1059
+#: ../gnome-panel/panel-menu-items.c:1063
 msgid "Open the contents of your desktop in a folder"
 msgstr "ä»¥è³?æ??å¤¾å½¢å¼?é??å??æ¡?é?¢ä¸ç??æ?±è¥¿"
 
-#: ../gnome-panel/panel-menu-items.c:1450
+#: ../gnome-panel/panel-menu-items.c:1454
 msgid "Places"
 msgstr "ä½?ç½®"
 
-#: ../gnome-panel/panel-menu-items.c:1479
+#: ../gnome-panel/panel-menu-items.c:1483
 msgid "System"
 msgstr "ç³»çµ±"
 
@@ -2177,7 +2213,7 @@ msgstr "ç³»çµ±"
 #. * but "1" if "Log Out %s" doesn't make any sense in your
 #. * language (where %s is a username).
 #.
-#: ../gnome-panel/panel-menu-items.c:1560
+#: ../gnome-panel/panel-menu-items.c:1564
 msgctxt "panel:showusername"
 msgid "1"
 msgstr "1"
@@ -2186,14 +2222,14 @@ msgstr "1"
 #. * panel-action-button.c
 #. Translators: this string is used ONLY if you translated
 #. * "1" (msgctxt: "panel:showusername") to "1"
-#: ../gnome-panel/panel-menu-items.c:1572
+#: ../gnome-panel/panel-menu-items.c:1576
 #, c-format
 msgid "Log Out %s..."
 msgstr "ç?»å?º %s..."
 
 #. Translators: this string is used ONLY if you translated
 #. * "1" (msgctxt: "panel:showusername") to "1"
-#: ../gnome-panel/panel-menu-items.c:1576
+#: ../gnome-panel/panel-menu-items.c:1580
 #, c-format
 msgid "Log out %s of this session to log in as a different user"
 msgstr "ç?»å?º %s é??å??ä½?æ¥é??æ®µï¼?ç?¶å¾?ä»¥å?¶å®?ä½¿ç?¨è??ç?»å?¥"
@@ -2207,10 +2243,14 @@ msgid "Applet Bonobo IID"
 msgstr "é?¢æ?¿ç¨?å¼?ç?? Bonobo IID"
 
 #: ../gnome-panel/panel-object.schemas.in.h:3
+msgid "Applet IID"
+msgstr "Applet IID"
+
+#: ../gnome-panel/panel-object.schemas.in.h:4
 msgid "Icon used for object's button"
 msgstr "æ??é??æ??ç?¨ç??å??ç¤º"
 
-#: ../gnome-panel/panel-object.schemas.in.h:4
+#: ../gnome-panel/panel-object.schemas.in.h:5
 msgid ""
 "If true, the custom_icon key is used as a custom icon for the button. If "
 "false, the custom_icon key is ignored. This key is only relevant if the "
@@ -2220,7 +2260,7 @@ msgstr ""
 "æ?? custom_icon è¨å®?ã??å?ªæ?? object_type æ?¯â??menu-objectâ??æ??â??drawer-objectâ??æ??ï¼?æ?¬"
 "è¨é?µå®?æ?¹æ??ç??æ??ã??"
 
-#: ../gnome-panel/panel-object.schemas.in.h:5
+#: ../gnome-panel/panel-object.schemas.in.h:6
 msgid ""
 "If true, the menu_path key is used as the path from which the menu contents "
 "should be constructed. If false, the menu_path key is ignored. This key is "
@@ -2229,56 +2269,48 @@ msgstr ""
 "å¦?è¨å®?ç?ºâ??trueâ??ï¼?å??æ??ä½¿ç?¨ menu_path è¨å®?ä¸æ??å®?ç??è·¯å¾?ä½?ç?ºå?ºç¤?ä¾?ç?¢ç??é?¸å?®ï¼?å?¦å??ä¸?"
 "æ??ç??æ?? menu_path è¨å®?ã??å?ªæ?? object_type æ?¯â??menu-objectâ??æ??ï¼?æ?¬è¨å®?é?µæ?¹æ??ç??æ??ã??"
 
-#: ../gnome-panel/panel-object.schemas.in.h:6
+#: ../gnome-panel/panel-object.schemas.in.h:7
 msgid ""
 "If true, the position of the object is interpreted relative to the right (or "
 "bottom if vertical) edge of the panel."
 msgstr ""
 "å¦?è¨å®?ç?ºâ??trueâ??ï¼?é?¢æ?¿ç?©ä»¶ç??ä½?ç½®æ??å¾?é?¢æ?¿ç??å?³é??ï¼?æ??è??å??ç?´é?¢æ?¿ç??åº?é?¨ï¼?é??å§?è¨?ç®?ã??"
 
-#: ../gnome-panel/panel-object.schemas.in.h:7
+#: ../gnome-panel/panel-object.schemas.in.h:8
 msgid ""
 "If true, the user may not move the applet without first unlocking the object "
 "using the \"Unlock\" menuitem."
 msgstr ""
 "å¦?è¨å®?ç?ºâ??trueâ??ï¼?ä½¿ç?¨è??å¿?é ?å?¨é?¸å?®ä¸é?¸å??ã??ä¸?é??å®?ä½?ç½®ã??ï¼?æ??å?¯ä»¥ç§»å??é?¢æ?¿ç¨?å¼?ã??"
 
-#: ../gnome-panel/panel-object.schemas.in.h:8
+#: ../gnome-panel/panel-object.schemas.in.h:9
 msgid "Interpret position relative to bottom/right edge"
 msgstr "å¾?å?³é??/åº?é?¨é??å§?è¨?ç®?é?¢æ?¿ç?©ä»¶ç??ä½?ç½®"
 
-#: ../gnome-panel/panel-object.schemas.in.h:9
+#: ../gnome-panel/panel-object.schemas.in.h:10
 msgid "Launcher location"
 msgstr "å??å??å??ç¤ºç??ä½?ç½®"
 
-#: ../gnome-panel/panel-object.schemas.in.h:10
+#: ../gnome-panel/panel-object.schemas.in.h:11
 msgid "Lock the object to the panel"
 msgstr "å°?é?¢æ?¿ä¸ç??ç?©ä»¶é??å®?ä½?ç½®"
 
-#: ../gnome-panel/panel-object.schemas.in.h:11
+#: ../gnome-panel/panel-object.schemas.in.h:12
 msgid "Menu content path"
 msgstr "é?¸å?®å?§å®¹ç??è·¯å¾?"
 
-#: ../gnome-panel/panel-object.schemas.in.h:12
+#: ../gnome-panel/panel-object.schemas.in.h:13
 msgid "Object's position on the panel"
 msgstr "ç?©ä»¶å?¨é?¢æ?¿ä¸ç??ä½?ç½®"
 
-#: ../gnome-panel/panel-object.schemas.in.h:13
+#: ../gnome-panel/panel-object.schemas.in.h:14
 msgid "Panel attached to drawer"
 msgstr "æ?¬æ?½å±?æ??é?£æ?¥ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-object.schemas.in.h:14
+#: ../gnome-panel/panel-object.schemas.in.h:15
 msgid "Panel object type"
 msgstr "é?¢æ?¿ç?©ä»¶é¡?å??"
 
-#: ../gnome-panel/panel-object.schemas.in.h:15
-msgid ""
-"The Bonobo implementation ID of the applet - e.g. \"OAFIID:GNOME_ClockApplet"
-"\". This key is only relevant if the object_type key is \"bonobo-applet\"."
-msgstr ""
-"é?¢æ?¿ç¨?å¼?ç?? Bonobo implementation ID - ä¾?å¦?â??OAFIID:GNOME_ClockAppletâ??ã??å?ªæ?? "
-"object_type æ?¯â??bonobo-appletâ??æ??æ?¬è¨å®?é?µæ?¹æ??ç??æ??ã??"
-
 #: ../gnome-panel/panel-object.schemas.in.h:16
 msgid ""
 "The action type this button represents. Possible values are \"lock\", "
@@ -2303,13 +2335,21 @@ msgstr "å??å?«æ?¬ç?©ä»¶ç??ç??ä¸?å±¤é?¢æ?¿ç??è?å?¥ç¢¼ã??"
 
 #: ../gnome-panel/panel-object.schemas.in.h:19
 msgid ""
+"The implementation ID of the applet - e.g. \"ClockAppletFactory::ClockApplet"
+"\". This key is only relevant if the object_type key is \"bonobo-applet\"."
+msgstr ""
+"é?¢æ?¿ç¨?å¼?ç??å¯¦ä½? ID - ä¾?å¦?ã??ClockAppletFactory::ClockAppletã??ã??å?ªæ??å?¨  "
+"object_type æ?¯ã??bonobo-appletã??æ??æ?¬è¨å®?é?µæ?¹æ??ç??æ??ã??"
+
+#: ../gnome-panel/panel-object.schemas.in.h:20
+msgid ""
 "The location of the .desktop file describing the launcher. This key is only "
 "relevant if the object_type key is \"launcher-object\"."
 msgstr ""
 "è©²å??å??å??ç¤ºç?? .desktop æª?æ¡?ä½?ç½®ã??å?ªæ??å?¨ object_type æ?¯â??launcher-objectâ??æ??ï¼?æ?¬"
 "è¨å®?æ?¹æ??ç??æ??ã??"
 
-#: ../gnome-panel/panel-object.schemas.in.h:20
+#: ../gnome-panel/panel-object.schemas.in.h:21
 msgid ""
 "The location of the image file used as the icon for the object's button. "
 "This key is only relevant if the object_type key is \"drawer-object\" or "
@@ -2318,7 +2358,7 @@ msgstr ""
 "å??ç??æª?ä½?ç½®ï¼?ä½?ç?ºä»£è¡¨è©²ç?©ä»¶ç??å??ç¤ºã??å?ªæ?? object_type æ?¯â??drawer-objectâ??æ??â??menu-"
 "objectâ??å?? use_custom_icon ç?ºâ??trueâ??æ??ï¼?æ?¬è¨å®?é?µæ?¹æ??ç??æ??ã??"
 
-#: ../gnome-panel/panel-object.schemas.in.h:21
+#: ../gnome-panel/panel-object.schemas.in.h:22
 msgid ""
 "The path from which the menu contents is contructed. This key is only "
 "relevant if the use_menu_path key is true and the object_type key is \"menu-"
@@ -2327,13 +2367,13 @@ msgstr ""
 "ä½¿ç?¨å?ªå??è·¯å¾?ä½?ç?ºæ ¹ç?®é??ä¾?ç?¢ç??é?¸å?®ã??å?ªæ??å?¨ use_menu_path ç?ºâ??trueâ??å?? "
 "object_type æ?¯â??menu-objectâ??æ??ï¼?æ?¬è¨å®?é?µæ?¹æ??ç??æ??ã??"
 
-#: ../gnome-panel/panel-object.schemas.in.h:22
+#: ../gnome-panel/panel-object.schemas.in.h:23
 msgid ""
 "The position of this panel object. The position is specified by the number "
 "of pixels from the left (or top if vertical) panel edge."
 msgstr "è©²é?¢æ?¿ç?©ä»¶ç??ä½?ç½®ã??ä½?ç½®æ?¯å¾?é?¢æ?¿ç??å·¦é??ï¼?æ??è??å??ç?´é?¢æ?¿ç??é ?é?¨ï¼?é??å§?è¨?ç®?ã??"
 
-#: ../gnome-panel/panel-object.schemas.in.h:23
+#: ../gnome-panel/panel-object.schemas.in.h:24
 msgid ""
 "The text to display in a tooltip for this drawer or this menu. This key is "
 "only relevant if the object_type key is \"drawer-object\" or \"menu-object\"."
@@ -2341,7 +2381,7 @@ msgstr ""
 "æ?¬æ?½å±?ç?©ä»¶æ??é?¸å?®ä¸é¡¯ç¤ºç??å·¥å?·æ??ç¤ºæ??å?ã??å?ªæ??å?¨ object_type æ?¯â??drawer-objectâ??æ??"
 "è??â??menu-objectâ??æ??ï¼?æ?¬è¨å®?æ?¹æ??ç??æ??ã??"
 
-#: ../gnome-panel/panel-object.schemas.in.h:24
+#: ../gnome-panel/panel-object.schemas.in.h:25
 msgid ""
 "The type of this panel object. Possible values are \"drawer-object\", \"menu-"
 "object\", \"launcher-object\", \"bonobo-applet\", \"action-applet\" and "
@@ -2350,19 +2390,30 @@ msgstr ""
 "æ?¬é?¢æ?¿ç?©ä»¶ç??é¡?å??ã??å?¯æ?¥å??ç??å?¼ç?ºï¼?â??drawer-objectâ??ã??â??menu-objectâ??ã??â??launcher-"
 "objectâ??ã??â??bonobo-appletâ??ã??â??action-appletâ??å??â??menu-barâ??ã??"
 
-#: ../gnome-panel/panel-object.schemas.in.h:25
+#: ../gnome-panel/panel-object.schemas.in.h:26
+msgid ""
+"This key is deprecated, following the migration to a new library for "
+"applets. The Bonobo implementation ID of the applet - e.g. \"OAFIID:"
+"GNOME_ClockApplet\". This key is only relevant if the object_type key is "
+"\"bonobo-applet\"."
+msgstr ""
+"é??å??è¨å®?é?µå·²å»¢æ£?ï¼?æ?¥ä¸?ä¾?æ??è©²è½?æ??å?°é?¢æ?¿ç¨?å¼?ç??æ?°ç¨?å¼?åº«ã??é?¢æ?¿ç¨?å¼?ç?? Bonobo "
+"implementation ID - ä¾?å¦?â??OAFIID:GNOME_ClockAppletâ??ã??å?ªæ?? object_type "
+"æ?¯â??bonobo-appletâ??æ??æ?¬è¨å®?é?µæ?¹æ??ç??æ??ã??"
+
+#: ../gnome-panel/panel-object.schemas.in.h:27
 msgid "Tooltip displayed for drawer or menu"
 msgstr "æ?½å±?æ??é?¸å?®ä¸é¡¯ç¤ºç??å·¥å?·æ??ç¤º"
 
-#: ../gnome-panel/panel-object.schemas.in.h:26
+#: ../gnome-panel/panel-object.schemas.in.h:28
 msgid "Toplevel panel containing object"
 msgstr "è¼?æ??è©²ç?©ä»¶ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-object.schemas.in.h:27
+#: ../gnome-panel/panel-object.schemas.in.h:29
 msgid "Use custom icon for object's button"
 msgstr "å?¨æ??é??ä¸ä½¿ç?¨è?ªè¨?å??ç¤º"
 
-#: ../gnome-panel/panel-object.schemas.in.h:28
+#: ../gnome-panel/panel-object.schemas.in.h:30
 msgid "Use custom path for menu contents"
 msgstr "ä½¿ç?¨è?ªè¨?ç??è·¯å¾?ä½?ç?ºé?¸å?®å?§å®¹"
 
@@ -2391,36 +2442,12 @@ msgstr "é?¢æ?¿â??%sâ??è¢«æ??å®?å?¨ç¬¬ %d å??è?¢å¹?ä¸é¡¯ç¤ºï¼?ä½?è©²è?¢å¹?ä¸?å?
 msgid "Error reading GConf boolean value '%s': %s"
 msgstr "è®?å?? GConf å¸?æ??å?¼â??%sâ??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../gnome-panel/panel-properties-dialog.c:123
-#: ../libpanel-applet/panel-test-applets.c:53
-msgctxt "Orientation"
-msgid "Top"
-msgstr "ä¸?"
-
-#: ../gnome-panel/panel-properties-dialog.c:124
-#: ../libpanel-applet/panel-test-applets.c:54
-msgctxt "Orientation"
-msgid "Bottom"
-msgstr "ä¸?"
-
-#: ../gnome-panel/panel-properties-dialog.c:125
-#: ../libpanel-applet/panel-test-applets.c:55
-msgctxt "Orientation"
-msgid "Left"
-msgstr "å·¦"
-
-#: ../gnome-panel/panel-properties-dialog.c:126
-#: ../libpanel-applet/panel-test-applets.c:56
-msgctxt "Orientation"
-msgid "Right"
-msgstr "å?³"
-
 #: ../gnome-panel/panel-properties-dialog.c:866
 msgid "Drawer Properties"
 msgstr "æ?½å±?å±¬æ?§"
 
 #: ../gnome-panel/panel-properties-dialog.c:981
-#: ../gnome-panel/panel-run-dialog.c:2019
+#: ../gnome-panel/panel-run-dialog.c:2022
 #, c-format
 msgid "Unable to load file '%s': %s."
 msgstr "ç?¡æ³?è¼?å?¥æª?æ¡?ã??%sã??ï¼?%sã??"
@@ -2509,20 +2536,10 @@ msgstr "å??ç¤º(_I):"
 msgid "_None (use system theme)"
 msgstr "ç?¡ï¼?ä½¿ç?¨ç³»çµ±ä½?æ?¯(_N)"
 
-#: ../gnome-panel/panel-properties-dialog.ui.h:23
-#: ../libpanel-applet/panel-test-applets.ui.h:4
-msgid "_Orientation:"
-msgstr "ä½?ç½®(_O):"
-
 #: ../gnome-panel/panel-properties-dialog.ui.h:24
 msgid "_Scale"
 msgstr "ä¾?æ¯?ä¾?ç¸®æ?¾(_S)"
 
-#: ../gnome-panel/panel-properties-dialog.ui.h:25
-#: ../libpanel-applet/panel-test-applets.ui.h:6
-msgid "_Size:"
-msgstr "å¤§å°?(_S):"
-
 #: ../gnome-panel/panel-properties-dialog.ui.h:26
 msgid "_Tile"
 msgstr "é?ªæ??(_T)"
@@ -2581,26 +2598,26 @@ msgstr "ç?¡æ³?å?·è¡?â??%sâ??æ??ä»¤"
 msgid "Could not convert '%s' from UTF-8"
 msgstr "ç?¡æ³?ç?± UTF-8 è½?æ??ç?ºâ??%sâ??"
 
-#: ../gnome-panel/panel-run-dialog.c:1256
+#: ../gnome-panel/panel-run-dialog.c:1259
 msgid "Choose a file to append to the command..."
 msgstr "å?¨æ??ä»¤å¾?é??å? æª?æ¡?å??ç¨±..."
 
-#: ../gnome-panel/panel-run-dialog.c:1634
+#: ../gnome-panel/panel-run-dialog.c:1637
 #: ../gnome-panel/panel-run-dialog.ui.h:8
 msgid "Select an application to view its description."
 msgstr "é?¸å??æ??ç?¨ç¨?å¼?å¾?å?¯ä»¥é¡¯ç¤ºæ??é??è©²ç¨?å¼?ç??èªªæ??ã??"
 
-#: ../gnome-panel/panel-run-dialog.c:1672
+#: ../gnome-panel/panel-run-dialog.c:1675
 #, c-format
 msgid "Will run command: '%s'"
 msgstr "å°?æ??å?·è¡?æ??ä»¤ï¼?â??%sâ??"
 
-#: ../gnome-panel/panel-run-dialog.c:1705
+#: ../gnome-panel/panel-run-dialog.c:1708
 #, c-format
 msgid "URI list dropped on run dialog had wrong format (%d) or length (%d)\n"
 msgstr "æ??æ?³å?°å?·è¡?è¦?çª?ç?? URI æ¸?å?®ç??æ ¼å¼? (%d) æ??é?·åº¦ (%d) é?¯èª¤\n"
 
-#: ../gnome-panel/panel-run-dialog.c:2024
+#: ../gnome-panel/panel-run-dialog.c:2027
 msgid "Could not display run dialog"
 msgstr "ç?¡æ³?é¡¯ç¤ºå?·è¡?å°?è©±è¦?çª?"
 
@@ -2665,73 +2682,73 @@ msgstr "æ¸?é?¤(_L)"
 msgid "D_on't Delete"
 msgstr "ä¸?è¦?å?ªé?¤(_O)"
 
-#: ../gnome-panel/panel-toplevel.c:1188
+#: ../gnome-panel/panel-toplevel.c:1190
 msgid "Hide Panel"
 msgstr "é?±è??æ?¬é?¢æ?¿"
 
 #. translators: these string will be shown in MetaCity's switch window
 #. * popup when you pass the focus to a panel
-#: ../gnome-panel/panel-toplevel.c:1595
+#: ../gnome-panel/panel-toplevel.c:1597
 msgid "Top Expanded Edge Panel"
 msgstr "é ?é?¨æ?´å¤§é??ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1596
+#: ../gnome-panel/panel-toplevel.c:1598
 msgid "Top Centered Panel"
 msgstr "é ?é?¨ç½®ä¸é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1597
+#: ../gnome-panel/panel-toplevel.c:1599
 msgid "Top Floating Panel"
 msgstr "é ?é?¨æµ®å??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1598
+#: ../gnome-panel/panel-toplevel.c:1600
 msgid "Top Edge Panel"
 msgstr "é ?é?¨é??ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1602
+#: ../gnome-panel/panel-toplevel.c:1604
 msgid "Bottom Expanded Edge Panel"
 msgstr "åº?é?¨æ?´å¤§é??ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1603
+#: ../gnome-panel/panel-toplevel.c:1605
 msgid "Bottom Centered Panel"
 msgstr "åº?é?¨ç½®ä¸é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1604
+#: ../gnome-panel/panel-toplevel.c:1606
 msgid "Bottom Floating Panel"
 msgstr "åº?é?¨æµ®å??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1605
+#: ../gnome-panel/panel-toplevel.c:1607
 msgid "Bottom Edge Panel"
 msgstr "åº?é?¨é??ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1609
+#: ../gnome-panel/panel-toplevel.c:1611
 msgid "Left Expanded Edge Panel"
 msgstr "å·¦é??æ?´å¤§é??ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1610
+#: ../gnome-panel/panel-toplevel.c:1612
 msgid "Left Centered Panel"
 msgstr "å·¦é??ç½®ä¸é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1611
+#: ../gnome-panel/panel-toplevel.c:1613
 msgid "Left Floating Panel"
 msgstr "å·¦é??æµ®å??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1612
+#: ../gnome-panel/panel-toplevel.c:1614
 msgid "Left Edge Panel"
 msgstr "å·¦é??é??ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1616
+#: ../gnome-panel/panel-toplevel.c:1618
 msgid "Right Expanded Edge Panel"
 msgstr "å?³é??æ?´å¤§é??ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1617
+#: ../gnome-panel/panel-toplevel.c:1619
 msgid "Right Centered Panel"
 msgstr "å?³é??ç½®ä¸é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1618
+#: ../gnome-panel/panel-toplevel.c:1620
 msgid "Right Floating Panel"
 msgstr "å?³é??æµ®å??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1619
+#: ../gnome-panel/panel-toplevel.c:1621
 msgid "Right Edge Panel"
 msgstr "å?³é??é??ç??é?¢æ?¿"
 
@@ -3089,31 +3106,31 @@ msgstr "é?¢æ?¿ç??å??ç?´åº§æ¨?"
 msgid "Y co-ordinate of panel, starting from the bottom of the screen"
 msgstr "é?¢æ?¿ç?? Y å??æ¨?ï¼?è?ªè?¢å¹?åº?é?¨ç®?èµ·"
 
-#: ../gnome-panel/panel-util.c:306
+#: ../gnome-panel/panel-util.c:315
 #, c-format
 msgid "Icon '%s' not found"
 msgstr "å??ç¤ºâ??%sâ??ä¸?å?å?¨"
 
-#: ../gnome-panel/panel-util.c:409
+#: ../gnome-panel/panel-util.c:418
 #, c-format
 msgid "Could not execute '%s'"
 msgstr "ç?¡æ³?å?·è¡?â??%sâ??"
 
-#: ../gnome-panel/panel-util.c:645
+#: ../gnome-panel/panel-util.c:654
 msgid "file"
 msgstr "æª?æ¡?"
 
-#: ../gnome-panel/panel-util.c:822
+#: ../gnome-panel/panel-util.c:831
 msgid "Home Folder"
 msgstr "å®¶ç?®é??"
 
 #. Translators: this is the same string as the one found in
 #. * nautilus
-#: ../gnome-panel/panel-util.c:834
+#: ../gnome-panel/panel-util.c:843
 msgid "File System"
 msgstr "æª?æ¡?ç³»çµ±"
 
-#: ../gnome-panel/panel-util.c:985
+#: ../gnome-panel/panel-util.c:1016
 msgid "Search"
 msgstr "æ??å°?"
 
@@ -3122,7 +3139,7 @@ msgstr "æ??å°?"
 #. * example, "Trash: some-directory". It means that the
 #. * directory called "some-directory" is in the trash.
 #.
-#: ../gnome-panel/panel-util.c:1031
+#: ../gnome-panel/panel-util.c:1062
 #, c-format
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"
@@ -3132,108 +3149,94 @@ msgstr "%1$s: %2$s"
 msgid "Open URL: %s"
 msgstr "é??å?? URLï¼?%s"
 
-#: ../gnome-panel/panel.c:1302
+#: ../gnome-panel/panel.c:1323
 msgid "Delete this drawer?"
 msgstr "å?ªé?¤é??æ?½å±?ï¼?"
 
-#: ../gnome-panel/panel.c:1303
+#: ../gnome-panel/panel.c:1324
 msgid ""
 "When a drawer is deleted, the drawer and its\n"
 "settings are lost."
 msgstr "ç?¶å?ªé?¤æ?½å±?å¾?ï¼?æ?½å±?å??å?¶è¨å®?é?½æ??æ¶?å¤±ã??"
 
-#: ../gnome-panel/panel.c:1306
+#: ../gnome-panel/panel.c:1327
 msgid "Delete this panel?"
 msgstr "å?ªé?¤æ?¬é?¢æ?¿ï¼?"
 
-#: ../gnome-panel/panel.c:1307
+#: ../gnome-panel/panel.c:1328
 msgid ""
 "When a panel is deleted, the panel and its\n"
 "settings are lost."
 msgstr "ç?¶å?ªé?¤é?¢æ?¿å¾?ï¼?é?¢æ?¿å??å?¶è¨å®?é?½æ??æ¶?å¤±ã??"
 
-#: ../libpanel-applet/GNOME_Panel_TestApplet.server.in.h:1
-msgid "A simple applet for testing the GNOME-2.0 panel"
-msgstr "ç?¨ä¾?æ¸¬è©¦ GNOME-2.0 é?¢æ?¿ç??ç°¡å?®é?¢æ?¿ç¨?å¼?"
+#~ msgid "Clock Applet Factory"
+#~ msgstr "æ??é??é?¢æ?¿ç¨?å¼?å·¥å» "
 
-#: ../libpanel-applet/GNOME_Panel_TestApplet.server.in.h:2
-msgid "Test Bonobo Applet"
-msgstr "Bonobo é?¢æ?¿æ¸¬è©¦ç¨?å¼?"
+#~ msgid "Factory for creating clock applets."
+#~ msgstr "ç?¢ç??æ??é??é?¢æ?¿ç¨?å¼?ç??å·¥å» ã??"
 
-#: ../libpanel-applet/GNOME_Panel_TestApplet.server.in.h:3
-msgid "Test Bonobo Applet Factory"
-msgstr "Bonobo é?¢æ?¿æ¸¬è©¦ç¨?å¼?å·¥å» "
+#~ msgid "Get the current time and date"
+#~ msgstr "å??å¾?ç?®å??ç??æ??å?»å??æ?¥æ??"
 
-#: ../libpanel-applet/panel-test-applets.c:34
-msgid "Specify an applet IID to load"
-msgstr "æ??å®?æº?å??è¼?å?¥ç??é?¢æ?¿ç¨?å¼?ç?? IID"
+#~ msgid "Change system time"
+#~ msgstr "æ?¹è®?ç³»çµ±æ??å?»"
 
-#: ../libpanel-applet/panel-test-applets.c:35
-msgid ""
-"Specify a gconf location in which the applet preferences should be stored"
-msgstr "é?¢æ?¿ç¨?å¼?ç??å??å¥½è¨å®?æ??è©²å?²å?å?¨æ??å®?ç?? gconf ä½?ç½®"
+#~ msgid "Change system time zone"
+#~ msgstr "æ?¹è®?ç³»çµ±æ??å??"
 
-#: ../libpanel-applet/panel-test-applets.c:36
-msgid "Specify the initial size of the applet (xx-small, medium, large etc.)"
-msgstr "æ??å®?é?¢æ?¿ç¨?å¼?é??å§?æ??ç??å¤§å°?ï¼?è¶?å¾®å??ã??ä¸å??ã??å¤§å??ç?ã??ï¼?"
+#~ msgid "Configure hardware clock"
+#~ msgstr "è¨å®?ç¡¬é«?æ??é??"
 
-#: ../libpanel-applet/panel-test-applets.c:37
-msgid ""
-"Specify the initial orientation of the applet (top, bottom, left or right)"
-msgstr "æ??å®?é?¢æ?¿ç¨?å¼?é??å§?é¡¯ç¤ºæ??ç??æ?¹å??ï¼?é ?é?¨ã??åº?é?¨ã??å·¦é??ã??å?³é??ï¼?"
+#~ msgid "Privileges are required to change the system time zone."
+#~ msgstr "æ?¹è®?ç³»çµ±æ??å??é??è¦?æ??æ¬?é??ã??"
 
-#: ../libpanel-applet/panel-test-applets.c:61
-msgctxt "Size"
-msgid "XX Small"
-msgstr "è¶?å°?"
+#~ msgid "Privileges are required to change the system time."
+#~ msgstr "æ?¹è®?ç³»çµ±æ??å?»é??è¦?æ??æ¬?é??ã??"
 
-#: ../libpanel-applet/panel-test-applets.c:62
-msgctxt "Size"
-msgid "X Small"
-msgstr "ç?¹å°?"
+#~ msgid "Privileges are required to configure the hardware clock."
+#~ msgstr "è¨å®?ç¡¬é«?æ??é??é??è¦?æ??æ¬?é??ã??"
 
-#: ../libpanel-applet/panel-test-applets.c:63
-msgctxt "Size"
-msgid "Small"
-msgstr "å°?"
+#~ msgid "Display a swimming fish or another animated creature"
+#~ msgstr "é¡¯ç¤ºæ¸¸æ³³ä¸ç??é?å??æ??å?¶å®?ç??ç?©"
 
-#: ../libpanel-applet/panel-test-applets.c:64
-msgctxt "Size"
-msgid "Medium"
-msgstr "ä¸"
+#~ msgid "From Whence That Stupid Fish Came"
+#~ msgstr "é?£æ¢?è ¢é?æ?¯å¾?å?ªè£¡ä¾?ç??"
 
-#: ../libpanel-applet/panel-test-applets.c:65
-msgctxt "Size"
-msgid "Large"
-msgstr "å¤§"
+#~ msgid "Wanda Factory"
+#~ msgstr "Wanda å·¥å» "
 
-#: ../libpanel-applet/panel-test-applets.c:66
-msgctxt "Size"
-msgid "X Large"
-msgstr "ç?¹å¤§"
+#~ msgid "Area where notification icons appear"
+#~ msgstr "é¡¯ç¤ºç¨?å¼?ç??æ??é??ç?¥å??ç¤ºç??å??å??"
 
-#: ../libpanel-applet/panel-test-applets.c:67
-msgctxt "Size"
-msgid "XX Large"
-msgstr "è¶?å¤§"
+#~ msgid "Notification Area Factory"
+#~ msgstr "ã??ç¨?å¼?ç??æ??é??ç?¥å??ã??å·¥å» "
 
-#: ../libpanel-applet/panel-test-applets.c:129
-#, c-format
-msgid "Failed to load applet %s"
-msgstr "è¼?å?¥é?¢æ?¿ç¨?å¼? %s å¤±æ??"
+#~ msgid "Factory for the window navigation related applets"
+#~ msgstr "ç?¨ä¾?ç?¢ç??å??è¦?çª?ç??è¦½æ??é??ç??é?¢æ?¿ç¨?å¼?ç??å·¥å» "
 
-#. This is an utility to easily test various applets
-#: ../libpanel-applet/panel-test-applets.ui.h:2
-msgid "Test applet utility"
-msgstr "é?¢æ?¿ç¨?å¼?æ¸¬è©¦å·¥å?·"
+#~ msgid "Hide application windows and show the desktop"
+#~ msgstr "é?±è??æ??æ??ç¨?å¼?è¦?çª?ä¸¦é¡¯ç¤ºæ¡?é?¢"
 
-#: ../libpanel-applet/panel-test-applets.ui.h:3
-msgid "_Applet:"
-msgstr "é?¢æ?¿ç¨?å¼?(_A):"
+#~ msgid "Show Desktop"
+#~ msgstr "é¡¯ç¤ºæ¡?é?¢"
 
-#: ../libpanel-applet/panel-test-applets.ui.h:5
-msgid "_Prefs Dir:"
-msgstr "å??å¥½è¨å®?ç?®é??(_P):"
+#~ msgid "Switch between open windows using a menu"
+#~ msgstr "ä½¿ç?¨é?¸å?®ä¾?å??æ??å·²é??å??ç??è¦?çª?"
+
+#~ msgid "Switch between open windows using buttons"
+#~ msgstr "ä½¿ç?¨æ??é??ä¾?å??æ??å·²é??å??ç??è¦?çª?"
+
+#~ msgid "Switch between workspaces"
+#~ msgstr "å??æ??å·¥ä½?å??"
+
+#~ msgid "Window Navigation Applet Factory"
+#~ msgstr "è¦?çª?ç??è¦½é?¢æ?¿ç¨?å¼?å·¥å» "
+
+#~ msgid "Exception from popup_menu '%s'\n"
+#~ msgstr "popup_menuâ??%sâ??å?ºç?¾ä¾?å¤?æ??æ³?\n"
+
+#~ msgid "Unable to obtain AppletShell interface from control\n"
+#~ msgstr "ç?¡æ³?å¾? control å??å¾? AppletShell ä»?é?¢\n"
 
 #~ msgid "If true, display time in Universal Coordinated Time zone."
 #~ msgstr "å¦?è¨å®?ç?ºâ??trueâ??ï¼?å??é¡¯ç¤ºä¸?ç??å??èª¿æ??(UTC)ã??"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]