[gnome-panel] Update Simplified Chinese translation.

[Aron Xu <aronxu src gnome org>]

commit 3e79c8a5255cbfdd9dc9af65266c5e24b8452243
Author: Aron Xu <aronxu gnome org>
Date:   Tue Jun 29 21:56:56 2010 +0800

    Update Simplified Chinese translation.

 po/zh_CN.po | 1187 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 636 insertions(+), 551 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4bd99a4..d931f68 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -17,8 +17,8 @@ msgstr ""
 "Project-Id-Version: gnome-panel\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "panel&component=general\n"
-"POT-Creation-Date: 2009-11-27 12:36+0000\n"
-"PO-Revision-Date: 2010-01-24 17:10+0800\n"
+"POT-Creation-Date: 2010-06-22 23:44+0000\n"
+"PO-Revision-Date: 2010-06-29 21:56+0800\n"
 "Last-Translator: è??è¿?强 <wzssyqa gmail com>\n"
 "Language-Team: Chinese (China) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
@@ -26,70 +26,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\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:3715
-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
 #. * am/pm.
-#: ../applets/clock/calendar-window.c:309 ../applets/clock/clock.c:448
+#. 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/calendar-window.c:303 ../applets/clock/clock.c:444
+#: ../applets/clock/clock-location-tile.c:520
 msgid "%l:%M %p"
 msgstr "%p %l:%M"
 
@@ -103,56 +49,61 @@ msgstr "%p %l:%M"
 #. Translators: This is a strftime format string.
 #. * It is used to display the time in 24-hours format
 #. * (eg, like in France: 20:10).
-#: ../applets/clock/calendar-window.c:314 ../applets/clock/clock.c:453
-#: ../applets/clock/clock.c:1599 ../applets/clock/clock-location-tile.c:476
+#. Translators: This is a strftime format string.
+#. * 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: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"
 
 #. Translators: This is a strftime format string.
 #. * It is used to display the start date of an appointment, in
 #. * the most abbreviated way possible.
-#: ../applets/clock/calendar-window.c:320
+#: ../applets/clock/calendar-window.c:314
 msgid "%b %d"
 msgstr "%-mæ??%-dæ?¥"
 
-#: ../applets/clock/calendar-window.c:853
+#: ../applets/clock/calendar-window.c:847
 msgid "Tasks"
 msgstr "任�"
 
-#: ../applets/clock/calendar-window.c:853
-#: ../applets/clock/calendar-window.c:1029
-#: ../applets/clock/calendar-window.c:1665
+#: ../applets/clock/calendar-window.c:847
+#: ../applets/clock/calendar-window.c:1022
+#: ../applets/clock/calendar-window.c:1655
 msgid "Edit"
 msgstr "ç¼?è¾?"
 
-#: ../applets/clock/calendar-window.c:974
+#: ../applets/clock/calendar-window.c:968
 msgid "All Day"
 msgstr "�天"
 
-#: ../applets/clock/calendar-window.c:1113
+#: ../applets/clock/calendar-window.c:1106
 msgid "Appointments"
 msgstr "约�"
 
-#: ../applets/clock/calendar-window.c:1138
+#: ../applets/clock/calendar-window.c:1131
 msgid "Birthdays and Anniversaries"
 msgstr "ç??æ?¥å??纪念æ?¥"
 
-#: ../applets/clock/calendar-window.c:1163
+#: ../applets/clock/calendar-window.c:1156
 msgid "Weather Information"
 msgstr "�象信�"
 
-#: ../applets/clock/calendar-window.c:1665 ../applets/clock/clock.ui.h:12
+#: ../applets/clock/calendar-window.c:1655 ../applets/clock/clock.ui.h:12
 msgid "Locations"
 msgstr "ä½?ç½®"
 
-#: ../applets/clock/calendar-window.c:1964
+#: ../applets/clock/calendar-window.c:1937
 msgid "Calendar"
 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:448
+#: ../applets/clock/clock.c:444
 msgid "%l:%M:%S %p"
 msgstr "%p %l:%M:%S"
 
@@ -163,7 +114,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:453 ../applets/clock/clock.c:1593
+#: ../applets/clock/clock.c:449 ../applets/clock/clock.c:1585
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -172,7 +123,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:464
+#: ../applets/clock/clock.c:460
 msgid "%a %b %e"
 msgstr "%-mæ??%-dæ?¥%A"
 
@@ -180,7 +131,7 @@ msgstr "%-mæ??%-dæ?¥%A"
 #. *              if the time should come before the
 #. *              date on a clock in your locale.
 #.
-#: ../applets/clock/clock.c:471
+#: ../applets/clock/clock.c:467
 #, c-format
 msgid ""
 "%1$s\n"
@@ -193,7 +144,7 @@ msgstr ""
 #. *              if the time should come before the
 #. *              date on a clock in your locale.
 #.
-#: ../applets/clock/clock.c:479
+#: ../applets/clock/clock.c:475
 #, c-format
 msgid "%1$s, %2$s"
 msgstr "%1$s %2$s"
@@ -202,27 +153,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:658
+#: ../applets/clock/clock.c:648
 msgid "%A %B %d (%%s)"
 msgstr "%mæ??%dæ?¥ æ??æ??%a (%%s)"
 
-#: ../applets/clock/clock.c:688
+#: ../applets/clock/clock.c:678
 msgid "Click to hide your appointments and tasks"
 msgstr "å??å?»é??è??æ?¨ç??约ä¼?å??ä»»å?¡"
 
-#: ../applets/clock/clock.c:691
+#: ../applets/clock/clock.c:681
 msgid "Click to view your appointments and tasks"
 msgstr "å??å?»æ?¥ç??æ?¨ç??约ä¼?å??ä»»å?¡"
 
-#: ../applets/clock/clock.c:695
+#: ../applets/clock/clock.c:685
 msgid "Click to hide month calendar"
 msgstr "å??å?»é??è??æ??å??"
 
-#: ../applets/clock/clock.c:698
+#: ../applets/clock/clock.c:688
 msgid "Click to view month calendar"
 msgstr "å??å?»æ?¥ç??æ??å??"
 
-#: ../applets/clock/clock.c:1432
+#: ../applets/clock/clock.c:1423
 msgid "Computer Clock"
 msgstr "计ç®?æ?ºæ?¶é??"
 
@@ -232,7 +183,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:1578
+#: ../applets/clock/clock.c:1570
 msgid "%I:%M:%S %p"
 msgstr "%H:%M:%S"
 
@@ -242,75 +193,116 @@ msgstr "%H:%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:1586
+#: ../applets/clock/clock.c:1578
 msgid "%I:%M %p"
 msgstr "%H:%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:1639
+#: ../applets/clock/clock.c:1624
 msgid "%A, %B %d %Y"
 msgstr "%Yå¹´%-mæ??%-dæ?¥%A"
 
-#: ../applets/clock/clock.c:1670
+#: ../applets/clock/clock.c:1655
 msgid "Set System Time..."
 msgstr "设置系���..."
 
-#: ../applets/clock/clock.c:1671
+#: ../applets/clock/clock.c:1656
 msgid "Set System Time"
 msgstr "设置系���"
 
-#: ../applets/clock/clock.c:1686
+#: ../applets/clock/clock.c:1671
 msgid "Failed to set the system time"
 msgstr "设置系���失败"
 
-#: ../applets/clock/clock.c:2748
+#: ../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:3206
+#: ../applets/clock/clock.c:3207
 msgid "Choose Location"
 msgstr "é??æ?©ä½?ç½®"
 
