[gnome-applets] Updated British English translation



commit 3695c81fed320904bb3424f6c00a53a65f807cb4
Author: Chris Leonard <cjl laptop org>
Date:   Sun Sep 23 12:32:20 2012 +0100

    Updated British English translation

 po/en_GB.po | 3217 +++++++++++++++++++++++++++++------------------------------
 1 files changed, 1605 insertions(+), 1612 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 75775be..75ab581 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -3,23 +3,25 @@
 # Robert Brady <robert susu org uk>, 2000.
 # Gareth Owen <gowen72 yahoo com>, David Lodge <dave cirt net>, 2004.
 # Philip Withnall <philip tecnocode co uk>, 2009, 2010.
-# Bruce Cowan <bcowan fastmail co uk>, 2010.
+# Bruce Cowan <bruce bcowan me uk>, 2010, 2012.
+# Chris Leonard <cjlhomeaddress gmail com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-applets 1.1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-01 09:21+0100\n"
-"PO-Revision-Date: 2010-02-24 17:15+0100\n"
-"Last-Translator: Philip Withnall <philip tecnocode co uk>\n"
+"POT-Creation-Date: 2012-09-23 12:29+0100\n"
+"PO-Revision-Date: 2012-09-23 12:31+0100\n"
+"Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
 "Language-Team: British English <en li org>\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.5.2\n"
+"X-Generator: Virtaal 0.7.1\n"
+"X-Project-Style: gnome\n"
 
-#: ../accessx-status/applet.c:137
+#: ../accessx-status/applet.c:139
 msgid "Shows the state of AccessX features such as latched modifiers"
 msgstr "Shows the state of AccessX features such as latched modifiers"
 
@@ -27,90 +29,93 @@ msgstr "Shows the state of AccessX features such as latched modifiers"
 #. about.set_documenters([])
 #. translators: These appear in the About dialog, usual format applies.
 #. "documenters",        documenters,
-#: ../accessx-status/applet.c:142 ../battstat/battstat_applet.c:1256
-#: ../charpick/charpick.c:610 ../cpufreq/src/cpufreq-applet.c:613
-#: ../drivemount/drivemount.c:117 ../geyes/geyes.c:196
+#: ../accessx-status/applet.c:144 ../battstat/battstat_applet.c:1203
+#: ../charpick/charpick.c:612 ../cpufreq/src/cpufreq-applet.c:611
+#: ../drivemount/drivemount.c:106 ../geyes/geyes.c:153
 #: ../gweather/gweather-about.c:55 ../invest-applet/invest/about.py:29
-#: ../mini-commander/src/about.c:53 ../mixer/applet.c:1467
+#: ../mini-commander/src/about.c:53 ../mixer/applet.c:1424
 #: ../modemlights/modem-applet.c:1023 ../multiload/main.c:61
-#: ../stickynotes/stickynotes_applet_callbacks.c:425
-#: ../trashapplet/src/trashapplet.c:432
+#: ../stickynotes/stickynotes_applet_callbacks.c:383
+#: ../trashapplet/src/trashapplet.c:431
 msgid "translator-credits"
 msgstr ""
 "Gareth Owen <gowen72 yahoo com>\n"
 "David Lodge <dave cirt net>\n"
 "Philip Withnall <philip tecnocode co uk>\n"
-"Bruce Cowan <bcowan fastmail co uk>"
+"Bruce Cowan <bruce bcowan me uk>\n"
+"Chris Leonard <cjl laptop org>"
 
-#: ../accessx-status/applet.c:167
+#: ../accessx-status/applet.c:169
 #, c-format
 msgid "There was an error launching the help viewer: %s"
 msgstr "There was an error launching the help viewer: %s"
 
-#: ../accessx-status/applet.c:216
+#: ../accessx-status/applet.c:201
+msgid "Open the keyboard preferences dialog"
+msgstr "Open the keyboard preferences dialogue"
+
+#: ../accessx-status/applet.c:219
 #, c-format
 msgid "There was an error launching the keyboard preferences dialog: %s"
 msgstr "There was an error launching the keyboard preferences dialogue: %s"
 
-#: ../accessx-status/applet.c:233
+#: ../accessx-status/applet.c:238
 msgid "_Keyboard Accessibility Preferences"
 msgstr "_Keyboard Accessibility Preferences"
 
-#: ../accessx-status/applet.c:236 ../battstat/battstat_applet.c:64
-#: ../charpick/charpick.c:717 ../cpufreq/src/cpufreq-applet.c:125
-#: ../drivemount/drivemount.c:153 ../geyes/geyes.c:361
+#: ../accessx-status/applet.c:241 ../battstat/battstat_applet.c:64
+#: ../charpick/charpick.c:719 ../cpufreq/src/cpufreq-applet.c:126
+#: ../drivemount/drivemount.c:144 ../geyes/geyes.c:318
 #: ../gweather/gweather-applet.c:124
-#: ../invest-applet/data/Invest_Applet.xml.h:2
-#: ../mini-commander/src/mini-commander_applet.c:56 ../mixer/applet.c:387
-#: ../modemlights/modem-applet.c:151 ../multiload/main.c:439
+#: ../mini-commander/src/mini-commander_applet.c:56 ../mixer/applet.c:381
+#: ../modemlights/modem-applet.c:151 ../multiload/main.c:465
 #: ../stickynotes/stickynotes_applet.c:45 ../trashapplet/src/trashapplet.c:75
 msgid "_Help"
 msgstr "_Help"
 
-#: ../accessx-status/applet.c:239 ../battstat/battstat_applet.c:67
-#: ../charpick/charpick.c:720 ../cpufreq/src/cpufreq-applet.c:128
-#: ../drivemount/drivemount.c:156 ../geyes/geyes.c:364
+#: ../accessx-status/applet.c:244 ../battstat/battstat_applet.c:67
+#: ../charpick/charpick.c:722 ../cpufreq/src/cpufreq-applet.c:129
+#: ../drivemount/drivemount.c:147 ../geyes/geyes.c:321
 #: ../gweather/gweather-applet.c:127
-#: ../invest-applet/data/Invest_Applet.xml.h:1
-#: ../mini-commander/src/mini-commander_applet.c:59 ../mixer/applet.c:390
-#: ../modemlights/modem-applet.c:154 ../multiload/main.c:442
+#: ../mini-commander/src/mini-commander_applet.c:59 ../mixer/applet.c:384
+#: ../modemlights/modem-applet.c:154 ../multiload/main.c:468
 #: ../stickynotes/stickynotes_applet.c:48 ../trashapplet/src/trashapplet.c:78
 msgid "_About"
 msgstr "_About"
 
 #. Note to translators: the first letter of the alphabet, not the indefinite article
-#: ../accessx-status/applet.c:474 ../accessx-status/applet.c:514
+#: ../accessx-status/applet.c:468 ../accessx-status/applet.c:508
 msgid "a"
 msgstr "a"
 
-#: ../accessx-status/applet.c:987 ../accessx-status/applet.c:1061
-#: ../accessx-status/applet.c:1130 ../accessx-status/applet.c:1340
+#: ../accessx-status/applet.c:981 ../accessx-status/applet.c:1055
+#: ../accessx-status/applet.c:1124 ../accessx-status/applet.c:1290
 msgid "AccessX Status"
 msgstr "AccessX Status"
 
-#: ../accessx-status/applet.c:988 ../accessx-status/applet.c:1131
+#: ../accessx-status/applet.c:982 ../accessx-status/applet.c:1125
 msgid "Shows keyboard status when accessibility features are used."
 msgstr "Shows keyboard status when accessibility features are used."
 
-#: ../accessx-status/applet.c:1023
+#: ../accessx-status/applet.c:1017
 msgid "XKB Extension is not enabled"
 msgstr "XKB Extension is not enabled"
 
-#: ../accessx-status/applet.c:1028
+#: ../accessx-status/applet.c:1022
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#: ../accessx-status/applet.c:1036
+#: ../accessx-status/applet.c:1030
 #, c-format
 msgid "Error: %s"
 msgstr "Error: %s"
 
-#: ../accessx-status/applet.c:1337
-#: ../accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in.in.h:2
+#: ../accessx-status/applet.c:1287
+#: ../accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in.in.h:3
 msgid "Keyboard Accessibility Status"
 msgstr "Keyboard Accessibility Status"
 
-#: ../accessx-status/applet.c:1342
+#: ../accessx-status/applet.c:1292
 msgid "Displays current state of keyboard accessibility features"
 msgstr "Displays current state of keyboard accessibility features"
 
@@ -118,7 +123,7 @@ msgstr "Displays current state of keyboard accessibility features"
 msgid "AccessX Status Applet Factory"
 msgstr "AccessX Status Applet Factory"
 
-#: ../accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in.in.h:3
+#: ../accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in.in.h:2
 msgid "Keyboard Accessibility Status Applet Factory"
 msgstr "Keyboard Accessibility Status Applet Factory"
 
@@ -126,12 +131,11 @@ msgstr "Keyboard Accessibility Status Applet Factory"
 msgid "Shows the status of keyboard accessibility features"
 msgstr "Shows the status of keyboard accessibility features"
 
-#: ../battstat/battstat_applet.c:61 ../charpick/charpick.c:714
-#: ../cpufreq/src/cpufreq-applet.c:122 ../geyes/geyes.c:358
+#: ../battstat/battstat_applet.c:61 ../charpick/charpick.c:716
+#: ../cpufreq/src/cpufreq-applet.c:123 ../geyes/geyes.c:315
 #: ../gweather/gweather-applet.c:121
-#: ../invest-applet/data/Invest_Applet.xml.h:3
-#: ../mini-commander/src/mini-commander_applet.c:53 ../mixer/applet.c:393
-#: ../multiload/main.c:433 ../stickynotes/stickynotes_applet.c:42
+#: ../mini-commander/src/mini-commander_applet.c:53 ../mixer/applet.c:387
+#: ../multiload/main.c:459 ../stickynotes/stickynotes_applet.c:42
 msgid "_Preferences"
 msgstr "_Preferences"
 
@@ -143,24 +147,24 @@ msgstr "System is running on AC power"
 msgid "System is running on battery power"
 msgstr "System is running on battery power"
 
-#: ../battstat/battstat_applet.c:375
+#: ../battstat/battstat_applet.c:339
 #, c-format
 msgid "Battery charged (%d%%)"
 msgstr "Battery charged (%d%%)"
 
-#: ../battstat/battstat_applet.c:377
+#: ../battstat/battstat_applet.c:341
 #, c-format
 msgid "Unknown time (%d%%) remaining"
 msgstr "Unknown time (%d%%) remaining"
 
-#: ../battstat/battstat_applet.c:379
+#: ../battstat/battstat_applet.c:343
 #, c-format
 msgid "Unknown time (%d%%) until charged"
 msgstr "Unknown time (%d%%) until charged"
 
 #  TRANSLATOR: "%d %s %d %s" are "%d hours %d minutes"
 #  * Swap order with "%2$s %2$d %1$s %1$d if needed
-#: ../battstat/battstat_applet.c:384
+#: ../battstat/battstat_applet.c:348
 #, c-format
 msgid "%d minute (%d%%) remaining"
 msgid_plural "%d minutes (%d%%) remaining"
@@ -168,7 +172,7 @@ msgstr[0] "%d minute (%d%%) remaining"
 msgstr[1] "%d minutes (%d%%) remaining"
 
 #  * Swap order with "%2$s %2$d %1$s %1$d if needed
-#: ../battstat/battstat_applet.c:389
+#: ../battstat/battstat_applet.c:353
 #, c-format
 msgid "%d minute until charged (%d%%)"
 msgid_plural "%d minutes until charged (%d%%)"
@@ -176,7 +180,7 @@ msgstr[0] "%d minute until charged (%d%%)"
 msgstr[1] "%d minutes until charged (%d%%)"
 
 #  * Swap order with "%2$s %2$d %1$s %1$d if needed
-#: ../battstat/battstat_applet.c:395
+#: ../battstat/battstat_applet.c:359
 #, c-format
 msgid "%d hour (%d%%) remaining"
 msgid_plural "%d hours (%d%%) remaining"
@@ -184,7 +188,7 @@ msgstr[0] "%d hour (%d%%) remaining"
 msgstr[1] "%d hours (%d%%) remaining"
 
 #  * Swap order with "%2$s %2$d %1$s %1$d if needed
-#: ../battstat/battstat_applet.c:400
+#: ../battstat/battstat_applet.c:364
 #, c-format
 msgid "%d hour until charged (%d%%)"
 msgid_plural "%d hours until charged (%d%%)"
@@ -194,18 +198,18 @@ msgstr[1] "%d hours until charged (%d%%)"
 #  * Swap order with "%2$s %2$d %1$s %1$d if needed
 #. TRANSLATOR: "%d %s %d %s" are "%d hours %d minutes"
 #. * Swap order with "%2$s %2$d %1$s %1$d if needed
-#: ../battstat/battstat_applet.c:407
+#: ../battstat/battstat_applet.c:371
 #, c-format
 msgid "%d %s %d %s (%d%%) remaining"
 msgstr "%d %s %d %s (%d%%) remaining"
 
-#: ../battstat/battstat_applet.c:408 ../battstat/battstat_applet.c:415
+#: ../battstat/battstat_applet.c:372 ../battstat/battstat_applet.c:379
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hour"
 msgstr[1] "hours"
 
-#: ../battstat/battstat_applet.c:409 ../battstat/battstat_applet.c:416
+#: ../battstat/battstat_applet.c:373 ../battstat/battstat_applet.c:380
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
@@ -214,30 +218,30 @@ msgstr[1] "minutes"
 #  * Swap order with "%2$s %2$d %1$s %1$d if needed
 #. TRANSLATOR: "%d %s %d %s" are "%d hours %d minutes"
 #. * Swap order with "%2$s %2$d %1$s %1$d if needed
-#: ../battstat/battstat_applet.c:414
+#: ../battstat/battstat_applet.c:378
 #, c-format
 msgid "%d %s %d %s until charged (%d%%)"
 msgstr "%d %s %d %s until charged (%d%%)"
 
-#: ../battstat/battstat_applet.c:428
+#: ../battstat/battstat_applet.c:392
 msgid "Battery Monitor"
 msgstr "Battery Monitor"
 
-#: ../battstat/battstat_applet.c:438 ../battstat/battstat_applet.c:498
+#: ../battstat/battstat_applet.c:402 ../battstat/battstat_applet.c:461
 msgid "Your battery is now fully recharged"
 msgstr "Your battery is now fully recharged"
 
-#: ../battstat/battstat_applet.c:474 ../battstat/battstat_applet.c:630
+#: ../battstat/battstat_applet.c:438 ../battstat/battstat_applet.c:593
 msgid "Battery Notice"
 msgstr "Battery Notice"
 
 #. we don't know the remaining time
-#: ../battstat/battstat_applet.c:575
+#: ../battstat/battstat_applet.c:538
 #, c-format
 msgid "You have %d%% of your total battery capacity remaining."
 msgstr "You have %d%% of your total battery capacity remaining."
 
-#: ../battstat/battstat_applet.c:581
+#: ../battstat/battstat_applet.c:544
 #, c-format
 msgid ""
 "You have %d minute of battery power remaining (%d%% of the total capacity)."
@@ -251,7 +255,7 @@ msgstr[1] ""
 #. TRANSLATORS: this is a list, it is left as a single string
 #. * to allow you to make it appear like a list would in your
 #. * locale.  This is if the laptop does not support suspend.
-#: ../battstat/battstat_applet.c:593
+#: ../battstat/battstat_applet.c:556
 msgid ""
 "To avoid losing your work:\n"
 " â plug your laptop into external power, or\n"
@@ -264,7 +268,7 @@ msgstr ""
 #. TRANSLATORS: this is a list, it is left as a single string
 #. * to allow you to make it appear like a list would in your
 #. * locale.  This is if the laptop supports suspend.
-#: ../battstat/battstat_applet.c:601
+#: ../battstat/battstat_applet.c:564
 msgid ""
 "To avoid losing your work:\n"
 " â suspend your laptop to save power,\n"
@@ -276,107 +280,107 @@ msgstr ""
 " â plug your laptop into external power, or\n"
 " â save open documents and shut your laptop down."
 
-#: ../battstat/battstat_applet.c:609
+#: ../battstat/battstat_applet.c:572
 msgid "Your battery is running low"
 msgstr "Your battery is running low"
 
 #  Displayed as a tooltip over the battery meter when no
 #  battery is present.
-#: ../battstat/battstat_applet.c:706
+#: ../battstat/battstat_applet.c:667
 msgid "No battery present"
 msgstr "No battery present"
 
-#: ../battstat/battstat_applet.c:709
+#: ../battstat/battstat_applet.c:670
 msgid "Battery status unknown"
 msgstr "Battery status unknown"
 
-#: ../battstat/battstat_applet.c:868
+#: ../battstat/battstat_applet.c:850
 msgid "N/A"
 msgstr "N/A"
 
-#: ../battstat/battstat_applet.c:1203 ../drivemount/drivemount.c:141
-#: ../geyes/geyes.c:346 ../geyes/themes.c:244 ../gweather/gweather-applet.c:70
-#: ../gweather/gweather-pref.c:748 ../mini-commander/src/preferences.c:366
-#: ../stickynotes/stickynotes_applet_callbacks.c:391
-#: ../stickynotes/stickynotes_applet_callbacks.c:607
-#: ../trashapplet/src/trashapplet.c:399
+#: ../battstat/battstat_applet.c:1150 ../drivemount/drivemount.c:132
+#: ../geyes/geyes.c:303 ../geyes/themes.c:242 ../gweather/gweather-applet.c:70
+#: ../gweather/gweather-pref.c:617 ../mini-commander/src/preferences.c:366
+#: ../stickynotes/stickynotes_applet_callbacks.c:349
+#: ../stickynotes/stickynotes_applet_callbacks.c:565
+#: ../trashapplet/src/trashapplet.c:398
 #, c-format
 msgid "There was an error displaying help: %s"
 msgstr "There was an error displaying help: %s"
 
-#: ../battstat/battstat_applet.c:1243
+#: ../battstat/battstat_applet.c:1190
 msgid "This utility shows the status of your laptop battery."
 msgstr "This utility shows the status of your laptop battery."
 
 #. true
-#: ../battstat/battstat_applet.c:1245
+#: ../battstat/battstat_applet.c:1192
 msgid "HAL backend enabled."
 msgstr "HAL backend enabled."
 
 #. false
-#: ../battstat/battstat_applet.c:1246
+#: ../battstat/battstat_applet.c:1193
 msgid "Legacy (non-HAL) backend enabled."
 msgstr "Legacy (non-HAL) backend enabled."
 
-#: ../battstat/battstat_applet.c:1622 ../battstat/battstat_applet.c:1676
-#: ../battstat/org.gnome.applets.BattstatApplet.panel-applet.in.in.h:1
+#: ../battstat/battstat_applet.c:1569 ../battstat/battstat_applet.c:1622
+#: ../battstat/org.gnome.applets.BattstatApplet.panel-applet.in.in.h:2
 msgid "Battery Charge Monitor"
 msgstr "Battery Charge Monitor"
 
-#: ../battstat/battstat_applet.c:1677
+#: ../battstat/battstat_applet.c:1623
 #: ../battstat/org.gnome.applets.BattstatApplet.panel-applet.in.in.h:3
 msgid "Monitor a laptop's remaining power"
 msgstr "Monitor a laptop's remaining power"
 
 #: ../battstat/battstat_applet.ui.h:1
-msgid "(shows single image for status and charge)"
-msgstr "(shows single image for status and charge)"
+msgid "Battery Charge Monitor Preferences"
+msgstr "Battery Charge Monitor Preferences"
 
 #: ../battstat/battstat_applet.ui.h:2
-msgid "(two images: one for status, one for charge)"
-msgstr "(two images: one for status, one for charge)"
-
-#: ../battstat/battstat_applet.ui.h:3
 msgid "Appearance"
 msgstr "Appearance"
 
+#: ../battstat/battstat_applet.ui.h:3
+msgid "_Compact view"
+msgstr "_Compact view"
+
 #: ../battstat/battstat_applet.ui.h:4
-msgid "Battery Charge Monitor Preferences"
-msgstr "Battery Charge Monitor Preferences"
+msgid "(shows single image for status and charge)"
+msgstr "(shows single image for status and charge)"
 
 #: ../battstat/battstat_applet.ui.h:5
-msgid "Notifications"
-msgstr "Notifications"
+msgid "_Expanded view"
+msgstr "_Expanded view"
 
 #: ../battstat/battstat_applet.ui.h:6
-msgid "Show _percentage remaining"
-msgstr "Show _percentage remaining"
+msgid "(two images: one for status, one for charge)"
+msgstr "(two images: one for status, one for charge)"
 
 #: ../battstat/battstat_applet.ui.h:7
-msgid "Show _time remaining"
-msgstr "Show _time remaining"
+msgid "_Show time/percentage:"
+msgstr "_Show time/percentage:"
 
 #: ../battstat/battstat_applet.ui.h:8
-msgid "_Compact view"
-msgstr "_Compact view"
+msgid "Show _time remaining"
+msgstr "Show _time remaining"
 
 #: ../battstat/battstat_applet.ui.h:9
-msgid "_Expanded view"
-msgstr "_Expanded view"
+msgid "Show _percentage remaining"
+msgstr "Show _percentage remaining"
 
 #: ../battstat/battstat_applet.ui.h:10
-msgid "_Notify when battery is fully recharged"
-msgstr "_Notify when battery is fully recharged"
-
-#: ../battstat/battstat_applet.ui.h:11
-msgid "_Show time/percentage:"
-msgstr "_Show time/percentage:"
+msgid "Notifications"
+msgstr "Notifications"
 
 #. TRANSLATOR: This is the beginning of the sentence 'Warn when battery charge drops to: [XX] percent/minutes remaining'
-#: ../battstat/battstat_applet.ui.h:13
+#: ../battstat/battstat_applet.ui.h:12
 msgid "_Warn when battery charge drops to:"
 msgstr "_Warn when battery charge drops to:"
 
+#: ../battstat/battstat_applet.ui.h:13
+msgid "_Notify when battery is fully recharged"
+msgstr "_Notify when battery is fully recharged"
+
 #: ../battstat/battstat-hal.c:343 ../battstat/battstat-hal.c:368
 msgid "HAL error"
 msgstr "HAL error"
@@ -397,42 +401,58 @@ msgid "Unable to initialise HAL: %s: %s"
 msgstr "Unable to initialise HAL: %s: %s"
 
 #: ../battstat/battstat.schemas.in.h:1
-msgid "0 for no label, 1 for percentage and 2 for time remaining."
-msgstr "0 for no label, 1 for percentage and 2 for time remaining."
+msgid "Red value level"
+msgstr "Red value level"
 
 #: ../battstat/battstat.schemas.in.h:2
