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

From: Chao-Hsiung Liao <chliao src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [gnome-panel] Updated Traditional Chinese translation(Hong Kong and Taiwan)
Date: Sat, 29 Aug 2009 13:58:37 +0000 (UTC)
commit 7ee080faf23404b6979e25e573b587caf57ee0ff
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Sat Aug 29 21:58:19 2009 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  773 ++++++++++++++++++++++++++++++++---------------------------
 po/zh_TW.po |  775 ++++++++++++++++++++++++++++++++---------------------------
 2 files changed, 832 insertions(+), 716 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 4f998b5..a397e1f 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -14,10 +14,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-panel 2.27.5\n"
+"Project-Id-Version: gnome-panel 2.27.92\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-11 15:24+0800\n"
-"PO-Revision-Date: 2009-08-11 15:24+0800\n"
+"POT-Creation-Date: 2009-08-29 21:57+0800\n"
+"PO-Revision-Date: 2009-08-29 21:57+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"
@@ -68,7 +68,7 @@ msgid "_Preferences"
 msgstr "å??å¥½è¨å®?(_P)"
 
 #: ../applets/clock/GNOME_ClockApplet_Factory.server.in.in.h:1
-#: ../applets/clock/clock.c:3639
+#: ../applets/clock/clock.c:3719
 msgid "Clock"
 msgstr "æ??é??"
 
@@ -84,77 +84,96 @@ msgstr "ç?¢ç??æ??é??é?¢æ?¿ç¨?å¼?ç??å·¥å» ã??"
 msgid "Get the current time and date"
 msgstr "å??å¾?ç?®å??ç??æ??å?»å??æ?¥æ??"
 
-#: ../applets/clock/calendar-window.c:242 ../applets/clock/clock.c:442
+#. 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:451
 msgid "%l:%M %p"
 msgstr "%p %l:%M"
 
-#. translators: This is a strftime format string that is used for formatting
-#. * the time that is displayed for locations in the popup. This string is used
-#. * for 24-hour format.
-#. * There should be little need to translate this string.
-#.
-#: ../applets/clock/calendar-window.c:244 ../applets/clock/clock.c:444
-#: ../applets/clock/clock.c:1563 ../applets/clock/clock-location-tile.c:480
+#. Translators: This is a strftime format string.
+#. * It is used to display the time in 24-hours format
+#. * (eg, like in France: 20:10).
+#. Translators: This is a strftime format
+#. * string.
+#. * It is used to display the time in 24-hours
+#. * format (eg, like in France: 20:10).
+#. 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:456
+#: ../applets/clock/clock.c:1601 ../applets/clock/clock-location-tile.c:476
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#. Translators: If the event did not start on the current day
-#. * we will display the start date in the most abbreviated way
-#. * possible.
-#: ../applets/clock/calendar-window.c:250
+#. 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
 msgid "%b %d"
 msgstr "%-d/%-m"
 
-#: ../applets/clock/calendar-window.c:773
+#: ../applets/clock/calendar-window.c:853
 msgid "Tasks"
 msgstr "å·¥ä½?"
 
-#: ../applets/clock/calendar-window.c:773
-#: ../applets/clock/calendar-window.c:949
-#: ../applets/clock/calendar-window.c:1585
+#: ../applets/clock/calendar-window.c:853
+#: ../applets/clock/calendar-window.c:1029
+#: ../applets/clock/calendar-window.c:1665
 msgid "Edit"
 msgstr "ç·¨è¼¯"
 
-#: ../applets/clock/calendar-window.c:894
+#: ../applets/clock/calendar-window.c:974
 msgid "All Day"
 msgstr "æ?´å¤©"
 
-#: ../applets/clock/calendar-window.c:1033
+#: ../applets/clock/calendar-window.c:1113
 msgid "Appointments"
 msgstr "ç´?æ??"
 
-#: ../applets/clock/calendar-window.c:1058
+#: ../applets/clock/calendar-window.c:1138
 msgid "Birthdays and Anniversaries"
 msgstr "ç??æ?¥å??é?±å¹´ç´?å¿µæ?¥"
 
-#: ../applets/clock/calendar-window.c:1083
+#: ../applets/clock/calendar-window.c:1163
 msgid "Weather Information"
 msgstr "å¤©æ°£è³?è¨?"
 
-#: ../applets/clock/calendar-window.c:1585 ../applets/clock/clock.glade.h:14
+#: ../applets/clock/calendar-window.c:1665 ../applets/clock/clock.ui.h:12
 msgid "Locations"
 msgstr "ä½?ç½®"
 
-#: ../applets/clock/calendar-window.c:1884
+#: ../applets/clock/calendar-window.c:1964
 msgid "Calendar"
 msgstr "æ??æ??"
 
-#: ../applets/clock/clock.c:442
+#. 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:451
 msgid "%l:%M:%S %p"
 msgstr "%p %l:%M:%S"
 
-#: ../applets/clock/clock.c:444 ../applets/clock/clock.c:1561
+#. Translators: This is a strftime format string.
+#. * It is used to display the time in 24-hours format (eg, like
+#. * in France: 20:10).
+#. 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/clock.c:456 ../applets/clock/clock.c:1595
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 # (Abel) FIXME: %-m å?? %-d æ?¯ GNU extension, *BSD ä¸?è?½ç?¨?
 # å?°è±¡ä¸ï¼?å¥½å?? freebsd æ??äº?å®?ç??æ?¯æ?´ï¼?ä¹?å¤?å?ªæ?? Solaris ç?¨ GNOME?
-#. translators: replace %e with %d if, when 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
+#. Translators: This is a strftime format string.
+#. * It is used to display the date. Replace %e with %d if, when
+#. * 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:476
 msgid "%a %b %e"
 msgstr "%-mæ??%-dæ?¥(%a)"
 
@@ -162,7 +181,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:483
 #, c-format
 msgid ""
 "%1$s\n"
@@ -175,100 +194,124 @@ msgstr ""
 #. *              if the time should come before the
 #. *              date on a clock in your locale.
 #.
-#: ../applets/clock/clock.c:479
+#: ../applets/clock/clock.c:491
 #, c-format
 msgid "%1$s, %2$s"
 msgstr "%1$s %2$s"
 
-#. Show date in tooltip.  Translators: please leave the "%%s" as it is; we
-#. * use it to put in the timezone name later.
-#.
-#: ../applets/clock/clock.c:661
+#. Show date in tooltip.
+#. 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:674
 msgid "%A %B %d (%%s)"
 msgstr "%B %d %A (%%s)"
 
-#: ../applets/clock/clock.c:691
+#: ../applets/clock/clock.c:704
 msgid "Click to hide your appointments and tasks"
 msgstr "æ??ä¸?ä»¥é?±è??ç´?æ??å??å·¥ä½?"
 
-#: ../applets/clock/clock.c:694
+#: ../applets/clock/clock.c:707
 msgid "Click to view your appointments and tasks"
 msgstr "æ??ä¸?ä¾?é¡¯ç¤ºç´?æ??å??å·¥ä½?"
 
-#: ../applets/clock/clock.c:698
+#: ../applets/clock/clock.c:711
 msgid "Click to hide month calendar"
 msgstr "æ??ä¸?ä»¥é?±è??æ??æ??"
 
-#: ../applets/clock/clock.c:701
+#: ../applets/clock/clock.c:714
 msgid "Click to view month calendar"
 msgstr "æ??ä¸?ä¾?é¡¯ç¤ºæ??æ??"
 
-#: ../applets/clock/clock.c:1416
+#: ../applets/clock/clock.c:1434
 msgid "Computer Clock"
 msgstr "é?»è?¦æ??é??"
 
-#: ../applets/clock/clock.c:1556
+#. Translators: This is a strftime format
+#. * string.
+#. * It is used to display the time in 12-hours
+#. * 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:1580
 msgid "%I:%M:%S %p"
 msgstr "%p %I:%M:%S"
 
-#: ../applets/clock/clock.c:1558
+#. Translators: This is a strftime format
+#. * string.
+#. * It is used to display the time in 12-hours
+#. * 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:1588
 msgid "%I:%M %p"
 msgstr "%p %I:%M"
 
-#: ../applets/clock/clock.c:1600
+#. 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:1641
 msgid "%A, %B %d %Y"
 msgstr "%Yå¹´%-mæ??%-dæ?¥(%A)"
 
-#: ../applets/clock/clock.c:1629
+#: ../applets/clock/clock.c:1672
 msgid "Set System Time..."
 msgstr "è¨å®?ç³»çµ±æ??å?»..."
 
-#: ../applets/clock/clock.c:1630 ../applets/clock/clock.glade.h:18
+#: ../applets/clock/clock.c:1673
 msgid "Set System Time"
 msgstr "è¨å®?ç³»çµ±æ??å?»"
 
-#: ../applets/clock/clock.c:1645
+#: ../applets/clock/clock.c:1688
 msgid "Failed to set the system time"
 msgstr "è¨å®?ç³»çµ±æ??å?»å¤±æ??"
 
-#: ../applets/clock/clock.c:2700
+#: ../applets/clock/clock.c:2752
 msgid "Custom format"
 msgstr "è?ªé?¸æ ¼å¼?"
 
-#: ../applets/clock/clock.c:3361
+#: ../applets/clock/clock.c:3210
+msgid "Choose Location"
+msgstr "é?¸æ??ä½?ç½®"
+
+#: ../applets/clock/clock.c:3285
+msgid "Edit Location"
+msgstr "ç·¨è¼¯ä½?ç½®"
+
+#: ../applets/clock/clock.c:3431
 msgid "City Name"
 msgstr "å??å¸?å??ç¨±"
 
-#: ../applets/clock/clock.c:3365
+#: ../applets/clock/clock.c:3435
 msgid "City Time Zone"
 msgstr "å??å¸?æ??å??"
 
-#: ../applets/clock/clock.c:3535
+#: ../applets/clock/clock.c:3615
 msgid "24 hour"
 msgstr "24 å°?æ??å?¶"
 
-#: ../applets/clock/clock.c:3536
+#: ../applets/clock/clock.c:3616
 msgid "UNIX time"
 msgstr "UNIX æ??é??"
 
-#: ../applets/clock/clock.c:3537
+#: ../applets/clock/clock.c:3617
 msgid "Internet time"
 msgstr "Internet æ??é??"
 
-#: ../applets/clock/clock.c:3545
+#: ../applets/clock/clock.c:3625
 msgid "Custom _format:"
 msgstr "è?ªé?¸æ ¼å¼?(_F):"
 
-#: ../applets/clock/clock.c:3642
+#: ../applets/clock/clock.c:3722
 msgid "The Clock displays the current time and date"
 msgstr "æ??é??ç¨?å¼?å?¯é¡¯ç¤ºç?®å??ç??æ??é??å??æ?¥æ??"
 
 #. Translator credits
-#: ../applets/clock/clock.c:3645 ../applets/fish/fish.c:613
+#: ../applets/clock/clock.c:3725 ../applets/fish/fish.c:623
 #: ../applets/notification_area/main.c:155
-#: ../applets/wncklet/showdesktop.c:531 ../applets/wncklet/window-list.c:607
+#: ../applets/wncklet/showdesktop.c:531 ../applets/wncklet/window-list.c:606
 #: ../applets/wncklet/window-menu.c:79
-#: ../applets/wncklet/workspace-switcher.c:622
+#: ../applets/wncklet/workspace-switcher.c:621
 #: ../gnome-panel/panel-context-menu.c:138
 msgid "translator-credits"
 msgstr ""
@@ -283,127 +326,131 @@ msgstr ""
 "Jing-Jong Shyue <shyue sonoma com tw>, 2000\n"
 "Yuan-Chung Cheng <platin linux org tw>, 1999"
 
-#: ../applets/clock/clock.glade.h:1
-msgid "<b>Clock Options</b>"
-msgstr "<b>æ??é??é?¸é ?</b>"
-
-#: ../applets/clock/clock.glade.h:2
-msgid "<b>Display</b>"
-msgstr "<b>é¡¯ç¤º</b>"
-
-#: ../applets/clock/clock.glade.h:3
-msgid "<b>Panel Display</b>"
-msgstr "<b>é?¢æ?¿é¡¯ç¤º</b>"
-
-#: ../applets/clock/clock.glade.h:4
+#: ../applets/clock/clock.ui.h:1
 msgid "<i>(optional)</i>"
 msgstr "<i>(é?¸ç?¨æ?§ç??)</i>"
 
 #. Languages that have a single word that translates as either "state" or "province" should use that instead of "region".
-#: ../applets/clock/clock.glade.h:6
+#: ../applets/clock/clock.ui.h:3
 msgid ""
 "<small><i>Type a city, region, or country name and then select a match from "
 "the pop-up.</i></small>"
 msgstr "<small><i>è¼¸å?¥å??å¸?ã??ç??æ??å??å®¶å??ç¨±ï¼?å??å¾?å½?å?ºå¼?é?¸å?®é?¸æ??ç¬¦å??ç??é ?ç?®ã??</i></small>"
 
-#: ../applets/clock/clock.glade.h:7
+#: ../applets/clock/clock.ui.h:4
+msgid "Clock Format"
+msgstr "æ??é??æ ¼å¼?"
+
+#: ../applets/clock/clock.ui.h:5
 msgid "Clock Preferences"
 msgstr "æ??é??å??å¥½è¨å®?"
 
-#: ../applets/clock/clock.glade.h:8
+#: ../applets/clock/clock.ui.h:6
 msgid "Current Time:"
 msgstr "ç?®å??ç??æ??å?»:"
 
-#: ../applets/clock/clock.glade.h:9
-msgid ""
-"East\n"
-"West"
-msgstr ""
-"æ?±ç¶?\n"
-"è¥¿ç¶?"
+#: ../applets/clock/clock.ui.h:7
+msgid "Display"
+msgstr "é¡¯ç¤º"
 
-#: ../applets/clock/clock.glade.h:11
-#: ../gnome-panel/panel-properties-dialog.glade.h:9
+#: ../applets/clock/clock.ui.h:8
+msgid "East"
+msgstr "æ?±"
+
+#: ../applets/clock/clock.ui.h:9 ../applets/fish/fish.ui.h:5
+#: ../gnome-panel/panel-properties-dialog.ui.h:9
 msgid "General"
 msgstr "ä¸?è?¬"
 
-#: ../applets/clock/clock.glade.h:12
-msgid "Latitude:"
-msgstr "ç·¯åº¦:"
+#: ../applets/clock/clock.ui.h:10
+msgid "L_atitude:"
+msgstr "ç·¯åº¦(_A):"
 
-#: ../applets/clock/clock.glade.h:13
-msgid "Location Name:"
-msgstr "å?°å??:"
+#: ../applets/clock/clock.ui.h:11
+msgid "L_ongitude:"
+msgstr "ç¶?åº¦(_O):"
 
-#: ../applets/clock/clock.glade.h:15
-msgid "Longitude:"
-msgstr "ç¶?åº¦:"
+#: ../applets/clock/clock.ui.h:13
+msgid "North"
+msgstr "å??"
 
-#: ../applets/clock/clock.glade.h:16
-msgid ""
-"North\n"
-"South"
-msgstr ""
-"å??ç·¯\n"
-"å??ç·¯"
+#: ../applets/clock/clock.ui.h:14
+msgid "Panel Display"
+msgstr "é?¢æ?¿é¡¯ç¤º"
 
-#: ../applets/clock/clock.glade.h:19
+#: ../applets/clock/clock.ui.h:15
 msgid "Show _temperature"
 msgstr "é¡¯ç¤ºæº«åº¦(_T)"
 
-#: ../applets/clock/clock.glade.h:20
+#: ../applets/clock/clock.ui.h:16
 msgid "Show _weather"
 msgstr "é¡¯ç¤ºå¤©æ°£(_W)"
 
-#: ../applets/clock/clock.glade.h:21
+#: ../applets/clock/clock.ui.h:17
 msgid "Show seco_nds"
 msgstr "é¡¯ç¤ºç§?æ?¸(_N)"
 
-#: ../applets/clock/clock.glade.h:22
+#: ../applets/clock/clock.ui.h:18
 msgid "Show the _date"
 msgstr "é¡¯ç¤ºæ?¥æ??(_D)"
 
-#: ../applets/clock/clock.glade.h:23
+#: ../applets/clock/clock.ui.h:19
+msgid "South"
+msgstr "å??"
+
+#: ../applets/clock/clock.ui.h:20
 msgid "Time & Date"
 msgstr "æ??å?» & æ?¥æ??"
 
-#: ../applets/clock/clock.glade.h:24
+#: ../applets/clock/clock.ui.h:21
 msgid "Time _Settings"
 msgstr "æ??å?»è¨å®?å?¼(_S)"
 
-#: ../applets/clock/clock.glade.h:25
-msgid "Time:"
-msgstr "æ??å?»:"
-
-#: ../applets/clock/clock.glade.h:26
-msgid "Timezone:"
-msgstr "æ??å??:"
-
-#: ../applets/clock/clock.glade.h:27
+#: ../applets/clock/clock.ui.h:22
 msgid "Weather"
 msgstr "å¤©æ°£"
 
-#: ../applets/clock/clock.glade.h:28
+#: ../applets/clock/clock.ui.h:23
+msgid "West"
+msgstr "è¥¿"
+
+#: ../applets/clock/clock.ui.h:24
 msgid "_12 hour format"
 msgstr "_12 å°?æ??å?¶"
 
-#: ../applets/clock/clock.glade.h:29
+#: ../applets/clock/clock.ui.h:25
 msgid "_24 hour format"
 msgstr "_24 å°?æ??å?¶"
 
-#: ../applets/clock/clock.glade.h:30
+#: ../applets/clock/clock.ui.h:26
+msgid "_Location Name:"
+msgstr "ä½?ç½®å??ç¨±(_L):"
+
+#: ../applets/clock/clock.ui.h:27
 msgid "_Pressure unit:"
 msgstr "æ°£å£?å?®ä½?(_P):"
 