-#: ../applets/clock/clock.c:3281
+#: ../applets/clock/clock.c:3286
 msgid "Edit Location"
 msgstr "ç¼?è¾?ä½?ç½®"
 
-#: ../applets/clock/clock.c:3427
+#: ../applets/clock/clock.c:3432
 msgid "City Name"
 msgstr "å??å¸?å??称"
 
-#: ../applets/clock/clock.c:3431
+#: ../applets/clock/clock.c:3436
 msgid "City Time Zone"
 msgstr "å??å¸?æ?¶å?º"
 
-#: ../applets/clock/clock.c:3611
+#: ../applets/clock/clock.c:3621
 msgid "24 hour"
 msgstr "24 å°?æ?¶"
 
-#: ../applets/clock/clock.c:3612
+#: ../applets/clock/clock.c:3622
 msgid "UNIX time"
 msgstr "UNIX ��"
 
-#: ../applets/clock/clock.c:3613
+#: ../applets/clock/clock.c:3623
 msgid "Internet time"
 msgstr "Internet ��"
 
-#: ../applets/clock/clock.c:3621
+#: ../applets/clock/clock.c:3631
 msgid "Custom _format:"
 msgstr "è?ªå®?ä¹?æ ¼å¼?(_F)ï¼?"
 
-#: ../applets/clock/clock.c:3718
+#: ../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:3721 ../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:624
 #: ../gnome-panel/panel-context-menu.c:138
 msgid "translator-credits"
 msgstr ""
@@ -511,100 +503,104 @@ msgid "If true, display seconds in time."
 msgstr "å¦?æ??为 trueï¼?å??æ?¾ç¤ºæ?¶é?´æ?¶æ?¾ç¤ºç§?æ?°ã??"
 
 #: ../applets/clock/clock.schemas.in.h:23
-msgid "If true, display time in Universal Coordinated Time zone."
-msgstr "å¦?æ??为 trueï¼?å??æ?¾ç¤º UTC æ?¶å?ºç??æ?¶é?´ã??"
-
-#: ../applets/clock/clock.schemas.in.h:24
 msgid "If true, expand the list of appointments in the calendar window."
 msgstr "å¦?æ??为 trueï¼?å??å?¨æ?¥å??中å±?å¼?约ä¼?å??表ã??"
 
-#: ../applets/clock/clock.schemas.in.h:25
+#: ../applets/clock/clock.schemas.in.h:24
 msgid "If true, expand the list of birthdays in the calendar window."
 msgstr "å¦?æ??为 trueï¼?å??å?¨æ?¥å??çª?å?£ä¸­å±?å¼?ç??æ?¥å??表ã??"
 
-#: ../applets/clock/clock.schemas.in.h:26
+#: ../applets/clock/clock.schemas.in.h:25
 msgid "If true, expand the list of locations in the calendar window."
 msgstr "å¦?æ??为 trueï¼?å??å?¨æ?¥å??çª?å?£ä¸­å±?å¼?ä½?ç½®å??表ã??"
 
-#: ../applets/clock/clock.schemas.in.h:27
+#: ../applets/clock/clock.schemas.in.h:26
 msgid "If true, expand the list of tasks in the calendar window."
 msgstr "å¦?æ??为 trueï¼?å??å?¨æ?¥å??çª?å?£ä¸­å±?å¼?ä»»å?¡å??表ã??"
 
-#: ../applets/clock/clock.schemas.in.h:28
+#: ../applets/clock/clock.schemas.in.h:27
 msgid "If true, expand the list of weather information in the calendar window."
 msgstr "å¦?æ??为 trueï¼?å??å?¨æ?¥å??中å±?å¼?æ°?象信æ?¯å??表ã??"
 
-#: ../applets/clock/clock.schemas.in.h:29
+#: ../applets/clock/clock.schemas.in.h:28
 msgid "If true, show date in a tooltip when the pointer is over the clock."
 msgstr "å¦?æ??为 trueï¼?å??å½?é¼ æ ?å?¨æ?¶é??ä¸?å??ç??æ?¶å?¨å·¥å?·æ??示中æ?¾ç¤ºæ?¥æ??ã??"
 
-#: ../applets/clock/clock.schemas.in.h:30
+#: ../applets/clock/clock.schemas.in.h:29
 msgid "If true, show the temperature next to the weather icon."
 msgstr "å¦?æ??为 trueï¼?å??å?¨å¤©æ°?å?¾æ ?æ??æ?¾ç¤ºæ¸©åº¦ã??"
 
-#: ../applets/clock/clock.schemas.in.h:31
+#: ../applets/clock/clock.schemas.in.h:30
 msgid "If true, show week numbers in the calendar."
 msgstr "å¦?æ??为 trueï¼?å??å?¨æ?¥å??中æ?¾ç¤ºå?¨åº?å?·ã??"
 
-#: ../applets/clock/clock.schemas.in.h:32
+#: ../applets/clock/clock.schemas.in.h:31
 msgid "List of locations"
 msgstr "ä½?ç½®å??表"
 
-#: ../applets/clock/clock.schemas.in.h:33
+#: ../applets/clock/clock.schemas.in.h:32
 msgid "Show date in clock"
 msgstr "å?¨æ?¶é??ä¸?æ?¾ç¤ºæ?¥æ??"
 
-#: ../applets/clock/clock.schemas.in.h:34
+#: ../applets/clock/clock.schemas.in.h:33
 msgid "Show date in tooltip"
 msgstr "å?¨æ??示中æ?¾ç¤ºæ?¥æ??"
 
-#: ../applets/clock/clock.schemas.in.h:35
+#: ../applets/clock/clock.schemas.in.h:34
 msgid "Show temperature in clock"
 msgstr "å?¨æ?¶é??ä¸?æ?¾ç¤ºæ¸©åº¦"
 
-#: ../applets/clock/clock.schemas.in.h:36
+#: ../applets/clock/clock.schemas.in.h:35
 msgid "Show time with seconds"
 msgstr "æ?¾ç¤ºå¸¦ç§?ç??æ?¶é?´"
 
-#: ../applets/clock/clock.schemas.in.h:37
+#: ../applets/clock/clock.schemas.in.h:36
 msgid "Show weather in clock"
 msgstr "å?¨æ?¶é??ä¸?æ?¾ç¤ºå¤©æ°?"
 
-#: ../applets/clock/clock.schemas.in.h:38
+#: ../applets/clock/clock.schemas.in.h:37
 msgid "Show week numbers in calendar"
 msgstr "å?¨æ?¥å??中æ?¾ç¤ºå?¨åº?å?·"
 
-#: ../applets/clock/clock.schemas.in.h:39
+#: ../applets/clock/clock.schemas.in.h:38
 msgid "Speed unit"
 msgstr "é??度å??ä½?"
 
-#: ../applets/clock/clock.schemas.in.h:40
+#: ../applets/clock/clock.schemas.in.h:39
 msgid "Temperature unit"
 msgstr "温度å??ä½?"
 
-#: ../applets/clock/clock.schemas.in.h:41
+#: ../applets/clock/clock.schemas.in.h:40
 msgid "The unit to use when showing temperatures."
 msgstr "æ?¾ç¤ºæ¸©åº¦æ?¶ä½¿ç?¨ç??å??ä½?"
 
-#: ../applets/clock/clock.schemas.in.h:42
+#: ../applets/clock/clock.schemas.in.h:41
 msgid "The unit to use when showing wind speed."
 msgstr "æ?¾ç¤ºé£?é??æ?¶ä½¿ç?¨ç??å??ä½?"
 