-msgid "Beep for warnings"
-msgstr "Beep for warnings"
+msgid ""
+"The battery level below which the battery is displayed as red. Also the "
+"value at which the low battery warning is displayed."
+msgstr ""
+"The battery level below which the battery is displayed as red. Also the "
+"value at which the low battery warning is displayed."
 
 #: ../battstat/battstat.schemas.in.h:3
-msgid "Beep when displaying a warning."
-msgstr "Beep when displaying a warning."
+msgid "Warn on low time rather than low percentage"
+msgstr "Warn on low time rather than low percentage"
 
 #: ../battstat/battstat.schemas.in.h:4
-msgid "Drain from top"
-msgstr "Drain from top"
+msgid ""
+"Use the value defined in red_value as a time remaining to show the warning "
+"dialog rather than a percentage."
+msgstr ""
+"Use the value defined in red_value as a time remaining to show the warning "
+"dialogue rather than a percentage."
 
 #: ../battstat/battstat.schemas.in.h:5
-msgid "Full Battery Notification"
-msgstr "Full Battery Notification"
-
-#: ../battstat/battstat.schemas.in.h:6
 msgid "Low Battery Notification"
 msgstr "Low Battery Notification"
 
+#: ../battstat/battstat.schemas.in.h:6
+msgid "Notify user when the battery is low."
+msgstr "Notify user when the battery is low."
+
 #: ../battstat/battstat.schemas.in.h:7
-msgid "Notify user when the battery is full."
-msgstr "Notify user when the battery is full."
+msgid "Full Battery Notification"
+msgstr "Full Battery Notification"
 
 #: ../battstat/battstat.schemas.in.h:8
-msgid "Notify user when the battery is low."
-msgstr "Notify user when the battery is low."
+msgid "Notify user when the battery is full."
+msgstr "Notify user when the battery is full."
 
 #: ../battstat/battstat.schemas.in.h:9
-msgid "Red value level"
-msgstr "Red value level"
+msgid "Beep for warnings"
+msgstr "Beep for warnings"
 
 #: ../battstat/battstat.schemas.in.h:10
+msgid "Beep when displaying a warning."
+msgstr "Beep when displaying a warning."
+
+#: ../battstat/battstat.schemas.in.h:11
+msgid "Drain from top"
+msgstr "Drain from top"
+
+#: ../battstat/battstat.schemas.in.h:12
 msgid ""
 "Show the battery meter draining from the top of the battery. Only "
 "implemented for traditional battery view."
@@ -440,47 +460,31 @@ msgstr ""
 "Show the battery meter draining from the top of the battery. Only "
 "implemented for traditional battery view."
 
-#: ../battstat/battstat.schemas.in.h:11
-msgid "Show the horizontal battery"
-msgstr "Show the horizontal battery"
-
-#: ../battstat/battstat.schemas.in.h:12
-msgid "Show the time/percent label"
-msgstr "Show the time/percent label"
-
 #: ../battstat/battstat.schemas.in.h:13
-msgid "Show the traditional, horizontal battery on the panel."
-msgstr "Show the traditional, horizontal battery on the panel."
+msgid "Upright (small) battery"
+msgstr "Upright (small) battery"
 
 #: ../battstat/battstat.schemas.in.h:14
 msgid "Show the upright, smaller battery on the panel."
 msgstr "Show the upright, smaller battery on the panel."
 
 #: ../battstat/battstat.schemas.in.h:15
-msgid ""
-"The battery level below which the battery is displayed as red. Also the "
-"value at which the low battery warning is displayed."
-msgstr ""
-"The battery level below which the battery is displayed as red. Also the "
-"value at which the low battery warning is displayed."
+msgid "Show the horizontal battery"
+msgstr "Show the horizontal battery"
 
 #: ../battstat/battstat.schemas.in.h:16
-msgid "Upright (small) battery"
-msgstr "Upright (small) battery"
+msgid "Show the traditional, horizontal battery on the panel."
+msgstr "Show the traditional, horizontal battery on the panel."
 
 #: ../battstat/battstat.schemas.in.h:17
-msgid ""
-"Use the value defined in red_value as a time remaining to show the warning "
-"dialog rather than a percentage."
-msgstr ""
-"Use the value defined in red_value as a time remaining to show the warning "
-"dialogue rather than a percentage."
+msgid "Show the time/percent label"
+msgstr "Show the time/percent label"
 
 #: ../battstat/battstat.schemas.in.h:18
-msgid "Warn on low time rather than low percentage"
-msgstr "Warn on low time rather than low percentage"
+msgid "0 for no label, 1 for percentage and 2 for time remaining."
+msgstr "0 for no label, 1 for percentage and 2 for time remaining."
 
-#: ../battstat/org.gnome.applets.BattstatApplet.panel-applet.in.in.h:2
+#: ../battstat/org.gnome.applets.BattstatApplet.panel-applet.in.in.h:1
 msgid "Battstat Factory"
 msgstr "Battstat Factory"
 
@@ -507,14 +511,14 @@ msgid "Battery Status Utility"
 msgstr "Battery Status Utility"
 
 #: ../battstat/sounds/battstat_applet.soundlist.in.h:2
-msgid "Battery fully re-charged"
-msgstr "Battery fully re-charged"
-
-#: ../battstat/sounds/battstat_applet.soundlist.in.h:3
 msgid "Battery power low"
 msgstr "Battery power low"
 
-#: ../charpick/charpick.c:436
+#: ../battstat/sounds/battstat_applet.soundlist.in.h:3
+msgid "Battery fully re-charged"
+msgstr "Battery fully re-charged"
+
+#: ../charpick/charpick.c:438
 msgid "Available palettes"
 msgstr "Available palettes"
 
@@ -522,21 +526,21 @@ msgstr "Available palettes"
 #. *             hopefully, the name of the unicode character has already
 #. *             been translated.
 #.
-#: ../charpick/charpick.c:483
+#: ../charpick/charpick.c:485
 #, c-format
 msgid "Insert \"%s\""
 msgstr "Insert \"%s\""
 
-#: ../charpick/charpick.c:486
+#: ../charpick/charpick.c:488
 msgid "Insert special character"
 msgstr "Insert special character"
 
-#: ../charpick/charpick.c:490
+#: ../charpick/charpick.c:492
 #, c-format
 msgid "insert special character %s"
 msgstr "insert special character %s"
 
-#: ../charpick/charpick.c:605
+#: ../charpick/charpick.c:607
 msgid ""
 "Gnome Panel applet for selecting strange characters that are not on my "
 "keyboard. Released under GNU General Public Licence."
@@ -544,34 +548,26 @@ msgstr ""
 "Gnome Panel applet for selecting strange characters that are not on my "
 "keyboard. Released under GNU General Public Licence."
 
-#: ../charpick/charpick.c:743 ../charpick/charpick.c:757
-#: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:1
-#: ../charpick/properties.c:452
+#: ../charpick/charpick.c:745 ../charpick/charpick.c:759
+#: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:2
+#: ../charpick/properties.c:451
 msgid "Character Palette"
 msgstr "Character Palette"
 
-#: ../charpick/charpick.c:743
+#: ../charpick/charpick.c:745
 #: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:3
 msgid "Insert characters"
 msgstr "Insert characters"
 
 #: ../charpick/charpick.schemas.in.h:1
-msgid "Characters shown on applet startup"
-msgstr "Characters shown on applet startup"
-
-#: ../charpick/charpick.schemas.in.h:2
 msgid "DEPRECATED - Characters shown on applet startup"
 msgstr "DEPRECATED â Characters shown on applet startup"
 
-#: ../charpick/charpick.schemas.in.h:3 ../charpick/properties.c:379
-msgid "List of available palettes"
-msgstr "List of available palettes"
-
-#: ../charpick/charpick.schemas.in.h:4
-msgid "List of strings containing the available palettes."
-msgstr "List of strings containing the available palettes."
+#: ../charpick/charpick.schemas.in.h:2
+msgid "Characters shown on applet startup"
+msgstr "Characters shown on applet startup"
 
-#: ../charpick/charpick.schemas.in.h:5
+#: ../charpick/charpick.schemas.in.h:3
 msgid ""
 "The string that the user had selected when the applet was last used. This "
 "string will be displayed when the user starts the applet."
@@ -579,7 +575,15 @@ msgstr ""
 "The string that the user had selected when the applet was last used. This "
 "string will be displayed when the user starts the applet."
 
-#: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:2
+#: ../charpick/charpick.schemas.in.h:4 ../charpick/properties.c:378
+msgid "List of available palettes"
+msgstr "List of available palettes"
+
+#: ../charpick/charpick.schemas.in.h:5
+msgid "List of strings containing the available palettes."
+msgstr "List of strings containing the available palettes."
+
+#: ../charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in.h:1
 msgid "Charpicker Applet Factory"
 msgstr "Charpicker Applet Factory"
 
@@ -587,71 +591,79 @@ msgstr "Charpicker Applet Factory"
 msgid "_Edit"
 msgstr "_Edit"
 
-#: ../charpick/properties.c:117
+#: ../charpick/properties.c:116
 msgid "_Palette:"
 msgstr "_Palette:"
 
-#: ../charpick/properties.c:125
+#: ../charpick/properties.c:124
 msgid "Palette entry"
 msgstr "Palette entry"
 
-#: ../charpick/properties.c:126
+#: ../charpick/properties.c:125
 msgid "Modify a palette by adding or removing characters"
 msgstr "Modify a palette by adding or removing characters"
 
-#: ../charpick/properties.c:240
+#: ../charpick/properties.c:239
 msgid "Add Palette"
 msgstr "Add Palette"
 
-#: ../charpick/properties.c:277
+#: ../charpick/properties.c:276
 msgid "Edit Palette"
 msgstr "Edit Palette"
 
-#: ../charpick/properties.c:378
+#: ../charpick/properties.c:377
 msgid "Palettes list"
 msgstr "Palettes list"
 
-#: ../charpick/properties.c:457
+#: ../charpick/properties.c:456
 msgid "_Palettes:"
 msgstr "_Palettes:"
 
-#: ../charpick/properties.c:473
+#: ../charpick/properties.c:472
 msgid "Add button"
 msgstr "Add button"
 
-#: ../charpick/properties.c:474
+#: ../charpick/properties.c:473
 msgid "Click to add a new palette"
 msgstr "Click to add a new palette"
 
-#: ../charpick/properties.c:481
+#: ../charpick/properties.c:480
 msgid "Edit button"
 msgstr "Edit button"
 
-#: ../charpick/properties.c:482
+#: ../charpick/properties.c:481
 msgid "Click to edit the selected palette"
 msgstr "Click to edit the selected palette"
 
-#: ../charpick/properties.c:489
+#: ../charpick/properties.c:488
 msgid "Delete button"
 msgstr "Delete button"
 
-#: ../charpick/properties.c:490
+#: ../charpick/properties.c:489
 msgid "Click to delete the selected palette"
 msgstr "Click to delete the selected palette"
 
-#: ../charpick/properties.c:541
+#: ../charpick/properties.c:540
 msgid "Character Palette Preferences"
 msgstr "Character Palette Preferences"
 
 #: ../cpufreq/cpufreq-applet.schemas.in.h:1
+msgid "CPU to Monitor"
+msgstr "CPU to Monitor"
+
+#: ../cpufreq/cpufreq-applet.schemas.in.h:2
 msgid ""
-"A 0 value means to show cpu frequency, 1 to show frequency and units, and 2 "
-"to show percentage instead of frequency."
+"Set the CPU to monitor. In a single processor system you don't have to "
+"change it."
 msgstr ""
-"A 0 value means to show cpu frequency, 1 to show frequency and units, and 2 "
-"to show percentage instead of frequency."
+"Set the CPU to monitor. In a single processor system you don't have to "
+"change it."
 
-#: ../cpufreq/cpufreq-applet.schemas.in.h:2
+#: ../cpufreq/cpufreq-applet.schemas.in.h:3
+msgid "Mode to show cpu usage"
+msgstr "Mode to show cpu usage"
+
+#: ../cpufreq/cpufreq-applet.schemas.in.h:4
 msgid ""
 "A 0 value means to show the applet in graphic mode (pixmap only), 1 to show "
 "the applet in text mode (not to show the pixmap) and 2 to show the applet in "
@@ -661,60 +673,52 @@ msgstr ""
 "the applet in text mode (not to show the pixmap) and 2 to show the applet in "
 "graphic and text mode."
 
-#: ../cpufreq/cpufreq-applet.schemas.in.h:3
-msgid "CPU to Monitor"
-msgstr "CPU to Monitor"
-
-#: ../cpufreq/cpufreq-applet.schemas.in.h:4
-msgid "Mode to show cpu usage"
-msgstr "Mode to show cpu usage"
-
 #: ../cpufreq/cpufreq-applet.schemas.in.h:5
-msgid ""
-"Set the CPU to monitor. In a single processor system you don't have to "
-"change it."
-msgstr ""
-"Set the CPU to monitor. In a single processor system you don't have to "
-"change it."
-
-#: ../cpufreq/cpufreq-applet.schemas.in.h:6
 msgid "The type of text to display (if the text is enabled)."
 msgstr "The type of text to display (if the text is enabled)."
 
+#: ../cpufreq/cpufreq-applet.schemas.in.h:6
+msgid ""
+"A 0 value means to show cpu frequency, 1 to show frequency and units, and 2 "
+"to show percentage instead of frequency."
+msgstr ""
+"A 0 value means to show cpu frequency, 1 to show frequency and units, and 2 "
+"to show percentage instead of frequency."
+
 #: ../cpufreq/cpufreq-preferences.ui.h:1
 msgid "CPU Frequency Monitor Preferences"
 msgstr "CPU Frequency Monitor Preferences"
 
 #: ../cpufreq/cpufreq-preferences.ui.h:2
-msgid "Display Settings"
-msgstr "Display Settings"
-
-#: ../cpufreq/cpufreq-preferences.ui.h:3
 msgid "Monitor Settings"
 msgstr "Monitor Settings"
 
+#: ../cpufreq/cpufreq-preferences.ui.h:3
+msgid "_Monitored CPU:"
+msgstr "_Monitored CPU:"
+
 #: ../cpufreq/cpufreq-preferences.ui.h:4
-msgid "Show CPU frequency as _frequency"
-msgstr "Show CPU frequency as _frequency"
+msgid "Display Settings"
+msgstr "Display Settings"
 
 #: ../cpufreq/cpufreq-preferences.ui.h:5
-msgid "Show CPU frequency as _percentage"
-msgstr "Show CPU frequency as _percentage"
+msgid "_Appearance:"
+msgstr "_Appearance:"
 
 #: ../cpufreq/cpufreq-preferences.ui.h:6
-msgid "Show frequency _units"
-msgstr "Show frequency _units"
+msgid "Show CPU frequency as _frequency"
+msgstr "Show CPU frequency as _frequency"
 
 #: ../cpufreq/cpufreq-preferences.ui.h:7
-msgid "_Appearance:"
-msgstr "_Appearance:"
+msgid "Show frequency _units"
+msgstr "Show frequency _units"
 
 #: ../cpufreq/cpufreq-preferences.ui.h:8
-msgid "_Monitored CPU:"
-msgstr "_Monitored CPU:"
+msgid "Show CPU frequency as _percentage"
+msgstr "Show CPU frequency as _percentage"
 
 #: ../cpufreq/org.gnome.applets.CPUFreqApplet.panel-applet.in.in.h:1
-#: ../cpufreq/src/cpufreq-applet.c:946 ../cpufreq/src/cpufreq-applet.c:1005
+#: ../cpufreq/src/cpufreq-applet.c:944 ../cpufreq/src/cpufreq-applet.c:1003
 msgid "CPU Frequency Scaling Monitor"
 msgstr "CPU Frequency Scaling Monitor"
 
@@ -722,15 +726,15 @@ msgstr "CPU Frequency Scaling Monitor"
 msgid "Monitor the CPU Frequency Scaling"
 msgstr "Monitor the CPU Frequency Scaling"
 
-#: ../cpufreq/src/cpufreq-applet.c:581 ../cpufreq/src/cpufreq-prefs.c:478
+#: ../cpufreq/src/cpufreq-applet.c:579 ../cpufreq/src/cpufreq-prefs.c:478
 msgid "Could not open help document"
 msgstr "Could not open help document"
 
-#: ../cpufreq/src/cpufreq-applet.c:608
+#: ../cpufreq/src/cpufreq-applet.c:606
 msgid "This utility shows the current CPU Frequency Scaling."
 msgstr "This utility shows the current CPU Frequency Scaling."
 
-#: ../cpufreq/src/cpufreq-applet.c:1006
+#: ../cpufreq/src/cpufreq-applet.c:1004
 msgid "This utility shows the current CPU Frequency"
 msgstr "This utility shows the current CPU Frequency"
 
@@ -746,7 +750,7 @@ msgstr "Text"
 msgid "Graphic and Text"
 msgstr "Graphic and Text"
 
-#: ../cpufreq/src/cpufreq-monitor-cpuinfo.c:117
+#: ../cpufreq/src/cpufreq-monitor-cpuinfo.c:121
 msgid "Frequency Scaling Unsupported"
 msgstr "Frequency Scaling Unsupported"
 
@@ -782,45 +786,48 @@ msgstr "(mounted)"
 msgid "(not mounted)"
 msgstr "(not mounted)"
 
-#: ../drivemount/drive-button.c:556
-#, c-format
-msgid "Cannot execute '%s'"
-msgstr "Cannot execute '%s'"
+#: ../drivemount/drive-button.c:562
+msgid "Cannot start Nautilus File Manager"
+msgstr "Cannot start Nautilus File Manager"
 
-#: ../drivemount/drive-button.c:879
+#: ../drivemount/drive-button.c:569
+msgid "Could not find Nautilus"
+msgstr "Could not find Nautilus"
+
+#: ../drivemount/drive-button.c:893
 msgid "_Play DVD"
 msgstr "_Play DVD"
 
-#: ../drivemount/drive-button.c:883
+#: ../drivemount/drive-button.c:897
 msgid "_Play CD"
 msgstr "_Play CD"
 
-#: ../drivemount/drive-button.c:886
+#: ../drivemount/drive-button.c:900
 #, c-format
 msgid "_Open %s"
 msgstr "_Open %s"
 
-#: ../drivemount/drive-button.c:895
+#: ../drivemount/drive-button.c:908
 #, c-format
 msgid "Un_mount %s"
 msgstr "Un_mount %s"
 
-#: ../drivemount/drive-button.c:902
+#: ../drivemount/drive-button.c:914
 #, c-format
 msgid "_Mount %s"
 msgstr "_Mount %s"
 
-#: ../drivemount/drive-button.c:910
+#: ../drivemount/drive-button.c:922
 #, c-format
 msgid "_Eject %s"
 msgstr "_Eject %s"
 
-#: ../drivemount/drivemount.c:114
+#: ../drivemount/drivemount.c:103
 msgid "Applet for mounting and unmounting block volumes."
 msgstr "Applet for mounting and unmounting block volumes."
 
-#: ../drivemount/drivemount.c:173 ../drivemount/drivemount.c:210
-#: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:1
+#: ../drivemount/drivemount.c:164 ../drivemount/drivemount.c:201
+#: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:3
 msgid "Disk Mounter"
 msgstr "Disk Mounter"
 
@@ -832,11 +839,11 @@ msgstr "Interval timeout to check mount point status"
 msgid "Time in seconds between status updates"
 msgstr "Time in seconds between status updates"
 
-#: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:2
+#: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:1
 msgid "Drive Mount Applet Factory"
 msgstr "Drive Mount Applet Factory"
 
-#: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:3
+#: ../drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in.h:2
 msgid "Factory for drive mount applet"
 msgstr "Factory for drive mount applet"
 
@@ -844,16 +851,16 @@ msgstr "Factory for drive mount applet"
 msgid "Mount local disks and devices"
 msgstr "Mount local disks and devices"
 
-#: ../geyes/geyes.c:191
+#: ../geyes/geyes.c:148
 msgid "A goofy set of eyes for the GNOME panel. They follow your mouse."
 msgstr "A goofy set of eyes for the GNOME panel. They follow your mouse."
 
-#: ../geyes/geyes.c:391 ../geyes/geyes.c:422 ../geyes/geyes.c:424
+#: ../geyes/geyes.c:348 ../geyes/geyes.c:379 ../geyes/geyes.c:381
 #: ../geyes/org.gnome.applets.GeyesApplet.panel-applet.in.in.h:2
 msgid "Eyes"
 msgstr "Eyes"
 
-#: ../geyes/geyes.c:425
+#: ../geyes/geyes.c:382
 msgid "The eyes look in the direction of the mouse pointer"
 msgstr "The eyes look in the direction of the mouse pointer"
 
@@ -862,13 +869,13 @@ msgid "Directory in which the theme is located"
 msgstr "Directory in which the theme is located"
 
 #: ../geyes/org.gnome.applets.GeyesApplet.panel-applet.in.in.h:1
-msgid "A set of eyeballs for your panel"
-msgstr "A set of eyeballs for your panel"
-
-#: ../geyes/org.gnome.applets.GeyesApplet.panel-applet.in.in.h:3
 msgid "Geyes Applet Factory"
 msgstr "Geyes Applet Factory"
 
+#: ../geyes/org.gnome.applets.GeyesApplet.panel-applet.in.in.h:3
+msgid "A set of eyeballs for your panel"
+msgstr "A set of eyeballs for your panel"
+
 #: ../geyes/themes.c:127
 msgid "Can not launch the eyes applet."
 msgstr "Can not launch the eyes applet."
@@ -877,634 +884,18 @@ msgstr "Can not launch the eyes applet."
 msgid "There was a fatal error while trying to load the theme."
 msgstr "There was a fatal error while trying to load the theme."
 
-#: ../geyes/themes.c:303
+#: ../geyes/themes.c:301
 msgid "Geyes Preferences"
 msgstr "Geyes Preferences"
 
-#: ../geyes/themes.c:337
+#: ../geyes/themes.c:334
 msgid "Themes"
 msgstr "Themes"
 
-#: ../geyes/themes.c:358
+#: ../geyes/themes.c:355
 msgid "_Select a theme:"
 msgstr "_Select a theme:"
 