-#: ../applets/clock/clock.glade.h:31
+#: ../applets/clock/clock.ui.h:28
+msgid "_Set System Time"
+msgstr "è¨å®?ç³»çµ±æ??å?»(_S)"
+
+#: ../applets/clock/clock.ui.h:29
 msgid "_Temperature unit:"
 msgstr "æº«åº¦å?®ä½?(_T):"
 
-#: ../applets/clock/clock.glade.h:32
+#: ../applets/clock/clock.ui.h:30
+msgid "_Time:"
+msgstr "æ??å?»(_T):"
+
+#: ../applets/clock/clock.ui.h:31
+msgid "_Timezone:"
+msgstr "æ??å??(_T):"
+
+#: ../applets/clock/clock.ui.h:32
 msgid "_Visibility unit:"
 msgstr "è?½è¦?åº¦å?®ä½?(_V):"
 
-#: ../applets/clock/clock.glade.h:33
+#: ../applets/clock/clock.ui.h:33
 msgid "_Wind speed unit:"
 msgstr "é¢¨é??å?®ä½?(_W):"
 
@@ -614,64 +661,63 @@ msgstr "<small>è¨å®?</small>"
 msgid "Set location as current location and use its timezone for this computer"
 msgstr "å°?ä½?ç½®è¨ç?ºç?®å??ç??ä½?ç½®ï¼?ä¸¦ä½¿ç?¨å?¶æ??å??è¨ç?ºé??å?°é?»è?¦ç?®å??ç??æ??å??"
 
-#. translators: This is a strftime format string that is used for formatting
-#. * the time that is displayed for locations in the popup. This string is used
-#. * for 12-hour format (the %p expands to am/pm), when the local weekday differs
-#. * from the weekday at the location (the %A expands to the weekday).
-#. * There should be little need to translate this string.
-#.
+#. 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), when the local
+#. * 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
 msgid "%l:%M <small>%p (%A)</small>"
 msgstr "%l:%M <small>%p (%A)</small>"
 
-#. translators: This is a strftime format string that is used for formatting
-#. * the time that is displayed for locations in the popup. This string is used
-#. * for 24-hour format (the %p expands to am/pm), when the local weekday differs
-#. * from the weekday at the location (the %A expands to the weekday).
-#. * There should be little need to translate this string.
-#.
-#: ../applets/clock/clock-location-tile.c:462
+#. Translators: This is a strftime format string.
+#. * It is used to display the time in 24-hours format
+#. * (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
 msgid "%H:%M <small>(%A)</small>"
 msgstr "%H:%M <small>(%A)</small>"
 
-#. translators: This is a strftime format string that is used for formatting
-#. * the time that is displayed for locations in the popup. This string is used
-#. * for 12-hour format (the %p expands to am/pm).
-#. * There should be little need to translate this string.
-#.
-#: ../applets/clock/clock-location-tile.c:472
+#. 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-location-tile.c:470
 msgid "%l:%M <small>%p</small>"
 msgstr "%l:%M <small>%p</small>"
 
-#: ../applets/clock/clock-location-tile.c:581
+#: ../applets/clock/clock-location-tile.c:577
 #, 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:593
-#: ../applets/clock/clock-location-tile.c:601
+#: ../applets/clock/clock-location-tile.c:589
+#: ../applets/clock/clock-location-tile.c:598
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../applets/clock/clock-location-tile.c:594
+#. Translators: The two strings are temperatures.
+#: ../applets/clock/clock-location-tile.c:591
 #, c-format
 msgid "%s, feels like %s"
 msgstr "%sï¼?æ??è¦ºå?? %s"
 
-#: ../applets/clock/clock-location-tile.c:612
+#: ../applets/clock/clock-location-tile.c:609
 #, c-format
 msgid "Sunrise: %s / Sunset: %s"
 msgstr "æ?¥å?º: %s / æ?¥è?½: %s"
 
-#: ../applets/clock/clock-utils.c:93 ../applets/fish/fish.c:169
+#: ../applets/clock/clock-utils.c:93 ../applets/fish/fish.c:168
 #: ../applets/notification_area/main.c:94 ../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:195
+#: ../applets/clock/clock-utils.c:122 ../applets/fish/fish.c:194
 #: ../applets/notification_area/main.c:115 ../applets/wncklet/wncklet.c:152
 msgid "Error displaying help document"
 msgstr "é¡¯ç¤ºæ±?å?©æ??ä»¶æ??ç?¼ç??é?¯èª¤"
@@ -705,7 +751,7 @@ msgid "Display a swimming fish or another animated creature"
 msgstr "é¡¯ç¤ºæ¸¸æ³³ä¸ç??é?å??æ??å?¶å®?ç??ç?©"
 
 #: ../applets/fish/GNOME_FishApplet_Factory.server.in.in.h:2
-#: ../applets/fish/fish.c:607
+#: ../applets/fish/fish.c:617
 msgid "Fish"
 msgstr "å°?é?"
 
@@ -717,7 +763,7 @@ msgstr "é?£æ¢?è ¢é?æ?¯å¾?å?ªè£?ä¾?ç??"
 msgid "Wanda Factory"
 msgstr "Wanda å·¥å» "
 
-#: ../applets/fish/fish.c:274
+#: ../applets/fish/fish.c:273
 #, c-format
 msgid ""
 "Warning:  The command appears to be something actually useful.\n"
@@ -729,17 +775,17 @@ msgstr ""
 "é?¢æ?¿ç¨?å¼?ï¼?ä½ æ??è??æ??è©²é?¿å??é??æ¨£å??ã??å¼·ç??å»ºè°ä¸?è¦?\n"
 "ç?¨ä»»ä½?æ?¹æ³?ç?¨ %s ä¾?é?²è¡?ä»»ä½?ã??å¯¦é??ã??æ??æ??ç?¨ç??äº?ã??"
 
-#: ../applets/fish/fish.c:461
+#: ../applets/fish/fish.c:471
 msgid "Images"
 msgstr "å??ç??"
 
-#: ../applets/fish/fish.c:575 ../applets/fish/fish.c:641
-#: ../applets/fish/fish.c:757
+#: ../applets/fish/fish.c:585 ../applets/fish/fish.c:651
+#: ../applets/fish/fish.c:767
 #, no-c-format
 msgid "%s the Fish"
 msgstr "å°?é? %s"
 
-#: ../applets/fish/fish.c:576
+#: ../applets/fish/fish.c:586
 #, c-format
 msgid ""
 "%s has no use what-so-ever. It only takes up disk space and compilation "
@@ -747,25 +793,25 @@ msgid ""
 "Anybody found using it should be promptly sent for a psychiatric evaluation."
 msgstr "%s ä¸?é»?ç?¨è??ä¹?æ²?æ??ï¼?å®?å?ªæ??ä½?ç¡¬ç¢?ç©ºé??ï¼?ç·¨è¯æ??å??è¦?ä½?ç?¨æ??é??ï¼?å??å??æ??é??å¾?ä½?å?»é?¢æ?¿ç©ºé??å??è¨?æ?¶é«?ç©ºé??ã??ä½¿ç?¨é??å??é?¢æ?¿ç¨?å¼?ç??äººæ??è©²è¦?é??å?»æª¢æ?¥ä¸?ä¸?ç²¾ç¥?ç??æ³?å?¢ã??"
 
-#: ../applets/fish/fish.c:600
+#: ../applets/fish/fish.c:610
 msgid "(with minor help from George)"
 msgstr "ï¼?é??æ?? George ç??å¹«å¿?ï¼?"
 
-#: ../applets/fish/fish.c:642
+#: ../applets/fish/fish.c:652
 #, c-format
 msgid "%s the Fish, a contemporary oracle"
 msgstr "GNOME å°?é? %s â?? ç?¶ä»£è??äºº"
 
-#: ../applets/fish/fish.c:713
+#: ../applets/fish/fish.c:723
 msgid "Unable to locate the command to execute"
 msgstr "æ?¾ä¸?å?°è¦?å?·è¡?ç??æ??ä»¤"
 
-#: ../applets/fish/fish.c:762
+#: ../applets/fish/fish.c:772
 #, no-c-format
 msgid "%s the Fish Says:"
 msgstr "GNOME å°?é? %s èªªï¼?"
 
-#: ../applets/fish/fish.c:831
+#: ../applets/fish/fish.c:841
 #, c-format
 msgid ""
 "Unable to read output from command\n"
@@ -776,16 +822,16 @@ msgstr ""
 "\n"
 "è©³æ??ï¼?%s"
 
-#: ../applets/fish/fish.c:896
+#: ../applets/fish/fish.c:906
 msgid "_Speak again"
 msgstr "å??å¿µä¸?é??(_S)"
 
-#: ../applets/fish/fish.c:979
+#: ../applets/fish/fish.c:989
 #, c-format
 msgid "The configured command is not working and has been replaced by: %s"
 msgstr "è¨ç½®ç??æ??ä»¤ç?¡æ³?å·¥ä½?ï¼?å??è¢«å??ä»£ç?ºï¼?%s"
 
-#: ../applets/fish/fish.c:1002
+#: ../applets/fish/fish.c:1012
 #, c-format
 msgid ""
 "Unable to execute '%s'\n"
@@ -796,7 +842,7 @@ msgstr ""
 "\n"
 "è©³æ??ï¼?%s"
 
-#: ../applets/fish/fish.c:1018
+#: ../applets/fish/fish.c:1028
 #, c-format
 msgid ""
 "Unable to read from '%s'\n"
@@ -807,69 +853,64 @@ msgstr ""
 "\n"
 "è©³æ??ï¼?%s"
 
-#: ../applets/fish/fish.c:1643
+#: ../applets/fish/fish.c:1653
 msgid "The water needs changing"
 msgstr "è©²æ??æ°´äº?"
 
-#: ../applets/fish/fish.c:1645
+#: ../applets/fish/fish.c:1655
 msgid "Look at today's date!"
 msgstr "ç??ç??ä»?å¤©æ?¯ç??éº¼æ?¥å?ï¼?"
 
-#: ../applets/fish/fish.c:1738
+#: ../applets/fish/fish.c:1748
 #, c-format
 msgid "%s the Fish, the fortune teller"
 msgstr "GNOME å°?é? %s â?? é ?è¨?å®¶"
 
-#: ../applets/fish/fish.glade.h:1
-#: ../gnome-panel/panel-properties-dialog.glade.h:1
+#: ../applets/fish/fish.ui.h:1 ../gnome-panel/panel-properties-dialog.ui.h:1
 msgid "    "
 msgstr "    "
 
-#: ../applets/fish/fish.glade.h:2
-msgid "<b>Animation</b>"
-msgstr "<b>å??ç?«</b>"
-
-#: ../applets/fish/fish.glade.h:3
-msgid "<b>General</b>"
-msgstr "<b>ä¸?è?¬è¨å®?</b>"
+#: ../applets/fish/fish.ui.h:2
+msgid "Animation"
+msgstr "å??ç?«"
 
-#: ../applets/fish/fish.glade.h:4
+#: ../applets/fish/fish.ui.h:3
 msgid "Co_mmand to run when clicked:"
 msgstr "æ??ä¸?æ??å?·è¡?ç??æ??ä»¤(_M):"
 
-#: ../applets/fish/fish.glade.h:5
+#: ../applets/fish/fish.ui.h:4
 msgid "Fish Preferences"
 msgstr "å°?é?å??å¥½è¨å®?"
 
-#: ../applets/fish/fish.glade.h:6
+#: ../applets/fish/fish.ui.h:6
 msgid "Select an animation"
 msgstr "é?¸æ??å??ç?«"
 
-#: ../applets/fish/fish.glade.h:7
+#: ../applets/fish/fish.ui.h:7
 msgid "_File:"
 msgstr "æª?æ¡?(_F):"
 
-#: ../applets/fish/fish.glade.h:8
+#: ../applets/fish/fish.ui.h:8
 msgid "_Name of fish:"
 msgstr "å°?é?ç??å??ç¨±(_N):"
 
-#: ../applets/fish/fish.glade.h:9
+#: ../applets/fish/fish.ui.h:9
 msgid "_Pause per frame:"
 msgstr "æ¯?æ ¼ç??æ?«å??æ??é??(_P):"
 
-#: ../applets/fish/fish.glade.h:10
+#: ../applets/fish/fish.ui.h:10
 msgid "_Rotate on vertical panels"
 msgstr "ä½¿ç?¨å??ç?´é?¢æ?¿æ??æ??æ??è½?ç¨?å¼?é¡¯ç¤º(_R)"
 
-#: ../applets/fish/fish.glade.h:11
+#: ../applets/fish/fish.ui.h:11
 msgid "_Total frames in animation:"
 msgstr "å??ç?«æ ¼æ?¸(_T):"
 
-#: ../applets/fish/fish.glade.h:12
+#: ../applets/fish/fish.ui.h:12
 msgid "frames"
 msgstr "æ ¼æ?¸"
 
-#: ../applets/fish/fish.glade.h:13
+#: ../applets/fish/fish.ui.h:13
 msgid "seconds"
 msgstr "ç§?"
 
@@ -972,7 +1013,7 @@ msgid "Switch between workspaces"
 msgstr "å??æ??å·¥ä½?å??"
 
 #: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:7
-#: ../applets/wncklet/window-list.c:610
+#: ../applets/wncklet/window-list.c:609
 msgid "Window List"
 msgstr "è¦?çª?æ¸?å?®"
 
@@ -986,7 +1027,7 @@ msgid "Window Selector"
 msgstr "è¦?çª?é?¸æ??ç¨?å¼?"
 
 #: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:10
-#: ../applets/wncklet/workspace-switcher.c:625
+#: ../applets/wncklet/workspace-switcher.c:624
 msgid "Workspace Switcher"
 msgstr "å·¥ä½?å??å??æ??ç¨?å¼?"
 
@@ -1021,53 +1062,53 @@ msgid ""
 "running a window manager."
 msgstr "ä½ ä½¿ç?¨ç??è¦?çª?ç¸½ç??å?¡ä¸?æ?¯æ?´ã??é¡¯ç¤ºæ¡?é?¢ã??æ??é??ï¼?æ??æ?¯ä½ æ ¹æ?¬æ²?æ??å?·è¡?ä»»ä½?è¦?çª?ç¸½ç??å?¡ã??"
 
-#: ../applets/wncklet/window-list.c:612
+#: ../applets/wncklet/window-list.c:611
 msgid ""
 "The Window List shows a list of all windows in a set of buttons and lets you "
 "browse them."
 msgstr "ã??è¦?çª?æ¸?å?®ã??å?¨ä¸?çµ?æ??é??ä¸é¡¯ç¤ºè¦?çª?æ¸?å?®ä»¥ä¾?ç??è¦½ã??"
 
-#: ../applets/wncklet/window-list.glade.h:1
-msgid "<b>Restoring Minimized Windows</b>"
-msgstr "<b>é??å??æ??å°?å??ç??æ??ä¸ç??è¦?çª?</b>"
-
-#: ../applets/wncklet/window-list.glade.h:2
-msgid "<b>Window Grouping</b>"
-msgstr "<b>è¦?çª?å??ä½µé¡¯ç¤º</b>"
-
-#: ../applets/wncklet/window-list.glade.h:3
-msgid "<b>Window List Content</b>"
-msgstr "<b>ã??è¦?çª?æ¸?å?®ã??å?§å®¹</b>"
-
-#: ../applets/wncklet/window-list.glade.h:4
+#: ../applets/wncklet/window-list.ui.h:1
 msgid "Group windows when _space is limited"
 msgstr "ç?¶é?¢æ?¿ç©ºé??æ??é??æ??ï¼?å°?å??é¡?è¦?çª?å??ä½µæ??ç¾£çµ?(_S)"
 
-#: ../applets/wncklet/window-list.glade.h:5
+#: ../applets/wncklet/window-list.ui.h:2
 msgid "Restore to current _workspace"
 msgstr "å?¨ç?®å??ç??å·¥ä½?å??é??å??è¦?çª?(_W)"
 
-#: ../applets/wncklet/window-list.glade.h:6
+#: ../applets/wncklet/window-list.ui.h:3
 msgid "Restore to na_tive workspace"
 msgstr "å?¨å??ä¾?ç??å·¥ä½?å??é??å??è¦?çª?(_T)"
 
-#: ../applets/wncklet/window-list.glade.h:7
+#: ../applets/wncklet/window-list.ui.h:4
+msgid "Restoring Minimized Windows"
+msgstr "é??å??æ??å°?å??ç??æ??ä¸ç??è¦?çª?"
+
+#: ../applets/wncklet/window-list.ui.h:5
 msgid "Sh_ow windows from current workspace"
 msgstr "é¡¯ç¤ºç?®å??å·¥ä½?å??ä¸ç??è¦?çª?(_O)"
 
-#: ../applets/wncklet/window-list.glade.h:8
+#: ../applets/wncklet/window-list.ui.h:6
 msgid "Show windows from a_ll workspaces"
 msgstr "é¡¯ç¤ºæ??æ??å·¥ä½?å??ä¸ç??è¦?çª?(_L)"
 
-#: ../applets/wncklet/window-list.glade.h:9
+#: ../applets/wncklet/window-list.ui.h:7
+msgid "Window Grouping"
+msgstr "è¦?çª?å??ä½µé¡¯ç¤º"
+
+#: ../applets/wncklet/window-list.ui.h:8
+msgid "Window List Content"
+msgstr "ã??è¦?çª?æ¸?å?®ã??å?§å®¹"
+
+#: ../applets/wncklet/window-list.ui.h:9
 msgid "Window List Preferences"
 msgstr "ã??è¦?çª?æ¸?å?®ã??å??å¥½è¨å®?"
 
-#: ../applets/wncklet/window-list.glade.h:10
+#: ../applets/wncklet/window-list.ui.h:10
 msgid "_Always group windows"
 msgstr "ç¸½æ?¯å??ä½µå??é¡?ç??è¦?çª?(_A)"
 