-#: ../applets/clock/clock.schemas.in.h:43
+#: ../applets/clock/clock.schemas.in.h:42
 msgid ""
 "The use of this key was deprecated in GNOME 2.22 with the use of an internal "
 "time configuration tool. The schema is retained for compatibility with older "
 "versions."
 msgstr ""
-"å?¨ GNOME 2.22 以å??å? 已使ç?¨å??é?¨æ?¶é?´é??置工å?·ï¼?æ??ä¸?ä¸?å??é??è¦?æ­¤é?®ï¼?è¿?é??ä»?为ä¸?æ?§ç??"
+"å?¨ GNOME 2.22 以å??å°?ä¸?å??使ç?¨æ­¤é?®ï¼?è??åº?该使ç?¨å??é?¨æ?¶é?´é??置工å?·ï¼?è¿?é??ä»?为ä¸?æ?§ç??"
 "æ?¬å?¼å®¹è??ä¿?ç??ã??"
 
+#: ../applets/clock/clock.schemas.in.h:43
+msgid ""
+"The use of this key was deprecated in GNOME 2.28 in favour of the use of "
+"timezones. The schema is retained for compatibility with older versions."
+msgstr ""
+"å?¨ GNOME 2.28 以å??å°?ä¸?å??使ç?¨æ­¤é?®ï¼?è??åº?该使ç?¨æ?¶å?ºã??è¿?é??ä»?为ä¸?æ?§ç??æ?¬å?¼å®¹è??ä¿?"
+"ç??ã??"
+
 #: ../applets/clock/clock.schemas.in.h:44
 msgid ""
 "The use of this key was deprecated in GNOME 2.6 in favour of the 'format' "
 "key. The schema is retained for compatibility with older versions."
 msgstr ""
-"å?¨ GNOME 2.6 以å??ä¸?æ?¨è??使ç?¨æ­¤é?®ï¼?è??åº?该使ç?¨â??formatâ??é?®ã??è¿?é??ä»?为ä¸?æ?§ç??æ?¬å?¼å®¹è??"
+"å?¨ GNOME 2.6 以å??å°?ä¸?å??使ç?¨æ­¤é?®ï¼?è??åº?该使ç?¨â??formatâ??é?®ã??è¿?é??ä»?为ä¸?æ?§ç??æ?¬å?¼å®¹è??"
 "ä¿?ç??ã??"
 
 #: ../applets/clock/clock.schemas.in.h:45
@@ -655,15 +651,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 "å°?ä½?置设置为å½?å??ä½?ç½®ï¼?并å°?å?¶ç?¨ä½?此计ç®?æ?ºç??æ?¶å?º"
 
@@ -673,7 +669,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>"
 
@@ -682,7 +678,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>"
 
@@ -690,41 +686,41 @@ 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:577
+#: ../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:589
-#: ../applets/clock/clock-location-tile.c:598
+#: ../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:591
+#: ../applets/clock/clock-location-tile.c:627
 #, c-format
 msgid "%s, feels like %s"
 msgstr "æ°?温 %s / ä½?æ?? %s"
 
-#: ../applets/clock/clock-location-tile.c:609
+#: ../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 "æ?¾ç¤ºå¸®å?©æ??æ¡£æ?¶å?ºé??"
 
@@ -752,24 +748,7 @@ msgstr "æ?´æ?¹ç³»ç»?æ?¶é?´é??è¦?ç?¹æ??ã??"
 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 "æ?ºè¾¾å·¥å??"
-
-#: ../applets/fish/fish.c:273
+#: ../applets/fish/fish.c:274
 #, c-format
 msgid ""
 "Warning:  The command appears to be something actually useful.\n"
@@ -786,13 +765,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 "
@@ -803,25 +782,29 @@ msgstr ""
 "å??å??å­?空é?´ã??å¦?æ??å??ç?°ä»»ä½?人å?¨ä½¿ç?¨è¿?个å°?ç¨?åº?ï¼?ä»?å?¯è?½åº?该马ä¸?é??å?»æ£?æ?¥ä¸?ä¸?ç²¾ç¥?ç?¶"
 "å?µå??ã??"
 
-#: ../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 "�鱼 %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 "�鱼 %s 说�"
 
-#: ../applets/fish/fish.c:841
+#: ../applets/fish/fish.c:839
 #, c-format
 msgid ""
 "Unable to read output from command\n"
@@ -832,7 +815,7 @@ msgstr ""
 "\n"
 "ç»?è??ï¼?%s"
 
-#: ../applets/fish/fish.c:906
+#: ../applets/fish/fish.c:905
 msgid "_Speak again"
 msgstr "å??说ä¸?é??(_S)"
 
@@ -863,15 +846,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 "�鱼 %s�����幸�"
@@ -981,98 +964,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."
@@ -1171,40 +1106,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:979
 #: ../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:979
 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:627
+msgid "Workspace Switcher"
+msgstr "å·¥ä½?å?ºå??æ?¢å?¨"
+
+#: ../applets/wncklet/workspace-switcher.c:629
 msgid ""
 "The Workspace Switcher shows you a small version of your workspaces that "
 "lets you manage your windows."
@@ -1282,17 +1225,242 @@ msgstr ""
 "å?³å®?äº?å·¥ä½?å?ºå??æ?¢å?¨å°?使ç?¨å¤?å°?è¡?(æ°´å¹³å¸?å±?)æ??å??(å??ç?´å¸?å±?)æ?¥æ?¾ç¤ºå·¥ä½?å?ºã??此设置ä»?"
 "å½?æ?¾ç¤ºæ??æ??å·¥ä½?å?ºä¸º 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 "é??å®?å?°é?¢æ?¿(_K)"
+
+#: ../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"
+msgstr "ä¸?æ?¯æ­£ç¡®ç?? .desktop æ??件"
+
+#: ../gnome-panel/libegg/eggdesktopfile.c:188
+#, c-format
+msgid "Unrecognized desktop file Version '%s'"
+msgstr "desktop æ??件ç??æ?¬ '%s' ä¸?è?½è¢«è¯?å?«"
+
+#: ../gnome-panel/libegg/eggdesktopfile.c:958
+#, c-format
+msgid "Starting %s"
+msgstr "正��� %s"
+
+#: ../gnome-panel/libegg/eggdesktopfile.c:1100
+#, c-format
+msgid "Application does not accept documents on command line"
+msgstr "å?¨å?½ä»¤è¡?模å¼?ä¸?ï¼?åº?ç?¨ç¨?åº?ä¸?æ?¥å??æ??æ¡£"
+
+#: ../gnome-panel/libegg/eggdesktopfile.c:1168
+#, c-format
+msgid "Unrecognized launch option: %d"
+msgstr "ä¸?è?½è¢«è¯?å?«ç??å?¯å?¨é??项ï¼?%d"
+
+#: ../gnome-panel/libegg/eggdesktopfile.c:1373
+#, c-format
+msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+msgstr "å?¨ desktop æ??件中ï¼?ä¸?è?½ä¼ é??æ??æ¡£ URI å?° 'Type=Link' 项"
+
+#: ../gnome-panel/libegg/eggdesktopfile.c:1394
+#, c-format
+msgid "Not a launchable item"
+msgstr "���个���项"
+
+#: ../gnome-panel/libegg/eggsmclient.c:226
+msgid "Disable connection to session manager"
+msgstr "ç¦?æ­¢è¿?æ?¥å?°ä¼?è¯?管ç??å?¨"
+
+#: ../gnome-panel/libegg/eggsmclient.c:229
+msgid "Specify file containing saved configuration"
+msgstr "æ??å®?å??å?«å·²ä¿?å­?é??ç½®ç??æ??件"
+
+#: ../gnome-panel/libegg/eggsmclient.c:229
+msgid "FILE"
+msgstr "æ??件"
+
+#: ../gnome-panel/libegg/eggsmclient.c:232
+msgid "Specify session management ID"
+msgstr "æ??å®?ä¼?è¯?管ç??å?¨ ID"
+
+#: ../gnome-panel/libegg/eggsmclient.c:232
+msgid "ID"
+msgstr "ID"
+
+#: ../gnome-panel/libegg/eggsmclient.c:253
+msgid "Session management options:"
+msgstr "ä¼?è¯?管ç??å?¨é??项ï¼?"
+
+#: ../gnome-panel/libegg/eggsmclient.c:254
+msgid "Show session management options"
+msgstr "æ?¾ç¤ºä¼?è¯?管ç??å?¨é??项"
+
 #. FIXME: We need a title in this case, but we don't know what
 #. * the format should be. Let's put something simple until
 #. * the following bug gets fixed:
 #. * 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 "é??误"
 