-#: ../gkb-new/xmodmap/base.xml.in.h:1 ../gkb-new/xmodmap.sun/base.xml.in.h:1
-msgid "Alt+Control changes layout."
-msgstr "Alt+Control changes layout."
-
-#: ../gkb-new/xmodmap/base.xml.in.h:2 ../gkb-new/xmodmap.sun/base.xml.in.h:2
-msgid "Alt+Shift changes layout."
-msgstr "Alt+Shift changes layout."
-
-#: ../gkb-new/xmodmap/base.xml.in.h:3
-msgid "Arabic keymap"
-msgstr "Arabic keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:4
-msgid "Armenian"
-msgstr "Armenian"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:5
-msgid "Basque"
-msgstr "Basque"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:6
-msgid "Belgian"
-msgstr "Belgian"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:7 ../gkb-new/xmodmap.sun/base.xml.in.h:6
-msgid "Both Alt keys together change layout."
-msgstr "Both Alt keys together change layout."
-
-#: ../gkb-new/xmodmap/base.xml.in.h:8 ../gkb-new/xmodmap.sun/base.xml.in.h:7
-msgid "Both Ctrl keys together change layout."
-msgstr "Both Ctrl keys together change layout."
-
-#: ../gkb-new/xmodmap/base.xml.in.h:9 ../gkb-new/xmodmap.sun/base.xml.in.h:8
-msgid "Both Shift keys together change layout."
-msgstr "Both Shift keys together change layout."
-
-#: ../gkb-new/xmodmap/base.xml.in.h:10
-msgid "Brazil Portuguese keymap"
-msgstr "Brazil Portuguese keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:11
-msgid "Bulgarian Cyrillic"
-msgstr "Bulgarian Cyrillic"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:12
-msgid "Bulgarian keymap"
-msgstr "Bulgarian keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:13 ../gkb-new/xmodmap.sun/base.xml.in.h:16
-msgid "CapsLock key changes layout."
-msgstr "CapsLock key changes layout."
-
-#: ../gkb-new/xmodmap/base.xml.in.h:14 ../gkb-new/xmodmap.sun/base.xml.in.h:17
-msgid "Control+Shift changes layout."
-msgstr "Control+Shift changes layout."
-
-#: ../gkb-new/xmodmap/base.xml.in.h:15
-msgid "Czech keymap"
-msgstr "Czech keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:16
-msgid "Danish keymap"
-msgstr "Danish keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:17
-msgid "Dutch keymap"
-msgstr "Dutch keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:18
-msgid "English keymap"
-msgstr "English keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:19
-msgid "Estonian keymap"
-msgstr "Estonian keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:20
-msgid "Finnish keymap"
-msgstr "Finnish keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:21
-msgid "French Swiss"
-msgstr "French Swiss"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:22
-msgid "French Swiss keymap"
-msgstr "French Swiss keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:23
-msgid "French keymap"
-msgstr "French keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:24
-msgid "French-Canadian 105-key"
-msgstr "French-Canadian 105-key"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:25
-msgid "GB 102-key"
-msgstr "GB 102-key"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:26
-msgid "GB 105-key"
-msgstr "GB 105-key"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:27 ../gkb-new/xmodmap.sun/base.xml.in.h:27
-msgid "Generic Keyboard"
-msgstr "Generic Keyboard"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:28
-msgid "Georgian Latin"
-msgstr "Georgian Latin"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:29
-msgid "Georgian Russian layout"
-msgstr "Georgian Russian layout"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:30
-msgid "Georgian keymap"
-msgstr "Georgian keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:31
-msgid "German"
-msgstr "German"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:32
-msgid "German Swiss with Euro"
-msgstr "German Swiss with Euro"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:33
-msgid "German keymap"
-msgstr "German keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:34
-msgid "Greek keymap"
-msgstr "Greek keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:35
-msgid "Hebrew keymap"
-msgstr "Hebrew keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:36
-msgid "Hungarian 101-key latin 1"
-msgstr "Hungarian 101-key latin 1"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:37
-msgid "Hungarian 101-key latin 2"
-msgstr "Hungarian 101-key latin 2"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:38
-msgid "Hungarian 105-key latin 1"
-msgstr "Hungarian 105-key latin 1"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:39
-msgid "Hungarian 105-key latin 2"
-msgstr "Hungarian 105-key latin 2"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:40
-msgid "Hungarian PC/AT 101 keyboard"
-msgstr "Hungarian PC/AT 101 keyboard"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:41
-msgid "Hungarian latin1"
-msgstr "Hungarian latin1"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:42
-msgid "Icelandic keymap"
-msgstr "Icelandic keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:43
-msgid "Italian keymap"
-msgstr "Italian keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:44
-msgid "Japanese keymap"
-msgstr "Japanese keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:45
-msgid "Lao keymap"
-msgstr "Lao keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:46 ../gkb-new/xmodmap.sun/base.xml.in.h:41
-msgid "Layout shift behavior"
-msgstr "Layout shift behaviour"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:47 ../gkb-new/xmodmap.sun/base.xml.in.h:42
-msgid "Left Alt key changes layout."
-msgstr "Left Alt key changes layout."
-
-#: ../gkb-new/xmodmap/base.xml.in.h:48 ../gkb-new/xmodmap.sun/base.xml.in.h:43
-msgid "Left Ctrl key changes group."
-msgstr "Left Ctrl key changes group."
-
-#: ../gkb-new/xmodmap/base.xml.in.h:49 ../gkb-new/xmodmap.sun/base.xml.in.h:44
-msgid "Left Shift key changes group."
-msgstr "Left Shift key changes group."
-
-#: ../gkb-new/xmodmap/base.xml.in.h:50 ../gkb-new/xmodmap.sun/base.xml.in.h:45
-msgid "Left Win-key changes layout."
-msgstr "Left Win-key changes layout."
-
-#: ../gkb-new/xmodmap/base.xml.in.h:51
-msgid "Lithuanian keymap"
-msgstr "Lithuanian keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:52
-msgid "Macedonian"
-msgstr "Macedonian"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:53 ../gkb-new/xmodmap.sun/base.xml.in.h:48
-msgid "Menu key changes layout."
-msgstr "Menu key changes layout."
-
-#: ../gkb-new/xmodmap/base.xml.in.h:54
-msgid "Mongolian alt keymap"
-msgstr "Mongolian alt keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:55
-msgid "Mongolian keymap"
-msgstr "Mongolian keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:56
-msgid "Mongolian phonetic keymap"
-msgstr "Mongolian phonetic keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:57
-msgid "Norwegian"
-msgstr "Norwegian"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:58
-msgid "Plain Russian keymap"
-msgstr "Plain Russian keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:59
-msgid "Polish"
-msgstr "Polish"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:60
-msgid "Polish deadkeys"
-msgstr "Polish deadkeys"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:61
-msgid "Portugal"
-msgstr "Portugal"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:62
-msgid "Portugal Deadkeys"
-msgstr "Portugal Deadkeys"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:63
-msgid "Portuguese keymap"
-msgstr "Portuguese keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:64 ../gkb-new/xmodmap.sun/base.xml.in.h:53
-msgid "Right Alt key changes layout."
-msgstr "Right Alt key changes layout."
-
-#: ../gkb-new/xmodmap/base.xml.in.h:65 ../gkb-new/xmodmap.sun/base.xml.in.h:54
-msgid "Right Ctrl key changes group."
-msgstr "Right Ctrl key changes group."
-
-#: ../gkb-new/xmodmap/base.xml.in.h:66 ../gkb-new/xmodmap.sun/base.xml.in.h:55
-msgid "Right Shift key changes group."
-msgstr "Right Shift key changes group."
-
-#: ../gkb-new/xmodmap/base.xml.in.h:67 ../gkb-new/xmodmap.sun/base.xml.in.h:56
-msgid "Right Win-key changes layout."
-msgstr "Right Win-key changes layout."
-
-#: ../gkb-new/xmodmap/base.xml.in.h:68
-msgid "Russian Cyrillic"
-msgstr "Russian Cyrillic"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:69
-msgid "Russian keymap"
-msgstr "Russian keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:70
-msgid "Serbian keymap"
-msgstr "Serbian keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:71 ../gkb-new/xmodmap.sun/base.xml.in.h:60
-msgid "Shift+CapsLock changes layout."
-msgstr "Shift+CapsLock changes layout."
-
-#: ../gkb-new/xmodmap/base.xml.in.h:72
-msgid "Slovak keymap"
-msgstr "Slovak keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:73
-msgid "Slovenian"
-msgstr "Slovenian"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:74
-msgid "Slovenian keymap"
-msgstr "Slovenian keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:75
-msgid "Spanish keymap"
-msgstr "Spanish keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:76
-msgid "Sun (!not PC!) type5 Hungarian latin 2"
-msgstr "Sun (!not PC!) type5 Hungarian latin 2"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:77
-msgid "Swedish"
-msgstr "Swedish"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:78
-msgid "Swedish keymap"
-msgstr "Swedish keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:79
-msgid "Swiss keymap"
-msgstr "Swiss keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:80
-msgid "Thai"
-msgstr "Thai"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:81
-msgid "Thai Kedmanee"
-msgstr "Thai Kedmanee"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:82
-msgid "Thai keymap"
-msgstr "Thai keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:83
-msgid "Turkish \"F\" keyboard"
-msgstr "Turkish \"F\" keyboard"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:84
-msgid "Turkish \"Q\" keyboard"
-msgstr "Turkish \"Q\" keyboard"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:85
-msgid "Turkish keymap"
-msgstr "Turkish keymap"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:86
-msgid "UK 105-key"
-msgstr "UK 105-key"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:87
-msgid "UK PC/AT keyboard"
-msgstr "UK PC/AT keyboard"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:88
-msgid "US 101-key keyboard"
-msgstr "US 101-key keyboard"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:89
-msgid "US 105-key keyboard (with windows keys)"
-msgstr "US 105-key keyboard (with windows keys)"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:90
-msgid "US 84-key"
-msgstr "US 84-key"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:91
-msgid "US DEC 450"
-msgstr "US DEC 450"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:92
-msgid "US IBM RS/6000"
-msgstr "US IBM RS/6000"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:93
-msgid "US International"
-msgstr "US International"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:94
-msgid "US Macintosh"
-msgstr "US Macintosh"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:95
-msgid "US PC/AT 101 keyboard"
-msgstr "US PC/AT 101 keyboard"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:96
-msgid "US Silicon Graphics 101-key"
-msgstr "US Silicon Graphics 101-key"
-
-#: ../gkb-new/xmodmap/base.xml.in.h:97
-msgid "US Sun type5"
-msgstr "US Sun type5"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:3
-msgid "Armenian Sun keymap"
-msgstr "Armenian Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:4
-msgid "Azerbaijani Turkish Sun keymap"
-msgstr "Azerbaijani Turkish Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:5
-msgid "Belarusian Sun keymap"
-msgstr "Belarusian Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:9
-msgid "Brazil Portuguese Sun USB keymap"
-msgstr "Brazil Portuguese Sun USB keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:10
-msgid "Brazil Portuguese Sun keymap"
-msgstr "Brazil Portuguese Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:11
-msgid "British Sun Type-4 keymap"
-msgstr "British Sun Type-4 keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:12
-msgid "British Sun USB keymap"
-msgstr "British Sun USB keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:13
-msgid "British Sun keymap"
-msgstr "British Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:14
-msgid "Bulgarian Sun keymap"
-msgstr "Bulgarian Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:15
-msgid "Canadian Sun keymap"
-msgstr "Canadian Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:18
-msgid "Czech Sun keymap"
-msgstr "Czech Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:19
-msgid "Danish Sun Type-4 keymap"
-msgstr "Danish Sun Type-4 keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:20
-msgid "Danish Sun USB keymap"
-msgstr "Danish Sun USB keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:21
-msgid "Danish Sun keymap"
-msgstr "Danish Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:22
-msgid "Dutch Sun keymap"
-msgstr "Dutch Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:23
-msgid "Estonian Sun keymap"
-msgstr "Estonian Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:24
-msgid "Finnish Sun keymap"
-msgstr "Finnish Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:25
-msgid "French Sun USB keymap"
-msgstr "French Sun USB keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:26
-msgid "French Sun keymap"
-msgstr "French Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:28
-msgid "German Sun Type-4 keymap"
-msgstr "German Sun Type-4 keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:29
-msgid "German Sun USB keymap"
-msgstr "German Sun USB keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:30
-msgid "German Sun keymap"
-msgstr "German Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:31
-msgid "Hebrew Sun keymap"
-msgstr "Hebrew Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:32
-msgid "Hungarian latin2 Sun keymap"
-msgstr "Hungarian latin2 Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:33
-msgid "Hungarian type5 latin 1 keymap"
-msgstr "Hungarian type5 latin 1 keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:34
-msgid "Icelandic Sun keymap"
-msgstr "Icelandic Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:35
-msgid "Italian Sun Type-4 keymap"
-msgstr "Italian Sun Type-4 keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:36
-msgid "Italian Sun USB keymap"
-msgstr "Italian Sun USB keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:37
-msgid "Italian Sun keymap"
-msgstr "Italian Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:38
-msgid "Japanese Sun Type-4 keymap"
-msgstr "Japanese Sun Type-4 keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:39
-msgid "Japanese Sun keymap"
-msgstr "Japanese Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:40
-msgid "Latvian Sun keymap"
-msgstr "Latvian Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:46
-msgid "Lithuanian Sun keymap"
-msgstr "Lithuanian Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:47
-msgid "Macedonian Sun keymap"
-msgstr "Macedonian Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:49
-msgid "Norwegian Sun keymap"
-msgstr "Norwegian Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:50
-msgid "Polish Sun keymap"
-msgstr "Polish Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:51
-msgid "Portuguese Sun Type-4 keymap"
-msgstr "Portuguese Sun Type-4 keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:52
-msgid "Portuguese Sun keymap"
-msgstr "Portuguese Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:57
-msgid "Romanian Sun keymap"
-msgstr "Romanian Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:58
-msgid "Russian Sun keymap"
-msgstr "Russian Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:59
-msgid "Serbian Sun standard keymap"
-msgstr "Serbian Sun standard keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:61
-msgid "Slovak Sun keymap"
-msgstr "Slovak Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:62
-msgid "Slovenian Sun keymap"
-msgstr "Slovenian Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:63
-msgid "Spanish Sun Type-4 keymap"
-msgstr "Spanish Sun Type-4 keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:64
-msgid "Spanish Sun USB keymap"
-msgstr "Spanish Sun USB keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:65
-msgid "Spanish Sun keymap"
-msgstr "Spanish Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:66
-msgid "Swedish Sun Type-4 keymap"
-msgstr "Swedish Sun Type-4 keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:67
-msgid "Swedish Sun USB keymap"
-msgstr "Swedish Sun USB keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:68
-msgid "Swedish Sun keymap"
-msgstr "Swedish Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:69
-msgid "Swiss German Sun keymap"
-msgstr "Swiss German Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:70
-msgid "Thai Sun keymap"
-msgstr "Thai Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:71
-msgid "Turkish Sun keymap"
-msgstr "Turkish Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:72
-msgid "US Sun Type-4 keymap"
-msgstr "US Sun Type-4 keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:73
-msgid "US Sun USB keymap"
-msgstr "US Sun USB keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:74
-msgid "US Sun type5 keymap"
-msgstr "US Sun type5 keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:75
-msgid "Ukrainian Sun keymap"
-msgstr "Ukrainian Sun keymap"
-
-#: ../gkb-new/xmodmap.sun/base.xml.in.h:76
-msgid "Vietnamese Sun keymap"
-msgstr "Vietnamese Sun keymap"
-
 #: ../gweather/gweather-about.c:50
 msgid "Â 1999-2005 by S. Papadimitriou and others"
 msgstr "Â 1999-2005 by S. Papadimitriou and others"
@@ -1517,24 +908,24 @@ msgstr "A panel application for monitoring local weather conditions."
 msgid "_Details"
 msgstr "_Details"
 
-#: ../gweather/gweather-applet.c:118 ../gweather/gweather-dialog.c:215
+#: ../gweather/gweather-applet.c:118 ../gweather/gweather-dialog.c:157
 msgid "_Update"
 msgstr "_Update"
 
-#: ../gweather/gweather-applet.c:329
-#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:4
+#: ../gweather/gweather-applet.c:318
+#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:3
 msgid "Weather Report"
 msgstr "Weather Report"
 
-#: ../gweather/gweather-applet.c:347 ../gweather/gweather-applet.c:351
+#: ../gweather/gweather-applet.c:336 ../gweather/gweather-applet.c:340
 msgid "GNOME Weather"
 msgstr "GNOME Weather"
 
-#: ../gweather/gweather-applet.c:453
+#: ../gweather/gweather-applet.c:439
 msgid "Weather Forecast"
 msgstr "Weather Forecast"
 
-#: ../gweather/gweather-applet.c:465
+#: ../gweather/gweather-applet.c:451
 #, c-format
 msgid ""
 "City: %s\n"
@@ -1545,138 +936,139 @@ msgstr ""
 "Sky: %s\n"
 "Temperature: %s"
 
-#: ../gweather/gweather-applet.c:515
+#: ../gweather/gweather-applet.c:500
 msgid "Updating..."
 msgstr "Updatingâ"
 
-#: ../gweather/gweather-dialog.c:213
+#: ../gweather/gweather-dialog.c:155
 msgid "Details"
 msgstr "Details"
 
-#: ../gweather/gweather-dialog.c:256
+#: ../gweather/gweather-dialog.c:196
 msgid "City:"
 msgstr "City:"
 
-#: ../gweather/gweather-dialog.c:264
+#: ../gweather/gweather-dialog.c:204
 msgid "Last update:"
 msgstr "Last update:"
 
-#: ../gweather/gweather-dialog.c:272
+#: ../gweather/gweather-dialog.c:212
 msgid "Conditions:"
 msgstr "Conditions:"
 
-#: ../gweather/gweather-dialog.c:280
+#: ../gweather/gweather-dialog.c:220
 msgid "Sky:"
 msgstr "Sky:"
 
-#: ../gweather/gweather-dialog.c:288
+#: ../gweather/gweather-dialog.c:228
 msgid "Temperature:"
 msgstr "Temperature:"
 
-#: ../gweather/gweather-dialog.c:296
+#: ../gweather/gweather-dialog.c:236
 msgid "Feels like:"
 msgstr "Feels like:"
 
-#: ../gweather/gweather-dialog.c:304
+#: ../gweather/gweather-dialog.c:244
 msgid "Dew point:"
 msgstr "Dew point:"
 
-#: ../gweather/gweather-dialog.c:312
+#: ../gweather/gweather-dialog.c:252
 msgid "Relative humidity:"
 msgstr "Relative humidity:"
 
-#: ../gweather/gweather-dialog.c:320
+#: ../gweather/gweather-dialog.c:260
 msgid "Wind:"
 msgstr "Wind:"
 
-#: ../gweather/gweather-dialog.c:328
+#: ../gweather/gweather-dialog.c:268
 msgid "Pressure:"
 msgstr "Pressure:"
 
-#: ../gweather/gweather-dialog.c:336
+#: ../gweather/gweather-dialog.c:276
 msgid "Visibility:"
 msgstr "Visibility:"
 
-#: ../gweather/gweather-dialog.c:344
+#: ../gweather/gweather-dialog.c:284
 msgid "Sunrise:"
 msgstr "Sunrise:"
 
-#: ../gweather/gweather-dialog.c:352
+#: ../gweather/gweather-dialog.c:292
 msgid "Sunset:"
 msgstr "Sunset:"
 
-#: ../gweather/gweather-dialog.c:486
+#: ../gweather/gweather-dialog.c:426
 msgid "Current Conditions"
 msgstr "Current Conditions"
 
-#: ../gweather/gweather-dialog.c:503
+#: ../gweather/gweather-dialog.c:441
 msgid "Forecast Report"
 msgstr "Forecast Report"
 
-#: ../gweather/gweather-dialog.c:503
+#: ../gweather/gweather-dialog.c:441
 msgid "See the ForeCast Details"
 msgstr "See the Forecast Details"
 
-#: ../gweather/gweather-dialog.c:513
+#: ../gweather/gweather-dialog.c:451
 msgid "Forecast"
 msgstr "Forecast"
 
-#: ../gweather/gweather-dialog.c:521
+#: ../gweather/gweather-dialog.c:457
 msgid "Radar Map"
 msgstr "Radar Map"
 
-#: ../gweather/gweather-dialog.c:552
+#. XXX: weather.com? is this an advert?
+#: ../gweather/gweather-dialog.c:489
 msgid "_Visit Weather.com"
 msgstr "_Visit Weather.com"
 
-#: ../gweather/gweather-dialog.c:553
+#: ../gweather/gweather-dialog.c:490
 msgid "Visit Weather.com"
 msgstr "Visit Weather.com"
 
-#: ../gweather/gweather-dialog.c:553
+#: ../gweather/gweather-dialog.c:490
 msgid "Click to Enter Weather.com"
 msgstr "Click to Enter Weather.com"
 
-#: ../gweather/gweather-dialog.c:638
+#: ../gweather/gweather-dialog.c:573
 msgid "Forecast not currently available for this location."
 msgstr "Forecast not currently available for this location."
 
 #. Accessible Name and Description for the components in Preference Dialog
-#: ../gweather/gweather-pref.c:171
+#: ../gweather/gweather-pref.c:130
 msgid "Location view"
 msgstr "Location view"
 
-#: ../gweather/gweather-pref.c:171
+#: ../gweather/gweather-pref.c:130
 msgid "Select Location from the list"
 msgstr "Select Location from the list"
 
-#: ../gweather/gweather-pref.c:172
+#: ../gweather/gweather-pref.c:131
 msgid "Update spin button"
 msgstr "Update spin button"
 
-#: ../gweather/gweather-pref.c:172
+#: ../gweather/gweather-pref.c:131
 msgid "Spinbutton for updating"
 msgstr "Spinbutton for updating"
 
-#: ../gweather/gweather-pref.c:173
+#: ../gweather/gweather-pref.c:132
 msgid "Address Entry"
 msgstr "Address Entry"
 
-#: ../gweather/gweather-pref.c:173
+#: ../gweather/gweather-pref.c:132
 msgid "Enter the URL"
 msgstr "Enter the URL"
 
-#: ../gweather/gweather-pref.c:317
+#: ../gweather/gweather-pref.c:298
 msgid ""
 "Failed to load the Locations XML database.  Please report this as a bug."
 msgstr ""
 "Failed to load the Locations XML database.  Please report this as a bug."
 
-#: ../gweather/gweather-pref.c:807
+#: ../gweather/gweather-pref.c:676
 msgid "Weather Preferences"
 msgstr "Weather Preferences"
 
-#: ../gweather/gweather-pref.c:839 ../gweather/gweather-pref.c:1024
+#: ../gweather/gweather-pref.c:707 ../gweather/gweather-pref.c:868
 msgid "_Automatically update every:"
 msgstr "_Automatically update every:"
 
@@ -1684,365 +1076,507 @@ msgstr "_Automatically update every:"
 #. * Units settings page.
 #.
 #. Temperature Unit
-#: ../gweather/gweather-pref.c:852
+#: ../gweather/gweather-pref.c:718
 msgid "_Temperature unit:"
 msgstr "_Temperature unit:"
 