-#: ../applets/wncklet/window-list.glade.h:11
+#: ../applets/wncklet/window-list.ui.h:11
 msgid "_Never group windows"
 msgstr "æ°¸ä¸?å??ä½µå??é¡?ç??è¦?çª?(_N)"
 
@@ -1121,76 +1162,76 @@ msgid ""
 "browse them."
 msgstr "ã??è¦?çª?é?¸æ??ç¨?å¼?ã??æ??å?¨é?¸å?®ä¸é¡¯ç¤ºè¦?çª?æ¸?å?®ä»¥ä¾?ç??è¦½ã??"
 
-#: ../applets/wncklet/workspace-switcher.c:215
-#: ../applets/wncklet/workspace-switcher.c:977
-#: ../applets/wncklet/workspace-switcher.glade.h:10
+#: ../applets/wncklet/workspace-switcher.c:214
+#: ../applets/wncklet/workspace-switcher.c:976
+#: ../applets/wncklet/workspace-switcher.ui.h:10
 msgid "rows"
 msgstr "å??"
 
-#: ../applets/wncklet/workspace-switcher.c:215
-#: ../applets/wncklet/workspace-switcher.c:977
+#: ../applets/wncklet/workspace-switcher.c:214
+#: ../applets/wncklet/workspace-switcher.c:976
 msgid "columns"
 msgstr "è¡?"
 
-#: ../applets/wncklet/workspace-switcher.c:489
+#: ../applets/wncklet/workspace-switcher.c:488
 #, c-format
 msgid "Error loading num_rows value for Workspace Switcher: %s\n"
 msgstr "è¼?å?¥ã??å·¥ä½?å??å??æ??ç¨?å¼?ã??ä¸ç?? num_rows æ?¸å?¼æ??å?ºç?¾é?¯èª¤ï¼?%s\n"
 
-#: ../applets/wncklet/workspace-switcher.c:500
+#: ../applets/wncklet/workspace-switcher.c:499
 #, 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:515
+#: ../applets/wncklet/workspace-switcher.c:514
 #, 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:627
+#: ../applets/wncklet/workspace-switcher.c:626
 msgid ""
 "The Workspace Switcher shows you a small version of your workspaces that "
 "lets you manage your windows."
 msgstr "ã??å·¥ä½?å??å??æ??ç¨?å¼?ã??å?¯å?¨è¼?å°?ç??ç©ºé??ä¸é¡¯ç¤ºå·¥ä½?å??ç??æ??æ³?ï¼?æ?¹ä¾¿ç®¡ç??è¦?çª?ã??"
 
-#: ../applets/wncklet/workspace-switcher.glade.h:1
-msgid "<b>Switcher</b>"
-msgstr "<b>é ?è¦½</b>"
-
-#: ../applets/wncklet/workspace-switcher.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>å·¥ä½?å??</b>"
-
-#: ../applets/wncklet/workspace-switcher.glade.h:3
+#: ../applets/wncklet/workspace-switcher.ui.h:1
 msgid "Number of _workspaces:"
 msgstr "å·¥ä½?å??æ?¸ç?®(_W):"
 
 # FIXME: "Show all workspaces in [4] rows" -- Abel
-#: ../applets/wncklet/workspace-switcher.glade.h:4
+#: ../applets/wncklet/workspace-switcher.ui.h:2
 msgid "Show _all workspaces in:"
 msgstr "é¡¯ç¤ºæ??æ??å·¥ä½?å??ç??æ?¹å¼?(_A):å??ç?º"
 
-#: ../applets/wncklet/workspace-switcher.glade.h:5
+#: ../applets/wncklet/workspace-switcher.ui.h:3
 msgid "Show _only the current workspace"
 msgstr "å?ªé¡¯ç¤ºç?®å??ç??å·¥ä½?å??(_O)"
 
-#: ../applets/wncklet/workspace-switcher.glade.h:6
+#: ../applets/wncklet/workspace-switcher.ui.h:4
 msgid "Show workspace _names in switcher"
 msgstr "å?¨å??æ??ç¨?å¼?ä¸é¡¯ç¤ºå·¥ä½?å??ç??å??ç¨±(_N)"
 
-#: ../applets/wncklet/workspace-switcher.glade.h:7
+#: ../applets/wncklet/workspace-switcher.ui.h:5
+msgid "Switcher"
+msgstr "å??æ??å?¨"
+
+#: ../applets/wncklet/workspace-switcher.ui.h:6
 msgid "Workspace Names"
 msgstr "å·¥ä½?å??å??ç¨±"
 
-#: ../applets/wncklet/workspace-switcher.glade.h:8
+#: ../applets/wncklet/workspace-switcher.ui.h:7
 msgid "Workspace Switcher Preferences"
 msgstr "ã??å·¥ä½?å??å??æ??ç¨?å¼?ã??å??å¥½è¨å®?"
 
-#: ../applets/wncklet/workspace-switcher.glade.h:9
+#: ../applets/wncklet/workspace-switcher.ui.h:8
 msgid "Workspace na_mes:"
 msgstr "å·¥ä½?å??å??ç¨±(_M):"
 
+#: ../applets/wncklet/workspace-switcher.ui.h:9
+msgid "Workspaces"
+msgstr "å·¥ä½?å??"
+
 #: ../applets/wncklet/workspace-switcher.schemas.in.h:1
 msgid "Display all workspaces"
 msgstr "é¡¯ç¤ºæ??æ??å·¥ä½?å??"
@@ -1274,7 +1315,7 @@ msgid "Cannot find an empty spot"
 msgstr "æ²?æ??ç©ºä½?"
 
 #: ../gnome-panel/drawer.c:350 ../gnome-panel/panel-addto.c:175
-#: ../gnome-panel/panel-toplevel.c:1617
+#: ../gnome-panel/panel-toplevel.c:1627
 msgid "Drawer"
 msgstr "æ?½å±?"
 
@@ -1553,7 +1594,7 @@ msgid "(empty)"
 msgstr "ï¼?ç©ºç?½ï¼?"
 
 #: ../gnome-panel/panel-addto.c:410
-#: ../libpanel-applet/panel-test-applets.c:250
+#: ../libpanel-applet/panel-test-applets.c:249
 #, c-format
 msgid "query returned exception %s\n"
 msgstr "è©¢å??æ??å??å?³äº?ä¾?å¤?æ??æ³? %s\n"
@@ -1687,6 +1728,7 @@ msgid "_Name:"
 msgstr "å??ç¨±(_N):"
 
 #: ../gnome-panel/panel-ditem-editor.c:637
+#: ../gnome-panel/panel-properties-dialog.c:286
 msgid "Browse icons"
 msgstr "ç??è¦½å??ç¤º"
 
@@ -1751,9 +1793,9 @@ msgstr "å¼·è¡?çµ?æ??é??å??æ??ç?¨ç¨?å¼?ï¼?"
 
 #: ../gnome-panel/panel-force-quit.c:207
 msgid ""
-"If you choose to force an application to exit, any open documents in it will "
-"be lost."
-msgstr "å¦?æ??é?¸æ??å¼·è¡?çµ?æ??é??å??ç¨?å¼?ï¼?å°?æ??å¤±å?»å?¶ä¸æ??æ??é??å??ç??æ??ä»¶ã??"
+"If you choose to force an application to exit, unsaved changes in any open "
+"documents in it might get lost."
+msgstr "å¦?æ??é?¸æ??å¼·è¡?çµ?æ??é??å??ç¨?å¼?ï¼?å°?æ??å¤±å?»å?¶ä¸æ??æ??é??å??ç??æ??ä»¶ä¸æ?ªå?²å?ç??æ?´æ?¹ã??"
 
 #: ../gnome-panel/panel-general.schemas.in.h:1
 msgid ""
@@ -1862,72 +1904,68 @@ msgid "Disable Force Quit"
 msgstr "ä¸?ä½¿ç?¨ã??å¼·è¡?çµ?æ??ã??"
 
 #: ../gnome-panel/panel-global.schemas.in.h:8
-msgid "Disable Lock Screen"
-msgstr "ä¸?ä½¿ç?¨ã??é??å®?ç?«é?¢ã??"
-
-#: ../gnome-panel/panel-global.schemas.in.h:9
 msgid "Disable Logging Out"
 msgstr "ä¸?ä½¿ç?¨ã??ç?»å?ºã??"
 
-#: ../gnome-panel/panel-global.schemas.in.h:10
+#: ../gnome-panel/panel-global.schemas.in.h:9
 #: ../gnome-panel/panel-toplevel.schemas.in.h:9
 msgid "Enable animations"
 msgstr "å??ç?¨å??ç?«"
 
-#: ../gnome-panel/panel-global.schemas.in.h:11
+#: ../gnome-panel/panel-global.schemas.in.h:10
 msgid "Enable tooltips"
 msgstr "æ??é¡¯ç¤ºå·¥å?·æ??ç¤º"
 
-#: ../gnome-panel/panel-global.schemas.in.h:12
+#: ../gnome-panel/panel-global.schemas.in.h:11
 msgid "Highlight launchers on mouseover"
 msgstr "æ»?é¼ ç§»å??è?³å??å??å??ç¤ºä¸?é?¢æ??ï¼?å? å¼·é¡¯ç¤ºå??å??å??ç¤º"
 
-#: ../gnome-panel/panel-global.schemas.in.h:13
+#: ../gnome-panel/panel-global.schemas.in.h:12
 msgid ""
 "If true, a dialog is shown asking for confirmation if the user wants to "
 "remove a panel."
 msgstr "å¦?è¨å®?ç?ºâ??trueâ??ï¼?ç?¶ç?¨æ?¶æº?å??ç§»é?¤é?¢æ?¿æ??ï¼?æ??é¡¯ç¤ºå°?è©±æ?¹å¡?è¦?æ±?ä½¿ç?¨è??ç¢ºèª?ã??"
 
-#: ../gnome-panel/panel-global.schemas.in.h:14
+#: ../gnome-panel/panel-global.schemas.in.h:13
 msgid ""
 "If true, a drawer will automatically be closed when the user clicks a "
 "launcher in it."
 msgstr "å¦?è¨å®?ç?ºâ??trueâ??ï¼?ç?¶ä½¿ç?¨è??æ??ä¸?æ?½å±?ä¸ç??å??å??å??ç¤ºå¾?ï¼?æ?½å±?æ??è?ªå??é??é??ã??"
 
-#: ../gnome-panel/panel-global.schemas.in.h:15
+#: ../gnome-panel/panel-global.schemas.in.h:14
 msgid ""
 "If true, a launcher is highlighted when the user moves the pointer over it."
 msgstr "å¦?è¨å®?ç?ºâ??trueâ??ï¼?æ»?é¼ ç§»å??è?³å??å??å??ç¤ºä¸?é?¢æ??ï¼?æ??å? å¼·é¡¯ç¤ºå??å??å??ç¤ºã??"
 
-#: ../gnome-panel/panel-global.schemas.in.h:16
+#: ../gnome-panel/panel-global.schemas.in.h:15
 msgid ""
 "If true, the panel will not allow a user to force an application to quit by "
 "removing access to the force quit button."
 msgstr "å¦?è¨å®?ç?ºâ??trueâ??ï¼?é?¢æ?¿å°?é?±è??ã??å¼·è¡?çµ?æ??ã??æ??é??ä»¥é?²æ¢ä½¿ç?¨è??å¼·è¡?çµ?æ??å?·è¡?ä¸ç??ç¨?å¼?ã??"
 
-#: ../gnome-panel/panel-global.schemas.in.h:17
-msgid ""
-"If true, the panel will not allow a user to lock their screen, by removing "
-"access to the lock screen menu entries."
-msgstr "å¦?è¨å®?ç?ºâ??trueâ??ï¼?é?¢æ?¿å°?é?±è??é?¸å?®ä¸ç??ã??é??å®?ç?«é?¢ã??é ?ä»¥é?²æ¢ä½¿ç?¨è??é??å®?ç?«é?¢ã??"
-
-#: ../gnome-panel/panel-global.schemas.in.h:18
+#: ../gnome-panel/panel-global.schemas.in.h:16
 msgid ""
 "If true, the panel will not allow a user to log out, by removing access to "
 "the log out menu entries."
 msgstr "å¦?è¨å®?ç?ºâ??trueâ??ï¼?é?¢æ?¿å°?é?±è??é?¸å?®ä¸ç??ã??ç?»å?ºã??é ?ä»¥é?²æ¢ä½¿ç?¨è??ç?»å?ºã??"
 
-#: ../gnome-panel/panel-global.schemas.in.h:19
+#: ../gnome-panel/panel-global.schemas.in.h:17
 msgid ""
 "If true, the panel will not allow any changes to the configuration of the "
 "panel. Individual applets may need to be locked down separately however. The "
 "panel must be restarted for this to take effect."
 msgstr "å¦?è¨å®?ç?ºâ??trueâ??ï¼?é?¢æ?¿å°?ä¸?å??è¨±ä»»ä½?å°?å?¶è¨å®?ç??æ?´æ?¹ã??ç?¶è??ï¼?å??å?¥é?¢æ?¿ç¨?å¼?ç??é??å®?å??è¦?å??é??å?·è¡?ã??ä»»ä½?æ?´æ?¹å?¨é?¢æ?¿é??æ?°å??å??å¾?æ??æ??ç??æ??ã??"
 
-#: ../gnome-panel/panel-global.schemas.in.h:20
+#: ../gnome-panel/panel-global.schemas.in.h:18
 msgid "If true, tooltips are shown for objects in panels."
 msgstr "å¦?è¨å®?ç?ºâ??trueâ??ï¼?é?¢æ?¿ä¸?ç??ç?©ä»¶æ??é¡¯ç¤ºå·¥å?·æ??ç¤ºã??"
 
+#: ../gnome-panel/panel-global.schemas.in.h:19
+msgid ""
+"This key is deprecated as it cannot be used to implement proper lockdown. "
+"The /desktop/gnome/lockdown/disable_lock_screen key should be used instead."
+msgstr "é??å??è¨å®?é?µå·²å»¢æ£?ï¼?å? ç?ºå®?ä¸?è?½ç?¨ä¾?å¯¦ä½?æ£ç¢ºç??å°?é??ã??æ??è©²ä½¿ç?¨ /desktop/gnome/lockdown/disable_lock_screen ä¾?ä»£æ?¿ã??"
+
 #: ../gnome-panel/panel-menu-bar.c:106
 msgid "Browse and run installed applications"
 msgstr "ç??è¦½å??å?·è¡?å·²å®?è£?ç??ç¨?å¼?"
@@ -2206,142 +2244,142 @@ 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:54
+#: ../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:55
+#: ../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:56
+#: ../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:57
+#: ../libpanel-applet/panel-test-applets.c:56
 msgctxt "Orientation"
 msgid "Right"
 msgstr "å?³"
 
-#: ../gnome-panel/panel-properties-dialog.c:949
+#: ../gnome-panel/panel-properties-dialog.c:952
 msgid "Drawer Properties"
 msgstr "æ?½å±?å±¬æ?§"
 
-#: ../gnome-panel/panel-properties-dialog.c:1057
-#: ../gnome-panel/panel-run-dialog.c:1928
+#: ../gnome-panel/panel-properties-dialog.c:1067
+#: ../gnome-panel/panel-run-dialog.c:2018
 #, c-format
-msgid "Unable to load file '%s'."
-msgstr "ç?¡æ³?è¼?å?¥æª?æ¡?â??%sâ??ã??"
+msgid "Unable to load file '%s': %s."
+msgstr "ç?¡æ³?è¼?å?¥æª?æ¡?ã??%sã??ï¼?%sã??"
 
-#: ../gnome-panel/panel-properties-dialog.c:1062
+#: ../gnome-panel/panel-properties-dialog.c:1073
 msgid "Could not display properties dialog"
 msgstr "ç?¡æ³?é¡¯ç¤ºå±¬æ?§å°?è©±è¦?çª?"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:2
+#: ../gnome-panel/panel-properties-dialog.ui.h:2
 msgid "<small>Opaque</small>"
 msgstr "<small>ä¸?é??æ??</small>"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:3
+#: ../gnome-panel/panel-properties-dialog.ui.h:3
 msgid "<small>Transparent</small>"
 msgstr "<small>é??æ??</small>"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:4
+#: ../gnome-panel/panel-properties-dialog.ui.h:4
 msgid "Arro_ws on hide buttons"
 msgstr "å?¨é?±è??æ??é??ä¸é¡¯ç¤ºç®é (_W)"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:5
+#: ../gnome-panel/panel-properties-dialog.ui.h:5
 msgid "Background"
 msgstr "è??æ?¯"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:6
+#: ../gnome-panel/panel-properties-dialog.ui.h:6
 msgid "Background _image:"
 msgstr "è??æ?¯å??ç??(_I):"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:7
+#: ../gnome-panel/panel-properties-dialog.ui.h:7
 msgid "Co_lor:"
 msgstr "é¡?è?²(_L):"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:8
+#: ../gnome-panel/panel-properties-dialog.ui.h:8
 msgid "E_xpand"
 msgstr "å±?é??(_X)"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:10
+#: ../gnome-panel/panel-properties-dialog.ui.h:10
 msgid "Image Background Details"
 msgstr "å??ç??è??æ?¯è©³ç´°è¨å®?"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:11
+#: ../gnome-panel/panel-properties-dialog.ui.h:11
 msgid "Panel Properties"
 msgstr "é?¢æ?¿å±¬æ?§"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:12
+#: ../gnome-panel/panel-properties-dialog.ui.h:12
 msgid "Pick a color"
 msgstr "æ??é?¸é¡?è?²"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:13
+#: ../gnome-panel/panel-properties-dialog.ui.h:13
 msgid "Rotate image when panel is _vertical"
 msgstr "ä½¿ç?¨å??ç?´é?¢æ?¿æ??è¦?æ??è½?é¡¯ç¤º(_V)"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:14
+#: ../gnome-panel/panel-properties-dialog.ui.h:14
 msgid "S_tyle:"
 msgstr "æ?¹å¼?(_T):"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:15