+#: ../gnome-panel/libpanel-util/panel-icon-chooser.c:382
+msgid "Choose an icon"
+msgstr "é??æ?©ä¸?个å?¾æ ?"
+
 #: ../gnome-panel/libpanel-util/panel-launch.c:45
 #, c-format
 msgid "Could not launch '%s'"
@@ -1312,28 +1480,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 "é??å®?å?°é?¢æ?¿(_K)"
-
-#: ../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:1310
+#: ../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:1627
+#: ../gnome-panel/drawer.c:350 ../gnome-panel/panel-addto.c:174
+#: ../gnome-panel/panel-toplevel.c:1626
 msgid "Drawer"
 msgstr "��"
 
@@ -1347,29 +1503,29 @@ msgstr "æ·»å? å?°æ?½å±?(_A)..."
 msgid "_Properties"
 msgstr "å±?æ?§(_P)"
 
-#: ../gnome-panel/gnome-desktop-item-edit.c:31
+#: ../gnome-panel/gnome-desktop-item-edit.c:29
 msgid "Create new file in the given directory"
 msgstr "æ? æ³?å?¨ç»?å®?ç??ç?®å½?中å??建æ?°æ??件"
 
-#: ../gnome-panel/gnome-desktop-item-edit.c:32
+#: ../gnome-panel/gnome-desktop-item-edit.c:30
 msgid "[FILE...]"
 msgstr "[æ??件...]"
 
-#: ../gnome-panel/gnome-desktop-item-edit.c:110
+#: ../gnome-panel/gnome-desktop-item-edit.c:108
 msgid "- Edit .desktop files"
 msgstr "- ç¼?è¾? .desktop æ??件"
 
-#: ../gnome-panel/gnome-desktop-item-edit.c:149
-#: ../gnome-panel/gnome-desktop-item-edit.c:203 ../gnome-panel/launcher.c:897
+#: ../gnome-panel/gnome-desktop-item-edit.c:146
+#: ../gnome-panel/gnome-desktop-item-edit.c:200 ../gnome-panel/launcher.c:897
 msgid "Create Launcher"
 msgstr "å??建å?¯å?¨å?¨"
 
-#: ../gnome-panel/gnome-desktop-item-edit.c:174
-#: ../gnome-panel/gnome-desktop-item-edit.c:197
+#: ../gnome-panel/gnome-desktop-item-edit.c:171
+#: ../gnome-panel/gnome-desktop-item-edit.c:194
 msgid "Directory Properties"
 msgstr "����"
 
-#: ../gnome-panel/gnome-desktop-item-edit.c:180 ../gnome-panel/launcher.c:735
+#: ../gnome-panel/gnome-desktop-item-edit.c:177 ../gnome-panel/launcher.c:735
 msgid "Launcher Properties"
 msgstr "�����"
 
@@ -1379,7 +1535,7 @@ msgid ""
 "show the time, etc."
 msgstr "è°?ç?¨å?¶å®?åº?ç?¨ç¨?åº?并æ??ä¾?å?¯ç?¨æ?¥å®?æ??管ç??管ç??çª?å?£ã??æ?¾ç¤ºæ?¶é?´ç­?å??è?½ç??å·¥å?·ã??"
 
-#: ../gnome-panel/gnome-panel.desktop.in.in.h:2 ../gnome-panel/main.c:72
+#: ../gnome-panel/gnome-panel.desktop.in.in.h:2 ../gnome-panel/main.c:93
 msgid "Panel"
 msgstr "��"
 
@@ -1414,37 +1570,37 @@ msgstr "��(_L)"
 msgid "Key %s is not set, cannot load launcher\n"
 msgstr "没æ??设置é?® %sï¼?æ? æ³?è½½å?¥å?¯å?¨å?¨\n"
 
-#: ../gnome-panel/launcher.c:964 ../gnome-panel/panel-ditem-editor.c:1407
-#: ../gnome-panel/panel-ditem-editor.c:1441
-#: ../gnome-panel/panel-ditem-editor.c:1472
+#: ../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:43
+#: ../gnome-panel/main.c:45
 msgid "Replace a currently running panel"
 msgstr "å??代å½?å??æ­£å?¨è¿?è¡?ç??ä¸?个é?¢æ?¿"
 
-#: ../gnome-panel/menu.c:913
+#: ../gnome-panel/menu.c:916
 msgid "Add this launcher to _panel"
 msgstr "å°?æ­¤å?¯å?¨å?¨æ·»å? å?°é?¢æ?¿(_P)"
 
-#: ../gnome-panel/menu.c:920
+#: ../gnome-panel/menu.c:923
 msgid "Add this launcher to _desktop"
 msgstr "å°?æ­¤å?¯å?¨å?¨æ·»å? å?°æ¡?é?¢(_D)"
 
-#: ../gnome-panel/menu.c:932
+#: ../gnome-panel/menu.c:935
 msgid "_Entire menu"
 msgstr "æ?´ä¸ªè??å??(_E)"
 
-#: ../gnome-panel/menu.c:937
+#: ../gnome-panel/menu.c:940
 msgid "Add this as _drawer to panel"
 msgstr "å°?å®?ä½?为æ?½å±?æ·»å? å?°é?¢æ?¿(_D)"
 
-#: ../gnome-panel/menu.c:944
+#: ../gnome-panel/menu.c:947
 msgid "Add this as _menu to panel"
 msgstr "å°?å®?ä½?为è??å??æ·»å? å?°é?¢æ?¿(_M)"
 
-#: ../gnome-panel/nothing.cP:601
+#: ../gnome-panel/nothing.cP:609
 #, c-format
 msgid "<b>GAME OVER</b> at level %d!"
 msgstr "游æ??å?¨ç¬¬ %d 级<b>ç»?æ??</b>äº?ï¼?"
@@ -1453,40 +1609,40 @@ msgstr "游æ??å?¨ç¬¬ %d 级<b>ç»?æ??</b>äº?ï¼?"
 #. * 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:608
+#: ../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:609
+#: ../gnome-panel/nothing.cP:617
 msgid "Press 'q' to quit"
 msgstr "æ??â??qâ??é??å?º"
 
-#: ../gnome-panel/nothing.cP:614
+#: ../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:617 ../gnome-panel/nothing.cP:628
+#: ../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:618
+#: ../gnome-panel/nothing.cP:626
 msgid "Press 'p' to unpause"
 msgstr "æ??â??pâ??å??æ¶?æ??å??"
 