-#: ../gweather/gweather-pref.c:861 ../gweather/gweather-pref.c:881
-#: ../gweather/gweather-pref.c:907 ../gweather/gweather-pref.c:935
-msgid "Default"
-msgstr "Default"
-
-#: ../gweather/gweather-pref.c:862
+#: ../gweather/gweather-pref.c:727
 msgid "Kelvin"
 msgstr "Kelvin"
 
 #  TRANSLATORS: Celsius is sometimes referred Centigrade
 #. TRANSLATORS: Celsius is sometimes referred Centigrade
-#: ../gweather/gweather-pref.c:864
+#: ../gweather/gweather-pref.c:729
 msgid "Celsius"
 msgstr "Celsius"
 
-#: ../gweather/gweather-pref.c:865
+#: ../gweather/gweather-pref.c:730
 msgid "Fahrenheit"
 msgstr "Fahrenheit"
 
 #. Speed Unit
-#: ../gweather/gweather-pref.c:872
+#: ../gweather/gweather-pref.c:734
 msgid "_Wind speed unit:"
 msgstr "_Wind speed unit:"
 
 #. TRANSLATOR: The wind speed unit "meters per second"
-#: ../gweather/gweather-pref.c:883
+#: ../gweather/gweather-pref.c:744
 msgid "m/s"
 msgstr "m/s"
 
 #. TRANSLATOR: The wind speed unit "kilometers per hour"
-#: ../gweather/gweather-pref.c:885
+#: ../gweather/gweather-pref.c:746
 msgid "km/h"
 msgstr "km/h"
 
 #. TRANSLATOR: The wind speed unit "miles per hour"
-#: ../gweather/gweather-pref.c:887
+#: ../gweather/gweather-pref.c:748
 msgid "mph"
 msgstr "mph"
 
 #. TRANSLATOR: The wind speed unit "knots"
-#: ../gweather/gweather-pref.c:889
+#: ../gweather/gweather-pref.c:750
 msgid "knots"
 msgstr "knots"
 
-#: ../gweather/gweather-pref.c:891
+#: ../gweather/gweather-pref.c:752
 msgid "Beaufort scale"
 msgstr "Beaufort scale"
 
 #. Pressure Unit
-#: ../gweather/gweather-pref.c:898
+#: ../gweather/gweather-pref.c:756
 msgid "_Pressure unit:"
 msgstr "_Pressure unit:"
 
 #  TRANSLATOR: The pressure unit "kiloPascals"
 #. TRANSLATOR: The pressure unit "kiloPascals"
-#: ../gweather/gweather-pref.c:909
+#: ../gweather/gweather-pref.c:766
 msgid "kPa"
 msgstr "kPa"
 
 #. TRANSLATOR: The pressure unit "hectoPascals"
-#: ../gweather/gweather-pref.c:911
+#: ../gweather/gweather-pref.c:768
 msgid "hPa"
 msgstr "hPa"
 
 #. TRANSLATOR: The pressure unit "millibars"
-#: ../gweather/gweather-pref.c:913
+#: ../gweather/gweather-pref.c:770
 msgid "mb"
 msgstr "mb"
 
 #. TRANSLATOR: The pressure unit "millibars of mercury"
-#: ../gweather/gweather-pref.c:915
+#: ../gweather/gweather-pref.c:772
 msgid "mmHg"
 msgstr "mmHg"
 
 #. TRANSLATOR: The pressure unit "inches of mercury"
-#: ../gweather/gweather-pref.c:917
+#: ../gweather/gweather-pref.c:774
 msgid "inHg"
 msgstr "inHg"
 
 #. TRANSLATOR: The pressure unit "atmospheres"
-#: ../gweather/gweather-pref.c:919
+#: ../gweather/gweather-pref.c:776
 msgid "atm"
 msgstr "atm"
 
 #. Distance Unit
-#: ../gweather/gweather-pref.c:926
+#: ../gweather/gweather-pref.c:780
 msgid "_Visibility unit:"
 msgstr "_Visibility unit:"
 
 #. TRANSLATOR: The distance unit "meters"
-#: ../gweather/gweather-pref.c:937
+#: ../gweather/gweather-pref.c:790
 msgid "meters"
 msgstr "meters"
 
 #. TRANSLATOR: The distance unit "kilometers"
-#: ../gweather/gweather-pref.c:939
+#: ../gweather/gweather-pref.c:792
 msgid "km"
 msgstr "km"
 
 #. TRANSLATOR: The distance unit "miles"
-#: ../gweather/gweather-pref.c:941
+#: ../gweather/gweather-pref.c:794
 msgid "miles"
 msgstr "miles"
 
-#: ../gweather/gweather-pref.c:975
+#: ../gweather/gweather-pref.c:825
 msgid "Enable _radar map"
 msgstr "Enable _radar map"
 
-#: ../gweather/gweather-pref.c:989
+#: ../gweather/gweather-pref.c:837
 msgid "Use _custom address for radar map"
 msgstr "Use _custom address for radar map"
 
-#: ../gweather/gweather-pref.c:1006
+#: ../gweather/gweather-pref.c:852
 msgid "A_ddress:"
 msgstr "A_ddress:"
 
-#: ../gweather/gweather-pref.c:1020
+#: ../gweather/gweather-pref.c:864
 msgid "Update"
 msgstr "Update"
 
-#: ../gweather/gweather-pref.c:1044
+#: ../gweather/gweather-pref.c:888
 msgid "minutes"
 msgstr "minutes"
 
-#: ../gweather/gweather-pref.c:1060
+#: ../gweather/gweather-pref.c:900
 msgid "Display"
 msgstr "Display"
 
-#: ../gweather/gweather-pref.c:1075
-#: ../mini-commander/src/mini-commander.ui.h:9
+#: ../gweather/gweather-pref.c:915
+#: ../mini-commander/src/mini-commander.ui.h:12
 msgid "General"
 msgstr "General"
 
-#: ../gweather/gweather-pref.c:1088
+#: ../gweather/gweather-pref.c:928
 msgid "_Select a location:"
 msgstr "_Select a location:"
 
-#: ../gweather/gweather-pref.c:1113
+#: ../gweather/gweather-pref.c:953
 msgid "_Find:"
 msgstr "_Find:"
 
-#: ../gweather/gweather-pref.c:1120
+#: ../gweather/gweather-pref.c:960
 msgid "Find _Next"
 msgstr "Find _Next"
 
-#: ../gweather/gweather-pref.c:1142
+#: ../gweather/gweather-pref.c:978
 msgid "Location"
 msgstr "Location"
 
-#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:1
-msgid "Factory for creating the weather applet."
-msgstr "Factory for creating the weather applet."
+#: ../gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in.h:1
+msgid "Update the data automatically"
+msgstr "Update the data automatically"
 
-#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:2
+#: ../gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in.h:2
+msgid ""
+"Determines whether the applet automatically updates its weather statistics "
+"or not."
+msgstr ""
+"Determines whether the applet automatically updates its weather statistics "
+"or not."
+
+#: ../gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in.h:3
+msgid "Update interval"
+msgstr "Update interval"
+
+#: ../gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in.h:4
+msgid "The interval, in seconds, between automatic updates."
+msgstr "The interval, in seconds, between automatic updates."
+
+#: ../gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in.h:5
+msgid "Display radar map"
+msgstr "Display radar map"
+
+#: ../gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in.h:6
+msgid "Fetch a radar map on each update."
+msgstr "Fetch a radar map on each update."
+
+#: ../gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in.h:7
+msgid "Show notification"
+msgstr "Show notification"
+
+#: ../gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in.h:8
+msgid "Show notifications for critical weather conditions"
+msgstr "Show notifications for critical weather conditions"
+
+#: ../gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in.h:9
+msgid "Show detailed forecast"
+msgstr "Show detailed forecast"
+
+#: ../gweather/org.gnome.applets.GWeatherApplet.gschema.xml.in.in.h:10
+msgid "If true, additional details about weather will be downloaded and shown."
+msgstr "If true, additional details about weather will be downloaded and shown."
+
+#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:1
 msgid "Gweather Applet Factory"
 msgstr "Gweather Applet Factory"
 
-#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:3
+#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:2
+msgid "Factory for creating the weather applet."
+msgstr "Factory for creating the weather applet."
+
+#: ../gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in.h:4
 msgid "Monitor the current weather conditions, and forecasts"
 msgstr "Monitor the current weather conditions, and forecasts"
 
-#: ../invest-applet/data/Invest_Applet.server.in.in.h:1
+#: ../invest-applet/data/org.gnome.applets.InvestApplet.panel-applet.in.in.h:1
+msgid "Invest Applet Factory"
+msgstr "Invest Applet Factory"
+
+#: ../invest-applet/data/org.gnome.applets.InvestApplet.panel-applet.in.in.h:2
+msgid "Factory for creating the invest applet."
+msgstr "Factory for creating the invest applet."
+
+#: ../invest-applet/data/org.gnome.applets.InvestApplet.panel-applet.in.in.h:3
 #: ../invest-applet/invest/about.py:17
 msgid "Invest"
 msgstr "Invest"
 
-#: ../invest-applet/data/Invest_Applet.server.in.in.h:2
+#: ../invest-applet/data/org.gnome.applets.InvestApplet.panel-applet.in.in.h:4
 #: ../invest-applet/invest/about.py:20
 msgid "Track your invested money."
 msgstr "Track your invested money."
 
-#: ../invest-applet/data/Invest_Applet.xml.h:4
-msgid "_Refresh"
-msgstr "_Refresh"
-
 #: ../invest-applet/data/financialchart.ui.h:1
-msgid "1 Year"
-msgstr "1 Year"
+#: ../invest-applet/invest/chart.py:112
+msgid "Financial Chart"
+msgstr "Financial Chart"
 
 #: ../invest-applet/data/financialchart.ui.h:2
-msgid "10"
-msgstr "10"
+msgid "_Ticker symbol: "
+msgstr "_Ticker symbol: "
 
 #: ../invest-applet/data/financialchart.ui.h:3
-msgid "100"
-msgstr "100"
+msgid "Auto _refresh"
+msgstr "Auto-_refresh"
 
 #: ../invest-applet/data/financialchart.ui.h:4
-msgid "20"
-msgstr "20"
+msgid "Today"
+msgstr "Today"
 
 #: ../invest-applet/data/financialchart.ui.h:5
-msgid "200"
-msgstr "200"
+msgid "5 Days"
+msgstr "5 Days"
 
 #: ../invest-applet/data/financialchart.ui.h:6
 msgid "3 Months"
 msgstr "3 Months"
 
 #: ../invest-applet/data/financialchart.ui.h:7
-msgid "5"
-msgstr "5"
+msgid "6 Months"
+msgstr "6 Months"
 
 #: ../invest-applet/data/financialchart.ui.h:8
-msgid "5 Days"
-msgstr "5 Days"
+msgid "1 Year"
+msgstr "1 Year"
 
 #: ../invest-applet/data/financialchart.ui.h:9
 msgid "5 Years"
 msgstr "5 Years"
 
 #: ../invest-applet/data/financialchart.ui.h:10
-msgid "50"
-msgstr "50"
+msgid "Maximum"
+msgstr "Maximum"
 
 #: ../invest-applet/data/financialchart.ui.h:11
-msgid "6 Months"
-msgstr "6 Months"
-
-#: ../invest-applet/data/financialchart.ui.h:12
-msgid "Auto _refresh"
-msgstr "Auto-_refresh"
+msgid "_Graph style: "
+msgstr "_Graph style: "
 
+#. see http://biz.yahoo.com/charts/guide11.html and http://en.wikipedia.org/wiki/Moving_average
 #: ../invest-applet/data/financialchart.ui.h:13
-msgid "Bollinger"
-msgstr "Bollinger"
-
-#: ../invest-applet/data/financialchart.ui.h:14
-msgid "Downloading chart from <b>Yahoo!</b>"
-msgstr "Downloading chart from <b>Yahoo!</b>"
+msgid "Moving average: "
+msgstr "Moving average: "
 
+#. see http://biz.yahoo.com/charts/guide12.html and http://en.wikipedia.org/wiki/Moving_average#Exponential_moving_average
 #: ../invest-applet/data/financialchart.ui.h:15
 msgid "Exponential moving average: "
 msgstr "Exponential moving average: "
 
 #: ../invest-applet/data/financialchart.ui.h:16
-msgid "Fast stoch"
-msgstr "Fast stoch"
+msgid "5"
+msgstr "5"
 
 #: ../invest-applet/data/financialchart.ui.h:17
-#: ../invest-applet/invest/chart.py:107
-msgid "Financial Chart"
-msgstr "Financial Chart"
+msgid "10"
+msgstr "10"
 
 #: ../invest-applet/data/financialchart.ui.h:18
-msgid "Indicators: "
-msgstr "Indicators: "
+msgid "20"
+msgstr "20"
 
 #: ../invest-applet/data/financialchart.ui.h:19
-msgid "MACD"
-msgstr "MACD"
+msgid "50"
+msgstr "50"
 
 #: ../invest-applet/data/financialchart.ui.h:20
-msgid "MFI"
-msgstr "MFI"
+msgid "100"
+msgstr "100"
 
 #: ../invest-applet/data/financialchart.ui.h:21
-msgid "Maximum"
-msgstr "Maximum"
-
-#: ../invest-applet/data/financialchart.ui.h:22
-msgid "Moving average: "
-msgstr "Moving average: "
+msgid "200"
+msgstr "200"
 
+#. see http://en.wikipedia.org/wiki/Technical_analysis#Overlays
 #: ../invest-applet/data/financialchart.ui.h:23
 msgid "Overlays: "
 msgstr "Overlays: "
 
-#: ../invest-applet/data/financialchart.ui.h:24
-msgid "ROC"
-msgstr "ROC"
-
+#. Please keep this term short. For its meaning, see http://biz.yahoo.com/charts/guide13.html and http://en.wikipedia.org/wiki/Bollinger_bands
 #: ../invest-applet/data/financialchart.ui.h:25
-msgid "RSI"
-msgstr "RSI"
+msgid "Bollinger"
+msgstr "Bollinger"
 
-#: ../invest-applet/data/financialchart.ui.h:26
+#. Please keep this term short. For its meaning, see http://biz.yahoo.com/charts/guide16.html and http://en.wikipedia.org/wiki/Parabolic_SAR
+#: ../invest-applet/data/financialchart.ui.h:27
 msgid "SAR"
 msgstr "SAR"
 
-#: ../invest-applet/data/financialchart.ui.h:27
-msgid "Slow stoch"
-msgstr "Slow stoch"
-
-#: ../invest-applet/data/financialchart.ui.h:28
+#. Please keep this term short. For its meaning, see http://biz.yahoo.com/charts/guide6.html and http://en.wikipedia.org/wiki/Stock_split
+#: ../invest-applet/data/financialchart.ui.h:29
 msgid "Splits"
 msgstr "Splits"
 
-#: ../invest-applet/data/financialchart.ui.h:29
-msgid "Today"
-msgstr "Today"
+#. Please keep this term short. For its meaning, see http://biz.yahoo.com/charts/guide20.html and http://en.wikipedia.org/wiki/Volume_%28finance%29
+#: ../invest-applet/data/financialchart.ui.h:31
+msgid "Volumes"
+msgstr "Volumes"
+
+#. see http://biz.yahoo.com/charts/guide10.html and http://en.wikipedia.org/wiki/Technical_indicator#Charting_terms_and_indicators
+#: ../invest-applet/data/financialchart.ui.h:33
+msgid "Indicators: "
+msgstr "Indicators: "
+
+#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Relative_Strength_Index
+#: ../invest-applet/data/financialchart.ui.h:35
+msgid "RSI"
+msgstr "RSI"
 
-#: ../invest-applet/data/financialchart.ui.h:30
+#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Volume_%28finance%29
+#: ../invest-applet/data/financialchart.ui.h:37
 msgid "Vol"
 msgstr "Vol"
 
-#: ../invest-applet/data/financialchart.ui.h:31
+#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Money_flow_index
+#: ../invest-applet/data/financialchart.ui.h:39
+msgid "MFI"
+msgstr "MFI"
+
+#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Stochastic_oscillator
+#: ../invest-applet/data/financialchart.ui.h:41
+msgid "Slow stoch"
+msgstr "Slow stoch"
+
+#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Volume_%28finance%29
+#: ../invest-applet/data/financialchart.ui.h:43
 msgid "Vol+MA"
 msgstr "Vol+MA"
 
-#: ../invest-applet/data/financialchart.ui.h:32
-msgid "Volumes"
-msgstr "Volumes"
+#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Rate_of_change_%28technical_analysis%29
+#: ../invest-applet/data/financialchart.ui.h:45
+msgid "ROC"
+msgstr "ROC"
 
-#: ../invest-applet/data/financialchart.ui.h:34
+#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Stochastic_oscillator
+#: ../invest-applet/data/financialchart.ui.h:47
+msgid "Fast stoch"
+msgstr "Fast stoch"
+
+#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/Williams_%25R
+#: ../invest-applet/data/financialchart.ui.h:50
 #, no-c-format
 msgid "W%R"
 msgstr "W%R"
 
-#: ../invest-applet/data/financialchart.ui.h:35
-msgid "_Graph style: "
-msgstr "_Graph style: "
+#. Please keep this term short. For its meaning, see http://en.wikipedia.org/wiki/MACD
+#: ../invest-applet/data/financialchart.ui.h:52
+msgid "MACD"
+msgstr "MACD"
+
+#: ../invest-applet/data/financialchart.ui.h:53
+msgid "Line"
+msgstr "Line"
+
+#: ../invest-applet/data/financialchart.ui.h:54
+msgid "Bar"
+msgstr "Bar"
+
+#: ../invest-applet/data/financialchart.ui.h:55
+msgid "Candle"
+msgstr "Candle"
+
+#: ../invest-applet/data/financialchart.ui.h:56
+msgid "Scale: "
+msgstr "Scale: "
 
-#: ../invest-applet/data/financialchart.ui.h:36
+#: ../invest-applet/data/financialchart.ui.h:57
+msgid "Linear"
+msgstr "Linear"
+
+#: ../invest-applet/data/financialchart.ui.h:58
+msgid "Logarithmic"
+msgstr "Logarithmic"
+
+#: ../invest-applet/data/financialchart.ui.h:59
 msgid "_Options"
 msgstr "_Options"
 
-#: ../invest-applet/data/financialchart.ui.h:37
-msgid "_Ticker symbol: "
-msgstr "_Ticker symbol: "
+#: ../invest-applet/data/financialchart.ui.h:60
+msgid "Downloading chart from <b>Yahoo!</b>"
+msgstr "Downloading chart from <b>Yahoo!</b>"
 
 #: ../invest-applet/data/prefs-dialog.ui.h:1
+msgid "Invest Preferences"
+msgstr "Invest Preferences"
+
+#: ../invest-applet/data/prefs-dialog.ui.h:2
+msgid "label"
+msgstr "label"
+
+#: ../invest-applet/data/prefs-dialog.ui.h:3
+msgid "Stocks"
+msgstr "Stocks"
+
+#. Instead of adding a single stock to the list of stocks, the 'Add Group' button adds a group (kind of a sub folder) to which numerous stocks can be added. A group here refers to a group of stocks.
+#: ../invest-applet/data/prefs-dialog.ui.h:5
+msgctxt " "
+msgid "Add Group"
+msgstr "Add Group"
+
+#. An index value (for instance the NASDAQ Composite) is based on a number of stocks. This option allows to also show the quotes of the stocks an index is based on.
+#: ../invest-applet/data/prefs-dialog.ui.h:7
+msgid "Show stocks of index values"
+msgstr "Show stocks of index values"
+
+#: ../invest-applet/data/prefs-dialog.ui.h:8
 msgid ""
-"<i><small><b>Note:</b> Quotes are delayed at least 15 minutes.\n"
-"<b>Source: </b> Yahoo!</small></i>"
+"An index value, for instance the <i>NASDAQ Composite</i> (^IXIC), is based "
+"on a number of stocks. This option allows to also show the quotes of the "
+"<i><b>stocks</b></i> an index is based on."
 msgstr ""
-"<i><small><b>Note:</b> Quotes are delayed at least 15 minutes.\n"
-"<b>Source: </b> Yahoo!</small></i>"
+"An index value, for instance the <i>NASDAQ Composite</i> (^IXIC), is based "
+"on a number of stocks. This option allows to also show the quotes of the "
+"<i><b>stocks</b></i> an index is based on."
 
-#: ../invest-applet/data/prefs-dialog.ui.h:3
+#: ../invest-applet/data/prefs-dialog.ui.h:9
+msgid "Hide charts in quotes list"
+msgstr "Hide charts in quotes list"
+
+#: ../invest-applet/data/prefs-dialog.ui.h:10
+msgid ""
+"A small chart image is shown next to each quote. The retrieval of each chart "
+"image causes network traffic. Hiding charts reduces the network bandwidth "
+"demand significantly."
+msgstr ""
+"A small chart image is shown next to each quote. The retrieval of each chart "
+"image causes network traffic. Hiding charts reduces the network bandwidth "
+"demand significantly."
+
+#: ../invest-applet/data/prefs-dialog.ui.h:11
+msgid ""
+"<i><small><b>Source:</b> <a href=\"http://finance.yahoo.com/\";>Yahoo! "
+"Finance</a> (at least 15 minutes delayed)</small></i>"
+msgstr ""
+"<i><small><b>Source:</b> <a href=\"http://finance.yahoo.com/\";>Yahoo! "
+"Finance</a> (at least 15 minutes delayed)</small></i>"
+
+#: ../invest-applet/data/prefs-dialog.ui.h:12
 msgid "Currency"
 msgstr "Currency"
 
-#: ../invest-applet/data/prefs-dialog.ui.h:4
-msgid "Invest Preferences"
-msgstr "Invest Preferences"
+#: ../invest-applet/data/prefs-dialog.ui.h:13
+msgid ""
+"Type the target currency to which all stock quotes will be converted to."
+msgstr ""
+"Type the target currency to which all stock quotes will be converted to."
 
-#: ../invest-applet/data/prefs-dialog.ui.h:5
-msgid "Stocks"
-msgstr "Stocks"
+#. name, stock_id, label, accellerator, tooltip, callback
+#: ../invest-applet/invest/applet.py:24
+msgid "About"
+msgstr "About"
 
-#: ../invest-applet/data/prefs-dialog.ui.h:6
-msgid "label"
-msgstr "label"
+#: ../invest-applet/invest/applet.py:25
+msgid "Help"
+msgstr "Help"
+
+#: ../invest-applet/invest/applet.py:26
+msgid "Preferences"
+msgstr "Preferences"
+
+#: ../invest-applet/invest/applet.py:27
+msgid "Refresh"
+msgstr "Refresh"
 
 #. a) We aren't configured yet
-#: ../invest-applet/invest/applet.py:50
+#: ../invest-applet/invest/applet.py:60
 msgid "<b>You have not entered any stock information yet</b>"
 msgstr "<b>You have not entered any stock information yet</b>"
 