+#: ../gnome-panel/panel-properties-dialog.ui.h:15
 msgid "Select background"
 msgstr "é?¸æ??è??æ?¯"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:16
+#: ../gnome-panel/panel-properties-dialog.ui.h:16
 msgid "Show hide _buttons"
 msgstr "é¡¯ç¤ºé?±è??æ??é??(_B)"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:17
+#: ../gnome-panel/panel-properties-dialog.ui.h:17
 msgid "Solid c_olor"
 msgstr "ç´?è?²(_O):"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:18
+#: ../gnome-panel/panel-properties-dialog.ui.h:18
 msgid "Some of these properties are locked down"
 msgstr "ä¸?é?¨å??ç??å±¬æ?§å·²è¢«é??å®?"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:19
+#: ../gnome-panel/panel-properties-dialog.ui.h:19
 msgid "St_retch"
 msgstr "ä¸?æ ¹æ??æ¯?ä¾?ä¼¸å±?(_R)"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:20
+#: ../gnome-panel/panel-properties-dialog.ui.h:20
 msgid "_Autohide"
 msgstr "è?ªå??é?±è??(_A)"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:21
+#: ../gnome-panel/panel-properties-dialog.ui.h:21
 msgid "_Icon:"
 msgstr "å??ç¤º(_I):"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:22
+#: ../gnome-panel/panel-properties-dialog.ui.h:22
 msgid "_None (use system theme)"
 msgstr "ç?¡ï¼?ä½¿ç?¨ç³»çµ±ä½?æ?¯(_N)"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:23
-#: ../libpanel-applet/panel-test-applets.glade.h:4
+#: ../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.glade.h:24
+#: ../gnome-panel/panel-properties-dialog.ui.h:24
 msgid "_Scale"
 msgstr "æ ¹æ??æ¯?ä¾?ç¸®æ?¾(_S)"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:25
-#: ../libpanel-applet/panel-test-applets.glade.h:6
+#: ../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.glade.h:26
+#: ../gnome-panel/panel-properties-dialog.ui.h:26
 msgid "_Tile"
 msgstr "é?ªæ??(_T)"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:27
+#: ../gnome-panel/panel-properties-dialog.ui.h:27
 msgid "pixels"
 msgstr "å??ç´ "
 
@@ -2385,92 +2423,84 @@ msgstr "æ¸?é?¤æ??è¿?å?å??æ??ä»¶..."
 msgid "Clear all items from the recent documents list"
 msgstr "æ¸?é?¤æ??è¿?å?å??æ??ä»¶æ¸?å?®ä¸ç??æ??æ??é ?ç?®ï¼?"
 
-#: ../gnome-panel/panel-run-dialog.c:325
+#: ../gnome-panel/panel-run-dialog.c:391
 #, c-format
 msgid "Could not run command '%s'"
 msgstr "ç?¡æ³?å?·è¡?â??%sâ??æ??ä»¤"
 
-#: ../gnome-panel/panel-run-dialog.c:378
+#: ../gnome-panel/panel-run-dialog.c:444
 #, c-format
 msgid "Could not convert '%s' from UTF-8"
 msgstr "ç?¡æ³?ç?± UTF-8 è½?æ??ç?ºâ??%sâ??"
 
-#: ../gnome-panel/panel-run-dialog.c:1186
+#: ../gnome-panel/panel-run-dialog.c:1255
 msgid "Choose a file to append to the command..."
 msgstr "å?¨æ??ä»¤å¾?é??å? æª?æ¡?å??ç¨±..."
 
-#: ../gnome-panel/panel-run-dialog.c:1562
-#: ../gnome-panel/panel-run-dialog.glade.h:10
+#: ../gnome-panel/panel-run-dialog.c:1633
+#: ../gnome-panel/panel-run-dialog.ui.h:8
 msgid "Select an application to view its description."
 msgstr "é?¸å??æ??ç?¨ç¨?å¼?å¾?å?¯ä»¥é¡¯ç¤ºæ??é??è©²ç¨?å¼?ç??èªªæ??ã??"
 
-#: ../gnome-panel/panel-run-dialog.c:1600
+#: ../gnome-panel/panel-run-dialog.c:1671
 #, c-format
 msgid "Will run command: '%s'"
 msgstr "å°?æ??å?·è¡?æ??ä»¤ï¼?â??%sâ??"
 
-#: ../gnome-panel/panel-run-dialog.c:1631
+#: ../gnome-panel/panel-run-dialog.c:1704
 #, 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:1932
+#: ../gnome-panel/panel-run-dialog.c:2023
 msgid "Could not display run dialog"
 msgstr "ç?¡æ³?é¡¯ç¤ºå?·è¡?å°?è©±è¦?çª?"
 
-#: ../gnome-panel/panel-run-dialog.glade.h:1
+#: ../gnome-panel/panel-run-dialog.ui.h:1
 msgid ""
 "Click this button to browse for a file whose name to append to the command "
 "string."
 msgstr "æ??ä¸?è©²æ??é??å¾?å?¯ä»¥é?¸å??æª?æ¡?ï¼?å°?è©²æª?æ¡?ç??å??ç¨±é??å? å?¨æ??ä»¤ä¹?å¾?ã??"
 
-#: ../gnome-panel/panel-run-dialog.glade.h:2
+#: ../gnome-panel/panel-run-dialog.ui.h:2
 msgid ""
 "Click this button to run the selected application or the command in the "
 "command entry field."
 msgstr "æ??ä¸?è©²æ??é??å?¯ä»¥å?·è¡?è¼¸å?¥æ¬?ä½?ä¸ç??æ??ä»¤ã??"
 
-#: ../gnome-panel/panel-run-dialog.glade.h:3
-msgid "Command entry"
-msgstr "æ??ä»¤è¼¸å?¥æ¬?ä½?"
-
-#: ../gnome-panel/panel-run-dialog.glade.h:4
+#: ../gnome-panel/panel-run-dialog.ui.h:3
 msgid "Command icon"
 msgstr "æ??ä»¤å??ç¤º"
 
-#: ../gnome-panel/panel-run-dialog.glade.h:5
-msgid "Enter a command string here to run it."
-msgstr "å?¨é??è£?è¼¸å?¥æ??ä»¤ã??"
-
-#: ../gnome-panel/panel-run-dialog.glade.h:6
+#: ../gnome-panel/panel-run-dialog.ui.h:4
 msgid "List of known applications"
 msgstr "å·²ç?¥ç??æ??ç?¨ç¨?å¼?ç??æ¸?å?®"
 
-#: ../gnome-panel/panel-run-dialog.glade.h:7
+#: ../gnome-panel/panel-run-dialog.ui.h:5
 msgid "Run Application"
 msgstr "å?·è¡?ç¨?å¼?"
 
-#: ../gnome-panel/panel-run-dialog.glade.h:8
+#: ../gnome-panel/panel-run-dialog.ui.h:6
 msgid "Run in _terminal"
 msgstr "å?¨çµ?ç«¯æ©?ä¸å?·è¡?(_T)"
 
-#: ../gnome-panel/panel-run-dialog.glade.h:9
+#: ../gnome-panel/panel-run-dialog.ui.h:7
 msgid "Run with _file..."
 msgstr "å?·è¡?æ??é??å??æ??å®?æª?æ¡?(_F)..."
 
-#: ../gnome-panel/panel-run-dialog.glade.h:11
+#: ../gnome-panel/panel-run-dialog.ui.h:9
 msgid "Select this box to run the command in a terminal window."
 msgstr "é?¸å??æ?¬é?¸é ?å¾?ï¼?æ??ä»¤æ??å?¨çµ?ç«¯æ©?ä¸å?·è¡?ã??"
 
-#: ../gnome-panel/panel-run-dialog.glade.h:12
+#: ../gnome-panel/panel-run-dialog.ui.h:10
 msgid "Show list of known _applications"
 msgstr "é¡¯ç¤ºå·²ç?¥ç??æ??ç?¨ç¨?å¼?ç??æ¸?å?®(_A)"
 
-#: ../gnome-panel/panel-run-dialog.glade.h:13
+#: ../gnome-panel/panel-run-dialog.ui.h:11
 msgid "The icon of the command to be run."
 msgstr "å?·è¡?æ??ä»¤æ??ä½¿ç?¨ç??è¦?çª?å??ç¤ºã??"
 
-#: ../gnome-panel/panel-run-dialog.glade.h:14
+#: ../gnome-panel/panel-run-dialog.ui.h:12
 #: ../gnome-panel/panel-stock-icons.c:90
 msgid "_Run"
 msgstr "å?·è¡?(_R)"
@@ -2487,73 +2517,73 @@ msgstr "æ¸?é?¤(_L)"
 msgid "D_on't Delete"
 msgstr "ä¸?è¦?å?ªé?¤(_O)"
 
-#: ../gnome-panel/panel-toplevel.c:1178
+#: ../gnome-panel/panel-toplevel.c:1188
 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:1588
+#: ../gnome-panel/panel-toplevel.c:1598
 msgid "Top Expanded Edge Panel"
 msgstr "é ?é?¨æ?´å¤§é??ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1589
+#: ../gnome-panel/panel-toplevel.c:1599
 msgid "Top Centered Panel"
 msgstr "é ?é?¨ç½®ä¸é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1590
+#: ../gnome-panel/panel-toplevel.c:1600
 msgid "Top Floating Panel"
 msgstr "é ?é?¨æµ®å??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1591
+#: ../gnome-panel/panel-toplevel.c:1601
 msgid "Top Edge Panel"
 msgstr "é ?é?¨é??ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1595
+#: ../gnome-panel/panel-toplevel.c:1605
 msgid "Bottom Expanded Edge Panel"
 msgstr "åº?é?¨æ?´å¤§é??ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1596
+#: ../gnome-panel/panel-toplevel.c:1606
 msgid "Bottom Centered Panel"
 msgstr "åº?é?¨ç½®ä¸é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1597
+#: ../gnome-panel/panel-toplevel.c:1607
 msgid "Bottom Floating Panel"
 msgstr "åº?é?¨æµ®å??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1598
+#: ../gnome-panel/panel-toplevel.c:1608
 msgid "Bottom Edge Panel"
 msgstr "åº?é?¨é??ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1602
+#: ../gnome-panel/panel-toplevel.c:1612
 msgid "Left Expanded Edge Panel"
 msgstr "å·¦é??æ?´å¤§é??ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1603
+#: ../gnome-panel/panel-toplevel.c:1613
 msgid "Left Centered Panel"
 msgstr "å·¦é??ç½®ä¸é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1604
+#: ../gnome-panel/panel-toplevel.c:1614
 msgid "Left Floating Panel"
 msgstr "å·¦é??æµ®å??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1605
+#: ../gnome-panel/panel-toplevel.c:1615
 msgid "Left Edge Panel"
 msgstr "å·¦é??é??ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1609
+#: ../gnome-panel/panel-toplevel.c:1619
 msgid "Right Expanded Edge Panel"
 msgstr "å?³é??æ?´å¤§é??ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1610
+#: ../gnome-panel/panel-toplevel.c:1620
 msgid "Right Centered Panel"
 msgstr "å?³é??ç½®ä¸é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1611
+#: ../gnome-panel/panel-toplevel.c:1621
 msgid "Right Floating Panel"
 msgstr "å?³é??æµ®å??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1612
+#: ../gnome-panel/panel-toplevel.c:1622
 msgid "Right Edge Panel"
 msgstr "å?³é??é??ç??é?¢æ?¿"
 
@@ -2933,77 +2963,107 @@ msgstr "Bonobo é?¢æ?¿æ¸¬è©¦ç¨?å¼?"
 msgid "Test Bonobo Applet Factory"
 msgstr "Bonobo é?¢æ?¿æ¸¬è©¦ç¨?å¼?å·¥å» "
 
-#: ../libpanel-applet/panel-test-applets.c:35
+#: ../libpanel-applet/panel-test-applets.c:34
 msgid "Specify an applet IID to load"
 msgstr "æ??å®?æº?å??è¼?å?¥ç??é?¢æ?¿ç¨?å¼?ç?? IID"
 
-#: ../libpanel-applet/panel-test-applets.c:36
+#: ../libpanel-applet/panel-test-applets.c:35
 msgid ""
 "Specify a gconf location in which the applet preferences should be stored"
 msgstr "é?¢æ?¿ç¨?å¼?ç??å??å¥½è¨å®?æ??è©²å?²å?å?¨æ??å®?ç?? gconf ä½?ç½®"
 
-#: ../libpanel-applet/panel-test-applets.c:37
+#: ../libpanel-applet/panel-test-applets.c:36
 msgid "Specify the initial size of the applet (xx-small, medium, large etc.)"
 msgstr "æ??å®?é?¢æ?¿ç¨?å¼?é??å§?æ??ç??å¤§å°?ï¼?è¶?å¾®å??ã??ä¸å??ã??å¤§å??ç?ã??ï¼?"
 
-#: ../libpanel-applet/panel-test-applets.c:38
+#: ../libpanel-applet/panel-test-applets.c:37
 msgid ""
 "Specify the initial orientation of the applet (top, bottom, left or right)"
 msgstr "æ??å®?é?¢æ?¿ç¨?å¼?é??å§?é¡¯ç¤ºæ??ç??æ?¹å??ï¼?é ?é?¨ã??åº?é?¨ã??å·¦é??ã??å?³é??ï¼?"
 
-#: ../libpanel-applet/panel-test-applets.c:62
+#: ../libpanel-applet/panel-test-applets.c:61
 msgctxt "Size"
 msgid "XX Small"
 msgstr "è¶?å°?"
 
-#: ../libpanel-applet/panel-test-applets.c:63
+#: ../libpanel-applet/panel-test-applets.c:62
 msgctxt "Size"
 msgid "X Small"
 msgstr "ç?¹å°?"
 
-#: ../libpanel-applet/panel-test-applets.c:64
+#: ../libpanel-applet/panel-test-applets.c:63
 msgctxt "Size"
 msgid "Small"
 msgstr "å°?"
 
-#: ../libpanel-applet/panel-test-applets.c:65
+#: ../libpanel-applet/panel-test-applets.c:64
 msgctxt "Size"
 msgid "Medium"
 msgstr "ä¸"
 
-#: ../libpanel-applet/panel-test-applets.c:66
+#: ../libpanel-applet/panel-test-applets.c:65
 msgctxt "Size"
 msgid "Large"
 msgstr "å¤§"
 
-#: ../libpanel-applet/panel-test-applets.c:67
+#: ../libpanel-applet/panel-test-applets.c:66
 msgctxt "Size"
 msgid "X Large"
 msgstr "ç?¹å¤§"
 
-#: ../libpanel-applet/panel-test-applets.c:68
+#: ../libpanel-applet/panel-test-applets.c:67
 msgctxt "Size"
 msgid "XX Large"
 msgstr "è¶?å¤§"
 
-#: ../libpanel-applet/panel-test-applets.c:130
+#: ../libpanel-applet/panel-test-applets.c:129
 #, c-format
 msgid "Failed to load applet %s"
 msgstr "è¼?å?¥é?¢æ?¿ç¨?å¼? %s å¤±æ??"
 
 #. This is an utility to easily test various applets
-#: ../libpanel-applet/panel-test-applets.glade.h:2
+#: ../libpanel-applet/panel-test-applets.ui.h:2
 msgid "Test applet utility"
 msgstr "é?¢æ?¿ç¨?å¼?æ¸¬è©¦å·¥å?·"
 
-#: ../libpanel-applet/panel-test-applets.glade.h:3
+#: ../libpanel-applet/panel-test-applets.ui.h:3
 msgid "_Applet:"
 msgstr "é?¢æ?¿ç¨?å¼?(_A):"
 
-#: ../libpanel-applet/panel-test-applets.glade.h:5
+#: ../libpanel-applet/panel-test-applets.ui.h:5
 msgid "_Prefs Dir:"
 msgstr "å??å¥½è¨å®?ç?®é??(_P):"
 
+#~ msgid "<b>Clock Options</b>"
+#~ msgstr "<b>æ??é??é?¸é ?</b>"
+
+#~ msgid "<b>Animation</b>"
+#~ msgstr "<b>å??ç?«</b>"
+
+#~ msgid "<b>General</b>"
+#~ msgstr "<b>ä¸?è?¬è¨å®?</b>"
+
+#~ msgid "<b>Switcher</b>"
+#~ msgstr "<b>é ?è¦½</b>"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>å·¥ä½?å??</b>"
+
+#~ msgid "Disable Lock Screen"
+#~ msgstr "ä¸?ä½¿ç?¨ã??é??å®?ç?«é?¢ã??"
+
+#~ msgid ""
+#~ "If true, the panel will not allow a user to lock their screen, by "
+#~ "removing access to the lock screen menu entries."
+#~ msgstr ""
+#~ "å¦?è¨å®?ç?ºâ??trueâ??ï¼?é?¢æ?¿å°?é?±è??é?¸å?®ä¸ç??ã??é??å®?ç?«é?¢ã??é ?ä»¥é?²æ¢ä½¿ç?¨è??é??å®?ç?«é?¢ã??"
+
+#~ msgid "Command entry"
+#~ msgstr "æ??ä»¤è¼¸å?¥æ¬?ä½?"
+
+#~ msgid "Enter a command string here to run it."
+#~ msgstr "å?¨é??è£¡è¼¸å?¥æ??ä»¤ã??"
+
 #~ msgid "Failed to launch time configuration tool: %s"
 #~ msgstr "ç?¡æ³?å?·è¡?æ??é??è¨ç½®å·¥å?·ï¼?%s"
 
@@ -3194,9 +3254,6 @@ msgstr "å??å¥½è¨å®?ç?®é??(_P):"
 #~ msgid "Log out of this system now?"
 #~ msgstr "ç?¾å?¨å¾?æ?¬ç³»çµ±ä¸ç?»å?ºï¼?"
 