-#: ../gnome-panel/nothing.cP:624
+#: ../gnome-panel/nothing.cP:632
 #, c-format
 msgid "Level: %s,  Lives: %s"
 msgstr "级��%s������%s"
 
-#: ../gnome-panel/nothing.cP:629
+#: ../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:1369
+#: ../gnome-panel/nothing.cP:1385
 msgid "Killer GEGLs from Outer Space"
 msgstr "ä»?å¤?太空æ??æ­» GEGL"
 
@@ -1538,7 +1694,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 "强å?¶é??å?º"
 
@@ -1563,124 +1719,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 "æ?¥è?ªå¼¹å?ºè??å??â??%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 "æ? æ³?ä»?æ?§ä»¶è?·å??å°?ç¨?åº?å¤?壳ç??é?¢\n"
-
 #: ../gnome-panel/panel-context-menu.c:104
 msgid "And many, many others..."
 msgstr "å¾?å¤?å?¶ä»?ç??..."
@@ -1723,93 +1864,88 @@ msgstr "�建��(_N)"
 msgid "A_bout Panels"
 msgstr "����(_B)"
 
-#: ../gnome-panel/panel-ditem-editor.c:117
+#: ../gnome-panel/panel-ditem-editor.c:114
 msgid "Application"
 msgstr "����"
 
-#: ../gnome-panel/panel-ditem-editor.c:119
+#: ../gnome-panel/panel-ditem-editor.c:116
 msgid "Application in Terminal"
 msgstr "�端����"
 
-#: ../gnome-panel/panel-ditem-editor.c:121
+#: ../gnome-panel/panel-ditem-editor.c:118
 msgid "Location"
 msgstr "ä½?ç½®"
 
 #. Type
-#: ../gnome-panel/panel-ditem-editor.c:625
+#: ../gnome-panel/panel-ditem-editor.c:622
 msgid "_Type:"
 msgstr "ç±»å??(_T)ï¼?"
 
 #. Name
-#: ../gnome-panel/panel-ditem-editor.c:632
+#: ../gnome-panel/panel-ditem-editor.c:629
 msgid "_Name:"
 msgstr "å??称(_N)ï¼?"
 
-#: ../gnome-panel/panel-ditem-editor.c:640
-#: ../gnome-panel/panel-properties-dialog.c:286
-msgid "Browse icons"
-msgstr "æµ?è§?å?¾æ ?"
-
-#: ../gnome-panel/panel-ditem-editor.c:658
+#: ../gnome-panel/panel-ditem-editor.c:656
 msgid "_Browse..."
 msgstr "��(_B)..."
 
 #. Comment
-#: ../gnome-panel/panel-ditem-editor.c:665
+#: ../gnome-panel/panel-ditem-editor.c:663
 msgid "Co_mment:"
 msgstr "注é??(_M)ï¼?"
 
-#: ../gnome-panel/panel-ditem-editor.c:1036
+#: ../gnome-panel/panel-ditem-editor.c:1012
 msgid "Choose an application..."
 msgstr "é??æ?©åº?ç?¨ç¨?åº?..."
 
-#: ../gnome-panel/panel-ditem-editor.c:1040
+#: ../gnome-panel/panel-ditem-editor.c:1016
 msgid "Choose a file..."
 msgstr "é??æ?©æ??件..."
 
-#: ../gnome-panel/panel-ditem-editor.c:1208
-#: ../gnome-panel/panel-ditem-editor.c:1217
+#: ../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:1226
+#: ../gnome-panel/panel-ditem-editor.c:1199
 msgid "_Location:"
 msgstr "ä½?ç½®(_L)ï¼?"
 
-#: ../gnome-panel/panel-ditem-editor.c:1408
+#: ../gnome-panel/panel-ditem-editor.c:1362
 msgid "The name of the launcher is not set."
 msgstr "æ?ªè®¾å®?å?¯å?¨å?¨å??称ã??"
 
-#: ../gnome-panel/panel-ditem-editor.c:1412
+#: ../gnome-panel/panel-ditem-editor.c:1366
 msgid "Could not save directory properties"
 msgstr "æ? æ³?ä¿?å­?ç?®å½?å±?æ?§"
 
-#: ../gnome-panel/panel-ditem-editor.c:1413
+#: ../gnome-panel/panel-ditem-editor.c:1367
 msgid "The name of the directory is not set."
 msgstr "æ?ªè®¾å®?ç?®å½?å??称ã??"
 
-#: ../gnome-panel/panel-ditem-editor.c:1429
+#: ../gnome-panel/panel-ditem-editor.c:1383
 msgid "The command of the launcher is not set."
 msgstr "æ?ªè®¾å®?å?¯å?¨å?¨å?½ä»¤ã??"
 
-#: ../gnome-panel/panel-ditem-editor.c:1432
+#: ../gnome-panel/panel-ditem-editor.c:1386
 msgid "The location of the launcher is not set."
 msgstr "å?¯å?¨å?¨ç??ä½?ç½®æ?ªè®¾å®?ã??"
 
-#: ../gnome-panel/panel-ditem-editor.c:1509
+#: ../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."
@@ -1848,8 +1984,8 @@ msgid ""
 "g. a launcher, action button or menu button/bar). The settings for each of "
 "these objects are stored in /apps/panel/objects/$(id)."
 msgstr ""
-"é?¢æ?¿å¯¹è±¡ ID å??表ã??æ¯?个 ID é?½æ ?æ??äº?ä¸?个ç?¬ç«?ç??é?¢æ?¿å¯¹è±¡(ä¾?å¦?å?¯å?¨å?¨ã??å?¨ä½?æ??é?®æ??"
-"è??å??æ??é?®/è??å??æ ?)ã??å?³äº?è¿?äº?å°?ç¨?åº?ç??设置ä¿?å­?å?¨ /apps/panel/objects/$(id) ä¹?中ã??"
+"é?¢æ?¿å¯¹è±¡ ID å??表ã??æ¯?个 ID é?½æ ?æ??äº?ä¸?个ç?¬ç«?ç??é?¢æ?¿å¯¹è±¡(ä¾?å¦?å?¯å?¨å?¨ã??å?¨ä½?æ??é?®æ??è??"
+"å??æ??é?®/è??å??æ ?)ã??å?³äº?è¿?äº?å°?ç¨?åº?ç??设置ä¿?å­?å?¨ /apps/panel/objects/$(id) ä¹?中ã??"
 
 #: ../gnome-panel/panel-general.schemas.in.h:5
 msgid "Enable autocompletion in \"Run Application\" dialog"
@@ -2021,69 +2157,69 @@ 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)"
 
-#: ../gnome-panel/panel-menu-items.c:439
+#: ../gnome-panel/panel-menu-items.c:472
 msgid "Bookmarks"
 msgstr "书签"
 
 #. Translators: %s is a URI
-#: ../gnome-panel/panel-menu-items.c:461 ../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:529
+#: ../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:572
+#: ../gnome-panel/panel-menu-items.c:609
 #, c-format
 msgid "Rescan %s"
 msgstr "é??æ?°æ?«æ?? %s"
 
-#: ../gnome-panel/panel-menu-items.c:609
+#: ../gnome-panel/panel-menu-items.c:646
 #, c-format
 msgid "Unable to mount %s"
 msgstr "æ? æ³?æ??è½½ %s"
 
-#: ../gnome-panel/panel-menu-items.c:672
+#: ../gnome-panel/panel-menu-items.c:709
 #, c-format
 msgid "Mount %s"
 msgstr "æ??è½½ %s"
 