-#: ../invest-applet/invest/applet.py:55
+#: ../invest-applet/invest/applet.py:65
 msgid "<b>No stock quotes are currently available</b>"
 msgstr "<b>No stock quotes are currently available</b>"
 
-#: ../invest-applet/invest/applet.py:56
+#: ../invest-applet/invest/applet.py:66
 msgid ""
 "The server could not be contacted. The computer is either offline or the "
 "servers are down. Try again later."
@@ -2050,98 +1584,113 @@ msgstr ""
 "The server could not be contacted. The computer is either offline or the "
 "servers are down. Try again later."
 
-#: ../invest-applet/invest/chart.py:156
+#: ../invest-applet/invest/chart.py:161
 #, python-format
 msgid "Financial Chart - %s"
 msgstr "Financial Chart â %s"
 
-#: ../invest-applet/invest/chart.py:223
+#: ../invest-applet/invest/chart.py:228
 msgid "Opening Chart"
 msgstr "Opening Chart"
 
-#: ../invest-applet/invest/chart.py:238
+#: ../invest-applet/invest/chart.py:243
 msgid "Chart downloaded"
 msgstr "Chart downloaded"
 
-#: ../invest-applet/invest/chart.py:240
+#: ../invest-applet/invest/chart.py:245
 msgid "Chart could not be downloaded"
 msgstr "Chart could not be downloaded"
 
-#: ../invest-applet/invest/invest-applet.py:41
-msgid "Invest Applet"
-msgstr "Invest Applet"
-
-#: ../invest-applet/invest/preferences.py:31
+#: ../invest-applet/invest/preferences.py:44
 msgid "Symbol"
 msgstr "Symbol"
 
-#: ../invest-applet/invest/preferences.py:31
+#: ../invest-applet/invest/preferences.py:44
 msgid "Label"
 msgstr "Label"
 
-#: ../invest-applet/invest/preferences.py:31
+#: ../invest-applet/invest/preferences.py:44
 msgid "Amount"
 msgstr "Amount"
 
-#: ../invest-applet/invest/preferences.py:31
+#: ../invest-applet/invest/preferences.py:44
 msgid "Price"
 msgstr "Price"
 
-#: ../invest-applet/invest/preferences.py:31
+#: ../invest-applet/invest/preferences.py:44
 msgid "Commission"
 msgstr "Commission"
 
-#: ../invest-applet/invest/preferences.py:31
+#: ../invest-applet/invest/preferences.py:44
 msgid "Currency Rate"
 msgstr "Currency Rate"
 
-#: ../invest-applet/invest/quotes.py:131
+#: ../invest-applet/invest/preferences.py:244
+msgid "Stock Group"
+msgstr "Stock Group"
+
+#. translators: Asks the user to confirm deletion of a group of stocks
+#: ../invest-applet/invest/preferences.py:269
+msgid "Delete entire stock group?"
+msgstr "Delete entire stock group?"
+
+#. translators: stocks can be grouped together into a "stock group".
+#. The user wants to delete a group, but the group still contains stocks.
+#. By deleting the group, also all stocks will be removed from configuration
+#: ../invest-applet/invest/preferences.py:277
+msgid ""
+"This removes all stocks contained in this stock group!\n"
+"Do you really want to remove this stock group?"
+msgstr ""
+"This removes all stocks contained in this stock group!\n"
+"Do you really want to remove this stock group?"
+
+#: ../invest-applet/invest/quotes.py:284
 msgid "Invest could not connect to Yahoo! Finance"
 msgstr "Invest could not connect to Yahoo! Finance"
 
-#. Translators: %s is an hour (%H:%M)
-#: ../invest-applet/invest/quotes.py:134 ../invest-applet/invest/quotes.py:163
-#, python-format
-msgid "Updated at %s"
-msgstr "Updated at %s"
-
 #. Translators: This is share-market jargon. It is the average percentage change of all stock prices. The %s gets replaced with the string value of the change (localized), including the percent sign.
-#: ../invest-applet/invest/quotes.py:153
+#: ../invest-applet/invest/quotes.py:327
 #, python-format
 msgid "Average change: %s"
 msgstr "Average change: %s"
 
 #. Translators: This is share-market jargon. It refers to the total difference between the current price and purchase price for all the shares put together for a particular currency. i.e. How much money would be earned if they were sold right now. The first string is the change value, the second the currency, and the third value is the percentage of the change, formatted using user's locale.
-#: ../invest-applet/invest/quotes.py:162
+#: ../invest-applet/invest/quotes.py:336
 #, python-format
 msgid "Positions balance: %s %s (%s)"
 msgstr "Positions balance: %s %s (%s)"
 
+#: ../invest-applet/invest/quotes.py:338
+#, python-format
+msgid "Updated at %s"
+msgstr "Updated at %s"
+
 #. model: SYMBOL, LABEL, TICKER_ONLY, BALANCE, BALANCE_PCT, VALUE, VARIATION_PCT, PB
 #. Translators: these words all refer to a stock. Last is short
 #. for "last price". Gain is referring to the gain since the
 #. stock was purchased.
-#: ../invest-applet/invest/widgets.py:51
+#: ../invest-applet/invest/widgets.py:52
 msgid "Ticker"
 msgstr "Ticker"
 
-#: ../invest-applet/invest/widgets.py:51
+#: ../invest-applet/invest/widgets.py:52
 msgid "Last"
 msgstr "Last"
 
-#: ../invest-applet/invest/widgets.py:51
+#: ../invest-applet/invest/widgets.py:52
 msgid "Change %"
 msgstr "Change %"
 
-#: ../invest-applet/invest/widgets.py:51
+#: ../invest-applet/invest/widgets.py:52
 msgid "Chart"
 msgstr "Chart"
 
-#: ../invest-applet/invest/widgets.py:51
+#: ../invest-applet/invest/widgets.py:52
 msgid "Gain"
 msgstr "Gain"
 
-#: ../invest-applet/invest/widgets.py:51
+#: ../invest-applet/invest/widgets.py:52
 msgid "Gain %"
 msgstr "Gain %"
 
@@ -2161,20 +1710,20 @@ msgstr ""
 "This GNOME applet adds a command line to the panel. It features command "
 "completion, command history, and changeable macros."
 
-#: ../mini-commander/src/command_line.c:345
+#: ../mini-commander/src/command_line.c:362
 msgid "No items in history"
 msgstr "No items in history"
 
 #. build file select dialog
-#: ../mini-commander/src/command_line.c:469
+#: ../mini-commander/src/command_line.c:488
 msgid "Start program"
 msgstr "Start program"
 
-#: ../mini-commander/src/command_line.c:522
+#: ../mini-commander/src/command_line.c:541
 msgid "Command line"
 msgstr "Command line"
 
-#: ../mini-commander/src/command_line.c:523
+#: ../mini-commander/src/command_line.c:542
 msgid "Type a command here and Gnome will execute it for you"
 msgstr "Type a command here and Gnome will execute it for you"
 
@@ -2214,182 +1763,198 @@ msgid "Error syncing config data: %s"
 msgstr "Error syncing config data: %s"
 
 #: ../mini-commander/src/mini-commander-global.schemas.in.h:1
-msgid "List of GConfValue entries containing strings for the macro commands."
-msgstr "List of GConfValue entries containing strings for the macro commands."
+#: ../mini-commander/src/mini-commander.schemas.in.h:26
+msgid "Macro pattern list"
+msgstr "Macro pattern list"
 
 #: ../mini-commander/src/mini-commander-global.schemas.in.h:2
 msgid "List of GConfValue entries containing strings for the macro patterns."
 msgstr "List of GConfValue entries containing strings for the macro patterns."
 
 #: ../mini-commander/src/mini-commander-global.schemas.in.h:3
-#: ../mini-commander/src/mini-commander.schemas.in.h:10
+#: ../mini-commander/src/mini-commander.schemas.in.h:28
 msgid "Macro command list"
 msgstr "Macro command list"
 
 #: ../mini-commander/src/mini-commander-global.schemas.in.h:4
-#: ../mini-commander/src/mini-commander.schemas.in.h:11
-msgid "Macro pattern list"
-msgstr "Macro pattern list"
+msgid "List of GConfValue entries containing strings for the macro commands."
+msgstr "List of GConfValue entries containing strings for the macro commands."
 
 #: ../mini-commander/src/mini-commander.ui.h:1
-msgid "Add New Macro"
-msgstr "Add New Macro"
+msgid "Command Line Preferences"
+msgstr "Command Line Preferences"
 
 #: ../mini-commander/src/mini-commander.ui.h:2
 msgid "Auto Completion"
 msgstr "Auto-Completion"
 
 #: ../mini-commander/src/mini-commander.ui.h:3
-msgid "Co_mmand:"
-msgstr "Co_mmand:"
+msgid "E_nable history-based auto completion"
+msgstr "E_nable history-based auto-completion"
 
-#: ../mini-commander/src/mini-commander.ui.h:4 ../multiload/properties.c:571
-msgid "Colors"
-msgstr "Colours"
+#: ../mini-commander/src/mini-commander.ui.h:4
+msgid "Size"
+msgstr "Size"
 
 #: ../mini-commander/src/mini-commander.ui.h:5
-msgid "Command Line Preferences"
-msgstr "Command Line Preferences"
+#: ../stickynotes/stickynotes.ui.h:19
+msgid "_Width:"
+msgstr "_Width:"
 
-#: ../mini-commander/src/mini-commander.ui.h:6
-msgid "Command line _background:"
-msgstr "Command line _background:"
+#: ../mini-commander/src/mini-commander.ui.h:6 ../multiload/properties.c:524
+msgid "pixels"
+msgstr "pixels"
 
-#: ../mini-commander/src/mini-commander.ui.h:7
-msgid "Command line _foreground:"
-msgstr "Command line _foreground:"
+#: ../mini-commander/src/mini-commander.ui.h:7 ../multiload/properties.c:569
+msgid "Colors"
+msgstr "Colours"
 
 #: ../mini-commander/src/mini-commander.ui.h:8
-msgid "E_nable history-based auto completion"
-msgstr "E_nable history-based auto-completion"
+msgid "_Use default theme colors"
+msgstr "_Use default theme colours"
+
+#: ../mini-commander/src/mini-commander.ui.h:9
+msgid "Command line _foreground:"
+msgstr "Command line _foreground:"
 
 #: ../mini-commander/src/mini-commander.ui.h:10
-msgid "Macros"
-msgstr "Macros"
+msgid "Command line _background:"
+msgstr "Command line _background:"
 
 #: ../mini-commander/src/mini-commander.ui.h:11
 msgid "Pick a color"
 msgstr "Pick a colour"
 
-#: ../mini-commander/src/mini-commander.ui.h:12
-msgid "Size"
-msgstr "Size"
-
 #: ../mini-commander/src/mini-commander.ui.h:13
+msgid "_Macros:"
+msgstr "_Macros:"
+
+#: ../mini-commander/src/mini-commander.ui.h:14
 msgid "_Add Macro..."
 msgstr "_Add Macroâ"
 
-#: ../mini-commander/src/mini-commander.ui.h:14
+#: ../mini-commander/src/mini-commander.ui.h:15
 msgid "_Delete Macro"
 msgstr "_Delete Macro"
 
-#: ../mini-commander/src/mini-commander.ui.h:15
-msgid "_Macros:"
-msgstr "_Macros:"
-
 #: ../mini-commander/src/mini-commander.ui.h:16
-msgid "_Pattern:"
-msgstr "_Pattern:"
+msgid "Macros"
+msgstr "Macros"
 
 #: ../mini-commander/src/mini-commander.ui.h:17
-msgid "_Use default theme colors"
-msgstr "_Use default theme colours"
+msgid "Add New Macro"
+msgstr "Add New Macro"
 
 #: ../mini-commander/src/mini-commander.ui.h:18
-#: ../stickynotes/stickynotes.ui.h:46
-msgid "_Width:"
-msgstr "_Width:"
+msgid "_Pattern:"
+msgstr "_Pattern:"
 
-#: ../mini-commander/src/mini-commander.ui.h:19 ../multiload/properties.c:526
-msgid "pixels"
-msgstr "pixels"
+#: ../mini-commander/src/mini-commander.ui.h:19
+msgid "Co_mmand:"
+msgstr "Co_mmand:"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:1
-msgid "Attempt to autocomplete a command from the history of commands entered."
-msgstr ""
-"Attempt to autocomplete a command from the history of commands entered."
+msgid "Show handle"
+msgstr "Show handle"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:2
-msgid "Background color, blue component"
-msgstr "Background colour, blue component"
+msgid "Show a handle so the applet can be detached from the panel."
+msgstr "Show a handle so the applet can be detached from the panel."
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:3
-msgid "Background color, green component"
-msgstr "Background colour, green component"
+msgid "Show frame"
+msgstr "Show frame"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:4
-msgid "Background color, red component"
-msgstr "Background colour, red component"
+msgid "Show a frame surrounding the applet."
+msgstr "Show a frame surrounding the applet."
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:5
-msgid "Foreground color, blue component"
-msgstr "Foreground colour, blue component"
+msgid "Perform history autocompletion"
+msgstr "Perform history autocompletion"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:6
-msgid "Foreground color, green component"
-msgstr "Foreground colour, green component"
+msgid "Attempt to autocomplete a command from the history of commands entered."
+msgstr ""
+"Attempt to autocomplete a command from the history of commands entered."
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:7
-msgid "Foreground color, red component"
-msgstr "Foreground colour, red component"
+msgid "Width"
+msgstr "Width"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:8
-msgid "History list"
-msgstr "History list"
+msgid "Width of the applet"
+msgstr "Width of the applet"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:9
-msgid "List of GConfValue entries containing strings for history entries."
-msgstr "List of GConfValue entries containing strings for history entries."
-
-#: ../mini-commander/src/mini-commander.schemas.in.h:12
 msgid "Not used anymore"
 msgstr "Not used anymore"
 
-#: ../mini-commander/src/mini-commander.schemas.in.h:13
-msgid "Perform history autocompletion"
-msgstr "Perform history autocompletion"
+#: ../mini-commander/src/mini-commander.schemas.in.h:10
+msgid "Use the default theme colors"
+msgstr "Use the default theme colours"
 
-#: ../mini-commander/src/mini-commander.schemas.in.h:14
-msgid "Show a frame surrounding the applet."
-msgstr "Show a frame surrounding the applet."
+#: ../mini-commander/src/mini-commander.schemas.in.h:11
+msgid "Use theme colors instead of custom ones."
+msgstr "Use theme colours instead of custom ones."
 
-#: ../mini-commander/src/mini-commander.schemas.in.h:15
-msgid "Show a handle so the applet can be detached from the panel."
-msgstr "Show a handle so the applet can be detached from the panel."
+#: ../mini-commander/src/mini-commander.schemas.in.h:12
+msgid "Foreground color, red component"
+msgstr "Foreground colour, red component"
+
+#: ../mini-commander/src/mini-commander.schemas.in.h:13
+msgid "The red component of the foreground color."
+msgstr "The red component of the foreground colour."
+
+#: ../mini-commander/src/mini-commander.schemas.in.h:14
+msgid "Foreground color, green component"
+msgstr "Foreground colour, green component"
+
+#: ../mini-commander/src/mini-commander.schemas.in.h:15
+msgid "The green component of the foreground color."
+msgstr "The green component of the foreground colour."
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:16
-msgid "Show frame"
-msgstr "Show frame"
+msgid "Foreground color, blue component"
+msgstr "Foreground colour, blue component"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:17
-msgid "Show handle"
-msgstr "Show handle"
+msgid "The blue component of the foreground color."
+msgstr "The blue component of the foreground colour."
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:18
-msgid "The blue component of the background color."
-msgstr "The blue component of the background colour."
+msgid "Background color, red component"
+msgstr "Background colour, red component"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:19
-msgid "The blue component of the foreground color."
-msgstr "The blue component of the foreground colour."
+msgid "The red component of the background color."
+msgstr "The red component of the background colour."
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:20
-msgid "The green component of the background color."
-msgstr "The green component of the background colour."
+msgid "Background color, green component"
+msgstr "Background colour, green component"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:21
-msgid "The green component of the foreground color."
-msgstr "The green component of the foreground colour."
+msgid "The green component of the background color."
+msgstr "The green component of the background colour."
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:22
-msgid "The red component of the background color."
-msgstr "The red component of the background colour."
+msgid "Background color, blue component"
+msgstr "Background colour, blue component"
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:23
-msgid "The red component of the foreground color."
-msgstr "The red component of the foreground colour."
+msgid "The blue component of the background color."
+msgstr "The blue component of the background colour."
 
 #: ../mini-commander/src/mini-commander.schemas.in.h:24
+msgid "History list"
+msgstr "History list"
+
+#: ../mini-commander/src/mini-commander.schemas.in.h:25
+msgid "List of GConfValue entries containing strings for history entries."
+msgstr "List of GConfValue entries containing strings for history entries."
+
+#: ../mini-commander/src/mini-commander.schemas.in.h:27
 msgid ""
 "This per-applet key is deprecated in favour of the global key, /schemas/apps/"
 "mini-commander-global/macro_patterns."
@@ -2397,22 +1962,6 @@ msgstr ""
 "This per-applet key is deprecated in favour of the global key, /schemas/apps/"
 "mini-commander-global/macro_patterns."
 
-#: ../mini-commander/src/mini-commander.schemas.in.h:25
-msgid "Use the default theme colors"
-msgstr "Use the default theme colours"
-
-#: ../mini-commander/src/mini-commander.schemas.in.h:26
-msgid "Use theme colors instead of custom ones."
-msgstr "Use theme colours instead of custom ones."
-
-#: ../mini-commander/src/mini-commander.schemas.in.h:27
-msgid "Width"
-msgstr "Width"
-
-#: ../mini-commander/src/mini-commander.schemas.in.h:28
-msgid "Width of the applet"
-msgstr "Width of the applet"
-
 #: ../mini-commander/src/mini-commander_applet.c:242
 #: ../mini-commander/src/mini-commander_applet.c:246
 msgid "Browser"
@@ -2435,27 +1984,27 @@ msgstr "Click this button for the list of previous commands"
 msgid "Command line has been disabled by your system administrator"
 msgstr "Command line has been disabled by your system administrator"
 
-#: ../mini-commander/src/mini-commander_applet.c:361
-#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:1
+#: ../mini-commander/src/mini-commander_applet.c:360
+#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:2
 msgid "Command Line"
 msgstr "Command Line"
 
-#: ../mini-commander/src/mini-commander_applet.c:407
+#: ../mini-commander/src/mini-commander_applet.c:406
 msgid "Mini-Commander applet"
 msgstr "Mini-Commander applet"
 
-#: ../mini-commander/src/mini-commander_applet.c:408
+#: ../mini-commander/src/mini-commander_applet.c:407
 msgid "This applet adds a command line to the panel"
 msgstr "This applet adds a command line to the panel"
 
-#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:2
-msgid "Mini-Commander"
-msgstr "Mini-Commander"
-
-#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:3
+#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:1
 msgid "MiniCommander Applet Factory"
 msgstr "MiniCommander Applet Factory"
 
+#: ../mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in.h:3
+msgid "Mini-Commander"
+msgstr "Mini-Commander"
+
 #: ../mini-commander/src/preferences.c:401
 msgid "You must specify a pattern"
 msgstr "You must specify a pattern"
@@ -2472,33 +2021,34 @@ msgstr "You must specify a command"
 msgid "You may not specify duplicate patterns"
 msgstr "You may not specify duplicate patterns"
 
-#: ../mini-commander/src/preferences.c:773
+#: ../mini-commander/src/preferences.c:779
 msgid "Pattern"
 msgstr "Pattern"
 
-#: ../mini-commander/src/preferences.c:783
+#: ../mini-commander/src/preferences.c:789
 msgid "Command"
 msgstr "Command"
 
-#: ../mixer/applet.c:184
+#: ../mixer/applet.c:179
 msgid "Volume Applet"
 msgstr "Volume Applet"
 
 #. tooltip over applet
-#: ../mixer/applet.c:200 ../mixer/applet.c:221 ../null_applet/null_applet.c:44
-#: ../null_applet/null_applet.c:46
+#: ../mixer/applet.c:195 ../mixer/applet.c:216
+#: ../mixer/org.gnome.applets.MixerApplet.panel-applet.in.in.h:1
+#: ../null_applet/null_applet.c:55 ../null_applet/null_applet.c:57
 msgid "Volume Control"
 msgstr "Volume Control"
 
-#: ../mixer/applet.c:384
+#: ../mixer/applet.c:378
 msgid "_Open Volume Control"
 msgstr "_Open Volume Control"
 
-#: ../mixer/applet.c:398
+#: ../mixer/applet.c:392
 msgid "Mu_te"
 msgstr "Mu_te"
 
-#: ../mixer/applet.c:564
+#: ../mixer/applet.c:558
 msgid ""
 "The volume control did not find any elements and/or devices to control. This "
 "means either that you don't have the right GStreamer plugins installed, or "
@@ -2508,7 +2058,7 @@ msgstr ""
 "means either that you don't have the right GStreamer plug-ins installed, or "
 "that you don't have a sound card configured."
 
-#: ../mixer/applet.c:568
+#: ../mixer/applet.c:562
 msgid ""
 "You can remove the volume control from the panel by right-clicking the "
 "speaker icon on the panel and selecting \"Remove From Panel\" from the menu."
@@ -2516,12 +2066,12 @@ msgstr ""
 "You can remove the volume control from the panel by right-clicking the "
 "speaker icon on the panel and selecting \"Remove From Panel\" from the menu."
 
-#: ../mixer/applet.c:754
+#: ../mixer/applet.c:745
 #, c-format
 msgid "Failed to start Volume Control: %s"
 msgstr "Failed to start Volume Control: %s"
 
-#: ../mixer/applet.c:1203
+#: ../mixer/applet.c:1160
 #, c-format
 msgid "%s: muted"
 msgstr "%s: muted"
@@ -2530,29 +2080,29 @@ msgstr "%s: muted"
 #. * to mark as a translation, but anyway. The string is a list of
 #. * selected tracks, the number is the volume in percent. You
 #. * most likely want to keep this as-is.
-#: ../mixer/applet.c:1209
+#: ../mixer/applet.c:1166
 #, c-format
 msgid "%s: %d%%"
 msgstr "%s: %d%%"
 
-#: ../mixer/applet.c:1445
+#: ../mixer/applet.c:1402
 #, c-format
 msgid "Failed to display help: %s"
 msgstr "Failed to display help: %s"
 
-#: ../mixer/applet.c:1458
+#: ../mixer/applet.c:1415
 msgid "Volume control for your GNOME Panel."
 msgstr "Volume control for your GNOME Panel."
 