-#~ msgid "_Switch User"
-#~ msgstr "å??æ??ä½¿ç?¨è??(_S)"
-
 #~ msgid "_Log Out"
 #~ msgstr "ç?»å?º(_L)"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 539464b..471923d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -14,10 +14,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-panel 2.27.5\n"
+"Project-Id-Version: gnome-panel 2.27.92\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-11 15:24+0800\n"
-"PO-Revision-Date: 2009-08-09 07:05+0800\n"
+"POT-Creation-Date: 2009-08-29 21:57+0800\n"
+"PO-Revision-Date: 2009-08-29 14:50+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"
@@ -68,7 +68,7 @@ msgid "_Preferences"
 msgstr "å??å¥½è¨å®?(_P)"
 
 #: ../applets/clock/GNOME_ClockApplet_Factory.server.in.in.h:1
-#: ../applets/clock/clock.c:3639
+#: ../applets/clock/clock.c:3719
 msgid "Clock"
 msgstr "æ??é??"
 
@@ -84,77 +84,96 @@ msgstr "ç?¢ç??æ??é??é?¢æ?¿ç¨?å¼?ç??å·¥å» ã??"
 msgid "Get the current time and date"
 msgstr "å??å¾?ç?®å??ç??æ??å?»å??æ?¥æ??"
 
-#: ../applets/clock/calendar-window.c:242 ../applets/clock/clock.c:442
+#. 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:451
 msgid "%l:%M %p"
 msgstr "%p %l:%M"
 
-#. translators: This is a strftime format string that is used for formatting
-#. * the time that is displayed for locations in the popup. This string is used
-#. * for 24-hour format.
-#. * There should be little need to translate this string.
-#.
-#: ../applets/clock/calendar-window.c:244 ../applets/clock/clock.c:444
-#: ../applets/clock/clock.c:1563 ../applets/clock/clock-location-tile.c:480
+#. Translators: This is a strftime format string.
+#. * It is used to display the time in 24-hours format
+#. * (eg, like in France: 20:10).
+#. Translators: This is a strftime format
+#. * string.
+#. * It is used to display the time in 24-hours
+#. * format (eg, like in France: 20:10).
+#. 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:456
+#: ../applets/clock/clock.c:1601 ../applets/clock/clock-location-tile.c:476
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#. Translators: If the event did not start on the current day
-#. * we will display the start date in the most abbreviated way
-#. * possible.
-#: ../applets/clock/calendar-window.c:250
+#. 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
 msgid "%b %d"
 msgstr "%-d/%-m"
 
-#: ../applets/clock/calendar-window.c:773
+#: ../applets/clock/calendar-window.c:853
 msgid "Tasks"
 msgstr "å·¥ä½?"
 
-#: ../applets/clock/calendar-window.c:773
-#: ../applets/clock/calendar-window.c:949
-#: ../applets/clock/calendar-window.c:1585
+#: ../applets/clock/calendar-window.c:853
+#: ../applets/clock/calendar-window.c:1029
+#: ../applets/clock/calendar-window.c:1665
 msgid "Edit"
 msgstr "ç·¨è¼¯"
 
-#: ../applets/clock/calendar-window.c:894
+#: ../applets/clock/calendar-window.c:974
 msgid "All Day"
 msgstr "æ?´å¤©"
 
-#: ../applets/clock/calendar-window.c:1033
+#: ../applets/clock/calendar-window.c:1113
 msgid "Appointments"
 msgstr "ç´?æ??"
 
-#: ../applets/clock/calendar-window.c:1058
+#: ../applets/clock/calendar-window.c:1138
 msgid "Birthdays and Anniversaries"
 msgstr "ç??æ?¥å??é?±å¹´ç´?å¿µæ?¥"
 
-#: ../applets/clock/calendar-window.c:1083
+#: ../applets/clock/calendar-window.c:1163
 msgid "Weather Information"
 msgstr "å¤©æ°£è³?è¨?"
 
-#: ../applets/clock/calendar-window.c:1585 ../applets/clock/clock.glade.h:14
+#: ../applets/clock/calendar-window.c:1665 ../applets/clock/clock.ui.h:12
 msgid "Locations"
 msgstr "ä½?ç½®"
 
-#: ../applets/clock/calendar-window.c:1884
+#: ../applets/clock/calendar-window.c:1964
 msgid "Calendar"
 msgstr "æ??æ??"
 
-#: ../applets/clock/clock.c:442
+#. 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:451
 msgid "%l:%M:%S %p"
 msgstr "%p %l:%M:%S"
 
-#: ../applets/clock/clock.c:444 ../applets/clock/clock.c:1561
+#. Translators: This is a strftime format string.
+#. * It is used to display the time in 24-hours format (eg, like
+#. * in France: 20:10).
+#. 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/clock.c:456 ../applets/clock/clock.c:1595
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 # (Abel) FIXME: %-m å?? %-d æ?¯ GNU extension, *BSD ä¸?è?½ç?¨?
 # å?°è±¡ä¸ï¼?å¥½å?? freebsd æ??äº?å®?ç??æ?¯æ?´ï¼?ä¹?å¤?å?ªæ?? Solaris ç?¨ GNOME?
-#. translators: replace %e with %d if, when 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
+#. Translators: This is a strftime format string.
+#. * It is used to display the date. Replace %e with %d if, when
+#. * 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:476
 msgid "%a %b %e"
 msgstr "%-mæ??%-dæ?¥(%a)"
 
@@ -162,7 +181,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:483
 #, c-format
 msgid ""
 "%1$s\n"
@@ -175,100 +194,124 @@ msgstr ""
 #. *              if the time should come before the
 #. *              date on a clock in your locale.
 #.
-#: ../applets/clock/clock.c:479
+#: ../applets/clock/clock.c:491
 #, c-format
 msgid "%1$s, %2$s"
 msgstr "%1$s %2$s"
 
-#. Show date in tooltip.  Translators: please leave the "%%s" as it is; we
-#. * use it to put in the timezone name later.
-#.
-#: ../applets/clock/clock.c:661
+#. Show date in tooltip.
+#. 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:674
 msgid "%A %B %d (%%s)"
 msgstr "%B %d %A (%%s)"
 
-#: ../applets/clock/clock.c:691
+#: ../applets/clock/clock.c:704
 msgid "Click to hide your appointments and tasks"
 msgstr "æ??ä¸?ä»¥é?±è??ç´?æ??å??å·¥ä½?"
 
-#: ../applets/clock/clock.c:694
+#: ../applets/clock/clock.c:707
 msgid "Click to view your appointments and tasks"
 msgstr "æ??ä¸?ä¾?é¡¯ç¤ºç´?æ??å??å·¥ä½?"
 
-#: ../applets/clock/clock.c:698
+#: ../applets/clock/clock.c:711
 msgid "Click to hide month calendar"
 msgstr "æ??ä¸?ä»¥é?±è??æ??æ??"
 
-#: ../applets/clock/clock.c:701
+#: ../applets/clock/clock.c:714
 msgid "Click to view month calendar"
 msgstr "æ??ä¸?ä¾?é¡¯ç¤ºæ??æ??"
 
-#: ../applets/clock/clock.c:1416
+#: ../applets/clock/clock.c:1434
 msgid "Computer Clock"
 msgstr "é?»è?¦æ??é??"
 
-#: ../applets/clock/clock.c:1556
+#. Translators: This is a strftime format
+#. * string.
+#. * It is used to display the time in 12-hours
+#. * 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:1580
 msgid "%I:%M:%S %p"
 msgstr "%p %I:%M:%S"
 
-#: ../applets/clock/clock.c:1558
+#. Translators: This is a strftime format
+#. * string.
+#. * It is used to display the time in 12-hours
+#. * 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:1588
 msgid "%I:%M %p"
 msgstr "%p %I:%M"
 
-#: ../applets/clock/clock.c:1600
+#. 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:1641
 msgid "%A, %B %d %Y"
 msgstr "%Yå¹´%-mæ??%-dæ?¥(%A)"
 
-#: ../applets/clock/clock.c:1629
+#: ../applets/clock/clock.c:1672
 msgid "Set System Time..."
 msgstr "è¨å®?ç³»çµ±æ??å?»..."
 
-#: ../applets/clock/clock.c:1630 ../applets/clock/clock.glade.h:18
+#: ../applets/clock/clock.c:1673
 msgid "Set System Time"
 msgstr "è¨å®?ç³»çµ±æ??å?»"
 
-#: ../applets/clock/clock.c:1645
+#: ../applets/clock/clock.c:1688
 msgid "Failed to set the system time"
 msgstr "è¨å®?ç³»çµ±æ??å?»å¤±æ??"
 
-#: ../applets/clock/clock.c:2700
+#: ../applets/clock/clock.c:2752
 msgid "Custom format"
 msgstr "è?ªè¨?æ ¼å¼?"
 
-#: ../applets/clock/clock.c:3361
+#: ../applets/clock/clock.c:3210
+msgid "Choose Location"
+msgstr "é?¸æ??ä½?ç½®"
+
+#: ../applets/clock/clock.c:3285
+msgid "Edit Location"
+msgstr "ç·¨è¼¯ä½?ç½®"
+
+#: ../applets/clock/clock.c:3431
 msgid "City Name"
 msgstr "å??å¸?å??ç¨±"
 
-#: ../applets/clock/clock.c:3365
+#: ../applets/clock/clock.c:3435
 msgid "City Time Zone"
 msgstr "å??å¸?æ??å??"
 
-#: ../applets/clock/clock.c:3535
+#: ../applets/clock/clock.c:3615
 msgid "24 hour"
 msgstr "24 å°?æ??å?¶"
 
-#: ../applets/clock/clock.c:3536
+#: ../applets/clock/clock.c:3616
 msgid "UNIX time"
 msgstr "UNIX æ??é??"
 
-#: ../applets/clock/clock.c:3537
+#: ../applets/clock/clock.c:3617
 msgid "Internet time"
 msgstr "Internet æ??é??"
 
-#: ../applets/clock/clock.c:3545
+#: ../applets/clock/clock.c:3625
 msgid "Custom _format:"
 msgstr "è?ªè¨?æ ¼å¼?(_F):"
 
-#: ../applets/clock/clock.c:3642
+#: ../applets/clock/clock.c:3722
 msgid "The Clock displays the current time and date"
 msgstr "æ??é??ç¨?å¼?å?¯é¡¯ç¤ºç?®å??ç??æ??é??å??æ?¥æ??"
 
 #. Translator credits
-#: ../applets/clock/clock.c:3645 ../applets/fish/fish.c:613
+#: ../applets/clock/clock.c:3725 ../applets/fish/fish.c:623
 #: ../applets/notification_area/main.c:155
-#: ../applets/wncklet/showdesktop.c:531 ../applets/wncklet/window-list.c:607
+#: ../applets/wncklet/showdesktop.c:531 ../applets/wncklet/window-list.c:606
 #: ../applets/wncklet/window-menu.c:79
-#: ../applets/wncklet/workspace-switcher.c:622
+#: ../applets/wncklet/workspace-switcher.c:621
 #: ../gnome-panel/panel-context-menu.c:138
 msgid "translator-credits"
 msgstr ""
@@ -283,128 +326,132 @@ msgstr ""
 "Jing-Jong Shyue <shyue sonoma com tw>, 2000\n"
 "Yuan-Chung Cheng <platin linux org tw>, 1999"
 
-#: ../applets/clock/clock.glade.h:1
-msgid "<b>Clock Options</b>"
-msgstr "<b>æ??é??é?¸é ?</b>"
-
-#: ../applets/clock/clock.glade.h:2
-msgid "<b>Display</b>"
-msgstr "<b>é¡¯ç¤º</b>"
-
-#: ../applets/clock/clock.glade.h:3
-msgid "<b>Panel Display</b>"
-msgstr "<b>é?¢æ?¿é¡¯ç¤º</b>"
-
-#: ../applets/clock/clock.glade.h:4
+#: ../applets/clock/clock.ui.h:1
 msgid "<i>(optional)</i>"
 msgstr "<i>(é?¸ç?¨æ?§ç??)</i>"
 
 #. Languages that have a single word that translates as either "state" or "province" should use that instead of "region".
-#: ../applets/clock/clock.glade.h:6
+#: ../applets/clock/clock.ui.h:3
 msgid ""
 "<small><i>Type a city, region, or country name and then select a match from "
 "the pop-up.</i></small>"
 msgstr ""
 "<small><i>è¼¸å?¥å??å¸?ã??ç??æ??å??å®¶å??ç¨±ï¼?å??å¾?å½?å?ºå¼?é?¸å?®é?¸æ??ç¬¦å??ç??é ?ç?®ã??</i></small>"
 
-#: ../applets/clock/clock.glade.h:7
+#: ../applets/clock/clock.ui.h:4
+msgid "Clock Format"
+msgstr "æ??é??æ ¼å¼?"
+
+#: ../applets/clock/clock.ui.h:5
 msgid "Clock Preferences"
 msgstr "æ??é??å??å¥½è¨å®?"
 
-#: ../applets/clock/clock.glade.h:8
+#: ../applets/clock/clock.ui.h:6
 msgid "Current Time:"
 msgstr "ç?®å??ç??æ??å?»:"
 
-#: ../applets/clock/clock.glade.h:9
-msgid ""
-"East\n"
-"West"
-msgstr ""
-"æ?±ç¶?\n"
-"è¥¿ç¶?"
+#: ../applets/clock/clock.ui.h:7
+msgid "Display"
+msgstr "é¡¯ç¤º"
 
-#: ../applets/clock/clock.glade.h:11
-#: ../gnome-panel/panel-properties-dialog.glade.h:9
+#: ../applets/clock/clock.ui.h:8
+msgid "East"
+msgstr "æ?±"
+
+#: ../applets/clock/clock.ui.h:9 ../applets/fish/fish.ui.h:5
+#: ../gnome-panel/panel-properties-dialog.ui.h:9
 msgid "General"
 msgstr "ä¸?è?¬"
 
-#: ../applets/clock/clock.glade.h:12
-msgid "Latitude:"
-msgstr "ç·¯åº¦:"
+#: ../applets/clock/clock.ui.h:10
+msgid "L_atitude:"
+msgstr "ç·¯åº¦(_A):"
 
-#: ../applets/clock/clock.glade.h:13
-msgid "Location Name:"
-msgstr "å?°å??:"
+#: ../applets/clock/clock.ui.h:11
+msgid "L_ongitude:"
+msgstr "ç¶?åº¦(_O):"
 
-#: ../applets/clock/clock.glade.h:15
-msgid "Longitude:"
-msgstr "ç¶?åº¦:"
+#: ../applets/clock/clock.ui.h:13
+msgid "North"
+msgstr "å??"
 
-#: ../applets/clock/clock.glade.h:16
-msgid ""
-"North\n"
-"South"
-msgstr ""
-"å??ç·¯\n"
-"å??ç·¯"
+#: ../applets/clock/clock.ui.h:14
+msgid "Panel Display"
+msgstr "é?¢æ?¿é¡¯ç¤º"
 
-#: ../applets/clock/clock.glade.h:19
+#: ../applets/clock/clock.ui.h:15
 msgid "Show _temperature"
 msgstr "é¡¯ç¤ºæº«åº¦(_T)"
 
-#: ../applets/clock/clock.glade.h:20
+#: ../applets/clock/clock.ui.h:16
 msgid "Show _weather"
 msgstr "é¡¯ç¤ºå¤©æ°£(_W)"
 
-#: ../applets/clock/clock.glade.h:21
+#: ../applets/clock/clock.ui.h:17
 msgid "Show seco_nds"
 msgstr "é¡¯ç¤ºç§?æ?¸(_N)"
 
-#: ../applets/clock/clock.glade.h:22
+#: ../applets/clock/clock.ui.h:18
 msgid "Show the _date"
 msgstr "é¡¯ç¤ºæ?¥æ??(_D)"
 
-#: ../applets/clock/clock.glade.h:23
+#: ../applets/clock/clock.ui.h:19
+msgid "South"
+msgstr "å??"
+
+#: ../applets/clock/clock.ui.h:20
 msgid "Time & Date"
 msgstr "æ??å?» & æ?¥æ??"
 
-#: ../applets/clock/clock.glade.h:24
+#: ../applets/clock/clock.ui.h:21
 msgid "Time _Settings"
 msgstr "æ??å?»è¨å®?å?¼(_S)"
 
-#: ../applets/clock/clock.glade.h:25
-msgid "Time:"
-msgstr "æ??å?»:"
-
-#: ../applets/clock/clock.glade.h:26
-msgid "Timezone:"
-msgstr "æ??å??:"
-
-#: ../applets/clock/clock.glade.h:27
+#: ../applets/clock/clock.ui.h:22
 msgid "Weather"
 msgstr "å¤©æ°£"
 
-#: ../applets/clock/clock.glade.h:28
+#: ../applets/clock/clock.ui.h:23
+msgid "West"
+msgstr "è¥¿"
+
+#: ../applets/clock/clock.ui.h:24
 msgid "_12 hour format"
 msgstr "_12 å°?æ??å?¶"
 
-#: ../applets/clock/clock.glade.h:29
+#: ../applets/clock/clock.ui.h:25
 msgid "_24 hour format"
 msgstr "_24 å°?æ??å?¶"
 
-#: ../applets/clock/clock.glade.h:30
+#: ../applets/clock/clock.ui.h:26
+msgid "_Location Name:"
+msgstr "ä½?ç½®å??ç¨±(_L):"
+
+#: ../applets/clock/clock.ui.h:27
 msgid "_Pressure unit:"
 msgstr "æ°£å£?å?®ä½?(_P):"
 
-#: ../applets/clock/clock.glade.h:31
+#: ../applets/clock/clock.ui.h:28
+msgid "_Set System Time"
+msgstr "è¨å®?ç³»çµ±æ??å?»(_S)"
+
+#: ../applets/clock/clock.ui.h:29
 msgid "_Temperature unit:"
 msgstr "æº«åº¦å?®ä½?(_T):"
 