-#: ../gnome-panel/panel-menu-items.c:880
+#: ../gnome-panel/panel-menu-items.c:917
 msgid "Removable Media"
 msgstr "�移��质"
 
-#: ../gnome-panel/panel-menu-items.c:967
+#: ../gnome-panel/panel-menu-items.c:1004
 msgid "Network Places"
 msgstr "ç½?ç»?ä½?ç½®"
 
-#: ../gnome-panel/panel-menu-items.c:1006
+#: ../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:1025
+#: ../gnome-panel/panel-menu-items.c:1062
 msgctxt "Desktop Folder"
 msgid "Desktop"
 msgstr "æ¡?é?¢æ??件夹"
 
-#: ../gnome-panel/panel-menu-items.c:1026
+#: ../gnome-panel/panel-menu-items.c:1063
 msgid "Open the contents of your desktop in a folder"
 msgstr "å°?æ¡?é?¢ä»¥æ??件夹形å¼?æ??å¼?"
 
-#: ../gnome-panel/panel-menu-items.c:1417
+#: ../gnome-panel/panel-menu-items.c:1454
 msgid "Places"
 msgstr "ä½?ç½®"
 
-#: ../gnome-panel/panel-menu-items.c:1446
+#: ../gnome-panel/panel-menu-items.c:1483
 msgid "System"
 msgstr "系�"
 
@@ -2092,7 +2228,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:1527
+#: ../gnome-panel/panel-menu-items.c:1564
 msgctxt "panel:showusername"
 msgid "1"
 msgstr "1"
@@ -2101,14 +2237,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:1539
+#: ../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:1543
+#: ../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 以便让ä¸?å??ç??ç?¨æ?·ç?»å½?"
@@ -2122,10 +2258,14 @@ msgid "Applet Bonobo IID"
 msgstr "��� Bonobo IID"
 
 #: ../gnome-panel/panel-object.schemas.in.h:3
+msgid "Applet IID"
+msgstr "��� 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 "
@@ -2134,7 +2274,7 @@ msgstr ""
 "å¦?æ??为 trueï¼?å??å®?å?¶å?¾æ ?设置就被ç?¨ä½?æ??é?®ç??å®?å?¶å?¾æ ?ã??å¦?æ??为 falseï¼?å??忽ç?¥å®?å?¶å?¾"
 "æ ?设置ã??该设置å?ªå?¨å¯¹è±¡ç±»å??为â??è??å??对象â??æ??â??æ?½å±?对象â??æ?¶æ??æ??æ??ã??"
 
-#: ../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 "
@@ -2143,55 +2283,47 @@ msgstr ""
 "å¦?æ??为 trueï¼?è??å??è·¯å¾?设置就被ç?¨ä½?é??å??建è??å??å??容ç??è·¯å¾?ã??å¦?æ??为 falseï¼?å??忽ç?¥è??"
 "å??è·¯å¾?设置ã??该设置å?ªå?¨å¯¹è±¡ç±»å??为â??è??å??对象â??æ?¶æ??æ??æ??ã??"
 
-#: ../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 å®?ç?° ID - ä¾?å¦? â??OAFIID:GNOME_ClockAppletâ??ã??该设置å?ªå?¨å¯¹è±¡ç±»å??"
-"为â??bonobo å°?ç¨?åº?â??ç??æ?¶å??æ??æ??æ??ã??"
-
 #: ../gnome-panel/panel-object.schemas.in.h:16
 msgid ""
 "The action type this button represents. Possible values are \"lock\", "
@@ -2213,12 +2345,20 @@ 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 ""
+"å°?ç¨?åº?ç?? Bonobo å®?ç?° ID - ä¾?å¦? â??ClockAppletFactory::ClockAppletâ??ã??该设置å?ªå?¨"
+"对象类å??为â??bonobo å°?ç¨?åº?â??ç??æ?¶å??æ??æ??æ??ã??"
+
+#: ../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 æ??件ç??ä½?ç½®ã??该设置å?ªå?¨å¯¹è±¡ç±»å??为â??å?¯å?¨å?¨å¯¹è±¡â??æ?¶æ??æ??æ??ã??"
 
-#: ../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 "
@@ -2227,7 +2367,7 @@ msgstr ""
 "ç?¨ä½?对象æ??é?®å?¾æ ?ç??å?¾å??æ??件ç??ä½?ç½®ã??该设置å?ªå?¨å¯¹è±¡ç±»å??为â??æ?½å±?对象â??æ??â??è??å??对"
 "象â??并ä¸? 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-"
@@ -2236,13 +2376,13 @@ msgstr ""
 "ä»?æ­¤å??建è??å??å??容ç??è·¯å¾?ã??该设置å?ªå?¨ use_menu_path 为 true 并ä¸?对象类å??为â??è??å??"
 "对象â??æ?¶æ??æ??æ??ã??"
 
-#: ../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\"."
@@ -2250,7 +2390,7 @@ msgstr ""
 "å?¨æ­¤æ?½å±?æ??è??å??ç??å·¥å?·æ??示中æ?¾ç¤ºç??æ??æ?¬ã??该设置å?ªæ??å?¨å¯¹è±¡ç±»å??为â??æ?½å±?对象â??æ??â??è??å??"
 "对象â??æ?¶æ??æ??æ??ã??"
 
-#: ../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 "
@@ -2259,19 +2399,30 @@ msgstr ""
 "该é?¢æ?¿å¯¹è±¡ç??ç±»å??ã??å?¯ä¾?é??æ?©ç??å?¼æ??â??æ?½å±?对象â??ã??â??è??å??对象â??ã??â??å?¯å?¨å?¨å¯¹"
 "象â??ã??â??bonobo å°?ç¨?åº?â??ã??â??å?¨ä½?å°?ç¨?åº?â??å??â??è??å??æ ?â??ã??"
 
-#: ../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 ""
+"æ­¤é?®å·²ç»?被åº?å¼?ï¼?æ?¥ä¸?æ?¥å°?è¿?移å?°ä¸?个æ?°ç??å°?ç¨?åº?åº?ã??\n"
+"å°?ç¨?åº?ç?? Bonobo å®?ç?° ID - ä¾?å¦? â??OAFIID:GNOME_ClockAppletâ??ã??该设置å?ªå?¨å¯¹è±¡ç±»å??"
+"为â??bonobo å°?ç¨?åº?â??ç??æ?¶å??æ??æ??æ??ã??"
+
+#: ../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 "使ç?¨è??å??å??容ç??è?ªå®?ä¹?è·¯å¾?"
 
@@ -2300,41 +2451,17 @@ msgstr "é?¢æ?¿â??%sâ??被设置为æ?¾ç¤ºå?¨å½?å??ä¸?å?¯ç?¨ç??å±?å¹? %d ä¸?ã??æ?ª
 msgid "Error reading GConf boolean value '%s': %s"
 msgstr "读å?¥ GConf å¸?å°?å?¼â??%sâ??å?ºé??ï¼?%s"
 
-#: ../gnome-panel/panel-properties-dialog.c:128
-#: ../libpanel-applet/panel-test-applets.c:53
-msgctxt "Orientation"
-msgid "Top"
-msgstr "顶端"
-
-#: ../gnome-panel/panel-properties-dialog.c:129
-#: ../libpanel-applet/panel-test-applets.c:54
-msgctxt "Orientation"
-msgid "Bottom"
-msgstr "��"
-
-#: ../gnome-panel/panel-properties-dialog.c:130
-#: ../libpanel-applet/panel-test-applets.c:55
-msgctxt "Orientation"
-msgid "Left"
-msgstr "左侧"
-
-#: ../gnome-panel/panel-properties-dialog.c:131
-#: ../libpanel-applet/panel-test-applets.c:56
-msgctxt "Orientation"
-msgid "Right"
-msgstr "�侧"
-
-#: ../gnome-panel/panel-properties-dialog.c:952
+#: ../gnome-panel/panel-properties-dialog.c:866
 msgid "Drawer Properties"
 msgstr "����"
 