-#: ../mixer/applet.c:1459
+#: ../mixer/applet.c:1416
 msgid "Using GStreamer 0.10."
 msgstr "Using GStreamer 0.10."
 
-#: ../mixer/dock.c:218
+#: ../mixer/dock.c:219
 msgid "Mute"
 msgstr "Mute"
 
-#: ../mixer/dock.c:224
+#: ../mixer/dock.c:225
 msgid "Volume Control..."
 msgstr "Volume Controlâ"
 
@@ -2573,12 +2123,16 @@ msgstr "Saved mute state"
 msgid "Saved volume to restore on startup"
 msgstr "Saved volume to restore on startup"
 
+#: ../mixer/org.gnome.applets.MixerApplet.panel-applet.in.in.h:2
+msgid "Adjust the sound volume"
+msgstr "Adjust the sound volume"
+
 #. make window look cute
 #: ../mixer/preferences.c:90
 msgid "Volume Control Preferences"
 msgstr "Volume Control Preferences"
 
-#: ../mixer/preferences.c:103
+#: ../mixer/preferences.c:102
 msgid "Select the device and track to control."
 msgstr "Select the device and track to control."
 
@@ -2590,12 +2144,12 @@ msgstr "_Activate"
 msgid "_Deactivate"
 msgstr "_Deactivate"
 
-#: ../modemlights/modem-applet.c:148 ../stickynotes/stickynotes.ui.h:43
+#: ../modemlights/modem-applet.c:148 ../stickynotes/stickynotes.ui.h:4
 msgid "_Properties"
 msgstr "_Properties"
 
 #: ../modemlights/modem-applet.c:184
-#: ../modemlights/org.gnome.applets.ModemApplet.panel-applet.in.in.h:2
+#: ../modemlights/org.gnome.applets.ModemApplet.panel-applet.in.in.h:1
 msgid "Modem Monitor"
 msgstr "Modem Monitor"
 
@@ -2673,22 +2227,22 @@ msgid "Applet for activating and monitoring a dial-up network connection."
 msgstr "Applet for activating and monitoring a dial-up network connection."
 
 #: ../modemlights/modemlights.ui.h:1
-msgid "Connecting with Internet Service Provider"
-msgstr "Connecting with Internet Service Provider"
-
-#: ../modemlights/modemlights.ui.h:2
 msgid "Enter password"
 msgstr "Enter password"
 
+#: ../modemlights/modemlights.ui.h:2
+msgid "Root password required"
+msgstr "Root password required"
+
 #: ../modemlights/modemlights.ui.h:3
 msgid "Password:"
 msgstr "Password:"
 
 #: ../modemlights/modemlights.ui.h:4
-msgid "Root password required"
-msgstr "Root password required"
+msgid "Connecting with Internet Service Provider"
+msgstr "Connecting with Internet Service Provider"
 
-#: ../modemlights/org.gnome.applets.ModemApplet.panel-applet.in.in.h:1
+#: ../modemlights/org.gnome.applets.ModemApplet.panel-applet.in.in.h:2
 msgid "Activate and monitor a dial-up network connection"
 msgstr "Activate and monitor a dial-up network connection"
 
@@ -2700,39 +2254,43 @@ msgstr ""
 "A system load monitor capable of displaying graphs for CPU, ram, and swap "
 "space use, plus network traffic."
 
-#: ../multiload/main.c:124
+#: ../multiload/main.c:129
+msgid "Start system-monitor"
+msgstr "Start system-monitor"
+
+#: ../multiload/main.c:150
 #, c-format
 msgid "There was an error executing '%s': %s"
 msgstr "There was an error executing '%s': %s"
 
-#: ../multiload/main.c:252 ../multiload/properties.c:596
+#: ../multiload/main.c:278 ../multiload/properties.c:594
 msgid "Processor"
 msgstr "Processor"
 
-#: ../multiload/main.c:254 ../multiload/properties.c:604
+#: ../multiload/main.c:280 ../multiload/properties.c:602
 msgid "Memory"
 msgstr "Memory"
 
-#: ../multiload/main.c:256 ../multiload/properties.c:612
+#: ../multiload/main.c:282 ../multiload/properties.c:610
 msgid "Network"
 msgstr "Network"
 
-#: ../multiload/main.c:258 ../multiload/properties.c:619
+#: ../multiload/main.c:284 ../multiload/properties.c:617
 msgid "Swap Space"
 msgstr "Swap Space"
 
-#: ../multiload/main.c:260 ../multiload/main.c:339
+#: ../multiload/main.c:286 ../multiload/main.c:365
 msgid "Load Average"
 msgstr "Load Average"
 
-#: ../multiload/main.c:262
+#: ../multiload/main.c:288
 msgid "Disk"
 msgstr "Disk"
 
 #. xgettext: use and cache are > 1 most of the time,
 #. please assume that they always are.
 #.
-#: ../multiload/main.c:278
+#: ../multiload/main.c:304
 #, c-format
 msgid ""
 "%s:\n"
@@ -2743,13 +2301,13 @@ msgstr ""
 "%u%% in use by programs\n"
 "%u%% in use as cache"
 
-#: ../multiload/main.c:286
+#: ../multiload/main.c:312
 #, c-format
 msgid "The system load average is %0.02f"
 msgstr "The system load average is %0.02f"
 
 #. xgettext: same as in graphic tab of g-s-m
-#: ../multiload/main.c:294
+#: ../multiload/main.c:320
 #, c-format
 msgid ""
 "%s:\n"
@@ -2760,7 +2318,7 @@ msgstr ""
 "Receiving %s\n"
 "Sending %s"
 
-#: ../multiload/main.c:310
+#: ../multiload/main.c:336
 #, c-format
 msgid ""
 "%s:\n"
@@ -2775,72 +2333,68 @@ msgstr[1] ""
 "%s:\n"
 "%u%% in use"
 
-#: ../multiload/main.c:335
+#: ../multiload/main.c:361
 msgid "CPU Load"
 msgstr "CPU Load"
 
-#: ../multiload/main.c:336
+#: ../multiload/main.c:362
 msgid "Memory Load"
 msgstr "Memory Load"
 
-#: ../multiload/main.c:337
+#: ../multiload/main.c:363
 msgid "Net Load"
 msgstr "Net Load"
 
-#: ../multiload/main.c:338
+#: ../multiload/main.c:364
 msgid "Swap Load"
 msgstr "Swap Load"
 
-#: ../multiload/main.c:340
+#: ../multiload/main.c:366
 msgid "Disk Load"
 msgstr "Disk Load"
 
-#: ../multiload/main.c:436
+#: ../multiload/main.c:462
 msgid "_Open System Monitor"
 msgstr "_Open System Monitor"
 
-#: ../multiload/main.c:464
-#: ../multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in.h:2
+#: ../multiload/main.c:490
+#: ../multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in.h:1
 msgid "System Monitor"
 msgstr "System Monitor"
 
 #: ../multiload/multiload.schemas.in.h:1
-msgid "Applet refresh rate in milliseconds"
-msgstr "Applet refresh rate in milliseconds"
+msgid "Enable CPU load graph"
+msgstr "Enable CPU load graph"
 
 #: ../multiload/multiload.schemas.in.h:2
-msgid "Background color for disk load graph"
-msgstr "Background colour for disk load graph"
+msgid "Enable memory load graph"
+msgstr "Enable memory load graph"
 
 #: ../multiload/multiload.schemas.in.h:3
-msgid "CPU graph background color"
-msgstr "CPU graph background colour"
+msgid "Enable network load graph"
+msgstr "Enable network load graph"
 
 #: ../multiload/multiload.schemas.in.h:4
-msgid "Enable CPU load graph"
-msgstr "Enable CPU load graph"
+msgid "Enable swap load graph"
+msgstr "Enable swap load graph"
 
 #: ../multiload/multiload.schemas.in.h:5
-msgid "Enable disk load graph"
-msgstr "Enable disk load graph"
-
-#: ../multiload/multiload.schemas.in.h:6
 msgid "Enable load average graph"
 msgstr "Enable load average graph"
 
+#: ../multiload/multiload.schemas.in.h:6
+msgid "Enable disk load graph"
+msgstr "Enable disk load graph"
+
 #: ../multiload/multiload.schemas.in.h:7
-msgid "Enable memory load graph"
-msgstr "Enable memory load graph"
+msgid "Applet refresh rate in milliseconds"
+msgstr "Applet refresh rate in milliseconds"
 
 #: ../multiload/multiload.schemas.in.h:8
-msgid "Enable network load graph"
-msgstr "Enable network load graph"
+msgid "Graph size"
+msgstr "Graph size"
 
 #: ../multiload/multiload.schemas.in.h:9
-msgid "Enable swap load graph"
-msgstr "Enable swap load graph"
-
-#: ../multiload/multiload.schemas.in.h:10
 msgid ""
 "For horizontal panels, the width of the graphs in pixels. For vertical "
 "panels, this is the height of the graphs."
@@ -2848,85 +2402,89 @@ msgstr ""
 "For horizontal panels, the width of the graphs in pixels. For vertical "
 "panels, this is the height of the graphs."
 
+#: ../multiload/multiload.schemas.in.h:10
+msgid "Graph color for user-related CPU activity"
+msgstr "Graph colour for user-related CPU activity"
+
 #: ../multiload/multiload.schemas.in.h:11
-msgid "Graph color for buffer memory"
-msgstr "Graph colour for buffer memory"
+msgid "Graph color for system-related CPU activity"
+msgstr "Graph colour for system-related CPU activity"
 
 #: ../multiload/multiload.schemas.in.h:12
-msgid "Graph color for cached memory"
-msgstr "Graph colour for cached memory"
+msgid "Graph color for nice-related CPU activity"
+msgstr "Graph colour for nice-related CPU activity"
 
 #: ../multiload/multiload.schemas.in.h:13
-msgid "Graph color for disk read"
-msgstr "Graph colour for disk read"
+msgid "Graph color for iowait related CPU activity"
+msgstr "Graph colour for iowait related CPU activity"
 
 #: ../multiload/multiload.schemas.in.h:14
-msgid "Graph color for disk write"
-msgstr "Graph colour for disk write"
+msgid "CPU graph background color"
+msgstr "CPU graph background colour"
 
 #: ../multiload/multiload.schemas.in.h:15
-msgid "Graph color for input network activity"
-msgstr "Graph colour for input network activity"
+msgid "Graph color for user-related memory usage"
+msgstr "Graph colour for user-related memory usage"
 
 #: ../multiload/multiload.schemas.in.h:16
-msgid "Graph color for iowait related CPU activity"
-msgstr "Graph colour for iowait related CPU activity"
+msgid "Graph color for shared memory"
+msgstr "Graph colour for shared memory"
 
 #: ../multiload/multiload.schemas.in.h:17
-msgid "Graph color for load average"
-msgstr "Graph colour for load average"
+msgid "Graph color for buffer memory"
+msgstr "Graph colour for buffer memory"
 
 #: ../multiload/multiload.schemas.in.h:18
-msgid "Graph color for loopback network usage"
-msgstr "Graph colour for loopback network usage"
+msgid "Graph color for cached memory"
+msgstr "Graph colour for cached memory"
 
 #: ../multiload/multiload.schemas.in.h:19
-msgid "Graph color for nice-related CPU activity"
-msgstr "Graph colour for nice-related CPU activity"
+msgid "Memory graph background color"
+msgstr "Memory graph background colour"
 
 #: ../multiload/multiload.schemas.in.h:20
-msgid "Graph color for output network activity"
-msgstr "Graph colour for output network activity"
+msgid "Graph color for input network activity"
+msgstr "Graph colour for input network activity"
 
 #: ../multiload/multiload.schemas.in.h:21
-msgid "Graph color for shared memory"
-msgstr "Graph colour for shared memory"
+msgid "Graph color for output network activity"
+msgstr "Graph colour for output network activity"
 
 #: ../multiload/multiload.schemas.in.h:22
-msgid "Graph color for system-related CPU activity"
-msgstr "Graph colour for system-related CPU activity"
+msgid "Graph color for loopback network usage"
+msgstr "Graph colour for loopback network usage"
 
 #: ../multiload/multiload.schemas.in.h:23
-msgid "Graph color for user-related CPU activity"
-msgstr "Graph colour for user-related CPU activity"
+msgid "Network graph background color"
+msgstr "Network graph background colour"
 
 #: ../multiload/multiload.schemas.in.h:24
-msgid "Graph color for user-related memory usage"
-msgstr "Graph colour for user-related memory usage"
-
-#: ../multiload/multiload.schemas.in.h:25
 msgid "Graph color for user-related swap usage"
 msgstr "Graph colour for user-related swap usage"
 
+#: ../multiload/multiload.schemas.in.h:25
+msgid "Swap graph background color"
+msgstr "Swap graph background colour"
+
 #: ../multiload/multiload.schemas.in.h:26
-msgid "Graph size"
-msgstr "Graph size"
+msgid "Graph color for load average"
+msgstr "Graph colour for load average"
 
 #: ../multiload/multiload.schemas.in.h:27
 msgid "Load graph background color"
 msgstr "Load graph background colour"
 
 #: ../multiload/multiload.schemas.in.h:28
-msgid "Memory graph background color"
-msgstr "Memory graph background colour"
+msgid "Graph color for disk read"
+msgstr "Graph colour for disk read"
 
 #: ../multiload/multiload.schemas.in.h:29
-msgid "Network graph background color"
-msgstr "Network graph background colour"
+msgid "Graph color for disk write"
+msgstr "Graph colour for disk write"
 
 #: ../multiload/multiload.schemas.in.h:30
-msgid "Swap graph background color"
-msgstr "Swap graph background colour"
+msgid "Background color for disk load graph"
+msgstr "Background colour for disk load graph"
 
 #: ../multiload/multiload.schemas.in.h:31
 msgid "The desktop description file to execute as the system monitor"
@@ -2937,208 +2495,160 @@ msgstr "The desktop description file to execute as the system monitor"
 msgid "%s/s"
 msgstr "%s/s"
 
-#: ../multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in.h:1
+#: ../multiload/org.gnome.applets.MultiLoadApplet.panel-applet.in.in.h:2
 msgid "A system load indicator"
 msgstr "A system load indicator"
 
-#: ../multiload/properties.c:357
+#: ../multiload/properties.c:355
 msgid "Monitored Resources"
 msgstr "Monitored Resources"
 
-#: ../multiload/properties.c:382
+#: ../multiload/properties.c:380
 msgid "_Processor"
 msgstr "_Processor"
 
-#: ../multiload/properties.c:395
+#: ../multiload/properties.c:393
 msgid "_Memory"
 msgstr "_Memory"
 
-#: ../multiload/properties.c:408
+#: ../multiload/properties.c:406
 msgid "_Network"
 msgstr "_Network"
 
-#: ../multiload/properties.c:421
+#: ../multiload/properties.c:419
 msgid "S_wap Space"
 msgstr "S_wap Space"
 
-#: ../multiload/properties.c:434
+#: ../multiload/properties.c:432
 msgid "_Load"
 msgstr "_Load"
 
-#: ../multiload/properties.c:447
+#: ../multiload/properties.c:445
 msgid "_Harddisk"
 msgstr "_Harddisk"
 
-#: ../multiload/properties.c:463
+#: ../multiload/properties.c:461
 msgid "Options"
 msgstr "Options"
 
-#: ../multiload/properties.c:493
+#: ../multiload/properties.c:491
 msgid "System m_onitor width: "
 msgstr "System m_onitor width: "
 
-#: ../multiload/properties.c:495
+#: ../multiload/properties.c:493
 msgid "System m_onitor height: "
 msgstr "System m_onitor height: "
 
-#: ../multiload/properties.c:534
+#: ../multiload/properties.c:532
 msgid "Sys_tem monitor update interval: "
 msgstr "Sys_tem monitor update interval: "
 
-#: ../multiload/properties.c:560
+#: ../multiload/properties.c:558
 msgid "milliseconds"
 msgstr "milliseconds"
 
-#: ../multiload/properties.c:598 ../multiload/properties.c:606
+#: ../multiload/properties.c:596 ../multiload/properties.c:604
 msgid "_User"
 msgstr "_User"
 
-#: ../multiload/properties.c:599
+#: ../multiload/properties.c:597
 msgid "S_ystem"
 msgstr "S_ystem"
 
-#: ../multiload/properties.c:600
+#: ../multiload/properties.c:598
 msgid "N_ice"
 msgstr "N_ice"
 
-#: ../multiload/properties.c:601
+#: ../multiload/properties.c:599
 msgid "I_OWait"
 msgstr "I_OWait"
 
-#: ../multiload/properties.c:602
+#: ../multiload/properties.c:600
 msgid "I_dle"
 msgstr "I_dle"
 
-#: ../multiload/properties.c:607
+#: ../multiload/properties.c:605
 msgid "Sh_ared"
 msgstr "Sh_ared"
 
-#: ../multiload/properties.c:608
+#: ../multiload/properties.c:606
 msgid "_Buffers"
 msgstr "_Buffers"
 
-#: ../multiload/properties.c:609
+#: ../multiload/properties.c:607
 msgid "Cach_ed"
 msgstr "Cach_ed"
 
-#: ../multiload/properties.c:610
+#: ../multiload/properties.c:608
 msgid "F_ree"
 msgstr "F_ree"
 
-#: ../multiload/properties.c:614
+#: ../multiload/properties.c:612
 msgid "_In"
 msgstr "_In"
 
-#: ../multiload/properties.c:615
+#: ../multiload/properties.c:613
 msgid "_Out"
 msgstr "_Out"
 
-#: ../multiload/properties.c:616
+#: ../multiload/properties.c:614
 msgid "_Local"
 msgstr "_Local"
 
-#: ../multiload/properties.c:617 ../multiload/properties.c:627
-#: ../multiload/properties.c:633
+#: ../multiload/properties.c:615 ../multiload/properties.c:625
+#: ../multiload/properties.c:631
 msgid "_Background"
 msgstr "_Background"
 
-#: ../multiload/properties.c:621
+#: ../multiload/properties.c:619
 msgid "_Used"
 msgstr "_Used"
 
-#: ../multiload/properties.c:622
+#: ../multiload/properties.c:620
 msgid "_Free"
 msgstr "_Free"
 
-#: ../multiload/properties.c:624
+#: ../multiload/properties.c:622
 msgid "Load"
 msgstr "Load"
 
-#: ../multiload/properties.c:626
+#: ../multiload/properties.c:624
 msgid "_Average"
 msgstr "_Average"
 
-#: ../multiload/properties.c:629
+#: ../multiload/properties.c:627
 msgid "Harddisk"
 msgstr "Harddisk"
 
-#: ../multiload/properties.c:631
+#: ../multiload/properties.c:629
 msgid "_Read"
 msgstr "_Read"
 
-#: ../multiload/properties.c:632
+#: ../multiload/properties.c:630
 msgid "_Write"
 msgstr "_Write"
 
-#: ../multiload/properties.c:657
+#: ../multiload/properties.c:655
 msgid "System Monitor Preferences"
 msgstr "System Monitor Preferences"
 
-#: ../null_applet/GNOME_CDPlayerApplet.server.in.h:1
-msgid "CD Player (Deprecated)"
-msgstr "CD Player (Deprecated)"
-
-#: ../null_applet/GNOME_CDPlayerApplet.server.in.h:2
-msgid "Panel applet for playing audio CDs"
-msgstr "Panel applet for playing audio CDs"
+#: ../null_applet/null_applet.c:51
+msgid "Inbox Monitor"
+msgstr "Inbox Monitor"
 
-#: ../null_applet/GNOME_MailcheckApplet_Factory.server.in.h:1
-msgid "Alert you when new mail arrives"
-msgstr "Alert you when new mail arrives"
+#: ../null_applet/null_applet.c:53
+msgid "CD Player"
+msgstr "CD Player"
 
-#: ../null_applet/GNOME_MailcheckApplet_Factory.server.in.h:2
-msgid "Inbox Monitor (Deprecated)"
-msgstr "Inbox Monitor (Deprecated)"
+#: ../null_applet/null_applet.c:59
+msgid "Keyboard Indicator"
+msgstr "Keyboard Indicator"
 
-#: ../null_applet/GNOME_MixerApplet.server.in.h:1
-msgid "Adjust the sound volume"
-msgstr "Adjust the sound volume"
-
-#: ../null_applet/GNOME_MixerApplet.server.in.h:2
-msgid "Volume Control (Deprecated)"
-msgstr "Volume Control (Deprecated)"
-
-#: ../null_applet/GNOME_NullApplet_Factory.server.in.in.h:1
-msgid "Factory for deprecating applets"
-msgstr "Factory for deprecating applets"
-
-#: ../null_applet/GNOME_NullApplet_Factory.server.in.in.h:2
-msgid "Null Applet Factory"
-msgstr "Null Applet Factory"
-
-#: ../null_applet/GNOME_Panel_WirelessApplet.server.in.h:1
-msgid "Monitor the quality of a wireless network link"
-msgstr "Monitor the quality of a wireless network link"
-
-#: ../null_applet/GNOME_Panel_WirelessApplet.server.in.h:2
-msgid "Wireless Link Monitor"
-msgstr "Wireless Link Monitor"
-
-#: ../null_applet/GNOME_KeyboardApplet.server.in.h:1
-msgid "Keyboard Indicator (Deprecated)"
-msgstr "Keyboard Indicator (Deprecated)"
-
-#: ../null_applet/GNOME_KeyboardApplet.server.in.h:2
-msgid "Keyboard layout indicator"
-msgstr "Keyboard layout indicator"
-
-#: ../null_applet/null_applet.c:40
-msgid "Inbox Monitor"
-msgstr "Inbox Monitor"
-
-#: ../null_applet/null_applet.c:42
-msgid "CD Player"
-msgstr "CD Player"
-
-#: ../null_applet/null_applet.c:48
-msgid "Keyboard Indicator"
-msgstr "Keyboard Indicator"
-
-#: ../null_applet/null_applet.c:151
+#: ../null_applet/null_applet.c:157
 msgid "Some panel items are no longer available"
 msgstr "Some panel items are no longer available"
 
-#: ../null_applet/null_applet.c:152
+#: ../null_applet/null_applet.c:158
 msgid ""
 "One or more panel items (also referred to as applets) are no longer "
 "available in the GNOME desktop."
@@ -3146,11 +2656,11 @@ msgstr ""
 "One or more panel items (also referred to as applets) are no longer "
 "available in the GNOME desktop."
 
-#: ../null_applet/null_applet.c:154
+#: ../null_applet/null_applet.c:160
 msgid "These items will now be removed from your configuration:"
 msgstr "These items will now be removed from your configuration:"
 
-#: ../null_applet/null_applet.c:157
+#: ../null_applet/null_applet.c:163
 msgid "You will not receive this message again."
 msgstr "You will not receive this message again."
 