-#: ../applets/clock/clock.glade.h:32
+#: ../applets/clock/clock.ui.h:30
+msgid "_Time:"
+msgstr "æ??å?»(_T):"
+
+#: ../applets/clock/clock.ui.h:31
+msgid "_Timezone:"
+msgstr "æ??å??(_T):"
+
+#: ../applets/clock/clock.ui.h:32
 msgid "_Visibility unit:"
 msgstr "è?½è¦?åº¦å?®ä½?(_V):"
 
-#: ../applets/clock/clock.glade.h:33
+#: ../applets/clock/clock.ui.h:33
 msgid "_Wind speed unit:"
 msgstr "é¢¨é??å?®ä½?(_W):"
 
@@ -624,64 +671,63 @@ msgstr "<small>è¨å®?</small>"
 msgid "Set location as current location and use its timezone for this computer"
 msgstr "å°?ä½?ç½®è¨ç?ºç?®å??ç??ä½?ç½®ï¼?ä¸¦ä½¿ç?¨å?¶æ??å??è¨ç?ºé??å?°é?»è?¦ç?®å??ç??æ??å??"
 
-#. translators: This is a strftime format string that is used for formatting
-#. * the time that is displayed for locations in the popup. This string is used
-#. * for 12-hour format (the %p expands to am/pm), when the local weekday differs
-#. * from the weekday at the location (the %A expands to the weekday).
-#. * There should be little need to translate this string.
-#.
+#. 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), when the local
+#. * 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
 msgid "%l:%M <small>%p (%A)</small>"
 msgstr "%l:%M <small>%p (%A)</small>"
 
-#. translators: This is a strftime format string that is used for formatting
-#. * the time that is displayed for locations in the popup. This string is used
-#. * for 24-hour format (the %p expands to am/pm), when the local weekday differs
-#. * from the weekday at the location (the %A expands to the weekday).
-#. * There should be little need to translate this string.
-#.
-#: ../applets/clock/clock-location-tile.c:462
+#. Translators: This is a strftime format string.
+#. * It is used to display the time in 24-hours format
+#. * (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
 msgid "%H:%M <small>(%A)</small>"
 msgstr "%H:%M <small>(%A)</small>"
 
-#. translators: This is a strftime format string that is used for formatting
-#. * the time that is displayed for locations in the popup. This string is used
-#. * for 12-hour format (the %p expands to am/pm).
-#. * There should be little need to translate this string.
-#.
-#: ../applets/clock/clock-location-tile.c:472
+#. 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-location-tile.c:470
 msgid "%l:%M <small>%p</small>"
 msgstr "%l:%M <small>%p</small>"
 
-#: ../applets/clock/clock-location-tile.c:581
+#: ../applets/clock/clock-location-tile.c:577
 #, 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:593
-#: ../applets/clock/clock-location-tile.c:601
+#: ../applets/clock/clock-location-tile.c:589
+#: ../applets/clock/clock-location-tile.c:598
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../applets/clock/clock-location-tile.c:594
+#. Translators: The two strings are temperatures.
+#: ../applets/clock/clock-location-tile.c:591
 #, c-format
 msgid "%s, feels like %s"
 msgstr "%sï¼?æ??è¦ºå?? %s"
 
-#: ../applets/clock/clock-location-tile.c:612
+#: ../applets/clock/clock-location-tile.c:609
 #, c-format
 msgid "Sunrise: %s / Sunset: %s"
 msgstr "æ?¥å?º: %s / æ?¥è?½: %s"
 
-#: ../applets/clock/clock-utils.c:93 ../applets/fish/fish.c:169
+#: ../applets/clock/clock-utils.c:93 ../applets/fish/fish.c:168
 #: ../applets/notification_area/main.c:94 ../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:195
+#: ../applets/clock/clock-utils.c:122 ../applets/fish/fish.c:194
 #: ../applets/notification_area/main.c:115 ../applets/wncklet/wncklet.c:152
 msgid "Error displaying help document"
 msgstr "é¡¯ç¤ºæ±?å?©æ??ä»¶æ??ç?¼ç??é?¯èª¤"
@@ -715,7 +761,7 @@ msgid "Display a swimming fish or another animated creature"
 msgstr "é¡¯ç¤ºæ¸¸æ³³ä¸ç??é?å??æ??å?¶å®?ç??ç?©"
 
 #: ../applets/fish/GNOME_FishApplet_Factory.server.in.in.h:2
-#: ../applets/fish/fish.c:607
+#: ../applets/fish/fish.c:617
 msgid "Fish"
 msgstr "å°?é?"
 
@@ -727,7 +773,7 @@ msgstr "é?£æ¢?è ¢é?æ?¯å¾?å?ªè£¡ä¾?ç??"
 msgid "Wanda Factory"
 msgstr "Wanda å·¥å» "
 
-#: ../applets/fish/fish.c:274
+#: ../applets/fish/fish.c:273
 #, c-format
 msgid ""
 "Warning:  The command appears to be something actually useful.\n"
@@ -739,17 +785,17 @@ msgstr ""
 "é?¢æ?¿ç¨?å¼?ï¼?æ?¨æ??è??æ??è©²é?¿å??é??æ¨£å??ã??å¼·ç??å»ºè°ä¸?è¦?\n"
 "ç?¨ä»»ä½?æ?¹æ³?ç?¨ %s ä¾?é?²è¡?ä»»ä½?ã??å¯¦é??ã??æ??æ??ç?¨ç??äº?ã??"
 
-#: ../applets/fish/fish.c:461
+#: ../applets/fish/fish.c:471
 msgid "Images"
 msgstr "å??ç??"
 
-#: ../applets/fish/fish.c:575 ../applets/fish/fish.c:641
-#: ../applets/fish/fish.c:757
+#: ../applets/fish/fish.c:585 ../applets/fish/fish.c:651
+#: ../applets/fish/fish.c:767
 #, no-c-format
 msgid "%s the Fish"
 msgstr "å°?é? %s"
 
-#: ../applets/fish/fish.c:576
+#: ../applets/fish/fish.c:586
 #, c-format
 msgid ""
 "%s has no use what-so-ever. It only takes up disk space and compilation "
@@ -759,25 +805,25 @@ msgstr ""
 "%s ä¸?é»?ç?¨è??ä¹?æ²?æ??ï¼?å®?å?ªæ??ä½?ç¡¬ç¢?ç©ºé??ï¼?ç·¨è¯æ??å??è¦?ä½?ç?¨æ??é??ï¼?å??å??æ??é??å¾?ä½?å?»é?¢æ?¿ç©º"
 "é??å??è¨?æ?¶é«?ç©ºé??ã??ä½¿ç?¨é??å??é?¢æ?¿ç¨?å¼?ç??äººæ??è©²è¦?é??å?»æª¢æ?¥ä¸?ä¸?ç²¾ç¥?ç??æ³?å?¢ã??"
 
-#: ../applets/fish/fish.c:600
+#: ../applets/fish/fish.c:610
 msgid "(with minor help from George)"
 msgstr "ï¼?é??æ?? George ç??å¹«å¿?ï¼?"
 
-#: ../applets/fish/fish.c:642
+#: ../applets/fish/fish.c:652
 #, c-format
 msgid "%s the Fish, a contemporary oracle"
 msgstr "GNOME å°?é? %s â?? ç?¶ä»£è??äºº"
 
-#: ../applets/fish/fish.c:713
+#: ../applets/fish/fish.c:723
 msgid "Unable to locate the command to execute"
 msgstr "æ?¾ä¸?å?°è¦?å?·è¡?ç??æ??ä»¤"
 
-#: ../applets/fish/fish.c:762
+#: ../applets/fish/fish.c:772
 #, no-c-format
 msgid "%s the Fish Says:"
 msgstr "GNOME å°?é? %s èªªï¼?"
 
-#: ../applets/fish/fish.c:831
+#: ../applets/fish/fish.c:841
 #, c-format
 msgid ""
 "Unable to read output from command\n"
@@ -788,16 +834,16 @@ msgstr ""
 "\n"
 "è©³æ??ï¼?%s"
 
-#: ../applets/fish/fish.c:896
+#: ../applets/fish/fish.c:906
 msgid "_Speak again"
 msgstr "å??å¿µä¸?é??(_S)"
 
-#: ../applets/fish/fish.c:979
+#: ../applets/fish/fish.c:989
 #, c-format
 msgid "The configured command is not working and has been replaced by: %s"
 msgstr "è¨ç½®ç??æ??ä»¤ç?¡æ³?å·¥ä½?ï¼?å??è¢«å??ä»£ç?ºï¼?%s"
 
-#: ../applets/fish/fish.c:1002
+#: ../applets/fish/fish.c:1012
 #, c-format
 msgid ""
 "Unable to execute '%s'\n"
@@ -808,7 +854,7 @@ msgstr ""
 "\n"
 "è©³æ??ï¼?%s"
 
-#: ../applets/fish/fish.c:1018
+#: ../applets/fish/fish.c:1028
 #, c-format
 msgid ""
 "Unable to read from '%s'\n"
@@ -819,69 +865,64 @@ msgstr ""
 "\n"
 "è©³æ??ï¼?%s"
 
-#: ../applets/fish/fish.c:1643
+#: ../applets/fish/fish.c:1653
 msgid "The water needs changing"
 msgstr "è©²æ??æ°´äº?"
 
-#: ../applets/fish/fish.c:1645
+#: ../applets/fish/fish.c:1655
 msgid "Look at today's date!"
 msgstr "ç??ç??ä»?å¤©æ?¯ç??éº¼æ?¥å?ï¼?"
 
-#: ../applets/fish/fish.c:1738
+#: ../applets/fish/fish.c:1748
 #, c-format
 msgid "%s the Fish, the fortune teller"
 msgstr "GNOME å°?é? %s â?? é ?è¨?å®¶"
 
-#: ../applets/fish/fish.glade.h:1
-#: ../gnome-panel/panel-properties-dialog.glade.h:1
+#: ../applets/fish/fish.ui.h:1 ../gnome-panel/panel-properties-dialog.ui.h:1
 msgid "    "
 msgstr "    "
 
-#: ../applets/fish/fish.glade.h:2
-msgid "<b>Animation</b>"
-msgstr "<b>å??ç?«</b>"
-
-#: ../applets/fish/fish.glade.h:3
-msgid "<b>General</b>"
-msgstr "<b>ä¸?è?¬è¨å®?</b>"
+#: ../applets/fish/fish.ui.h:2
+msgid "Animation"
+msgstr "å??ç?«"
 
-#: ../applets/fish/fish.glade.h:4
+#: ../applets/fish/fish.ui.h:3
 msgid "Co_mmand to run when clicked:"
 msgstr "æ??ä¸?æ??å?·è¡?ç??æ??ä»¤(_M):"
 
-#: ../applets/fish/fish.glade.h:5
+#: ../applets/fish/fish.ui.h:4
 msgid "Fish Preferences"
 msgstr "å°?é?å??å¥½è¨å®?"
 
-#: ../applets/fish/fish.glade.h:6
+#: ../applets/fish/fish.ui.h:6
 msgid "Select an animation"
 msgstr "é?¸æ??å??ç?«"
 
-#: ../applets/fish/fish.glade.h:7
+#: ../applets/fish/fish.ui.h:7
 msgid "_File:"
 msgstr "æª?æ¡?(_F):"
 
-#: ../applets/fish/fish.glade.h:8
+#: ../applets/fish/fish.ui.h:8
 msgid "_Name of fish:"
 msgstr "å°?é?ç??å??ç¨±(_N):"
 
-#: ../applets/fish/fish.glade.h:9
+#: ../applets/fish/fish.ui.h:9
 msgid "_Pause per frame:"
 msgstr "æ¯?æ ¼ç??æ?«å??æ??é??(_P):"
 
-#: ../applets/fish/fish.glade.h:10
+#: ../applets/fish/fish.ui.h:10
 msgid "_Rotate on vertical panels"
 msgstr "ä½¿ç?¨å??ç?´é?¢æ?¿æ??æ??æ??è½?ç¨?å¼?é¡¯ç¤º(_R)"
 
-#: ../applets/fish/fish.glade.h:11
+#: ../applets/fish/fish.ui.h:11
 msgid "_Total frames in animation:"
 msgstr "å??ç?«æ ¼æ?¸(_T):"
 
-#: ../applets/fish/fish.glade.h:12
+#: ../applets/fish/fish.ui.h:12
 msgid "frames"
 msgstr "æ ¼æ?¸"
 
-#: ../applets/fish/fish.glade.h:13
+#: ../applets/fish/fish.ui.h:13
 msgid "seconds"
 msgstr "ç§?"
 
@@ -986,7 +1027,7 @@ msgid "Switch between workspaces"
 msgstr "å??æ??å·¥ä½?å??"
 
 #: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:7
-#: ../applets/wncklet/window-list.c:610
+#: ../applets/wncklet/window-list.c:609
 msgid "Window List"
 msgstr "è¦?çª?æ¸?å?®"
 
@@ -1000,7 +1041,7 @@ msgid "Window Selector"
 msgstr "è¦?çª?é?¸æ??ç¨?å¼?"
 
 #: ../applets/wncklet/GNOME_Wncklet_Factory.server.in.in.h:10
-#: ../applets/wncklet/workspace-switcher.c:625
+#: ../applets/wncklet/workspace-switcher.c:624
 msgid "Workspace Switcher"
 msgstr "å·¥ä½?å??å??æ??ç¨?å¼?"
 
@@ -1036,53 +1077,53 @@ msgid ""
 msgstr ""
 "æ?¨ä½¿ç?¨ç??è¦?çª?ç¸½ç??å?¡ä¸?æ?¯æ?´ã??é¡¯ç¤ºæ¡?é?¢ã??æ??é??ï¼?æ??æ?¯æ?¨æ ¹æ?¬æ²?æ??å?·è¡?ä»»ä½?è¦?çª?ç¸½ç??å?¡ã??"
 
-#: ../applets/wncklet/window-list.c:612
+#: ../applets/wncklet/window-list.c:611
 msgid ""
 "The Window List shows a list of all windows in a set of buttons and lets you "
 "browse them."
 msgstr "ã??è¦?çª?æ¸?å?®ã??å?¨ä¸?çµ?æ??é??ä¸é¡¯ç¤ºè¦?çª?æ¸?å?®ä»¥ä¾?ç??è¦½ã??"
 
-#: ../applets/wncklet/window-list.glade.h:1
-msgid "<b>Restoring Minimized Windows</b>"
-msgstr "<b>é??å??æ??å°?å??ç??æ??ä¸ç??è¦?çª?</b>"
-
-#: ../applets/wncklet/window-list.glade.h:2
-msgid "<b>Window Grouping</b>"
-msgstr "<b>è¦?çª?å??ä½µé¡¯ç¤º</b>"
-
-#: ../applets/wncklet/window-list.glade.h:3
-msgid "<b>Window List Content</b>"
-msgstr "<b>ã??è¦?çª?æ¸?å?®ã??å?§å®¹</b>"
-
-#: ../applets/wncklet/window-list.glade.h:4
+#: ../applets/wncklet/window-list.ui.h:1
 msgid "Group windows when _space is limited"
 msgstr "ç?¶é?¢æ?¿ç©ºé??æ??é??æ??ï¼?å°?å??é¡?è¦?çª?å??ä½µæ??ç¾¤çµ?(_S)"
 
-#: ../applets/wncklet/window-list.glade.h:5
+#: ../applets/wncklet/window-list.ui.h:2
 msgid "Restore to current _workspace"
 msgstr "å?¨ç?®å??ç??å·¥ä½?å??é??å??è¦?çª?(_W)"
 
-#: ../applets/wncklet/window-list.glade.h:6
+#: ../applets/wncklet/window-list.ui.h:3
 msgid "Restore to na_tive workspace"
 msgstr "å?¨å??ä¾?ç??å·¥ä½?å??é??å??è¦?çª?(_T)"
 
-#: ../applets/wncklet/window-list.glade.h:7
+#: ../applets/wncklet/window-list.ui.h:4
+msgid "Restoring Minimized Windows"
+msgstr "é??å??æ??å°?å??ç??æ??ä¸ç??è¦?çª?"
+
+#: ../applets/wncklet/window-list.ui.h:5
 msgid "Sh_ow windows from current workspace"
 msgstr "é¡¯ç¤ºç?®å??å·¥ä½?å??ä¸ç??è¦?çª?(_O)"
 
-#: ../applets/wncklet/window-list.glade.h:8
+#: ../applets/wncklet/window-list.ui.h:6
 msgid "Show windows from a_ll workspaces"
 msgstr "é¡¯ç¤ºæ??æ??å·¥ä½?å??ä¸ç??è¦?çª?(_L)"
 
-#: ../applets/wncklet/window-list.glade.h:9
+#: ../applets/wncklet/window-list.ui.h:7
+msgid "Window Grouping"
+msgstr "è¦?çª?å??ä½µé¡¯ç¤º"
+
+#: ../applets/wncklet/window-list.ui.h:8
+msgid "Window List Content"
+msgstr "ã??è¦?çª?æ¸?å?®ã??å?§å®¹"
+
+#: ../applets/wncklet/window-list.ui.h:9
 msgid "Window List Preferences"
 msgstr "ã??è¦?çª?æ¸?å?®ã??å??å¥½è¨å®?"
 
-#: ../applets/wncklet/window-list.glade.h:10
+#: ../applets/wncklet/window-list.ui.h:10
 msgid "_Always group windows"
 msgstr "ç¸½æ?¯å??ä½µå??é¡?ç??è¦?çª?(_A)"
 
-#: ../applets/wncklet/window-list.glade.h:11
+#: ../applets/wncklet/window-list.ui.h:11
 msgid "_Never group windows"
 msgstr "æ°¸ä¸?å??ä½µå??é¡?ç??è¦?çª?(_N)"
 
@@ -1142,77 +1183,77 @@ msgid ""
 "browse them."
 msgstr "ã??è¦?çª?é?¸æ??ç¨?å¼?ã??æ??å?¨é?¸å?®ä¸é¡¯ç¤ºè¦?çª?æ¸?å?®ä»¥ä¾?ç??è¦½ã??"
 