-#: ../gnome-panel/panel-properties-dialog.c:1067
-#: ../gnome-panel/panel-run-dialog.c:2019
+#: ../gnome-panel/panel-properties-dialog.c:981
+#: ../gnome-panel/panel-run-dialog.c:2022
 #, c-format
 msgid "Unable to load file '%s': %s."
 msgstr "æ? æ³?è½½å?¥æ??件â??%sâ??ï¼?%sã??"
 
-#: ../gnome-panel/panel-properties-dialog.c:1073
+#: ../gnome-panel/panel-properties-dialog.c:987
 msgid "Could not display properties dialog"
 msgstr "æ? æ³?æ?¾ç¤ºå±?æ?§å¯¹è¯?æ¡?"
 
@@ -2418,20 +2545,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)"
@@ -2491,26 +2608,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 "æ? æ³?æ?¾ç¤ºè¿?è¡?对è¯?æ¡?"
 
@@ -2575,73 +2692,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:1598
+#: ../gnome-panel/panel-toplevel.c:1597
 msgid "Top Expanded Edge Panel"
 msgstr "����边���"
 
-#: ../gnome-panel/panel-toplevel.c:1599
+#: ../gnome-panel/panel-toplevel.c:1598
 msgid "Top Centered Panel"
 msgstr "���中��"
 
-#: ../gnome-panel/panel-toplevel.c:1600
+#: ../gnome-panel/panel-toplevel.c:1599
 msgid "Top Floating Panel"
 msgstr "��浮���"
 
-#: ../gnome-panel/panel-toplevel.c:1601
+#: ../gnome-panel/panel-toplevel.c:1600
 msgid "Top Edge Panel"
 msgstr "��边���"
 
-#: ../gnome-panel/panel-toplevel.c:1605
+#: ../gnome-panel/panel-toplevel.c:1604
 msgid "Bottom Expanded Edge Panel"
 msgstr "����边���"
 
-#: ../gnome-panel/panel-toplevel.c:1606
+#: ../gnome-panel/panel-toplevel.c:1605
 msgid "Bottom Centered Panel"
 msgstr "���中��"
 
-#: ../gnome-panel/panel-toplevel.c:1607
+#: ../gnome-panel/panel-toplevel.c:1606
 msgid "Bottom Floating Panel"
 msgstr "��浮���"
 
-#: ../gnome-panel/panel-toplevel.c:1608
+#: ../gnome-panel/panel-toplevel.c:1607
 msgid "Bottom Edge Panel"
 msgstr "��边���"
 
-#: ../gnome-panel/panel-toplevel.c:1612
+#: ../gnome-panel/panel-toplevel.c:1611
 msgid "Left Expanded Edge Panel"
 msgstr "左���边���"
 
-#: ../gnome-panel/panel-toplevel.c:1613
+#: ../gnome-panel/panel-toplevel.c:1612
 msgid "Left Centered Panel"
 msgstr "左��中��"
 
-#: ../gnome-panel/panel-toplevel.c:1614
+#: ../gnome-panel/panel-toplevel.c:1613
 msgid "Left Floating Panel"
 msgstr "左�浮���"
 
-#: ../gnome-panel/panel-toplevel.c:1615
+#: ../gnome-panel/panel-toplevel.c:1614
 msgid "Left Edge Panel"
 msgstr "左�边���"
 
-#: ../gnome-panel/panel-toplevel.c:1619
+#: ../gnome-panel/panel-toplevel.c:1618
 msgid "Right Expanded Edge Panel"
 msgstr "����边���"
 
-#: ../gnome-panel/panel-toplevel.c:1620
+#: ../gnome-panel/panel-toplevel.c:1619
 msgid "Right Centered Panel"
 msgstr "���中��"
 
-#: ../gnome-panel/panel-toplevel.c:1621
+#: ../gnome-panel/panel-toplevel.c:1620
 msgid "Right Floating Panel"
 msgstr "��浮���"
 
-#: ../gnome-panel/panel-toplevel.c:1622
+#: ../gnome-panel/panel-toplevel.c:1621
 msgid "Right Edge Panel"
 msgstr "��边���"
 
@@ -2749,9 +2866,9 @@ msgid ""
 "If false, the panel will only be large enough to accommodate the applets, "
 "launchers and buttons on the panel."
 msgstr ""
-"å¦?æ??为 trueï¼?å??é?¢æ?¿å°?å? æ?®æ?´ä¸ªå±?å¹?ç??宽度(å¦?æ??æ?¯å??ç?´é?¢æ?¿å??æ?¯é«?度)ã??æ­¤æ?¶é?¢æ?¿å?ª"
-"è?½ç½®äº?å±?å¹?è¾¹ç¼?ã??å¦?æ??为 falseï¼?å??é?¢æ?¿å?ªå?·æ??è?½å¤?容纳é?¢æ?¿ä¸­æ??æ??å°?ç¨?åº?ã??å?¯å?¨å?¨ã??"
-"æ??é?®ç??æ??å°?空é?´ã??"
+"å¦?æ??为 trueï¼?å??é?¢æ?¿å°?å? æ?®æ?´ä¸ªå±?å¹?ç??宽度(å¦?æ??æ?¯å??ç?´é?¢æ?¿å??æ?¯é«?度)ã??æ­¤æ?¶é?¢æ?¿å?ªè?½"
+"ç½®äº?å±?å¹?è¾¹ç¼?ã??å¦?æ??为 falseï¼?å??é?¢æ?¿å?ªå?·æ??è?½å¤?容纳é?¢æ?¿ä¸­æ??æ??å°?ç¨?åº?ã??å?¯å?¨å?¨ã??æ??"
+"é?®ç??æ??å°?空é?´ã??"
 
 #: ../gnome-panel/panel-toplevel.schemas.in.h:22
 msgid ""
@@ -2991,31 +3108,31 @@ msgstr "é?¢æ?¿ç?? Y å??æ ?"
 msgid "Y co-ordinate of panel, starting from the bottom of the screen"
 msgstr "é?¢æ?¿ç?? Y å??æ ?ï¼?ä»?å±?å¹?åº?é?¨è®¡"
 
-#: ../gnome-panel/panel-util.c:323
+#: ../gnome-panel/panel-util.c:315
 #, c-format
 msgid "Icon '%s' not found"
 msgstr "æ?ªæ?¾å?°å?¾æ ?â??%sâ??"
 
-#: ../gnome-panel/panel-util.c:426
+#: ../gnome-panel/panel-util.c:418
 #, c-format
 msgid "Could not execute '%s'"
 msgstr "æ? æ³?æ?§è¡?â??%sâ??"
 
-#: ../gnome-panel/panel-util.c:662
+#: ../gnome-panel/panel-util.c:654
 msgid "file"
 msgstr "æ??件"
 
-#: ../gnome-panel/panel-util.c:839
+#: ../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:851
+#: ../gnome-panel/panel-util.c:843
 msgid "File System"
 msgstr "æ??件系ç»?"
 
-#: ../gnome-panel/panel-util.c:998
+#: ../gnome-panel/panel-util.c:1016
 msgid "Search"
 msgstr "æ??ç´¢"
 