@@ -3163,226 +2673,224 @@ msgid "Tomboy (transparent upgrade from stickynotes)"
 msgstr "Tomboy (transparent upgrade from stickynotes)"
 
 #: ../stickynotes/org.gnome.applets.StickyNotesApplet.panel-applet.in.in.h:1
-msgid "Create, view, and manage sticky notes on the desktop"
-msgstr "Create, view, and manage sticky notes on the desktop"
+msgid "Sticky Notes Applet Factory"
+msgstr "Sticky Notes Applet Factory"
 
 #: ../stickynotes/org.gnome.applets.StickyNotesApplet.panel-applet.in.in.h:2
-#: ../stickynotes/stickynotes_applet.c:148
-#: ../stickynotes/stickynotes_applet.c:429
+#: ../stickynotes/stickynotes_applet.c:146
+#: ../stickynotes/stickynotes_applet.c:427
 msgid "Sticky Notes"
 msgstr "Sticky Notes"
 
 #: ../stickynotes/org.gnome.applets.StickyNotesApplet.panel-applet.in.in.h:3
-msgid "Sticky Notes Applet Factory"
-msgstr "Sticky Notes Applet Factory"
+msgid "Create, view, and manage sticky notes on the desktop"
+msgstr "Create, view, and manage sticky notes on the desktop"
 
-#: ../stickynotes/stickynotes.c:635
+#: ../stickynotes/stickynotes.c:630
 msgid "This note is locked."
 msgstr "This note is locked."
 
-#: ../stickynotes/stickynotes.c:639
+#: ../stickynotes/stickynotes.c:634
 msgid "This note is unlocked."
 msgstr "This note is unlocked."
 
-#: ../stickynotes/stickynotes.ui.h:1
-msgid "Behavior"
-msgstr "Behaviour"
+#: ../stickynotes/stickynotes.ui.h:1 ../stickynotes/stickynotes_applet.c:33
+msgid "_New Note"
+msgstr "_New Note"
 
 #: ../stickynotes/stickynotes.ui.h:2
-msgid "Choose a base color to use for all sticky notes"
-msgstr "Choose a base colour to use for all sticky notes"
+msgid "_Delete Note..."
+msgstr "_Delete Noteâ"
 
 #: ../stickynotes/stickynotes.ui.h:3
-msgid "Choose a color for the note"
-msgstr "Choose a colour for the note"
-
-#: ../stickynotes/stickynotes.ui.h:4
-msgid "Choose a font for the note"
-msgstr "Choose a font for the note"
+msgid "_Lock Note"
+msgstr "_Lock Note"
 
 #: ../stickynotes/stickynotes.ui.h:5
-msgid "Choose a font to use for all sticky notes"
-msgstr "Choose a font to use for all sticky notes"
+msgid "Sticky Notes Preferences"
+msgstr "Sticky Notes Preferences"
 
 #: ../stickynotes/stickynotes.ui.h:6
-msgid "Choose if notes are visible on all workspaces"
-msgstr "Choose if notes are visible on all workspaces"
+msgid "Default Note Properties"
+msgstr "Default Note Properties"
 
 #: ../stickynotes/stickynotes.ui.h:7
-msgid "Choose if the default style is forced on all notes"
-msgstr "Choose if the default style is forced on all notes"
+msgid "Choose a font to use for all sticky notes"
+msgstr "Choose a font to use for all sticky notes"
 
 #: ../stickynotes/stickynotes.ui.h:8
-msgid "Choose whether to hide all notes when selecting on the desktop"
-msgstr "Choose whether to hide all notes when selecting on the desktop"
+msgid "Pick a default sticky note font"
+msgstr "Pick a default sticky note font"
 
 #: ../stickynotes/stickynotes.ui.h:9
-msgid "Close note"
-msgstr "Close note"
+msgid "_Font:"
+msgstr "_Font:"
 
 #: ../stickynotes/stickynotes.ui.h:10
-msgid "Default Note Properties"
-msgstr "Default Note Properties"
+msgid "Use fo_nt from the system theme"
+msgstr "Use fo_nt from the system theme"
 
 #: ../stickynotes/stickynotes.ui.h:11
-msgid "Delete all sticky notes?"
-msgstr "Delete all sticky notes?"
+msgid "Note C_olor:"
+msgstr "Note C_olour:"
 
 #: ../stickynotes/stickynotes.ui.h:12
-msgid "Delete this sticky note?"
-msgstr "Delete this sticky note?"
+msgid "Font Co_lor:"
+msgstr "Font Co_lour:"
 
 #: ../stickynotes/stickynotes.ui.h:13
-msgid "Font C_olor:"
-msgstr "Font C_olour:"
+msgid "Choose a base color to use for all sticky notes"
+msgstr "Choose a base colour to use for all sticky notes"
 
 #: ../stickynotes/stickynotes.ui.h:14
-msgid "Font Co_lor:"
-msgstr "Font Co_lour:"
+msgid "Pick a default sticky note color"
+msgstr "Pick a default sticky note colour"
 
 #: ../stickynotes/stickynotes.ui.h:15
-msgid "Force _default color and font on notes"
-msgstr "Force _default colour and font on notes"
+msgid "Use co_lor from the system theme"
+msgstr "Use co_lour from the system theme"
 
 #: ../stickynotes/stickynotes.ui.h:16
-msgid "H_eight:"
-msgstr "H_eight:"
+msgid "Specify the default height (in pixels) of new notes"
+msgstr "Specify the default height (in pixels) of new notes"
 
 #: ../stickynotes/stickynotes.ui.h:17
-msgid "Hide notes when the des_ktop is clicked on"
-msgstr "Hide notes when the des_ktop is clicked on"
+msgid "Specify the default width (in pixels) of new notes"
+msgstr "Specify the default width (in pixels) of new notes"
 
 #: ../stickynotes/stickynotes.ui.h:18
-msgid "Lock/Unlock note"
-msgstr "Lock/Unlock note"
-
-#: ../stickynotes/stickynotes.ui.h:19
-msgid "Note C_olor:"
-msgstr "Note C_olour:"
+msgid "H_eight:"
+msgstr "H_eight:"
 
 #: ../stickynotes/stickynotes.ui.h:20
-msgid "Note _Color:"
-msgstr "Note _Colour:"
+msgid "Behavior"
+msgstr "Behaviour"
 
 #: ../stickynotes/stickynotes.ui.h:21
-msgid "Pick a color for the sticky note"
-msgstr "Pick a colour for the sticky note"
+msgid "Hide notes when the des_ktop is clicked on"
+msgstr "Hide notes when the des_ktop is clicked on"
 
 #: ../stickynotes/stickynotes.ui.h:22
-msgid "Pick a default sticky note color"
-msgstr "Pick a default sticky note colour"
+msgid "Choose whether to hide all notes when selecting on the desktop"
+msgstr "Choose whether to hide all notes when selecting on the desktop"
 
 #: ../stickynotes/stickynotes.ui.h:23
-msgid "Pick a default sticky note font"
-msgstr "Pick a default sticky note font"
+msgid "Force _default color and font on notes"
+msgstr "Force _default colour and font on notes"
 
 #: ../stickynotes/stickynotes.ui.h:24
-msgid "Pick a font for the sticky note"
-msgstr "Pick a font for the sticky note"
+msgid "Choose if the default style is forced on all notes"
+msgstr "Choose if the default style is forced on all notes"
 
 #: ../stickynotes/stickynotes.ui.h:25
-msgid "Properties"
-msgstr "Properties"
+msgid "_Put notes on all workspaces"
+msgstr "_Put notes on all workspaces"
 
 #: ../stickynotes/stickynotes.ui.h:26
-msgid "Resize note"
-msgstr "Resize note"
+msgid "Choose if notes are visible on all workspaces"
+msgstr "Choose if notes are visible on all workspaces"
 
 #: ../stickynotes/stickynotes.ui.h:27
-msgid "Specify a title for the note"
-msgstr "Specify a title for the note"
+msgid "Delete this sticky note?"
+msgstr "Delete this sticky note?"
 
 #: ../stickynotes/stickynotes.ui.h:28
-msgid "Specify the default height (in pixels) of new notes"
-msgstr "Specify the default height (in pixels) of new notes"
+msgid "This cannot be undone."
+msgstr "This cannot be undone."
 
 #: ../stickynotes/stickynotes.ui.h:29
-msgid "Specify the default width (in pixels) of new notes"
-msgstr "Specify the default width (in pixels) of new notes"
+msgid "Delete all sticky notes?"
+msgstr "Delete all sticky notes?"
 
 #: ../stickynotes/stickynotes.ui.h:30
-msgid "Sticky Note"
-msgstr "Sticky Note"
+msgid "_Delete All"
+msgstr "_Delete All"
 
 #: ../stickynotes/stickynotes.ui.h:31
-msgid "Sticky Note Properties"
-msgstr "Sticky Note Properties"
+msgid "Sticky Note"
+msgstr "Sticky Note"
 
 #: ../stickynotes/stickynotes.ui.h:32
-msgid "Sticky Notes Preferences"
-msgstr "Sticky Notes Preferences"
+msgid "Lock/Unlock note"
+msgstr "Lock/Unlock note"
 
 #: ../stickynotes/stickynotes.ui.h:33
-msgid "This cannot be undone."
-msgstr "This cannot be undone."
+msgid "Close note"
+msgstr "Close note"
 
 #: ../stickynotes/stickynotes.ui.h:34
-msgid "Use co_lor from the system theme"
-msgstr "Use co_lour from the system theme"
+msgid "Resize note"
+msgstr "Resize note"
 
 #: ../stickynotes/stickynotes.ui.h:35
-msgid "Use default co_lor"
-msgstr "Use default co_lour"
+msgid "Sticky Note Properties"
+msgstr "Sticky Note Properties"
 
 #: ../stickynotes/stickynotes.ui.h:36
-msgid "Use default fo_nt"
-msgstr "Use default fo_nt"
+msgid "Properties"
+msgstr "Properties"
 
 #: ../stickynotes/stickynotes.ui.h:37
-msgid "Use fo_nt from the system theme"
-msgstr "Use fo_nt from the system theme"
+msgid "Choose a font for the note"
+msgstr "Choose a font for the note"
 
 #: ../stickynotes/stickynotes.ui.h:38
-msgid "_Delete All"
-msgstr "_Delete All"
+msgid "Pick a font for the sticky note"
+msgstr "Pick a font for the sticky note"
 
 #: ../stickynotes/stickynotes.ui.h:39
-msgid "_Delete Note..."
-msgstr "_Delete Noteâ"
+msgid "Use default fo_nt"
+msgstr "Use default fo_nt"
 
 #: ../stickynotes/stickynotes.ui.h:40
-msgid "_Font:"
-msgstr "_Font:"
+msgid "Choose a color for the note"
+msgstr "Choose a colour for the note"
 
 #: ../stickynotes/stickynotes.ui.h:41
-msgid "_Lock Note"
-msgstr "_Lock Note"
+msgid "Pick a color for the sticky note"
+msgstr "Pick a colour for the sticky note"
 
-#: ../stickynotes/stickynotes.ui.h:42 ../stickynotes/stickynotes_applet.c:33
-msgid "_New Note"
-msgstr "_New Note"
+#: ../stickynotes/stickynotes.ui.h:42
+msgid "Note _Color:"
+msgstr "Note _Colour:"
+
+#: ../stickynotes/stickynotes.ui.h:43
+msgid "Font C_olor:"
+msgstr "Font C_olour:"
 
 #: ../stickynotes/stickynotes.ui.h:44
-msgid "_Put notes on all workspaces"
-msgstr "_Put notes on all workspaces"
+msgid "Use default co_lor"
+msgstr "Use default co_lour"
 
 #: ../stickynotes/stickynotes.ui.h:45
+msgid "Specify a title for the note"
+msgstr "Specify a title for the note"
+
+#: ../stickynotes/stickynotes.ui.h:46
 msgid "_Title:"
 msgstr "_Title:"
 
 #: ../stickynotes/stickynotes.schemas.in.h:1
-msgid ""
-"By default, sticky notes are given the current date as the title when they "
-"are created. This format is used; anything that can be parsed by strftime() "
-"is valid."
-msgstr ""
-"By default, sticky notes are given the current date as the title when they "
-"are created. This format is used; anything that can be parsed by strftime() "
-"is valid."
+msgid "Default width for new notes"
+msgstr "Default width for new notes"
 
 #: ../stickynotes/stickynotes.schemas.in.h:2
-msgid "Date format of note's title"
-msgstr "Date format of note's title"
+msgid "Default width for new sticky notes in pixels."
+msgstr "Default width for new sticky notes in pixels."
 
 #: ../stickynotes/stickynotes.schemas.in.h:3
-msgid "Default color for font"
-msgstr "Default colour for font"
+msgid "Default height for new notes"
+msgstr "Default height for new notes"
 
 #: ../stickynotes/stickynotes.schemas.in.h:4
+msgid "Default height for new sticky notes in pixels."
+msgstr "Default height for new sticky notes in pixels."
+
+#: ../stickynotes/stickynotes.schemas.in.h:5
 msgid "Default color for new notes"
 msgstr "Default colour for new notes"
 
-#: ../stickynotes/stickynotes.schemas.in.h:5
+#: ../stickynotes/stickynotes.schemas.in.h:6
 msgid ""
 "Default color for new sticky notes. This should be in html hex "
 "specification, for example \"#30FF50\"."
@@ -3390,7 +2898,11 @@ msgstr ""
 "Default colour for new sticky notes. This should be in html hex "
 "specification, for example \"#30FF50\"."
 
-#: ../stickynotes/stickynotes.schemas.in.h:6
+#: ../stickynotes/stickynotes.schemas.in.h:7
+msgid "Default color for font"
+msgstr "Default colour for font"
+
+#: ../stickynotes/stickynotes.schemas.in.h:8
 msgid ""
 "Default font color for new sticky notes. This should be in html hex "
 "specification, for example \"#000000\"."
@@ -3398,11 +2910,11 @@ msgstr ""
 "Default font colour for new sticky notes. This should be in html hex "
 "specification, for example \"#000000\"."
 
-#: ../stickynotes/stickynotes.schemas.in.h:7
+#: ../stickynotes/stickynotes.schemas.in.h:9
 msgid "Default font for new notes"
 msgstr "Default font for new notes"
 
-#: ../stickynotes/stickynotes.schemas.in.h:8
+#: ../stickynotes/stickynotes.schemas.in.h:10
 msgid ""
 "Default font for new sticky notes. This should be a Pango Font Name, for "
 "example \"Sans Italic 10\"."
@@ -3410,27 +2922,45 @@ msgstr ""
 "Default font for new sticky notes. This should be a Pango Font Name, for "
 "example \"Sans Italic 10\"."
 
-#: ../stickynotes/stickynotes.schemas.in.h:9
-msgid "Default height for new notes"
-msgstr "Default height for new notes"
-
-#: ../stickynotes/stickynotes.schemas.in.h:10
-msgid "Default height for new sticky notes in pixels."
-msgstr "Default height for new sticky notes in pixels."
-
 #: ../stickynotes/stickynotes.schemas.in.h:11
-msgid "Default width for new notes"
-msgstr "Default width for new notes"
+msgid "Sticky notes' workspace stickyness"
+msgstr "Sticky notes' workspace stickiness"
 
 #: ../stickynotes/stickynotes.schemas.in.h:12
-msgid "Default width for new sticky notes in pixels."
-msgstr "Default width for new sticky notes in pixels."
+msgid ""
+"Specifies whether the sticky notes are visible on ALL workspaces on the "
+"desktop, or not."
+msgstr ""
+"Specifies whether the sticky notes are visible on ALL workspaces on the "
+"desktop, or not."
 
 #: ../stickynotes/stickynotes.schemas.in.h:13
-msgid "Empty notes are always deleted without confirmation."
-msgstr "Empty notes are always deleted without confirmation."
+msgid "Sticky notes' locked state"
+msgstr "Sticky notes' locked state"
+
+#: ../stickynotes/stickynotes.schemas.in.h:14
+msgid "Specifies whether the sticky notes are locked (non-editable) or not."
+msgstr "Specifies whether the sticky notes are locked (non-editable) or not."
+
+#: ../stickynotes/stickynotes.schemas.in.h:15
+msgid "Date format of note's title"
+msgstr "Date format of note's title"
+
+#: ../stickynotes/stickynotes.schemas.in.h:16
+msgid ""
+"By default, sticky notes are given the current date as the title when they "
+"are created. This format is used; anything that can be parsed by strftime() "
+"is valid."
+msgstr ""
+"By default, sticky notes are given the current date as the title when they "
+"are created. This format is used; anything that can be parsed by strftime() "
+"is valid."
 
-#: ../stickynotes/stickynotes.schemas.in.h:14
+#: ../stickynotes/stickynotes.schemas.in.h:17
+msgid "Whether to use the default system color"
+msgstr "Whether to use the default system colour"
+
+#: ../stickynotes/stickynotes.schemas.in.h:18
 msgid ""
 "If this option is disabled, a custom color can be used as the default color "
 "for all sticky notes."
@@ -3438,7 +2968,11 @@ msgstr ""
 "If this option is disabled, a custom colour can be used as the default "
 "colour for all sticky notes."
 
-#: ../stickynotes/stickynotes.schemas.in.h:15
+#: ../stickynotes/stickynotes.schemas.in.h:19
+msgid "Whether to use the default system font"
+msgstr "Whether to use the default system font"
+
+#: ../stickynotes/stickynotes.schemas.in.h:20
 msgid ""
 "If this option is disabled, a custom font can be used as the default font "
 "for all sticky notes."
@@ -3446,15 +2980,11 @@ msgstr ""
 "If this option is disabled, a custom font can be used as the default font "
 "for all sticky notes."
 
-#: ../stickynotes/stickynotes.schemas.in.h:16
-msgid ""
-"If this option is enabled, selecting the desktop in any way will "
-"automatically hide all the open notes."
-msgstr ""
-"If this option is enabled, selecting the desktop in any way will "
-"automatically hide all the open notes."
+#: ../stickynotes/stickynotes.schemas.in.h:21
+msgid "Whether to force the default color and font on all notes"
+msgstr "Whether to force the default colour and font on all notes"
 
-#: ../stickynotes/stickynotes.schemas.in.h:17
+#: ../stickynotes/stickynotes.schemas.in.h:22
 msgid ""
 "If this option is enabled, the custom colors and fonts that have been "
 "assigned to individual notes will be ignored."
@@ -3462,45 +2992,25 @@ msgstr ""
 "If this option is enabled, the custom colours and fonts that have been "
 "assigned to individual notes will be ignored."
 
-#: ../stickynotes/stickynotes.schemas.in.h:18
-msgid "Specifies whether the sticky notes are locked (non-editable) or not."
-msgstr "Specifies whether the sticky notes are locked (non-editable) or not."
+#: ../stickynotes/stickynotes.schemas.in.h:23
+msgid "Whether to hide all notes when the desktop is selected"
+msgstr "Whether to hide all notes when the desktop is selected"
 
-#: ../stickynotes/stickynotes.schemas.in.h:19
+#: ../stickynotes/stickynotes.schemas.in.h:24
 msgid ""
-"Specifies whether the sticky notes are visible on ALL workspaces on the "
-"desktop, or not."
+"If this option is enabled, selecting the desktop in any way will "
+"automatically hide all the open notes."
 msgstr ""
-"Specifies whether the sticky notes are visible on ALL workspaces on the "
-"desktop, or not."
-
-#: ../stickynotes/stickynotes.schemas.in.h:20
-msgid "Sticky notes' locked state"
-msgstr "Sticky notes' locked state"
-
-#: ../stickynotes/stickynotes.schemas.in.h:21
-msgid "Sticky notes' workspace stickyness"
-msgstr "Sticky notes' workspace stickiness"
+"If this option is enabled, selecting the desktop in any way will "
+"automatically hide all the open notes."
 
-#: ../stickynotes/stickynotes.schemas.in.h:22
+#: ../stickynotes/stickynotes.schemas.in.h:25
 msgid "Whether to ask for confirmation when deleting a note"
 msgstr "Whether to ask for confirmation when deleting a note"
 
-#: ../stickynotes/stickynotes.schemas.in.h:23
-msgid "Whether to force the default color and font on all notes"
-msgstr "Whether to force the default colour and font on all notes"
-
-#: ../stickynotes/stickynotes.schemas.in.h:24
-msgid "Whether to hide all notes when the desktop is selected"
-msgstr "Whether to hide all notes when the desktop is selected"
-
-#: ../stickynotes/stickynotes.schemas.in.h:25
-msgid "Whether to use the default system color"
-msgstr "Whether to use the default system colour"
-
 #: ../stickynotes/stickynotes.schemas.in.h:26
-msgid "Whether to use the default system font"
-msgstr "Whether to use the default system font"
+msgid "Empty notes are always deleted without confirmation."
+msgstr "Empty notes are always deleted without confirmation."
 
 #: ../stickynotes/stickynotes_applet.c:36
 msgid "Hi_de Notes"
@@ -3514,30 +3024,30 @@ msgstr "_Delete Notes"
 msgid "_Lock Notes"
 msgstr "_Lock Notes"
 
-#: ../stickynotes/stickynotes_applet.c:622
+#: ../stickynotes/stickynotes_applet.c:620
 #, c-format
 msgid "%d note"
 msgid_plural "%d notes"
 msgstr[0] "%d note"
 msgstr[1] "%d notes"
 
-#: ../stickynotes/stickynotes_applet.c:623
+#: ../stickynotes/stickynotes_applet.c:621
 msgid "Show sticky notes"
 msgstr "Show sticky notes"
 
-#: ../stickynotes/stickynotes_applet_callbacks.c:421
+#: ../stickynotes/stickynotes_applet_callbacks.c:379
 msgid "Sticky Notes for the GNOME Desktop Environment"
 msgstr "Sticky Notes for the GNOME Desktop Environment"
 
 #: ../trashapplet/org.gnome.applets.TrashApplet.panel-applet.in.in.h:1
-msgid "Go to Trash"
-msgstr "Go to Wastebasket"
-
-#: ../trashapplet/org.gnome.applets.TrashApplet.panel-applet.in.in.h:2
 msgid "Trash"
 msgstr "Wastebasket"
 
-#: ../trashapplet/src/trashapplet.c:69 ../trashapplet/src/trash-empty.c:351
+#: ../trashapplet/org.gnome.applets.TrashApplet.panel-applet.in.in.h:2
+msgid "Go to Trash"
+msgstr "Go to Wastebasket"
+
+#: ../trashapplet/src/trashapplet.c:69 ../trashapplet/src/trash-empty.c:343
 msgid "_Empty Trash"
 msgstr "_Empty the Wastebasket"
 
@@ -3556,7 +3066,7 @@ msgstr[1] "%d Items in the Wastebasket"
 msgid "No Items in Trash"
 msgstr "No items in the Wastebasket"
 