-#: ../applets/wncklet/workspace-switcher.c:215
-#: ../applets/wncklet/workspace-switcher.c:977
-#: ../applets/wncklet/workspace-switcher.glade.h:10
+#: ../applets/wncklet/workspace-switcher.c:214
+#: ../applets/wncklet/workspace-switcher.c:976
+#: ../applets/wncklet/workspace-switcher.ui.h:10
 msgid "rows"
 msgstr "å??"
 
-#: ../applets/wncklet/workspace-switcher.c:215
-#: ../applets/wncklet/workspace-switcher.c:977
+#: ../applets/wncklet/workspace-switcher.c:214
+#: ../applets/wncklet/workspace-switcher.c:976
 msgid "columns"
 msgstr "è¡?"
 
-#: ../applets/wncklet/workspace-switcher.c:489
+#: ../applets/wncklet/workspace-switcher.c:488
 #, c-format
 msgid "Error loading num_rows value for Workspace Switcher: %s\n"
 msgstr "è¼?å?¥ã??å·¥ä½?å??å??æ??ç¨?å¼?ã??ä¸ç?? num_rows æ?¸å?¼æ??å?ºç?¾é?¯èª¤ï¼?%s\n"
 
-#: ../applets/wncklet/workspace-switcher.c:500
+#: ../applets/wncklet/workspace-switcher.c:499
 #, 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:515
+#: ../applets/wncklet/workspace-switcher.c:514
 #, 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:627
+#: ../applets/wncklet/workspace-switcher.c:626
 msgid ""
 "The Workspace Switcher shows you a small version of your workspaces that "
 "lets you manage your windows."
 msgstr "ã??å·¥ä½?å??å??æ??ç¨?å¼?ã??å?¯å?¨è¼?å°?ç??ç©ºé??ä¸é¡¯ç¤ºå·¥ä½?å??ç??æ??æ³?ï¼?æ?¹ä¾¿ç®¡ç??è¦?çª?ã??"
 
-#: ../applets/wncklet/workspace-switcher.glade.h:1
-msgid "<b>Switcher</b>"
-msgstr "<b>é ?è¦½</b>"
-
-#: ../applets/wncklet/workspace-switcher.glade.h:2
-msgid "<b>Workspaces</b>"
-msgstr "<b>å·¥ä½?å??</b>"
-
-#: ../applets/wncklet/workspace-switcher.glade.h:3
+#: ../applets/wncklet/workspace-switcher.ui.h:1
 msgid "Number of _workspaces:"
 msgstr "å·¥ä½?å??æ?¸ç?®(_W):"
 
 # FIXME: "Show all workspaces in [4] rows" -- Abel
-#: ../applets/wncklet/workspace-switcher.glade.h:4
+#: ../applets/wncklet/workspace-switcher.ui.h:2
 msgid "Show _all workspaces in:"
 msgstr "é¡¯ç¤ºæ??æ??å·¥ä½?å??ç??æ?¹å¼?(_A):å??ç?º"
 
-#: ../applets/wncklet/workspace-switcher.glade.h:5
+#: ../applets/wncklet/workspace-switcher.ui.h:3
 msgid "Show _only the current workspace"
 msgstr "å?ªé¡¯ç¤ºç?®å??ç??å·¥ä½?å??(_O)"
 
-#: ../applets/wncklet/workspace-switcher.glade.h:6
+#: ../applets/wncklet/workspace-switcher.ui.h:4
 msgid "Show workspace _names in switcher"
 msgstr "å?¨å??æ??ç¨?å¼?ä¸é¡¯ç¤ºå·¥ä½?å??ç??å??ç¨±(_N)"
 
-#: ../applets/wncklet/workspace-switcher.glade.h:7
+#: ../applets/wncklet/workspace-switcher.ui.h:5
+msgid "Switcher"
+msgstr "å??æ??å?¨"
+
+#: ../applets/wncklet/workspace-switcher.ui.h:6
 msgid "Workspace Names"
 msgstr "å·¥ä½?å??å??ç¨±"
 
-#: ../applets/wncklet/workspace-switcher.glade.h:8
+#: ../applets/wncklet/workspace-switcher.ui.h:7
 msgid "Workspace Switcher Preferences"
 msgstr "ã??å·¥ä½?å??å??æ??ç¨?å¼?ã??å??å¥½è¨å®?"
 
-#: ../applets/wncklet/workspace-switcher.glade.h:9
+#: ../applets/wncklet/workspace-switcher.ui.h:8
 msgid "Workspace na_mes:"
 msgstr "å·¥ä½?å??å??ç¨±(_M):"
 
+#: ../applets/wncklet/workspace-switcher.ui.h:9
+msgid "Workspaces"
+msgstr "å·¥ä½?å??"
+
 #: ../applets/wncklet/workspace-switcher.schemas.in.h:1
 msgid "Display all workspaces"
 msgstr "é¡¯ç¤ºæ??æ??å·¥ä½?å??"
@@ -1302,7 +1343,7 @@ msgid "Cannot find an empty spot"
 msgstr "æ²?æ??ç©ºä½?"
 
 #: ../gnome-panel/drawer.c:350 ../gnome-panel/panel-addto.c:175
-#: ../gnome-panel/panel-toplevel.c:1617
+#: ../gnome-panel/panel-toplevel.c:1627
 msgid "Drawer"
 msgstr "æ?½å±?"
 
@@ -1581,7 +1622,7 @@ msgid "(empty)"
 msgstr "ï¼?ç©ºç?½ï¼?"
 
 #: ../gnome-panel/panel-addto.c:410
-#: ../libpanel-applet/panel-test-applets.c:250
+#: ../libpanel-applet/panel-test-applets.c:249
 #, c-format
 msgid "query returned exception %s\n"
 msgstr "è©¢å??æ??å??å?³äº?ä¾?å¤?æ??æ³? %s\n"
@@ -1715,6 +1756,7 @@ msgid "_Name:"
 msgstr "å??ç¨±(_N):"
 
 #: ../gnome-panel/panel-ditem-editor.c:637
+#: ../gnome-panel/panel-properties-dialog.c:286
 msgid "Browse icons"
 msgstr "ç??è¦½å??ç¤º"
 
@@ -1779,9 +1821,9 @@ msgstr "å¼·è¡?çµ?æ??é??å??æ??ç?¨ç¨?å¼?ï¼?"
 
 #: ../gnome-panel/panel-force-quit.c:207
 msgid ""
-"If you choose to force an application to exit, any open documents in it will "
-"be lost."
-msgstr "å¦?æ??é?¸æ??å¼·è¡?çµ?æ??é??å??ç¨?å¼?ï¼?å°?æ??å¤±å?»å?¶ä¸æ??æ??é??å??ç??æ??ä»¶ã??"
+"If you choose to force an application to exit, unsaved changes in any open "
+"documents in it might get lost."
+msgstr "å¦?æ??é?¸æ??å¼·è¡?çµ?æ??é??å??ç¨?å¼?ï¼?å°?æ??å¤±å?»å?¶ä¸æ??æ??é??å??ç??æ??ä»¶ä¸æ?ªå?²å?ç??è®?æ?´ã??"
 
 #: ../gnome-panel/panel-general.schemas.in.h:1
 msgid ""
@@ -1905,63 +1947,53 @@ msgid "Disable Force Quit"
 msgstr "ä¸?ä½¿ç?¨ã??å¼·è¡?çµ?æ??ã??"
 
 #: ../gnome-panel/panel-global.schemas.in.h:8
-msgid "Disable Lock Screen"
-msgstr "ä¸?ä½¿ç?¨ã??é??å®?ç?«é?¢ã??"
-
-#: ../gnome-panel/panel-global.schemas.in.h:9
 msgid "Disable Logging Out"
 msgstr "ä¸?ä½¿ç?¨ã??ç?»å?ºã??"
 
-#: ../gnome-panel/panel-global.schemas.in.h:10
+#: ../gnome-panel/panel-global.schemas.in.h:9
 #: ../gnome-panel/panel-toplevel.schemas.in.h:9
 msgid "Enable animations"
 msgstr "å??ç?¨å??ç?«"
 
-#: ../gnome-panel/panel-global.schemas.in.h:11
+#: ../gnome-panel/panel-global.schemas.in.h:10
 msgid "Enable tooltips"
 msgstr "æ??é¡¯ç¤ºå·¥å?·æ??ç¤º"
 
-#: ../gnome-panel/panel-global.schemas.in.h:12
+#: ../gnome-panel/panel-global.schemas.in.h:11
 msgid "Highlight launchers on mouseover"
 msgstr "æ»?é¼ ç§»å??è?³å??å??å??ç¤ºä¸?é?¢æ??ï¼?å? å¼·é¡¯ç¤ºå??å??å??ç¤º"
 
-#: ../gnome-panel/panel-global.schemas.in.h:13
+#: ../gnome-panel/panel-global.schemas.in.h:12
 msgid ""
 "If true, a dialog is shown asking for confirmation if the user wants to "
 "remove a panel."
 msgstr "å¦?è¨å®?ç?ºâ??trueâ??ï¼?ç?¶ç?¨æ?¶æº?å??ç§»é?¤é?¢æ?¿æ??ï¼?æ??é¡¯ç¤ºå°?è©±æ?¹å¡?è¦?æ±?ä½¿ç?¨è??ç¢ºèª?ã??"
 
-#: ../gnome-panel/panel-global.schemas.in.h:14
+#: ../gnome-panel/panel-global.schemas.in.h:13
 msgid ""
 "If true, a drawer will automatically be closed when the user clicks a "
 "launcher in it."
 msgstr "å¦?è¨å®?ç?ºâ??trueâ??ï¼?ç?¶ä½¿ç?¨è??æ??ä¸?æ?½å±?ä¸ç??å??å??å??ç¤ºå¾?ï¼?æ?½å±?æ??è?ªå??é??é??ã??"
 
-#: ../gnome-panel/panel-global.schemas.in.h:15
+#: ../gnome-panel/panel-global.schemas.in.h:14
 msgid ""
 "If true, a launcher is highlighted when the user moves the pointer over it."
 msgstr "å¦?è¨å®?ç?ºâ??trueâ??ï¼?æ»?é¼ ç§»å??è?³å??å??å??ç¤ºä¸?é?¢æ??ï¼?æ??å? å¼·é¡¯ç¤ºå??å??å??ç¤ºã??"
 
-#: ../gnome-panel/panel-global.schemas.in.h:16
+#: ../gnome-panel/panel-global.schemas.in.h:15
 msgid ""
 "If true, the panel will not allow a user to force an application to quit by "
 "removing access to the force quit button."
 msgstr ""
 "å¦?è¨å®?ç?ºâ??trueâ??ï¼?é?¢æ?¿å°?é?±è??ã??å¼·è¡?çµ?æ??ã??æ??é??ä»¥é?²æ¢ä½¿ç?¨è??å¼·è¡?çµ?æ??å?·è¡?ä¸ç??ç¨?å¼?ã??"
 
-#: ../gnome-panel/panel-global.schemas.in.h:17
-msgid ""
-"If true, the panel will not allow a user to lock their screen, by removing "
-"access to the lock screen menu entries."
-msgstr "å¦?è¨å®?ç?ºâ??trueâ??ï¼?é?¢æ?¿å°?é?±è??é?¸å?®ä¸ç??ã??é??å®?ç?«é?¢ã??é ?ä»¥é?²æ¢ä½¿ç?¨è??é??å®?ç?«é?¢ã??"
-
-#: ../gnome-panel/panel-global.schemas.in.h:18
+#: ../gnome-panel/panel-global.schemas.in.h:16
 msgid ""
 "If true, the panel will not allow a user to log out, by removing access to "
 "the log out menu entries."
 msgstr "å¦?è¨å®?ç?ºâ??trueâ??ï¼?é?¢æ?¿å°?é?±è??é?¸å?®ä¸ç??ã??ç?»å?ºã??é ?ä»¥é?²æ¢ä½¿ç?¨è??ç?»å?ºã??"
 
-#: ../gnome-panel/panel-global.schemas.in.h:19
+#: ../gnome-panel/panel-global.schemas.in.h:17
 msgid ""
 "If true, the panel will not allow any changes to the configuration of the "
 "panel. Individual applets may need to be locked down separately however. The "
@@ -1970,10 +2002,18 @@ msgstr ""
 "å¦?è¨å®?ç?ºâ??trueâ??ï¼?é?¢æ?¿å°?ä¸?å??è¨±ä»»ä½?å°?å?¶è¨å®?ç??æ?´æ?¹ã??ç?¶è??ï¼?å??å?¥é?¢æ?¿ç¨?å¼?ç??é??å®?å??è¦?"
 "å??é??å?·è¡?ã??ä»»ä½?æ?´æ?¹å?¨é?¢æ?¿é??æ?°å??å??å¾?æ??æ??ç??æ??ã??"
 
-#: ../gnome-panel/panel-global.schemas.in.h:20
+#: ../gnome-panel/panel-global.schemas.in.h:18
 msgid "If true, tooltips are shown for objects in panels."
 msgstr "å¦?è¨å®?ç?ºâ??trueâ??ï¼?é?¢æ?¿ä¸?ç??ç?©ä»¶æ??é¡¯ç¤ºå·¥å?·æ??ç¤ºã??"
 
+#: ../gnome-panel/panel-global.schemas.in.h:19
+msgid ""
+"This key is deprecated as it cannot be used to implement proper lockdown. "
+"The /desktop/gnome/lockdown/disable_lock_screen key should be used instead."
+msgstr ""
+"é??å??è¨å®?é?µå·²å»¢æ£?ï¼?å? ç?ºå®?ä¸?è?½ç?¨ä¾?å¯¦ä½?æ£ç¢ºç??å°?é??ã??æ??è©²ä½¿ç?¨ /desktop/gnome/"
+"lockdown/disable_lock_screen ä¾?ä»£æ?¿ã??"
+
 #: ../gnome-panel/panel-menu-bar.c:106
 msgid "Browse and run installed applications"
 msgstr "ç??è¦½å??å?·è¡?å·²å®?è£?ç??ç¨?å¼?"
@@ -2276,142 +2316,142 @@ 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:54
+#: ../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:55
+#: ../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:56
+#: ../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:57
+#: ../libpanel-applet/panel-test-applets.c:56
 msgctxt "Orientation"
 msgid "Right"
 msgstr "å?³"
 
-#: ../gnome-panel/panel-properties-dialog.c:949
+#: ../gnome-panel/panel-properties-dialog.c:952
 msgid "Drawer Properties"
 msgstr "æ?½å±?å±¬æ?§"
 
-#: ../gnome-panel/panel-properties-dialog.c:1057
-#: ../gnome-panel/panel-run-dialog.c:1928
+#: ../gnome-panel/panel-properties-dialog.c:1067
+#: ../gnome-panel/panel-run-dialog.c:2018
 #, c-format
-msgid "Unable to load file '%s'."
-msgstr "ç?¡æ³?è¼?å?¥æª?æ¡?â??%sâ??ã??"
+msgid "Unable to load file '%s': %s."
+msgstr "ç?¡æ³?è¼?å?¥æª?æ¡?ã??%sã??ï¼?%sã??"
 
-#: ../gnome-panel/panel-properties-dialog.c:1062
+#: ../gnome-panel/panel-properties-dialog.c:1073
 msgid "Could not display properties dialog"
 msgstr "ç?¡æ³?é¡¯ç¤ºå±¬æ?§å°?è©±è¦?çª?"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:2
+#: ../gnome-panel/panel-properties-dialog.ui.h:2
 msgid "<small>Opaque</small>"
 msgstr "<small>ä¸?é??æ??</small>"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:3
+#: ../gnome-panel/panel-properties-dialog.ui.h:3
 msgid "<small>Transparent</small>"
 msgstr "<small>é??æ??</small>"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:4
+#: ../gnome-panel/panel-properties-dialog.ui.h:4
 msgid "Arro_ws on hide buttons"
 msgstr "å?¨é?±è??æ??é??ä¸é¡¯ç¤ºç®é (_W)"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:5
+#: ../gnome-panel/panel-properties-dialog.ui.h:5
 msgid "Background"
 msgstr "è??æ?¯"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:6
+#: ../gnome-panel/panel-properties-dialog.ui.h:6
 msgid "Background _image:"
 msgstr "è??æ?¯å??ç??(_I):"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:7
+#: ../gnome-panel/panel-properties-dialog.ui.h:7
 msgid "Co_lor:"
 msgstr "é¡?è?²(_L):"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:8
+#: ../gnome-panel/panel-properties-dialog.ui.h:8
 msgid "E_xpand"
 msgstr "å±?é??(_X)"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:10
+#: ../gnome-panel/panel-properties-dialog.ui.h:10
 msgid "Image Background Details"
 msgstr "å??ç??è??æ?¯è©³ç´°è¨å®?"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:11
+#: ../gnome-panel/panel-properties-dialog.ui.h:11
 msgid "Panel Properties"
 msgstr "é?¢æ?¿å±¬æ?§"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:12
+#: ../gnome-panel/panel-properties-dialog.ui.h:12
 msgid "Pick a color"
 msgstr "æ??é?¸é¡?è?²"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:13
+#: ../gnome-panel/panel-properties-dialog.ui.h:13
 msgid "Rotate image when panel is _vertical"
 msgstr "ä½¿ç?¨å??ç?´é?¢æ?¿æ??è¦?æ??è½?é¡¯ç¤º(_V)"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:14
+#: ../gnome-panel/panel-properties-dialog.ui.h:14
 msgid "S_tyle:"
 msgstr "æ?¹å¼?(_T):"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:15
+#: ../gnome-panel/panel-properties-dialog.ui.h:15
 msgid "Select background"
 msgstr "é?¸æ??è??æ?¯"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:16
+#: ../gnome-panel/panel-properties-dialog.ui.h:16
 msgid "Show hide _buttons"
 msgstr "é¡¯ç¤ºé?±è??æ??é??(_B)"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:17