@@ -3024,7 +3141,7 @@ msgstr "æ??ç´¢"
 #. * example, "Trash: some-directory". It means that the
 #. * directory called "some-directory" is in the trash.
 #.
-#: ../gnome-panel/panel-util.c:1044
+#: ../gnome-panel/panel-util.c:1062
 #, c-format
 msgid "%1$s: %2$s"
 msgstr "%1$sï¼?%2$s"
@@ -3034,11 +3151,11 @@ 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."
@@ -3046,11 +3163,11 @@ msgstr ""
 "å? é?¤æ?½å±?æ?¶ï¼?æ?½å±?å??å?¶è®¾ç½®\n"
 "é?½ä¼?丢失ã??"
 
-#: ../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."
@@ -3058,88 +3175,62 @@ msgstr ""
 "å? é?¤é?¢æ?¿æ?¶ï¼?é?¢æ?¿å??å?¶è®¾ç½®\n"
 "é?½ä¼?丢失ã??"
 
-#: ../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 "If true, display time in Universal Coordinated Time zone."
+#~ msgstr "å¦?æ??为 trueï¼?å??æ?¾ç¤º UTC æ?¶å?ºç??æ?¶é?´ã??"
 
-#: ../libpanel-applet/panel-test-applets.c:35
-msgid ""
-"Specify a gconf location in which the applet preferences should be stored"
-msgstr "æ??å®?ä¿?å­?å°?ç¨?åº?é¦?é??项ç?? gconf ä½?ç½®"
+#~ msgid "Display a swimming fish or another animated creature"
+#~ msgstr "æ?¾ç¤ºä¸?æ?¡æ­£å?¨æ¸¸æ³³ç??é±¼æ??å?¶å®?æ´»å?¨ç??ç??ç?©"
 
-#: ../libpanel-applet/panel-test-applets.c:36
-msgid "Specify the initial size of the applet (xx-small, medium, large etc.)"
-msgstr "æ??å®?å°?ç¨?åº?ç??å??å§?大å°?(å°?ã??中ã??大ç­?ã??)"
+#~ msgid "From Whence That Stupid Fish Came"
+#~ msgstr "è?ªä»?é?£å?ªè ¢é±¼æ?¥äº?以å??"
 
-#: ../libpanel-applet/panel-test-applets.c:37
-msgid ""
-"Specify the initial orientation of the applet (top, bottom, left or right)"
-msgstr "æ??å®?å°?ç¨?åº?ç??å??å§?ä½?ç½®(顶ã??åº?ã??å·¦æ??å?³)"
+#~ msgid "Wanda Factory"
+#~ msgstr "æ?ºè¾¾å·¥å??"
 
-#: ../libpanel-applet/panel-test-applets.c:61
-msgctxt "Size"
-msgid "XX Small"
-msgstr "æ??å°?"
+#~ msgid "Area where notification icons appear"
+#~ msgstr "é??ç?¥å?¾æ ?æ?¾ç¤ºç??å?ºå??"
 
-#: ../libpanel-applet/panel-test-applets.c:62
-msgctxt "Size"
-msgid "X Small"
-msgstr "å¾?å°?"
+#~ msgid "Notification Area Factory"
+#~ msgstr "é??ç?¥å?ºå??å·¥å??"
 
-#: ../libpanel-applet/panel-test-applets.c:63
-msgctxt "Size"
-msgid "Small"
-msgstr "å°?"
+#~ msgid "Factory for the window navigation related applets"
+#~ msgstr "å??建æ??å?³çª?å?£å¯¼è?ªç??å°?ç¨?åº?ç??å·¥å??"
 
-#: ../libpanel-applet/panel-test-applets.c:64
-msgctxt "Size"
-msgid "Medium"
-msgstr "中"
+#~ msgid "Hide application windows and show the desktop"
+#~ msgstr "é??è??çª?å?£å¹¶æ?¾ç¤ºæ¡?é?¢"
 
-#: ../libpanel-applet/panel-test-applets.c:65
-msgctxt "Size"
-msgid "Large"
-msgstr "大"
+#~ msgid "Show Desktop"
+#~ msgstr "�示��"
 
-#: ../libpanel-applet/panel-test-applets.c:66
-msgctxt "Size"
-msgid "X Large"
-msgstr "�大"
+#~ msgid "Switch between open windows using a menu"
+#~ msgstr "使ç?¨è??å??å?¨æ??å¼?ç??çª?å?£é?´å??æ?¢"
 
-#: ../libpanel-applet/panel-test-applets.c:67
-msgctxt "Size"
-msgid "XX Large"
-msgstr "æ??大"
+#~ msgid "Switch between open windows using buttons"
+#~ msgstr "使ç?¨æ??é?®å?¨æ??å¼?ç??çª?å?£é?´å??æ?¢"
 
-#: ../libpanel-applet/panel-test-applets.c:129
-#, c-format
-msgid "Failed to load applet %s"
-msgstr "载���� %s 失败"
+#~ msgid "Switch between workspaces"
+#~ msgstr "å?¨å·¥ä½?å?ºé?´å??æ?¢"
 
-#. This is an utility to easily test various applets
-#: ../libpanel-applet/panel-test-applets.ui.h:2
-msgid "Test applet utility"
-msgstr "�����工�"
+#~ msgid "Window Navigation Applet Factory"
+#~ msgstr "��导����车�"
 
-#: ../libpanel-applet/panel-test-applets.ui.h:3
-msgid "_Applet:"
-msgstr "���(_A)�"
+#~ msgid "Exception from popup_menu '%s'\n"
+#~ msgstr "æ?¥è?ªå¼¹å?ºè??å??â??%sâ??ç??ä¾?å¤?\n"
 
-#: ../libpanel-applet/panel-test-applets.ui.h:5
-msgid "_Prefs Dir:"
-msgstr "é¦?é??ç?®å½?(_P)ï¼?"
+#~ msgid "Unable to obtain AppletShell interface from control\n"
+#~ msgstr "æ? æ³?ä»?æ?§ä»¶è?·å??å°?ç¨?åº?å¤?壳ç??é?¢\n"
+
+#~ msgid "Browse icons"
+#~ msgstr "æµ?è§?å?¾æ ?"
 
 #~ msgid "Failed to launch time configuration tool: %s"
 #~ msgstr "å?¯å?¨æ?¶é?´é??置工å?·å¤±è´¥ï¼?%s"
@@ -3210,9 +3301,6 @@ msgstr "é¦?é??ç?®å½?(_P)ï¼?"
 #~ msgid "panel:showusername|1"
 #~ msgstr "1"
 
-#~ msgid "Could not launch menu item"
-#~ msgstr "æ? æ³?è°?ç?¨è??å??项"
-
 #~ msgid "Orientation|Top"
 #~ msgstr "�"
 
@@ -3252,9 +3340,6 @@ msgstr "é¦?é??ç?®å½?(_P)ï¼?"
 #~ msgid "Unknown background type received"
 #~ msgstr "æ?¶å?°æ?ªç?¥ç??è??æ?¯ç±»å??"
 
-#~ msgid "The Applet's containing Panel's orientation"
-#~ msgstr "å°?ç¨?åº?æ??å?¨é?¢æ?¿ç??æ?¹å??"
-
 #~ msgid "The Applet's containing Panel's size in pixels"
 #~ msgstr "å°?ç¨?åº?æ??å?¨é?¢æ?¿ç??尺寸(以å??ç´ ä¸ºå??ä½?)"