-#: ../trashapplet/src/trashapplet.c:378
+#: ../trashapplet/src/trashapplet.c:377
 #, c-format
 msgid ""
 "Error while spawning nautilus:\n"
@@ -3565,7 +3075,7 @@ msgstr ""
 "Error while spawning Nautilus:\n"
 "%s"
 
-#: ../trashapplet/src/trashapplet.c:427
+#: ../trashapplet/src/trashapplet.c:426
 msgid ""
 "A GNOME trash bin that lives in your panel. You can use it to view the trash "
 "or drag and drop items into the trash."
@@ -3573,43 +3083,43 @@ msgstr ""
 "A GNOME wastebasket that lives in your panel. You can use it to view the "
 "waste or drag and drop items into the wastebasket."
 
-#: ../trashapplet/src/trashapplet.c:452
+#: ../trashapplet/src/trashapplet.c:451
 msgid "Delete Immediately?"
 msgstr "Delete Immediately?"
 
-#: ../trashapplet/src/trashapplet.c:482
+#: ../trashapplet/src/trashapplet.c:480
 msgid "Cannot move items to trash, do you want to delete them immediately?"
 msgstr ""
 "Cannot move items to the wastebasket, do you want to delete them immediately?"
 
-#: ../trashapplet/src/trashapplet.c:487
+#: ../trashapplet/src/trashapplet.c:485
 msgid ""
 "Cannot move some items to trash, do you want to delete these immediately?"
 msgstr ""
 "Cannot move some items to the wastebasket, do you want to delete these "
 "immediately?"
 
-#: ../trashapplet/src/trashapplet.c:617
+#: ../trashapplet/src/trashapplet.c:615
 msgid "Trash Applet"
 msgstr "Wastebasket Applet"
 
 #. Translators: the %s in this string should be read as %d.
-#: ../trashapplet/src/trash-empty.c:81
+#: ../trashapplet/src/trash-empty.c:73
 #, c-format
 msgid "Removing item %s of %s"
 msgstr "Removing item %s of %s"
 
 #. Translators: %s is a file name
-#: ../trashapplet/src/trash-empty.c:107
+#: ../trashapplet/src/trash-empty.c:99
 #, c-format
 msgid "Removing: %s"
 msgstr "Removing: %s"
 
-#: ../trashapplet/src/trash-empty.c:330
+#: ../trashapplet/src/trash-empty.c:322
 msgid "Empty all of the items from the trash?"
 msgstr "Empty all of the items from the wastebasket?"
 
-#: ../trashapplet/src/trash-empty.c:337
+#: ../trashapplet/src/trash-empty.c:329
 msgid ""
 "If you choose to empty the trash, all items in it will be permanently lost. "
 "Please note that you can also delete them separately."
@@ -3625,6 +3135,517 @@ msgstr "Emptying the Wastebasket"
 msgid "From:"
 msgstr "From:"
 
+#~ msgid "Default"
+#~ msgstr "Default"
+
+#~ msgid "Cannot execute '%s'"
+#~ msgstr "Cannot execute '%s'"
+
+#~ msgid "Alt+Control changes layout."
+#~ msgstr "Alt+Control changes layout."
+
+#~ msgid "Alt+Shift changes layout."
+#~ msgstr "Alt+Shift changes layout."
+
+#~ msgid "Arabic keymap"
+#~ msgstr "Arabic keymap"
+
+#~ msgid "Armenian"
+#~ msgstr "Armenian"
+
+#~ msgid "Basque"
+#~ msgstr "Basque"
+
+#~ msgid "Belgian"
+#~ msgstr "Belgian"
+
+#~ msgid "Both Alt keys together change layout."
+#~ msgstr "Both Alt keys together change layout."
+
+#~ msgid "Both Ctrl keys together change layout."
+#~ msgstr "Both Ctrl keys together change layout."
+
+#~ msgid "Both Shift keys together change layout."
+#~ msgstr "Both Shift keys together change layout."
+
+#~ msgid "Brazil Portuguese keymap"
+#~ msgstr "Brazil Portuguese keymap"
+
+#~ msgid "Bulgarian Cyrillic"
+#~ msgstr "Bulgarian Cyrillic"
+
+#~ msgid "Bulgarian keymap"
+#~ msgstr "Bulgarian keymap"
+
+#~ msgid "CapsLock key changes layout."
+#~ msgstr "CapsLock key changes layout."
+
+#~ msgid "Control+Shift changes layout."
+#~ msgstr "Control+Shift changes layout."
+
+#~ msgid "Czech keymap"
+#~ msgstr "Czech keymap"
+
+#~ msgid "Danish keymap"
+#~ msgstr "Danish keymap"
+
+#~ msgid "Dutch keymap"
+#~ msgstr "Dutch keymap"
+
+#~ msgid "English keymap"
+#~ msgstr "English keymap"
+
+#~ msgid "Estonian keymap"
+#~ msgstr "Estonian keymap"
+
+#~ msgid "Finnish keymap"
+#~ msgstr "Finnish keymap"
+
+#~ msgid "French Swiss"
+#~ msgstr "French Swiss"
+
+#~ msgid "French Swiss keymap"
+#~ msgstr "French Swiss keymap"
+
+#~ msgid "French keymap"
+#~ msgstr "French keymap"
+
+#~ msgid "French-Canadian 105-key"
+#~ msgstr "French-Canadian 105-key"
+
+#~ msgid "GB 102-key"
+#~ msgstr "GB 102-key"
+
+#~ msgid "GB 105-key"
+#~ msgstr "GB 105-key"
+
+#~ msgid "Generic Keyboard"
+#~ msgstr "Generic Keyboard"
+
+#~ msgid "Georgian Latin"
+#~ msgstr "Georgian Latin"
+
+#~ msgid "Georgian Russian layout"
+#~ msgstr "Georgian Russian layout"
+
+#~ msgid "Georgian keymap"
+#~ msgstr "Georgian keymap"
+
+#~ msgid "German"
+#~ msgstr "German"
+
+#~ msgid "German Swiss with Euro"
+#~ msgstr "German Swiss with Euro"
+
+#~ msgid "German keymap"
+#~ msgstr "German keymap"
+
+#~ msgid "Greek keymap"
+#~ msgstr "Greek keymap"
+
+#~ msgid "Hebrew keymap"
+#~ msgstr "Hebrew keymap"
+
+#~ msgid "Hungarian 101-key latin 1"
+#~ msgstr "Hungarian 101-key latin 1"
+
+#~ msgid "Hungarian 101-key latin 2"
+#~ msgstr "Hungarian 101-key latin 2"
+
+#~ msgid "Hungarian 105-key latin 1"
+#~ msgstr "Hungarian 105-key latin 1"
+
+#~ msgid "Hungarian 105-key latin 2"
+#~ msgstr "Hungarian 105-key latin 2"
+
+#~ msgid "Hungarian PC/AT 101 keyboard"
+#~ msgstr "Hungarian PC/AT 101 keyboard"
+
+#~ msgid "Hungarian latin1"
+#~ msgstr "Hungarian latin1"
+
+#~ msgid "Icelandic keymap"
+#~ msgstr "Icelandic keymap"
+
+#~ msgid "Italian keymap"
+#~ msgstr "Italian keymap"
+
+#~ msgid "Japanese keymap"
+#~ msgstr "Japanese keymap"
+
+#~ msgid "Lao keymap"
+#~ msgstr "Lao keymap"
+
+#~ msgid "Layout shift behavior"
+#~ msgstr "Layout shift behaviour"
+
+#~ msgid "Left Alt key changes layout."
+#~ msgstr "Left Alt key changes layout."
+
+#~ msgid "Left Ctrl key changes group."
+#~ msgstr "Left Ctrl key changes group."
+
+#~ msgid "Left Shift key changes group."
+#~ msgstr "Left Shift key changes group."
+
+#~ msgid "Left Win-key changes layout."
+#~ msgstr "Left Win-key changes layout."
+
+#~ msgid "Lithuanian keymap"
+#~ msgstr "Lithuanian keymap"
+
+#~ msgid "Macedonian"
+#~ msgstr "Macedonian"
+
+#~ msgid "Menu key changes layout."
+#~ msgstr "Menu key changes layout."
+
+#~ msgid "Mongolian alt keymap"
+#~ msgstr "Mongolian alt keymap"
+
+#~ msgid "Mongolian keymap"
+#~ msgstr "Mongolian keymap"
+
+#~ msgid "Mongolian phonetic keymap"
+#~ msgstr "Mongolian phonetic keymap"
+
+#~ msgid "Norwegian"
+#~ msgstr "Norwegian"
+
+#~ msgid "Plain Russian keymap"
+#~ msgstr "Plain Russian keymap"
+
+#~ msgid "Polish"
+#~ msgstr "Polish"
+
+#~ msgid "Polish deadkeys"
+#~ msgstr "Polish deadkeys"
+
+#~ msgid "Portugal"
+#~ msgstr "Portugal"
+
+#~ msgid "Portugal Deadkeys"
+#~ msgstr "Portugal Deadkeys"
+
+#~ msgid "Portuguese keymap"
+#~ msgstr "Portuguese keymap"
+
+#~ msgid "Right Alt key changes layout."
+#~ msgstr "Right Alt key changes layout."
+
+#~ msgid "Right Ctrl key changes group."
+#~ msgstr "Right Ctrl key changes group."
+
+#~ msgid "Right Shift key changes group."
+#~ msgstr "Right Shift key changes group."
+
+#~ msgid "Right Win-key changes layout."
+#~ msgstr "Right Win-key changes layout."
+
+#~ msgid "Russian Cyrillic"
+#~ msgstr "Russian Cyrillic"
+
+#~ msgid "Russian keymap"
+#~ msgstr "Russian keymap"
+
+#~ msgid "Serbian keymap"
+#~ msgstr "Serbian keymap"
+
+#~ msgid "Shift+CapsLock changes layout."
+#~ msgstr "Shift+CapsLock changes layout."
+
+#~ msgid "Slovak keymap"
+#~ msgstr "Slovak keymap"
+
+#~ msgid "Slovenian"
+#~ msgstr "Slovenian"
+
+#~ msgid "Slovenian keymap"
+#~ msgstr "Slovenian keymap"
+
+#~ msgid "Spanish keymap"
+#~ msgstr "Spanish keymap"
+
+#~ msgid "Sun (!not PC!) type5 Hungarian latin 2"
+#~ msgstr "Sun (!not PC!) type5 Hungarian latin 2"
+
+#~ msgid "Swedish"
+#~ msgstr "Swedish"
+
+#~ msgid "Swedish keymap"
+#~ msgstr "Swedish keymap"
+
+#~ msgid "Swiss keymap"
+#~ msgstr "Swiss keymap"
+
+#~ msgid "Thai"
+#~ msgstr "Thai"
+
+#~ msgid "Thai Kedmanee"
+#~ msgstr "Thai Kedmanee"
+
+#~ msgid "Thai keymap"
+#~ msgstr "Thai keymap"
+
+#~ msgid "Turkish \"F\" keyboard"
+#~ msgstr "Turkish \"F\" keyboard"
+
+#~ msgid "Turkish \"Q\" keyboard"
+#~ msgstr "Turkish \"Q\" keyboard"
+
+#~ msgid "Turkish keymap"
+#~ msgstr "Turkish keymap"
+
+#~ msgid "UK 105-key"
+#~ msgstr "UK 105-key"
+
+#~ msgid "UK PC/AT keyboard"
+#~ msgstr "UK PC/AT keyboard"
+
+#~ msgid "US 101-key keyboard"
+#~ msgstr "US 101-key keyboard"
+
+#~ msgid "US 105-key keyboard (with windows keys)"
+#~ msgstr "US 105-key keyboard (with windows keys)"
+
+#~ msgid "US 84-key"
+#~ msgstr "US 84-key"
+
+#~ msgid "US DEC 450"
+#~ msgstr "US DEC 450"
+
+#~ msgid "US IBM RS/6000"
+#~ msgstr "US IBM RS/6000"
+
+#~ msgid "US International"
+#~ msgstr "US International"
+
+#~ msgid "US Macintosh"
+#~ msgstr "US Macintosh"
+
+#~ msgid "US PC/AT 101 keyboard"
+#~ msgstr "US PC/AT 101 keyboard"
+
+#~ msgid "US Silicon Graphics 101-key"
+#~ msgstr "US Silicon Graphics 101-key"
+
+#~ msgid "US Sun type5"
+#~ msgstr "US Sun type5"
+
+#~ msgid "Armenian Sun keymap"
+#~ msgstr "Armenian Sun keymap"
+
+#~ msgid "Azerbaijani Turkish Sun keymap"
+#~ msgstr "Azerbaijani Turkish Sun keymap"
+
+#~ msgid "Belarusian Sun keymap"
+#~ msgstr "Belarusian Sun keymap"
+
+#~ msgid "Brazil Portuguese Sun USB keymap"
+#~ msgstr "Brazil Portuguese Sun USB keymap"
+
+#~ msgid "Brazil Portuguese Sun keymap"
+#~ msgstr "Brazil Portuguese Sun keymap"
+
+#~ msgid "British Sun Type-4 keymap"
+#~ msgstr "British Sun Type-4 keymap"
+
+#~ msgid "British Sun USB keymap"
+#~ msgstr "British Sun USB keymap"
+
+#~ msgid "British Sun keymap"
+#~ msgstr "British Sun keymap"
+
+#~ msgid "Bulgarian Sun keymap"
+#~ msgstr "Bulgarian Sun keymap"
+
+#~ msgid "Canadian Sun keymap"
+#~ msgstr "Canadian Sun keymap"
+
+#~ msgid "Czech Sun keymap"
+#~ msgstr "Czech Sun keymap"
+
+#~ msgid "Danish Sun Type-4 keymap"
+#~ msgstr "Danish Sun Type-4 keymap"
+
+#~ msgid "Danish Sun USB keymap"
+#~ msgstr "Danish Sun USB keymap"
+
+#~ msgid "Danish Sun keymap"
+#~ msgstr "Danish Sun keymap"
+
+#~ msgid "Dutch Sun keymap"
+#~ msgstr "Dutch Sun keymap"
+
+#~ msgid "Estonian Sun keymap"
+#~ msgstr "Estonian Sun keymap"
+
+#~ msgid "Finnish Sun keymap"
+#~ msgstr "Finnish Sun keymap"
+
+#~ msgid "French Sun USB keymap"
+#~ msgstr "French Sun USB keymap"
+
+#~ msgid "French Sun keymap"
+#~ msgstr "French Sun keymap"
+
+#~ msgid "German Sun Type-4 keymap"
+#~ msgstr "German Sun Type-4 keymap"
+
+#~ msgid "German Sun USB keymap"
+#~ msgstr "German Sun USB keymap"
+
+#~ msgid "German Sun keymap"
+#~ msgstr "German Sun keymap"
+
+#~ msgid "Hebrew Sun keymap"
+#~ msgstr "Hebrew Sun keymap"
+
+#~ msgid "Hungarian latin2 Sun keymap"
+#~ msgstr "Hungarian latin2 Sun keymap"
+
+#~ msgid "Hungarian type5 latin 1 keymap"
+#~ msgstr "Hungarian type5 latin 1 keymap"
+
+#~ msgid "Icelandic Sun keymap"
+#~ msgstr "Icelandic Sun keymap"
+
+#~ msgid "Italian Sun Type-4 keymap"
+#~ msgstr "Italian Sun Type-4 keymap"
+
+#~ msgid "Italian Sun USB keymap"
+#~ msgstr "Italian Sun USB keymap"
+
+#~ msgid "Italian Sun keymap"
+#~ msgstr "Italian Sun keymap"
+
+#~ msgid "Japanese Sun Type-4 keymap"
+#~ msgstr "Japanese Sun Type-4 keymap"
+
+#~ msgid "Japanese Sun keymap"
+#~ msgstr "Japanese Sun keymap"
+
+#~ msgid "Latvian Sun keymap"
+#~ msgstr "Latvian Sun keymap"
+
+#~ msgid "Lithuanian Sun keymap"
+#~ msgstr "Lithuanian Sun keymap"
+
+#~ msgid "Macedonian Sun keymap"
+#~ msgstr "Macedonian Sun keymap"
+
+#~ msgid "Norwegian Sun keymap"
+#~ msgstr "Norwegian Sun keymap"
+
+#~ msgid "Polish Sun keymap"
+#~ msgstr "Polish Sun keymap"
+
+#~ msgid "Portuguese Sun Type-4 keymap"
+#~ msgstr "Portuguese Sun Type-4 keymap"
+
+#~ msgid "Portuguese Sun keymap"
+#~ msgstr "Portuguese Sun keymap"
+
+#~ msgid "Romanian Sun keymap"
+#~ msgstr "Romanian Sun keymap"
+
+#~ msgid "Russian Sun keymap"
+#~ msgstr "Russian Sun keymap"
+
+#~ msgid "Serbian Sun standard keymap"
+#~ msgstr "Serbian Sun standard keymap"
+
+#~ msgid "Slovak Sun keymap"
+#~ msgstr "Slovak Sun keymap"
+
+#~ msgid "Slovenian Sun keymap"
+#~ msgstr "Slovenian Sun keymap"
+
+#~ msgid "Spanish Sun Type-4 keymap"
+#~ msgstr "Spanish Sun Type-4 keymap"
+
+#~ msgid "Spanish Sun USB keymap"
+#~ msgstr "Spanish Sun USB keymap"
+
+#~ msgid "Spanish Sun keymap"
+#~ msgstr "Spanish Sun keymap"
+
+#~ msgid "Swedish Sun Type-4 keymap"
+#~ msgstr "Swedish Sun Type-4 keymap"
+
+#~ msgid "Swedish Sun USB keymap"
+#~ msgstr "Swedish Sun USB keymap"
+
+#~ msgid "Swedish Sun keymap"
+#~ msgstr "Swedish Sun keymap"
+
+#~ msgid "Swiss German Sun keymap"
+#~ msgstr "Swiss German Sun keymap"
+
+#~ msgid "Thai Sun keymap"
+#~ msgstr "Thai Sun keymap"
+
+#~ msgid "Turkish Sun keymap"
+#~ msgstr "Turkish Sun keymap"
+
+#~ msgid "US Sun Type-4 keymap"
+#~ msgstr "US Sun Type-4 keymap"
+
+#~ msgid "US Sun USB keymap"
+#~ msgstr "US Sun USB keymap"
+
+#~ msgid "US Sun type5 keymap"
+#~ msgstr "US Sun type5 keymap"
+
+#~ msgid "Ukrainian Sun keymap"
+#~ msgstr "Ukrainian Sun keymap"
+
+#~ msgid "Vietnamese Sun keymap"
+#~ msgstr "Vietnamese Sun keymap"
+
+#~ msgid ""
+#~ "<i><small><b>Note:</b> Quotes are delayed at least 15 minutes.\n"
+#~ "<b>Source: </b> Yahoo!</small></i>"
+#~ msgstr ""
+#~ "<i><small><b>Note:</b> Quotes are delayed at least 15 minutes.\n"
+#~ "<b>Source: </b> Yahoo!</small></i>"
+
+#~ msgid "Invest Applet"
+#~ msgstr "Invest Applet"
+
+#~ msgid "CD Player (Deprecated)"
+#~ msgstr "CD Player (Deprecated)"
+
+#~ msgid "Panel applet for playing audio CDs"
+#~ msgstr "Panel applet for playing audio CDs"
+
+#~ msgid "Alert you when new mail arrives"
+#~ msgstr "Alert you when new mail arrives"
+
+#~ msgid "Inbox Monitor (Deprecated)"
+#~ msgstr "Inbox Monitor (Deprecated)"
+
+#~ msgid "Volume Control (Deprecated)"
+#~ msgstr "Volume Control (Deprecated)"
+
+#~ msgid "Factory for deprecating applets"
+#~ msgstr "Factory for deprecating applets"
+
+#~ msgid "Null Applet Factory"
+#~ msgstr "Null Applet Factory"
+
+#~ msgid "Monitor the quality of a wireless network link"
+#~ msgstr "Monitor the quality of a wireless network link"
+
+#~ msgid "Wireless Link Monitor"
+#~ msgstr "Wireless Link Monitor"
+
+#~ msgid "Keyboard Indicator (Deprecated)"
+#~ msgstr "Keyboard Indicator (Deprecated)"
+
+#~ msgid "Keyboard layout indicator"
+#~ msgstr "Keyboard layout indicator"
+
 #~ msgid "Keyboard _Preferences"
 #~ msgstr "Keyboard _Preferences"
 
@@ -3634,9 +3655,6 @@ msgstr "From:"
 #~ msgid "Show Current _Layout"
 #~ msgstr "Show Current _Layout"
 
-#~ msgid "_Groups"
-#~ msgstr "_Groups"
-
 #~ msgid "Keyboard applet factory"
 #~ msgstr "Keyboard applet factory"
 
@@ -3982,9 +4000,6 @@ msgstr "From:"
 #~ msgid "Ice pellet storm"
 #~ msgstr "Ice pellet storm"
 
-#~ msgid "Showers of ice pellets"
-#~ msgstr "Showers of ice pellets"
-
 #~ msgid "Hail"
 #~ msgstr "Hail"
 
@@ -4191,22 +4206,9 @@ msgstr "From:"
 #~ "A unique zone for the city, as found from http://cvs.gnome.org/viewcvs/";
 #~ "*checkout*/gnome-applets/gweather/Locations.xml.in"
 
-#~ msgid ""
-#~ "Determines whether the applet automatically updates its weather "
-#~ "statistics or not."
-#~ msgstr ""
-#~ "Determines whether the applet automatically updates its weather "
-#~ "statistics or not."
-
-#~ msgid "Display radar map"
-#~ msgstr "Display radar map"
-
 #~ msgid "Distance unit"
 #~ msgstr "Distance unit"
 
-#~ msgid "Fetch a radar map on each update."
-#~ msgstr "Fetch a radar map on each update."
-
 #~ msgid ""
 #~ "If true, then retrieve a radar map from a location specified by the "
 #~ "\"radar\" key."
@@ -4252,9 +4254,6 @@ msgstr "From:"
 #~ msgid "The custom url from where to retrieve a radar map."
 #~ msgstr "The custom url from where to retrieve a radar map."
 
-#~ msgid "The interval, in seconds, between automatic updates."
-#~ msgstr "The interval, in seconds, between automatic updates."
-
 #~ msgid "The unit to use for pressure."
 #~ msgstr "The unit to use for pressure."
 
@@ -4267,12 +4266,6 @@ msgstr "From:"
 #~ msgid "The unit to use for wind speed."
 #~ msgstr "The unit to use for wind speed."
 
-#~ msgid "Update interval"
-#~ msgstr "Update interval"
-
-#~ msgid "Update the data automatically"
-#~ msgstr "Update the data automatically"
-
 #~ msgid "Url for the radar map"
 #~ msgstr "Url for the radar map"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]