+#: ../gnome-panel/panel-properties-dialog.ui.h:17
 msgid "Solid c_olor"
 msgstr "ç´?è?²(_O):"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:18
+#: ../gnome-panel/panel-properties-dialog.ui.h:18
 msgid "Some of these properties are locked down"
 msgstr "ä¸?é?¨å??ç??å±¬æ?§å·²è¢«é??å®?"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:19
+#: ../gnome-panel/panel-properties-dialog.ui.h:19
 msgid "St_retch"
 msgstr "ä¸?ä¾?æ¯?ä¾?ä¼¸å±?(_R)"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:20
+#: ../gnome-panel/panel-properties-dialog.ui.h:20
 msgid "_Autohide"
 msgstr "è?ªå??é?±è??(_A)"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:21
+#: ../gnome-panel/panel-properties-dialog.ui.h:21
 msgid "_Icon:"
 msgstr "å??ç¤º(_I):"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:22
+#: ../gnome-panel/panel-properties-dialog.ui.h:22
 msgid "_None (use system theme)"
 msgstr "ç?¡ï¼?ä½¿ç?¨ç³»çµ±ä½?æ?¯(_N)"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:23
-#: ../libpanel-applet/panel-test-applets.glade.h:4
+#: ../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.glade.h:24
+#: ../gnome-panel/panel-properties-dialog.ui.h:24
 msgid "_Scale"
 msgstr "ä¾?æ¯?ä¾?ç¸®æ?¾(_S)"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:25
-#: ../libpanel-applet/panel-test-applets.glade.h:6
+#: ../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.glade.h:26
+#: ../gnome-panel/panel-properties-dialog.ui.h:26
 msgid "_Tile"
 msgstr "é?ªæ??(_T)"
 
-#: ../gnome-panel/panel-properties-dialog.glade.h:27
+#: ../gnome-panel/panel-properties-dialog.ui.h:27
 msgid "pixels"
 msgstr "å??ç´ "
 
@@ -2455,92 +2495,84 @@ msgstr "æ¸?é?¤æ??è¿?å?å??æ??ä»¶..."
 msgid "Clear all items from the recent documents list"
 msgstr "æ¸?é?¤æ??è¿?å?å??æ??ä»¶æ¸?å?®ä¸ç??æ??æ??é ?ç?®ï¼?"
 
-#: ../gnome-panel/panel-run-dialog.c:325
+#: ../gnome-panel/panel-run-dialog.c:391
 #, c-format
 msgid "Could not run command '%s'"
 msgstr "ç?¡æ³?å?·è¡?â??%sâ??æ??ä»¤"
 
-#: ../gnome-panel/panel-run-dialog.c:378
+#: ../gnome-panel/panel-run-dialog.c:444
 #, c-format
 msgid "Could not convert '%s' from UTF-8"
 msgstr "ç?¡æ³?ç?± UTF-8 è½?æ??ç?ºâ??%sâ??"
 
-#: ../gnome-panel/panel-run-dialog.c:1186
+#: ../gnome-panel/panel-run-dialog.c:1255
 msgid "Choose a file to append to the command..."
 msgstr "å?¨æ??ä»¤å¾?é??å? æª?æ¡?å??ç¨±..."
 
-#: ../gnome-panel/panel-run-dialog.c:1562
-#: ../gnome-panel/panel-run-dialog.glade.h:10
+#: ../gnome-panel/panel-run-dialog.c:1633
+#: ../gnome-panel/panel-run-dialog.ui.h:8
 msgid "Select an application to view its description."
 msgstr "é?¸å??æ??ç?¨ç¨?å¼?å¾?å?¯ä»¥é¡¯ç¤ºæ??é??è©²ç¨?å¼?ç??èªªæ??ã??"
 
-#: ../gnome-panel/panel-run-dialog.c:1600
+#: ../gnome-panel/panel-run-dialog.c:1671
 #, c-format
 msgid "Will run command: '%s'"
 msgstr "å°?æ??å?·è¡?æ??ä»¤ï¼?â??%sâ??"
 
-#: ../gnome-panel/panel-run-dialog.c:1631
+#: ../gnome-panel/panel-run-dialog.c:1704
 #, 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:1932
+#: ../gnome-panel/panel-run-dialog.c:2023
 msgid "Could not display run dialog"
 msgstr "ç?¡æ³?é¡¯ç¤ºå?·è¡?å°?è©±è¦?çª?"
 
-#: ../gnome-panel/panel-run-dialog.glade.h:1
+#: ../gnome-panel/panel-run-dialog.ui.h:1
 msgid ""
 "Click this button to browse for a file whose name to append to the command "
 "string."
 msgstr "æ??ä¸?è©²æ??é??å¾?å?¯ä»¥é?¸å??æª?æ¡?ï¼?å°?è©²æª?æ¡?ç??å??ç¨±é??å? å?¨æ??ä»¤ä¹?å¾?ã??"
 
-#: ../gnome-panel/panel-run-dialog.glade.h:2
+#: ../gnome-panel/panel-run-dialog.ui.h:2
 msgid ""
 "Click this button to run the selected application or the command in the "
 "command entry field."
 msgstr "æ??ä¸?è©²æ??é??å?¯ä»¥å?·è¡?è¼¸å?¥æ¬?ä½?ä¸ç??æ??ä»¤ã??"
 
-#: ../gnome-panel/panel-run-dialog.glade.h:3
-msgid "Command entry"
-msgstr "æ??ä»¤è¼¸å?¥æ¬?ä½?"
-
-#: ../gnome-panel/panel-run-dialog.glade.h:4
+#: ../gnome-panel/panel-run-dialog.ui.h:3
 msgid "Command icon"
 msgstr "æ??ä»¤å??ç¤º"
 
-#: ../gnome-panel/panel-run-dialog.glade.h:5
-msgid "Enter a command string here to run it."
-msgstr "å?¨é??è£¡è¼¸å?¥æ??ä»¤ã??"
-
-#: ../gnome-panel/panel-run-dialog.glade.h:6
+#: ../gnome-panel/panel-run-dialog.ui.h:4
 msgid "List of known applications"
 msgstr "å·²ç?¥ç??æ??ç?¨ç¨?å¼?ç??æ¸?å?®"
 
-#: ../gnome-panel/panel-run-dialog.glade.h:7
+#: ../gnome-panel/panel-run-dialog.ui.h:5
 msgid "Run Application"
 msgstr "å?·è¡?ç¨?å¼?"
 
-#: ../gnome-panel/panel-run-dialog.glade.h:8
+#: ../gnome-panel/panel-run-dialog.ui.h:6
 msgid "Run in _terminal"
 msgstr "å?¨çµ?ç«¯æ©?ä¸å?·è¡?(_T)"
 
-#: ../gnome-panel/panel-run-dialog.glade.h:9
+#: ../gnome-panel/panel-run-dialog.ui.h:7
 msgid "Run with _file..."
 msgstr "å?·è¡?æ??é??å??æ??å®?æª?æ¡?(_F)..."
 
-#: ../gnome-panel/panel-run-dialog.glade.h:11
+#: ../gnome-panel/panel-run-dialog.ui.h:9
 msgid "Select this box to run the command in a terminal window."
 msgstr "é?¸å??æ?¬é?¸é ?å¾?ï¼?æ??ä»¤æ??å?¨çµ?ç«¯æ©?ä¸å?·è¡?ã??"
 
-#: ../gnome-panel/panel-run-dialog.glade.h:12
+#: ../gnome-panel/panel-run-dialog.ui.h:10
 msgid "Show list of known _applications"
 msgstr "é¡¯ç¤ºå·²ç?¥ç??æ??ç?¨ç¨?å¼?ç??æ¸?å?®(_A)"
 
-#: ../gnome-panel/panel-run-dialog.glade.h:13
+#: ../gnome-panel/panel-run-dialog.ui.h:11
 msgid "The icon of the command to be run."
 msgstr "å?·è¡?æ??ä»¤æ??ä½¿ç?¨ç??è¦?çª?å??ç¤ºã??"
 
-#: ../gnome-panel/panel-run-dialog.glade.h:14
+#: ../gnome-panel/panel-run-dialog.ui.h:12
 #: ../gnome-panel/panel-stock-icons.c:90
 msgid "_Run"
 msgstr "å?·è¡?(_R)"
@@ -2557,73 +2589,73 @@ msgstr "æ¸?é?¤(_L)"
 msgid "D_on't Delete"
 msgstr "ä¸?è¦?å?ªé?¤(_O)"
 
-#: ../gnome-panel/panel-toplevel.c:1178
+#: ../gnome-panel/panel-toplevel.c:1188
 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:1588
+#: ../gnome-panel/panel-toplevel.c:1598
 msgid "Top Expanded Edge Panel"
 msgstr "é ?é?¨æ?´å¤§é??ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1589
+#: ../gnome-panel/panel-toplevel.c:1599
 msgid "Top Centered Panel"
 msgstr "é ?é?¨ç½®ä¸é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1590
+#: ../gnome-panel/panel-toplevel.c:1600
 msgid "Top Floating Panel"
 msgstr "é ?é?¨æµ®å??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1591
+#: ../gnome-panel/panel-toplevel.c:1601
 msgid "Top Edge Panel"
 msgstr "é ?é?¨é??ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1595
+#: ../gnome-panel/panel-toplevel.c:1605
 msgid "Bottom Expanded Edge Panel"
 msgstr "åº?é?¨æ?´å¤§é??ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1596
+#: ../gnome-panel/panel-toplevel.c:1606
 msgid "Bottom Centered Panel"
 msgstr "åº?é?¨ç½®ä¸é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1597
+#: ../gnome-panel/panel-toplevel.c:1607
 msgid "Bottom Floating Panel"
 msgstr "åº?é?¨æµ®å??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1598
+#: ../gnome-panel/panel-toplevel.c:1608
 msgid "Bottom Edge Panel"
 msgstr "åº?é?¨é??ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1602
+#: ../gnome-panel/panel-toplevel.c:1612
 msgid "Left Expanded Edge Panel"
 msgstr "å·¦é??æ?´å¤§é??ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1603
+#: ../gnome-panel/panel-toplevel.c:1613
 msgid "Left Centered Panel"
 msgstr "å·¦é??ç½®ä¸é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1604
+#: ../gnome-panel/panel-toplevel.c:1614
 msgid "Left Floating Panel"
 msgstr "å·¦é??æµ®å??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1605
+#: ../gnome-panel/panel-toplevel.c:1615
 msgid "Left Edge Panel"
 msgstr "å·¦é??é??ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1609
+#: ../gnome-panel/panel-toplevel.c:1619
 msgid "Right Expanded Edge Panel"
 msgstr "å?³é??æ?´å¤§é??ç??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1610
+#: ../gnome-panel/panel-toplevel.c:1620
 msgid "Right Centered Panel"
 msgstr "å?³é??ç½®ä¸é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1611
+#: ../gnome-panel/panel-toplevel.c:1621
 msgid "Right Floating Panel"
 msgstr "å?³é??æµ®å??é?¢æ?¿"
 
-#: ../gnome-panel/panel-toplevel.c:1612
+#: ../gnome-panel/panel-toplevel.c:1622
 msgid "Right Edge Panel"
 msgstr "å?³é??é??ç??é?¢æ?¿"
 
@@ -3056,77 +3088,107 @@ msgstr "Bonobo é?¢æ?¿æ¸¬è©¦ç¨?å¼?"
 msgid "Test Bonobo Applet Factory"
 msgstr "Bonobo é?¢æ?¿æ¸¬è©¦ç¨?å¼?å·¥å» "
 
-#: ../libpanel-applet/panel-test-applets.c:35
+#: ../libpanel-applet/panel-test-applets.c:34
 msgid "Specify an applet IID to load"
 msgstr "æ??å®?æº?å??è¼?å?¥ç??é?¢æ?¿ç¨?å¼?ç?? IID"
 
-#: ../libpanel-applet/panel-test-applets.c:36
+#: ../libpanel-applet/panel-test-applets.c:35
 msgid ""
 "Specify a gconf location in which the applet preferences should be stored"
 msgstr "é?¢æ?¿ç¨?å¼?ç??å??å¥½è¨å®?æ??è©²å?²å?å?¨æ??å®?ç?? gconf ä½?ç½®"
 
-#: ../libpanel-applet/panel-test-applets.c:37
+#: ../libpanel-applet/panel-test-applets.c:36
 msgid "Specify the initial size of the applet (xx-small, medium, large etc.)"
 msgstr "æ??å®?é?¢æ?¿ç¨?å¼?é??å§?æ??ç??å¤§å°?ï¼?è¶?å¾®å??ã??ä¸å??ã??å¤§å??ç?ã??ï¼?"
 
-#: ../libpanel-applet/panel-test-applets.c:38
+#: ../libpanel-applet/panel-test-applets.c:37
 msgid ""
 "Specify the initial orientation of the applet (top, bottom, left or right)"
 msgstr "æ??å®?é?¢æ?¿ç¨?å¼?é??å§?é¡¯ç¤ºæ??ç??æ?¹å??ï¼?é ?é?¨ã??åº?é?¨ã??å·¦é??ã??å?³é??ï¼?"
 
-#: ../libpanel-applet/panel-test-applets.c:62
+#: ../libpanel-applet/panel-test-applets.c:61
 msgctxt "Size"
 msgid "XX Small"
 msgstr "è¶?å°?"
 
-#: ../libpanel-applet/panel-test-applets.c:63
+#: ../libpanel-applet/panel-test-applets.c:62
 msgctxt "Size"
 msgid "X Small"
 msgstr "ç?¹å°?"
 
-#: ../libpanel-applet/panel-test-applets.c:64
+#: ../libpanel-applet/panel-test-applets.c:63
 msgctxt "Size"
 msgid "Small"
 msgstr "å°?"
 
-#: ../libpanel-applet/panel-test-applets.c:65
+#: ../libpanel-applet/panel-test-applets.c:64
 msgctxt "Size"
 msgid "Medium"
 msgstr "ä¸"
 
-#: ../libpanel-applet/panel-test-applets.c:66
+#: ../libpanel-applet/panel-test-applets.c:65
 msgctxt "Size"
 msgid "Large"
 msgstr "å¤§"
 
-#: ../libpanel-applet/panel-test-applets.c:67
+#: ../libpanel-applet/panel-test-applets.c:66
 msgctxt "Size"
 msgid "X Large"
 msgstr "ç?¹å¤§"
 
-#: ../libpanel-applet/panel-test-applets.c:68
+#: ../libpanel-applet/panel-test-applets.c:67
 msgctxt "Size"
 msgid "XX Large"
 msgstr "è¶?å¤§"
 
-#: ../libpanel-applet/panel-test-applets.c:130
+#: ../libpanel-applet/panel-test-applets.c:129
 #, c-format
 msgid "Failed to load applet %s"
 msgstr "è¼?å?¥é?¢æ?¿ç¨?å¼? %s å¤±æ??"
 
 #. This is an utility to easily test various applets
-#: ../libpanel-applet/panel-test-applets.glade.h:2
+#: ../libpanel-applet/panel-test-applets.ui.h:2
 msgid "Test applet utility"
 msgstr "é?¢æ?¿ç¨?å¼?æ¸¬è©¦å·¥å?·"
 
-#: ../libpanel-applet/panel-test-applets.glade.h:3
+#: ../libpanel-applet/panel-test-applets.ui.h:3
 msgid "_Applet:"
 msgstr "é?¢æ?¿ç¨?å¼?(_A):"
 
-#: ../libpanel-applet/panel-test-applets.glade.h:5
+#: ../libpanel-applet/panel-test-applets.ui.h:5
 msgid "_Prefs Dir:"
 msgstr "å??å¥½è¨å®?ç?®é??(_P):"
 
+#~ msgid "<b>Clock Options</b>"
+#~ msgstr "<b>æ??é??é?¸é ?</b>"
+
+#~ msgid "<b>Animation</b>"
+#~ msgstr "<b>å??ç?«</b>"
+
+#~ msgid "<b>General</b>"
+#~ msgstr "<b>ä¸?è?¬è¨å®?</b>"
+
+#~ msgid "<b>Switcher</b>"
+#~ msgstr "<b>é ?è¦½</b>"
+
+#~ msgid "<b>Workspaces</b>"
+#~ msgstr "<b>å·¥ä½?å??</b>"
+
+#~ msgid "Disable Lock Screen"
+#~ msgstr "ä¸?ä½¿ç?¨ã??é??å®?ç?«é?¢ã??"
+
+#~ msgid ""
+#~ "If true, the panel will not allow a user to lock their screen, by "
+#~ "removing access to the lock screen menu entries."
+#~ msgstr ""
+#~ "å¦?è¨å®?ç?ºâ??trueâ??ï¼?é?¢æ?¿å°?é?±è??é?¸å?®ä¸ç??ã??é??å®?ç?«é?¢ã??é ?ä»¥é?²æ¢ä½¿ç?¨è??é??å®?ç?«é?¢ã??"
+
+#~ msgid "Command entry"
+#~ msgstr "æ??ä»¤è¼¸å?¥æ¬?ä½?"
+
+#~ msgid "Enter a command string here to run it."
+#~ msgstr "å?¨é??è£¡è¼¸å?¥æ??ä»¤ã??"
+
 #~ msgid "Failed to launch time configuration tool: %s"
 #~ msgstr "ç?¡æ³?å?·è¡?æ??é??è¨ç½®å·¥å?·ï¼?%s"
 
@@ -3317,9 +3379,6 @@ msgstr "å??å¥½è¨å®?ç?®é??(_P):"
 #~ msgid "Log out of this system now?"
 #~ msgstr "ç?¾å?¨å¾?æ?¬ç³»çµ±ä¸ç?»å?ºï¼?"
 
-#~ msgid "_Switch User"
-#~ msgstr "å??æ??ä½¿ç?¨è??(_S)"
-
 #~ msgid "_Log Out"
 #~ msgstr "ç?»å?º(_L)"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]